.editorconfig

@@ -1,7 +1,7 @@
 [*.cs]
 
 # CS8632: The annotation for nullable reference types should only be used in code within a '#nullable' annotations context.
-dotnet_diagnostic.CS8632.severity = silent
+dotnet_diagnostic.CS8632.severity = suggestion
 
 # CS4014: Because this call is not awaited, execution of the current method continues before the call is completed
 dotnet_diagnostic.CS4014.severity = suggestion

WindowsFormsApplication2/ConfigManager.cs

@@ -25,21 +25,25 @@ namespace JellyfinRPC
             if (!File.Exists(ConfigFile))
                 saveCfg();
 
-            using StreamReader cfgReader = File.OpenText(ConfigFile);
+            using (StreamReader cfgReader = File.OpenText(ConfigFile))
-            for (string line = cfgReader.ReadLine(); line != null; line = cfgReader.ReadLine())
             {
-                if (line.StartsWith("*")) continue;
+                for (string line = cfgReader.ReadLine(); line != null; line = cfgReader.ReadLine())
-                string[] values = line.Split(SEPERATOR.First());
+                {
-                cfgEntries.Add(values.First().Trim(), String.Join(SEPERATOR, values.Skip(1)).Trim());
+                    if (line.StartsWith("*")) continue;
+                    string[] values = line.Split(SEPERATOR.First());
+                    cfgEntries.Add(values.First().Trim(), String.Join(SEPERATOR, values.Skip(1)).Trim());
+                }
             }
         }
         private static void saveCfg()
         {
-            using StreamWriter cfgWriter = File.CreateText(ConfigFile);
+            using (StreamWriter cfgWriter = File.CreateText(ConfigFile))
-            cfgWriter.WriteLine("**JellyfinDiscordRPC Config**");
-            foreach (KeyValuePair<String, String> values in cfgEntries)
             {
-                cfgWriter.WriteLine(String.Join(SEPERATOR, new String[] { values.Key.Trim(), values.Value.Trim() }));
+                cfgWriter.WriteLine("**JellyfinDiscordRPC Config**");
+                foreach (KeyValuePair<String, String> values in cfgEntries)
+                {
+                    cfgWriter.WriteLine(String.Join(SEPERATOR, new String[] { values.Key.Trim(), values.Value.Trim() } ));
+                }
             }
         }
         public static void SetEntry(string key, string value)

WindowsFormsApplication2/DiscordRPC.cs

@@ -11,13 +11,13 @@ namespace JellyfinRPC
         public static Int64 discordAppID = Int64.Parse(ConfigManager.GetEntry("DiscordClientID"));
         
 
-        public static void UpdateActivity(Discord.Discord discord)
+        static void UpdateActivity(Discord.Discord discord)
         {
             var activityManager = discord.GetActivityManager();
             string[] RPCVari = JellyfinAPI.Jellyfin().Result.Split('|');
             if (JellyfinAPI.Jellyfin().Result != null)
             {
-                Activity activity = new Activity
+                var activity = new Discord.Activity
                 {
                     Details = RPCVari.GetValue(int.Parse("2")).ToString(),
                     State = RPCVari.GetValue(int.Parse("3")).ToString(),

WindowsFormsApplication2/JellyfinAPI.cs

@@ -179,6 +179,7 @@ namespace JellyfinRPC
             }
             return "album_cover";
         }
+        private static Dictionary<string, string> jsonEntries = new Dictionary<string, string>();
         public static async Task<string> SendQuickConnectRequest()
         {
             using var httpClient = new HttpClient();
@@ -197,18 +198,36 @@ namespace JellyfinRPC
                     {
                         response.EnsureSuccessStatusCode();
                         var jsonResponse = await response.Content.ReadAsStringAsync();
-                        var jsonObject = JObject.Parse(jsonResponse);
+                        string[] splitEmUp = jsonResponse.Split(',');
 
-                        if (!jsonObject.HasValues)
+                        if (!splitEmUp.Any())
                         {
                             return "Error: Server did not respond.";
                         }
                         else
                         {
-                            string quickConnectCode = jsonObject.Value<string>("Code");
+                            foreach (var splitstring in splitEmUp)
-                            string quickConnectToken = jsonObject.Value<string>("Secret");
+                            {
-                            return quickConnectCode;
+                                string[] values = splitstring.Split(':');
+                                jsonEntries.Add(values.First().Trim(), String.Join(":", values.Skip(1)).Trim());
+                                
+                            }
                         }
+
+
+                        if (jsonEntries.ContainsKey("\"Code\""))
+                        {
+                            return jsonEntries["\"Code\""].Replace('"', ' ').Trim();
+
+                        }
+                        else
+                        {
+                            return "Error: Server did not return code.";
+                        }
+
+
+
+
                     }
                     catch (Exception ex)
                     {
@@ -225,12 +244,14 @@ namespace JellyfinRPC
 
         public static string DeviceID()
         {
-            using RNGCryptoServiceProvider rng = new RNGCryptoServiceProvider();
+            using (RNGCryptoServiceProvider rng = new RNGCryptoServiceProvider())
-            byte[] randomNumber = new byte[4];
+            {
-            rng.GetBytes(randomNumber);
+                byte[] randomNumber = new byte[4];
-            int value = BitConverter.ToInt32(randomNumber, 0);
+                rng.GetBytes(randomNumber);
-            byte[] valueBytes = System.Text.Encoding.UTF8.GetBytes(value.ToString());
+                int value = BitConverter.ToInt32(randomNumber, 0);
-            return System.Convert.ToBase64String(valueBytes);
+                byte[] valueBytes = System.Text.Encoding.UTF8.GetBytes(value.ToString());
+                return System.Convert.ToBase64String(valueBytes);
+            }
 
         }
         public static async Task GetTokenFromUsernameAndPassword(string Username, string Password)
@@ -273,10 +294,8 @@ namespace JellyfinRPC
 
     public class Login
     {
-#pragma warning disable IDE1006 // Naming Styles
         public string username { get; set; }
         public string pw { get; set; }
-#pragma warning restore IDE1006 // Naming Styles
     }
     public class QuickConnect
     {

WindowsFormsApplication2/obj/x86/Debug/JellyfinRPCGUI.csproj.FileListAbsolute.txt

@@ -39,4 +39,3 @@ C:\Users\random()\Documents\Visual Studio 2010\Projects\WindowsFormsApplication2
 C:\Users\random()\Documents\Visual Studio 2010\Projects\WindowsFormsApplication2\WindowsFormsApplication2\obj\x86\Debug\JellyfinRPCGUI.csproj.CopyComplete
 C:\Users\random()\Documents\Visual Studio 2010\Projects\WindowsFormsApplication2\WindowsFormsApplication2\obj\x86\Debug\Jellyfin Rich Presence.exe
 C:\Users\random()\Documents\Visual Studio 2010\Projects\WindowsFormsApplication2\WindowsFormsApplication2\obj\x86\Debug\Jellyfin Rich Presence.pdb
-C:\Users\random()\Documents\Visual Studio 2010\Projects\WindowsFormsApplication2\WindowsFormsApplication2\obj\x86\Debug\JellyfinRPCGUI.csproj.AssemblyReference.cache