diff --git a/DML.Client/DMLClient.cs b/DML.Client/DMLClient.cs index 691f563..07060f0 100644 --- a/DML.Client/DMLClient.cs +++ b/DML.Client/DMLClient.cs @@ -22,4 +22,4 @@ namespace DML.Client return Client.LoginState == LoginState.LoggedIn && Client.ConnectionState == ConnectionState.Connected; } } -} +} \ No newline at end of file diff --git a/Discord Media Loader.Application/Classes/Core.cs b/Discord Media Loader.Application/Classes/Core.cs index 00104dd..930e251 100644 --- a/Discord Media Loader.Application/Classes/Core.cs +++ b/Discord Media Loader.Application/Classes/Core.cs @@ -1,11 +1,5 @@ -using System; -using System.Globalization; -using System.IO; -using System.Linq; -using System.Runtime; -using System.Threading.Tasks; -using System.Windows.Forms; -using Discord; +using Discord; +using Discord.Net; using Discord.WebSocket; using DML.AppCore.Classes; using DML.Application.Dialogs; @@ -16,6 +10,13 @@ using SharpRaven.Data; using SweetLib.Utils; using SweetLib.Utils.Logger; using SweetLib.Utils.Logger.Memory; +using System; +using System.Globalization; +using System.IO; +using System.Linq; +using System.Runtime; +using System.Threading.Tasks; +using System.Windows.Forms; using Logger = SweetLib.Utils.Logger.Logger; namespace DML.Application.Classes @@ -175,7 +176,6 @@ namespace DML.Application.Classes Logger.Info("Trying to log into discord..."); - var abort = false; DMLClient.Client.Connected += Client_Connected; @@ -183,10 +183,19 @@ namespace DML.Application.Classes while (!loggedIn) { - if (!string.IsNullOrEmpty(Settings.LoginToken)) + var token = "abc"; + try { - Logger.Debug("Trying to login with last known token..."); - loggedIn = await DMLClient.Login(Settings.LoginToken); + if (!string.IsNullOrEmpty(Settings.LoginToken)) + { + Logger.Debug("Trying to login with last known token..."); + loggedIn = await DMLClient.Login(token); + } + + } + catch (HttpException e) + { + Logger.Warn("HTTPException occured during login. Probably from login token."); } if (!loggedIn) @@ -248,12 +257,16 @@ namespace DML.Application.Classes var isError = false; var guild = FindServerById(job.GuildId); if (guild == null) + { isError = true; + } else { var channel = FindChannelById(guild, job.ChannelId); if (channel == null) + { isError = true; + } } if (isError) @@ -280,9 +293,11 @@ namespace DML.Application.Classes } catch (Exception ex) { - Logger.Error($"{ex.Message} occured at: {ex.StackTrace}"); + Logger.Error($"{ex.Message} [{ex.GetType().Name}] occured at: {ex.StackTrace}"); if (MessageBox.Show($"An error occured while running Discord Media Loader:\n{ex.GetType().Name}: {ex.Message}\n\nDo you aggree to sending the error report to the creator of the tool?", "Discord Media Loader", MessageBoxButtons.YesNo) == DialogResult.Yes) + { Raven.Capture(new SentryEvent(ex)); + } } }