Updates

Author: gvbvdxx

server-src/server.js

@@ -1454,6 +1454,8 @@ async function startRoomWSS(roomid) {
       return true;
     }
   }
+  var _currentOnlineListMessage = "";
+  var _currentOnlineListMessageOwner = "";
   function sendOnlineList() {
     var userlist = [];
     for (var cli of wss.clients) {
@@ -1492,6 +1494,8 @@ async function startRoomWSS(roomid) {
       type: "onlineList",
       list: userlist,
     });
+    _currentOnlineListMessage = onlistNonOwner;
+    _currentOnlineListMessageOwner = onlist;
     wss.clients.forEach((cli) => {
       if (!cli._rrIsReady) {
         return;
@@ -1754,6 +1758,13 @@ async function startRoomWSS(roomid) {
               );
             }
           }
+          if (json.type == "onlineList") {
+            if (ws._rrIsOwner) {
+              ws.send(_currentOnlineListMessageOwner);
+            } else {
+              ws.send(_currentOnlineListMessage);
+            }
+          }
           if (json.type == "typing") {
             for (var client of wss.clients) {
               client.send(

src/chat/interface/chatinterface.js

@@ -174,6 +174,17 @@ var KnownUserList = require("./userlist-menu.js");
       );
     }
 
+    rrLoadingStatusText.textContent = "Loading known user list...";
+
+    try {
+      await KnownUserList.fetchUserList();
+    } catch (e) {
+      console.error(e);
+      dialogs.alert(
+        "Something went wrong while trying to load your known user list."
+      );
+    }
+
     rrLoadingStatusText.textContent = "Connecting to the rant room...";
 
     if (!window.screenShareClient) {
@@ -371,7 +382,7 @@ var KnownUserList = require("./userlist-menu.js");
     });
 
     addBanUserButton.addEventListener("click", async function () {
-      var response =  await KnownUserList.getUserPrompt("Block/ban user");
+      var response = await KnownUserList.getUserPrompt("Block/ban user");
       if (!response) {
         return;
       }
@@ -387,7 +398,7 @@ var KnownUserList = require("./userlist-menu.js");
     });
 
     addAllowUserButton.addEventListener("click", async function () {
-      var response =  await KnownUserList.getUserPrompt("Allow an user");
+      var response = await KnownUserList.getUserPrompt("Allow an user");
       if (!response) {
         return;
       }

src/chat/interface/onlineuserdivgenerator/index.js

@@ -2,6 +2,7 @@ var elements = require("../../../gp2/elements.js");
 var accountHelper = require("../../../accounthelper");
 var shtml = require("../../../safehtmlencode.js");
 var cacheBust = require("../cachebust.js");
+var KnownUserList = require("../userlist-menu.js");
 
 function generateDiv(
   username,
@@ -190,6 +191,46 @@ function generateDiv(
     }
   }
 
+  if (username) {
+    if (!KnownUserList.isUserAdded(username)) {
+      icons.push({
+        element: "div",
+        style: {
+          height: "23px",
+        },
+        className: "divButton roundborder onlineDivButton",
+        title: "Click to add to your known users list",
+        children: [
+          {
+            element: "img",
+            style: {
+              height: "100%",
+            },
+            src: "images/adduserlist.svg",
+          },
+          {
+            element: "span",
+            textContent: "Know this user",
+          },
+        ],
+        eventListeners: [
+          {
+            event: "click",
+            func: async function () {
+              this.disabled = true;
+              this.innerHTML = "";
+              this.className = "loader";
+              this.src = "";
+              this.style.width = "23px";
+              await KnownUserList.addUsername(username);
+              this.remove();
+            },
+          },
+        ],
+      });
+    }
+  }
+
   var dom = elements.createElementsFromJSON([
     {
       element: "div",

src/chat/interface/userlist-menu.js

@@ -7,6 +7,7 @@ var elements = require("../../gp2/elements.js");
 var accountHelper = require("../../accounthelper");
 var shtml = require("../../safehtmlencode.js");
 var cacheBust = require("./cachebust.js");
+var sws = require("./sharedwebsocket.js");
 
 function makeUserListDiv(username, removeFunction, selectFunction) {
   var pfp = accountHelper.getProfilePictureURL(username);
@@ -359,6 +360,7 @@ class UserListMenu {
   }
 
   async removeFromUserList(username) {
+    var dialogBG = this.showLoadingScreen();
     try {
       var r = await fetch(
         accountHelper.getServerURL() + "/account/removeuserlist",
@@ -372,13 +374,15 @@ class UserListMenu {
       if (!r.ok) {
         throw new Error("");
       }
+
       this.loadUserListMenu();
     } catch (e) {
       dialogs.alert(
         "Failed to remove user from your known user list, try again later."
       );
       console.error(e);
     }
+    dialogBG.remove();
   }
 
   async addUsername(username) {
@@ -430,6 +434,28 @@ class UserListMenu {
         },
       ]);
     }
+
+    try {
+      sws.send(
+        JSON.stringify({
+          type: "onlineList",
+        })
+      );
+    } catch (e) {}
+  }
+
+  isUserAdded(username) {
+    var formattedUsername = username.trim().toLowerCase();
+    var state = accountHelper.getCurrentValidationState();
+    if (state) {
+      if (formattedUsername == state.username.trim().toLowerCase()) {
+        return true;
+      }
+    }
+    if (this.currentUserList) {
+      return this.currentUserList.indexOf(formattedUsername) > -1;
+    }
+    return false;
   }
 
   getUserPrompt(infoText = "Choose an user") {
@@ -530,14 +556,10 @@ class UserListMenu {
                     overflow: "auto",
                   },
                   children: _this.currentUserList.map((username) => {
-                    return makeUserListDiv(
-                      username,
-                      null,
-                      function () {
-                        usernameInput.value = username;
-                        usernameInput.scrollIntoView();
-                      }
-                    );
+                    return makeUserListDiv(username, null, function () {
+                      usernameInput.value = username;
+                      usernameInput.scrollIntoView();
+                    });
                   }),
                 },
               ],

wpstatic/version.json

@@ -1 +1 @@
-{"timestamp":"1761587465990"}
+{"timestamp":"1761590491212"}