ToxicMushroom/Dalamud
1
0
Fork 0
mirror of https://github.com/goatcorp/Dalamud.git synced 2025-12-12 18:27:23 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Revert "Revert "fix: catch some discord bot errors""

Browse source 
This reverts commit 5410981beb.
This commit is contained in:
goat 2020-07-20 18:34:22 +02:00
parent 5410981beb
commit fe76d1e31a
3 changed files with 31 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Dalamud.Injector/Program.cs
View file

@ -75,7 +75,7 @@ namespace Dalamud.Injector {
Thread.Sleep(1000);
#if DEBUG
#if NO
// Inject exception handler
NativeInject(process);
#endif

38
Dalamud/DiscordBot/DiscordBotManager.cs
View file

@ -188,27 +188,35 @@ namespace Dalamud.DiscordBot {
string senderName;
string senderWorld;
if (playerLink == null) {
// chat messages from the local player do not include a player link, and are just the raw name
// but we should still track other instances to know if this is ever an issue otherwise
// Special case 2 - When the local player talks in party/alliance, the name comes through as raw text,
// but prefixed by their position number in the party (which for local player may always be 1)
if (sender.TextValue.EndsWith(this.dalamud.ClientState.LocalPlayer.Name))
if (this.dalamud.ClientState.LocalPlayer != null) {
if (playerLink == null)
{
senderName = this.dalamud.ClientState.LocalPlayer.Name;
// chat messages from the local player do not include a player link, and are just the raw name
// but we should still track other instances to know if this is ever an issue otherwise
// Special case 2 - When the local player talks in party/alliance, the name comes through as raw text,
// but prefixed by their position number in the party (which for local player may always be 1)
if (sender.TextValue.EndsWith(this.dalamud.ClientState.LocalPlayer.Name))
{
senderName = this.dalamud.ClientState.LocalPlayer.Name;
}
else
{
Log.Error("playerLink was null. Sender: {0}", BitConverter.ToString(sender.Encode()));
senderName = wasOutgoingTell ? this.dalamud.ClientState.LocalPlayer.Name : sender.TextValue;
}
senderWorld = this.dalamud.ClientState.LocalPlayer.HomeWorld.GameData.Name;
}
else
{
Log.Error("playerLink was null. Sender: {0}", BitConverter.ToString(sender.Encode()));
senderName = wasOutgoingTell ? this.dalamud.ClientState.LocalPlayer.Name : sender.TextValue;
senderName = wasOutgoingTell ? this.dalamud.ClientState.LocalPlayer.Name : playerLink.PlayerName;
senderWorld = playerLink.World.Name;
}
senderWorld = this.dalamud.ClientState.LocalPlayer.HomeWorld.GameData.Name;
} else {
senderName = wasOutgoingTell ? this.dalamud.ClientState.LocalPlayer.Name : playerLink.PlayerName;
senderWorld = playerLink.World.Name;
senderName = string.Empty;
senderWorld = string.Empty;
}
var rawMessage = message.TextValue;

8
Dalamud/Game/ChatHandlers.cs
View file

@ -170,7 +170,13 @@ namespace Dalamud.Game {
var messageCopy = message;
var senderCopy = sender;
Task.Run(() => this.dalamud.BotManager.ProcessChatMessage(type, messageCopy, senderCopy));
Task.Run(async () => {
try {
await this.dalamud.BotManager.ProcessChatMessage(type, messageCopy, senderCopy);
} catch (Exception ex) {
Log.Error(ex, "Could not process discord bot message.");
}
});
// Handle all of this with SeString some day
/*