Merge pull request #613 from UWPCommunity/rewrite/main

Release alpha

Author: matthew4850

src/API/Discord.API/Gateways/Gateway.Sockets.cs

@@ -66,7 +66,7 @@ public async Task ResumeAsync()
         private async Task ListenOnSocket()
         {
             var buffer = new ArraySegment<byte>(new byte[16 * 1024]);
-            while (_tokenSource.IsCancellationRequested && _socket!.State == WebSocketState.Open)
+            while (!_tokenSource.IsCancellationRequested && _socket!.State == WebSocketState.Open)
             {
                 WebSocketReceiveResult socketResult = await _socket.ReceiveAsync(buffer, _tokenSource.Token).ConfigureAwait(false);
                 if (socketResult.MessageType == WebSocketMessageType.Close)

src/Quarrel.ViewModels/Services/Discord/DiscordService.cs

@@ -25,6 +25,7 @@ public partial class DiscordService : IDiscordService
         private readonly ILocalizationService _localizationService;
         private readonly IDispatcherService _dispatcherService;
         private readonly IMessenger _messenger;
+        private LoginType? _loginSource;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="DiscordService"/> class.
@@ -66,11 +67,9 @@ public async Task<bool> LoginAsync(string token, LoginType source = LoginType.Un
 
             try
             {
+                _loginSource = source;
                 await _quarrelClient.LoginAsync(token);
 
-                _analyticsService.Log(LoggedEvent.SuccessfulLogin,
-                    (nameof(source), $"{source}"));
-
                 return true;
             }
             catch (Exception e)
@@ -87,6 +86,8 @@ public async Task<bool> LoginAsync(string token, LoginType source = LoginType.Un
 
         private void OnLoggedIn(object sender, SelfUser e)
         {
+            _analyticsService.Log(LoggedEvent.SuccessfulLogin, (nameof(_loginSource), $"{_loginSource}"));
+
             string? token = _quarrelClient.Token;
 
             Guard.IsNotNull(token, nameof(token));