Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main.py

.vscode/settings.json

@@ -19,5 +19,8 @@
     "terminal.integrated.hideOnStartup": "always",
     "[jsonc]": {
       "editor.defaultFormatter": "vscode.json-language-features"
+    },
+    "files.exclude": {
+      "**/__pycache__": true
     }
 }

src/tools/discord_tools.py

@@ -15,7 +15,10 @@ class CheckDiscord:
     @staticmethod
     def isdiscordrunning() -> bool:
         for process in psutil.process_iter(["name"]):
-            if process.info["name"].lower() == "discord.exe":
+            if (process.info["name"].lower() == "discord.exe" or
+                process.info["name"].lower() == "discordcanary.exe" or
+                process.info["name"].lower() == "discord" or
+                process.info["name"].lower() == "discord canary"):
                 return True
         return False
 
@@ -23,6 +26,7 @@ class CheckDiscord:
     def isuserconnected(clientid: str) -> bool:
         rpc = Presence(clientid)
         try:
+            rpc.connect()
             return True
         except Exception:
             return False