replace discordsocketclient by rest client

Author: DeinFreund

Zero-K.info/Controllers/HomeController.cs

@@ -23,6 +23,7 @@
 using System.Net.Http;
 using Newtonsoft.Json.Linq;
 using System.Threading;
+using System.Threading.Tasks;
 
 namespace ZeroKWeb.Controllers
 {
@@ -237,10 +238,9 @@ public ActionResult NotLoggedIn()
         }
 
 
-        public ActionResult DiscordAuth(string code, string state)
+        public async Task<ActionResult> DiscordAuth(string code, string state)
         {
-            SynchronizationContext.SetSynchronizationContext(null);
-            Global.Server.DiscordWebApi.LinkAccount(state, code);
+            await Global.Server.DiscordWebApi.LinkAccount(state, code);
             return Content("Linking discord account");
         }
 

ZkLobbyServer/DiscordWebApi.cs

@@ -1,5 +1,5 @@
 using Discord;
-using Discord.WebSocket;
+using Discord.Rest;
 using Newtonsoft.Json.Linq;
 using System;
 using System.Collections.Concurrent;
@@ -73,9 +73,7 @@ public async Task LinkAccount(string state, string code)
                 var payload = JObject.Parse(await response.Content.ReadAsStringAsync());
                 var token = payload.Value<string>("access_token");
 
-                var discord = new DiscordSocketClient();
-                Trace.TraceInformation("Starting discord client...");
-                await discord.StartAsync();
+                var discord = new DiscordRestClient();
                 Trace.TraceInformation("Logging in discord client...");
                 await discord.LoginAsync(TokenType.Bearer, token);
                 var discordId = discord.CurrentUser.Id;