Version 0.7.2e - Fix des utilisateurs

data/users.json

@@ -1,4 +1,157 @@
 [
+  {
+    "auth": {
+      "token_type": "Bearer",
+      "access_token": "gHgMkIRcjnOTRTJNPfRHWLEiIkYIw4",
+      "expires_in": 604800,
+      "refresh_token": "qkgDIogFGXM4A8PlO2zZmsCrdpQrvv",
+      "scope": "identify guilds guilds.members.read"
+    },
+    "avatar": null,
+    "communication_disabled_until": null,
+    "flags": 0,
+    "joined_at": "2019-11-30T19:59:21.532000+00:00",
+    "nick": null,
+    "pending": false,
+    "premium_since": null,
+    "roles": [
+      "397725552968204288"
+    ],
+    "user": {
+      "id": "442290526545510421",
+      "username": "mido_lol27",
+      "avatar": "715cd4626ba7f734affdb2623bc4fb24",
+      "discriminator": "0",
+      "public_flags": 64,
+      "flags": 64,
+      "banner": null,
+      "accent_color": null,
+      "global_name": "Mido",
+      "avatar_decoration_data": null,
+      "banner_color": null
+    },
+    "mute": false,
+    "deaf": false,
+    "bio": "",
+    "banner": null,
+    "token": "bd442487-c73e-451f-9e3b-9f902170f7d8",
+    "admin": false
+  },
+  {
+    "auth": {
+      "token_type": "Bearer",
+      "access_token": "H2GnAISsS2hCMG9Sk1lsEhPUfjNKbQ",
+      "expires_in": 604800,
+      "refresh_token": "LFcrd8aXanArEM0ivavDMFCUYgZF9s",
+      "scope": "guilds guilds.members.read identify"
+    },
+    "avatar": null,
+    "communication_disabled_until": null,
+    "flags": 0,
+    "joined_at": "2021-05-23T20:38:29.274000+00:00",
+    "nick": null,
+    "pending": false,
+    "premium_since": null,
+    "roles": [
+      "397724656548970508"
+    ],
+    "user": {
+      "id": "226744358567804928",
+      "username": "alexmario5",
+      "avatar": "90467211fb1287f0d264c0a6a11b7861",
+      "discriminator": "0",
+      "public_flags": 0,
+      "flags": 0,
+      "banner": null,
+      "accent_color": 14981530,
+      "global_name": "alexmario5",
+      "avatar_decoration_data": null,
+      "banner_color": "#e4999a"
+    },
+    "mute": false,
+    "deaf": false,
+    "bio": "",
+    "banner": null,
+    "token": "b4f1b8cd-2711-48b7-b301-0290f9d9f69b",
+    "admin": false
+  },
+  {
+    "auth": {
+      "token_type": "Bearer",
+      "access_token": "l7nUoMgqZN1w3f9SE5iSrEuYedaLZF",
+      "expires_in": 604800,
+      "refresh_token": "pHiIXvVPBiRY49lqxZe6SqBqmlxgY4",
+      "scope": "identify guilds.members.read guilds"
+    },
+    "avatar": null,
+    "communication_disabled_until": null,
+    "flags": 0,
+    "joined_at": "2020-03-06T18:17:58.037000+00:00",
+    "nick": null,
+    "pending": false,
+    "premium_since": null,
+    "roles": [
+      "397725552968204288"
+    ],
+    "user": {
+      "id": "249494159629484033",
+      "username": "immudelki",
+      "avatar": "9a0742b8d6a2092a049e207dbc0cdf89",
+      "discriminator": "0",
+      "public_flags": 0,
+      "flags": 0,
+      "banner": null,
+      "accent_color": 1123662,
+      "global_name": "Immudelki",
+      "avatar_decoration_data": null,
+      "banner_color": "#11254e"
+    },
+    "mute": false,
+    "deaf": false,
+    "bio": "",
+    "banner": null,
+    "token": "3b65e082-8a12-4124-9c81-d296b618c68f",
+    "admin": false
+  },
+  {
+    "auth": {
+      "token_type": "Bearer",
+      "access_token": "9mddRrtxla0BS69BVagf6fu2BHIHxa",
+      "expires_in": 604800,
+      "refresh_token": "9Rio7R8v8jbLTeJASem1zXKtz9YH8W",
+      "scope": "identify guilds.members.read guilds"
+    },
+    "avatar": null,
+    "communication_disabled_until": null,
+    "flags": 0,
+    "joined_at": "2020-04-14T08:47:38.484000+00:00",
+    "nick": null,
+    "pending": false,
+    "premium_since": "2021-01-08T17:00:59.380000+00:00",
+    "roles": [
+      "397725552968204288",
+      "630169940640399370"
+    ],
+    "user": {
+      "id": "435462012974268426",
+      "username": "gabouille",
+      "avatar": "5424e9938b46c0cd48b4145136dd88dd",
+      "discriminator": "0",
+      "public_flags": 256,
+      "flags": 256,
+      "banner": "336d92bc07973449e1347736839d06e6",
+      "accent_color": 16775056,
+      "global_name": "Gabouille",
+      "avatar_decoration_data": null,
+      "banner_color": "#fff790"
+    },
+    "mute": false,
+    "deaf": false,
+    "bio": "",
+    "banner": null,
+    "token": "baedf970-fec2-4d8b-ac06-a1652480a653",
+    "admin": false
+  },
   {
     "auth": {
       "token_type": "Bearer",
@@ -34,7 +187,45 @@
     "deaf": false,
     "bio": "",
     "banner": null,
-    "token": "06f1be40-5bd3-47fb-8d47-a3fb227984eb",
+    "token": "021fec9a-c26f-4d16-8bab-439e355ea292",
     "admin": true
+  },
+  {
+    "auth": {
+      "token_type": "Bearer",
+      "access_token": "xa9w0vGStc3NMnSM7JadWJXdlE8vjw",
+      "expires_in": 604800,
+      "refresh_token": "yIPoVpUVq59oI5Nin2i4YbKI6G2Wxb",
+      "scope": "identify guilds guilds.members.read"
+    },
+    "avatar": null,
+    "communication_disabled_until": null,
+    "flags": 0,
+    "joined_at": "2019-10-17T20:04:23.689000+00:00",
+    "nick": "Pierre, Empereur FR",
+    "pending": false,
+    "premium_since": null,
+    "roles": [
+      "397725552968204288"
+    ],
+    "user": {
+      "id": "158369928104116224",
+      "username": "pierreber",
+      "avatar": "8ecb7b32c67be13eadb2f6e3a372c205",
+      "discriminator": "0",
+      "public_flags": 0,
+      "flags": 0,
+      "banner": null,
+      "accent_color": 921132,
+      "global_name": "PierreB.",
+      "avatar_decoration_data": null,
+      "banner_color": "#0e0e2c"
+    },
+    "mute": false,
+    "deaf": false,
+    "bio": "",
+    "banner": null,
+    "token": "58e43544-b4f7-4f32-bb7d-d00d71577629",
+    "admin": false
   }
 ]

src/modules/sub-web.js

@@ -252,7 +252,7 @@ function IOConnection(io) {
                 
                 const users_data = auth.getUsers()
 
-                socket.emit("ANSWER/GET/USERS", users_data)
+                socket.emit("ALWAYS/USERS", users_data)
 
             }
 
@@ -356,8 +356,10 @@ function IOConnection(io) {
                     auth.setAdmin(data)
 
                     socket.emit("ANSWER/GET/USERS/ADMIN", "OK")
-                    socket.emit("ALWAYS/UPDATE_USERS")
 
+                    const users_data = auth.getUsers()
+
+                    socket.emit("ALWAYS/USERS", users_data)
                 }
 
             } else {
@@ -387,8 +389,10 @@ function IOConnection(io) {
                     auth.removeUser(data.token)
 
                     socket.emit("ANSWER/GET/USERS/ADMIN", "OK")
-                    socket.emit("ALWAYS/UPDATE_USERS")
 
+                    const users_data = auth.getUsers()
+
+                    socket.emit("ALWAYS/USERS", users_data)
 
                 }
 

src/web/public/javascript/__settings_script.js

@@ -33,70 +33,12 @@ settingsBtn.addEventListener("click", () => {
         
     })
 
-    socket.on("ALWAYS/UPDATE_USERS", () => {
-
-        loadUsers()
-    })
-
     settings_logs.style.color = "white"
 
     function loadUsers() {
        
-        get("USERS").then(data => {
-
-
-            var userToPush = new Array()
-            for(var user of data) {
-
-                var admin_bar = ''
-
-                if(user.beta == true) {
-
-                    admin_bar = "<div><p>BETA</p></div>"
-                }
-                
-                userToPush.push("<div class='set_user'><div class='set_user_info'><img src='https://cdn.discordapp.com/avatars/" + user.user.id + "/" + user.user.avatar + "'><div style='display: flex; flex-direction: column; justify-content: center;'><p class='INDEX_gbname'>" + user.user.global_name + "</p><p class='INDEX_usrname'>" + user.user.username + "</p></div>" + admin_bar + "</div><div style='font-size: 25px;'><button id='" + data.indexOf(user) +  "_admin' style='margin: 0 !important;' class='list_upSong'><i class='fa fa-star'></i></button><button id='" + data.indexOf(user) +  "_delete' class='list_delete'><i class='fa fa-trash'></i></button></div></div>")
-                
-            }
-
-            settings_content.innerHTML = userToPush.join("")
-
-            for(var user of data) {
-
-                
-                var adminBtn = document.getElementById(data.indexOf(user) + "_admin")
-                var deleteBtn = document.getElementById(data.indexOf(user) + "_delete") 
-
-                if(adminBtn) {
-
-                    if(data[data.indexOf(user)].admin == true) {
-
-                        adminBtn.style.color = "#19a7d2"
-    
-                    }
-
-                    adminBtn.addEventListener("click", () => { 
-
-                        send("USERS/ADMIN", data[adminBtn.id.replace("_admin", "")])
-    
         socket.emit("GET/USERS")
-                    })
        
-                    deleteBtn.addEventListener("click", () => {
-    
-    
-                        send("USERS/DELETE", data[adminBtn.id.replace("_admin", "")])
-    
-                        socket.emit("GET/USERS")
-                    })
-                }
-
-                
-             }
-
-
-
-        })
 
         
         
@@ -226,3 +168,67 @@ settingsBtn.addEventListener("click", () => {
 })
 
 
+
+
+socket.on("ALWAYS/USERS",(data) => {
+
+    const settings_content = document.getElementById("settings_content")
+
+
+    var userToPush = new Array()
+
+    console.log(data)
+
+    for(var user of data) {
+
+        var admin_bar = ''
+
+        if(user.beta == true) {
+
+            admin_bar = "<div><p>BETA</p></div>"
+        }
+        
+        userToPush.push("<div class='set_user'><div class='set_user_info'><img src='https://cdn.discordapp.com/avatars/" + user.user.id + "/" + user.user.avatar + "'><div style='display: flex; flex-direction: column; justify-content: center;'><p class='INDEX_gbname'>" + user.user.global_name + "</p><p class='INDEX_usrname'>" + user.user.username + "</p></div>" + admin_bar + "</div><div style='font-size: 25px;'><button id='" + data.indexOf(user) +  "_admin' style='margin: 0 !important;' class='list_upSong'><i class='fa fa-star'></i></button><button id='" + data.indexOf(user) +  "_delete' class='list_delete'><i class='fa fa-trash'></i></button></div></div>")
+        
+    }
+
+
+    settings_content.innerHTML = userToPush.join("")
+   
+
+
+    
+    for(var user of data) {
+
+
+        let adminBtn = document.getElementById(data.indexOf(user) + "_admin")
+        let deleteBtn = document.getElementById(data.indexOf(user) + "_delete") 
+
+        console.log(adminBtn)
+
+        if(data[adminBtn.id.replace("_admin", "")].admin == true) {
+
+
+            adminBtn.style.color = "#d2bd19"
+
+        } 
+
+        adminBtn.addEventListener("click", () => { 
+
+            send("USERS/ADMIN", data[adminBtn.id.replace("_admin", "")])
+
+            socket.emit("GET/USERS")
+        })
+        
+        deleteBtn.addEventListener("click", () => {
+
+
+            send("USERS/DELETE", data[adminBtn.id.replace("_admin", "")])
+
+            socket.emit("GET/USERS")
+        })
+     }
+
+
+
+})