Updates

gvbvdxx · gvbvdxx · commit 050e6ba17ec2 · 2025-10-31T14:05:02.000Z
diff --git a/src/chat/elementjson/accountnotice.js b/src/chat/elementjson/accountnotice.js
@@ -5,6 +5,7 @@ module.exports = {
   style: {
     zIndex: 10,
   },
+  className: "normalLevelDialog",
   children: [
     {
       element: "div",
@@ -111,7 +112,7 @@ module.exports = {
                     window.location.href =
                       "/signin?href=" +
                       encodeURIComponent(
-                        window.location.pathname + window.location.hash,
+                        window.location.pathname + window.location.hash
                       );
                   },
                 },
@@ -129,7 +130,7 @@ module.exports = {
                     window.location.href =
                       "/signup?href=" +
                       encodeURIComponent(
-                        window.location.pathname + window.location.hash,
+                        window.location.pathname + window.location.hash
                       );
                   },
                 },
diff --git a/src/chat/elementjson/banned.js b/src/chat/elementjson/banned.js
@@ -5,6 +5,7 @@ module.exports = {
   style: {
     zIndex: 10,
   },
+  className: "normalLevelDialog",
   children: [
     {
       element: "div",
diff --git a/src/chat/elementjson/chat-styles.css b/src/chat/elementjson/chat-styles.css
@@ -1673,6 +1673,14 @@ a {
   }
 }
 
+.normalLevelDialog {
+  position: fixed;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+}
+
 .veryImportantDialog {
   /* Important dialogs go to the front so that they can be visible */
   position: fixed;
diff --git a/src/chat/elementjson/installappdialog.js b/src/chat/elementjson/installappdialog.js
@@ -8,6 +8,7 @@ module.exports = {
   style: {
     zIndex: 10,
   },
+  className: "normalLevelDialog",
   children: [
     {
       element: "div",
diff --git a/src/chat/elementjson/noguests.js b/src/chat/elementjson/noguests.js
@@ -5,6 +5,7 @@ module.exports = {
   style: {
     zIndex: 10,
   },
+  className: "normalLevelDialog",
   children: [
     {
       element: "div",
@@ -52,7 +53,7 @@ module.exports = {
                 window.location.href =
                   "/signin?href=" +
                   encodeURIComponent(
-                    window.location.pathname + window.location.hash,
+                    window.location.pathname + window.location.hash
                   );
               },
             },
@@ -69,7 +70,7 @@ module.exports = {
                 window.location.href =
                   "/signup?href=" +
                   encodeURIComponent(
-                    window.location.pathname + window.location.hash,
+                    window.location.pathname + window.location.hash
                   );
               },
             },
diff --git a/src/chat/elementjson/notallowed.js b/src/chat/elementjson/notallowed.js
@@ -5,6 +5,7 @@ module.exports = {
   style: {
     zIndex: 10,
   },
+  className: "normalLevelDialog",
   children: [
     {
       element: "div",
diff --git a/src/chat/elementjson/roomerror.js b/src/chat/elementjson/roomerror.js
@@ -5,6 +5,7 @@ module.exports = {
   style: {
     zIndex: 10,
   },
+  className: "normalLevelDialog",
   children: [
     {
       element: "div",
diff --git a/src/chat/elementjson/toomanyconnections.js b/src/chat/elementjson/toomanyconnections.js
@@ -5,6 +5,7 @@ module.exports = {
   style: {
     zIndex: 10,
   },
+  className: "normalLevelDialog",
   children: [
     {
       element: "div",
diff --git a/src/chat/elementjson/usernameerror.js b/src/chat/elementjson/usernameerror.js
@@ -5,6 +5,7 @@ module.exports = {
   style: {
     zIndex: 10,
   },
+  className: "normalLevelDialog",
   children: [
     {
       element: "div",
diff --git a/src/chat/interface/mini-loader.js b/src/chat/interface/mini-loader.js
@@ -0,0 +1,77 @@
+var elements = require("../../gp2/elements.js");
+
+class LoadingScreen {
+  constructor(text = "Loading...") {
+    var _this = this;
+    this.loadingElement = document.createElement("div");
+    this.textSpan = null;
+    var dom = elements.createElementsFromJSON([
+      //Background
+      {
+        element: "div",
+        className: "dialogBackground",
+        style: {
+          zIndex: "9999999999",
+        },
+      },
+      //Dialog box
+      {
+        element: "div",
+        className: "centerMiddle",
+        style: {
+          zIndex: "9999999999",
+          padding: "5px 5px",
+          display: "flex",
+          flexDirection: "column",
+          justifyContent: "center",
+          alignItems: "center",
+        },
+        children: [
+          {
+            element: "div",
+            className: "loader2Container",
+            children: [
+              {
+                element: "div",
+                className: "loader2",
+              },
+            ],
+          },
+          {
+            element: "span",
+            textContent: "",
+            style: {
+              fontWeight: "bold",
+              fontSize: "17px",
+              textAlign: "center",
+              padding: "7px 7px",
+              background: "rgba(255, 255, 255, 50%)",
+              color: "black",
+              borderRadius: "5px",
+            },
+            GPWhenCreated: (elm) => (_this.textSpan = elm),
+          },
+        ],
+      },
+    ]);
+    elements.appendElements(this.loadingElement, dom);
+    document.body.append(this.loadingElement);
+
+    this.setText(text);
+  }
+
+  setText(text) {
+    this.textSpan.textContent = text;
+  }
+
+  dispose() {
+    this.loadingElement.remove();
+    this.loadingElement = null;
+    this.textSpan.remove();
+    this.textSpan = null;
+  }
+  remove() {
+    this.dispose();
+  }
+}
+module.exports = LoadingScreen;
diff --git a/src/chat/interface/notifications/index.js b/src/chat/interface/notifications/index.js
@@ -9,6 +9,7 @@ var notify = require("../notify.js");
 var sws = require("./sws.js");
 var isSecure = require("../is-secure.js");
 var roomSelect = require("../roomselect.js");
+var LoadingScreen = require("../mini-loader.js");
 
 class RealTimeNotifications {
   constructor() {
diff --git a/src/chat/interface/roomselect.js b/src/chat/interface/roomselect.js
@@ -4,6 +4,7 @@ var dialog = require("../../dialogs.js");
 var currentRoom = require("./getroom.js");
 var KnownUserList = require("./userlist-menu.js");
 var commandEffects = elements.getGPId("commandEffects");
+var LoadingScreen = require("./mini-loader.js");
 var rs = {};
 
 var validState = accountHelper.getCurrentValidationState();
@@ -147,18 +148,7 @@ async function doRoomSelect() {
       });
     }
 
-    var dialogBG = document.createElement("div");
-    var loadingSpinnerDiv = document.createElement("div");
-    var loadingSpinnerContainerDiv = document.createElement("div");
-    var loadingSpinnerCDiv = document.createElement("div");
-    loadingSpinnerContainerDiv.className = "loader2Container";
-    dialogBG.className = "dialogBackground";
-    loadingSpinnerDiv.className = "loader2";
-    loadingSpinnerContainerDiv.append(loadingSpinnerDiv);
-    loadingSpinnerCDiv.append(loadingSpinnerContainerDiv);
-    loadingSpinnerCDiv.className = "centerMiddle";
-    dialogBG.append(loadingSpinnerCDiv);
-    commandEffects.append(dialogBG);
+    var dialogBG = new LoadingScreen("Loading rooms...");
     try {
       var rooms = await getRooms();
       dialogBG.remove();
@@ -190,7 +180,7 @@ async function doRoomSelect() {
                   div.remove();
                   doRoomSelect();
                 } catch (err) {
-                  dialog.alert("Error removing this room ${err}");
+                  dialog.alert(`Error removing this room ${err}`);
                 }
               }
             },
@@ -328,45 +318,52 @@ async function doRoomSelect() {
           {
             element: "div",
             className: "divButton roundborder",
-            textContent: "Invite someone to this room",
+            textContent: "Invite users",
             eventListeners: [
               {
                 event: "click",
                 func: async function (e) {
                   e.preventDefault();
                   try {
-                    var inviteTarget = await KnownUserList.getUserPrompt(
-                      "Choose a username to invite"
+                    var inviteTargets = await KnownUserList.getUsersPrompt(
+                      "Select users to invite"
                     );
-                    if (!inviteTarget) {
+                    if (!inviteTargets) {
                       return;
                     }
-                    var response = await fetch(
-                      accountHelper.getServerURL() + "/account/inviteroom",
-                      {
-                        method: "POST",
-                        body: JSON.stringify({
-                          id: room.id,
-                          name: room.name,
-                          username: inviteTarget,
-                        }),
-                      }
-                    );
-                    if (!response.ok) {
-                      dialog.alert(
-                        "Invite error. That username doesn’t exist... or maybe it escaped through a portal. Check it and try again!" +
-                          "\n" +
-                          "Server said: " +
-                          response.status
-                      );
-                    } else {
-                      dialog.alert(
-                        "Invite success! This user should see the invite in their notifications."
+                    if (inviteTargets.length == 0) {
+                      return;
+                    }
+                    var loader = new LoadingScreen();
+                    var invited = 0;
+                    for (var username of inviteTargets) {
+                      invited += 1;
+                      loader.setText(
+                        `Inviting "${username}"... (${invited}/${inviteTargets.length})`
                       );
+                      try {
+                        var response = await fetch(
+                          accountHelper.getServerURL() + "/account/inviteroom",
+                          {
+                            method: "POST",
+                            body: JSON.stringify({
+                              id: room.id,
+                              name: room.name,
+                              username: username,
+                            }),
+                          }
+                        );
+                      } catch (e) {
+                        console.error(e);
+                      }
                     }
+                    loader.remove();
+                    dialog.alert(
+                      "All selected users have been invited! These users should see the invite in their notifications."
+                    );
                   } catch (e) {
                     dialog.alert(
-                      "Failed to invite a user to room. Error Message: ${e}"
+                      `Failed to invite a user to room. Error Message: ${e}`
                     );
                   }
                 },
@@ -483,7 +480,7 @@ async function doRoomSelect() {
               {
                 element: "li",
                 textContent:
-                  'Use "Invite someone" to bring a friend in via username.',
+                  'Use "Invite users" to bring friend(s) in via username.',
               },
               {
                 element: "li",
diff --git a/src/chat/interface/userlist-menu.js b/src/chat/interface/userlist-menu.js
@@ -9,6 +9,8 @@ var shtml = require("../../safehtmlencode.js");
 var cacheBust = require("./cachebust.js");
 var sws = require("./sharedwebsocket.js");
 
+var LoadingScreen = require("./mini-loader.js");
+
 function makeUserListDiv(
   username,
   removeFunction,
@@ -269,10 +271,6 @@ class UserListMenu {
                   },
                 ],
               },
-
-              {
-                element: "br",
-              },
               {
                 element: "div",
                 style: {
@@ -333,11 +331,6 @@ class UserListMenu {
                   _this.userListDiv = elm;
                 },
               },
-
-              {
-                element: "br",
-              },
-
               {
                 element: "div",
                 className: "divButton roundborder",
@@ -405,7 +398,7 @@ class UserListMenu {
     this.dialogElement.hidden = false;
   }
   async loadUserListMenu() {
-    var dialogBG = this.showLoadingScreen();
+    var dialogBG = new LoadingScreen("Loading your known user list...");
     await this.fetchUserList();
     dialogBG.remove();
   }
@@ -431,7 +424,9 @@ class UserListMenu {
   }
 
   async removeFromUserList(username) {
-    var dialogBG = this.showLoadingScreen();
+    var dialogBG = new LoadingScreen(
+      'Removing "' + username + '" from your known user list...'
+    );
     try {
       var r = await fetch(
         accountHelper.getServerURL() + "/account/removeuserlist",
@@ -457,7 +452,9 @@ class UserListMenu {
   }
 
   async addUsername(username) {
-    var dialogBG = this.showLoadingScreen();
+    var dialogBG = new LoadingScreen(
+      'Adding "' + username + '" to your known user list...'
+    );
     try {
       var r = await fetch(
         accountHelper.getServerURL() + "/account/adduserlist",
diff --git a/wpstatic/version.json b/wpstatic/version.json
@@ -1 +1 @@
-{"timestamp":"1761917009748"}
+{"timestamp":"1761919378078"}

Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@ module.exports = {`
`5`	`5`	`style: {`
`6`	`6`	`zIndex: 10,`
`7`	`7`	`},`
	`8`	`+ className: "normalLevelDialog",`
`8`	`9`	`children: [`
`9`	`10`	`{`
`10`	`11`	`element: "div",`
Original file line number	Diff line number	Diff line change
`@@ -1673,6 +1673,14 @@ a {`
`1673`	`1673`	`}`
`1674`	`1674`	`}`
`1675`	`1675`
	`1676`	`+.normalLevelDialog {`
	`1677`	`+ position: fixed;`
	`1678`	`+ top: 0;`
	`1679`	`+ left: 0;`
	`1680`	`+ width: 100%;`
	`1681`	`+ height: 100%;`
	`1682`	`+}`
	`1683`	`+`
`1676`	`1684`	`.veryImportantDialog {`
`1677`	`1685`	`/* Important dialogs go to the front so that they can be visible */`
`1678`	`1686`	`position: fixed;`
Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@ module.exports = {`
`8`	`8`	`style: {`
`9`	`9`	`zIndex: 10,`
`10`	`10`	`},`
	`11`	`+ className: "normalLevelDialog",`
`11`	`12`	`children: [`
`12`	`13`	`{`
`13`	`14`	`element: "div",`