Fix user duplication

Hatry1337 · Apr 25, 2023 · 02f234d · 02f234d
1 parent 9fc2f18
commit 02f234d
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 16 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "synergy3",
-  "version": "3.13.2",
+  "version": "3.13.3",
   "description": "Synergy 3 - Powerful Discord BOT Framework.",
   "license": "MIT",
   "author": {

diff --git a/src/EventManager.ts b/src/EventManager.ts
@@ -144,8 +144,8 @@ class EventManager extends EventEmitter{
     private async onGuildMemberAdd(member: Discord.GuildMember){
         GlobalLogger.userlog.info(`${member} (${member.user.tag}) joined guild ${member.guild} (${member.guild.name}).`);
 
-        let user = await this.bot.users.get(member.id);
-        if(!user){
+        let userId = await this.bot.users.unifiedIdFromDiscordId(member.id);
+        if(!userId){
             await this.bot.users.createFromDiscord(member.user);
             return;
         }

diff --git a/src/InteractionsManager.ts b/src/InteractionsManager.ts
@@ -281,9 +281,12 @@ export default class InteractionsManager{
                 return;
             }
             try {
-                let user = await this.bot.users.get(interaction.user.id);
-
-                if(!user){
+                let userId = await this.bot.users.unifiedIdFromDiscordId(interaction.user.id);
+                let user;
+                if(userId){
+                    user = await this.bot.users.get(userId);
+                }
+                if(!user) {
                     user = await this.bot.users.createFromDiscord(interaction.user);
                 }
                 await cmd._autocomplete(interaction, user);
@@ -310,9 +313,12 @@ export default class InteractionsManager{
             return;
         }
 
-        let user = await this.bot.users.get(interaction.user.id);
-
-        if(!user){
+        let userId = await this.bot.users.unifiedIdFromDiscordId(interaction.user.id);
+        let user;
+        if(userId){
+            user = await this.bot.users.get(userId);
+        }
+        if(!user) {
             user = await this.bot.users.createFromDiscord(interaction.user);
         }
 

diff --git a/src/Modules/Core/Profile.ts b/src/Modules/Core/Profile.ts
@@ -65,10 +65,13 @@ export default class Profile extends Module{
             return;
         }
 
-        let target = await this.bot.users.get(target_user.id);
-
-        if (!target) {
-            target = await this.bot.users.createFromDiscord(target_user);
+        let userId = await this.bot.users.unifiedIdFromDiscordId(target_user.id);
+        let target;
+        if(userId){
+            target = await this.bot.users.get(userId);
+        }
+        if(!target) {
+            target = await this.bot.users.createFromDiscord(interaction.user);
         }
 
         await interaction.reply({embeds: [this.createMessageTemplate(target)]});

diff --git a/src/Structures/Access.ts b/src/Structures/Access.ts
@@ -26,8 +26,8 @@ export default class Access {
     static GROUP(group: string): AccessTarget {
         return `group<${group}>`;
     }
-    static USER(user_id: number | string): AccessTarget {
-        return `user<${user_id.toString()}>`;
+    static USER(user_id: string): AccessTarget {
+        return `user<${user_id}>`;
     }
     static ROLE(role_id: string): AccessTarget {
         return `role<${role_id}>`;
@@ -62,7 +62,7 @@ export default class Access {
                     GlobalLogger.root.warn("Access.Check: Passed invalid user access target \"", a + "\"");
                     continue;
                 }
-                if(user.unifiedId.toString() === res[1] || user.discord?.id === res[1]){
+                if(user.unifiedId === res[1] || user.discord?.id === res[1]){
                     access_flag = true;
                     break;
                 }