Rename converse-chats to converse-app-chat

jcbrand · jcbrand · commit 15060966351e · 2025-08-25T13:06:17.000+02:00
diff --git a/src/plugins/chatboxviews/index.js b/src/plugins/chatboxviews/index.js
@@ -28,9 +28,9 @@ converse.plugins.add('converse-chatboxviews', {
             render: () => {
                 const extra_classes = api.settings.get('singleton') ? ['converse-singleton'] : [];
                 extra_classes.push(`converse-${api.settings.get('view_mode')}`);
-                return html`<converse-chats
+                return html`<converse-app-chat
                     class="converse-chatboxes row justify-content-start g-0 ${extra_classes.join(' ')}"
-                ></converse-chats>`;
+                ></converse-app-chat>`;
             },
             renderControlbox: () => html`
                 <converse-headlines-feeds-list class="controlbox-section"></converse-headlines-feeds-list>
diff --git a/src/plugins/chatboxviews/styles/chats.scss b/src/plugins/chatboxviews/styles/chats.scss
@@ -18,7 +18,7 @@
 
 
 .conversejs {
-    converse-chats {
+    converse-app-chat {
         &.converse-overlayed {
             > .row {
                 flex-direction: row-reverse;
@@ -60,7 +60,7 @@
 
 @include media-breakpoint-down(sm) {
     .conversejs {
-        converse-chats {
+        converse-app-chat {
             width: 100%;
         }
     }
diff --git a/src/plugins/chatboxviews/view.js b/src/plugins/chatboxviews/view.js
@@ -3,7 +3,7 @@ import { CustomElement } from 'shared/components/element.js';
 import tplChats from './templates/chats.js';
 
 
-class ConverseChats extends CustomElement {
+class ChatApp extends CustomElement {
 
     initialize () {
         this.model = _converse.state.chatboxes;
@@ -39,4 +39,4 @@ class ConverseChats extends CustomElement {
     }
 }
 
-api.elements.define('converse-chats', ConverseChats);
+api.elements.define('converse-app-chat', ChatApp);
diff --git a/src/plugins/chatview/styles/chatbox.scss b/src/plugins/chatview/styles/chatbox.scss
@@ -1,5 +1,5 @@
 .conversejs {
-    converse-chats {
+    converse-app-chat {
         &.converse-overlayed {
             .chatbox {
                 margin: 0 var(--overlayed-chat-gutter);
diff --git a/src/plugins/chatview/styles/index.scss b/src/plugins/chatview/styles/index.scss
@@ -8,8 +8,8 @@
 /* ******************* Overlay and embedded styles *************************** */
 
 .conversejs {
-    converse-chats.converse-embedded,
-    converse-chats.converse-overlayed {
+    converse-app-chat.converse-embedded,
+    converse-app-chat.converse-overlayed {
         .controlbox-head {
             padding: 0.5em;
         }
@@ -28,7 +28,7 @@
         }
     }
 
-    converse-chats.converse-overlayed  {
+    converse-app-chat.converse-overlayed  {
         .chat-head, .box-flyout {
             border-top-left-radius: var(--chatbox-border-radius);
             border-top-right-radius: var(--chatbox-border-radius);
@@ -78,8 +78,8 @@
 }
 
 .conversejs {
-    converse-chats.converse-embedded,
-    converse-chats.converse-fullscreen  {
+    converse-app-chat.converse-embedded,
+    converse-app-chat.converse-fullscreen  {
         .flyout {
             border-radius: 0;
             border:none;
@@ -94,7 +94,7 @@
         }
     }
 
-    converse-chats.converse-fullscreen  {
+    converse-app-chat.converse-fullscreen  {
         &:not(.converse-singleton) {
             .chatbox {
                 @include media-breakpoint-up(md) {
@@ -124,7 +124,7 @@
         }
     }
 
-    converse-chats.converse-embedded {
+    converse-app-chat.converse-embedded {
         .chat-head {
             font-size: var(--font-size-huge);
         }
@@ -147,7 +147,7 @@
 /* ******************* Fullpage styles *************************** */
 
 .conversejs {
-    converse-chats.converse-fullscreen  {
+    converse-app-chat.converse-fullscreen  {
         .chatbox-btn {
             font-size: var(--fullpage-chatbox-button-size);
         }
@@ -186,7 +186,7 @@
 
 @include media-breakpoint-down(md) {
     .conversejs {
-        converse-chats:not(.converse-embedded)  {
+        converse-app-chat:not(.converse-embedded)  {
             > .row {
                 flex-direction: row-reverse;
             }
@@ -208,8 +208,8 @@
             }
         }
 
-        converse-chats.converse-overlayed,
-        converse-chats.converse-fullscreen {
+        converse-app-chat.converse-overlayed,
+        converse-app-chat.converse-fullscreen {
             .chat-head {
                 converse-controlbox-navback {
                     margin: auto 0;
diff --git a/src/plugins/controlbox/styles/_controlbox.scss b/src/plugins/controlbox/styles/_controlbox.scss
@@ -164,7 +164,7 @@
 }
 
 .conversejs {
-    converse-chats {
+    converse-app-chat {
         &.converse-overlayed {
             display: flex;
             flex-direction: row-reverse;
diff --git a/src/plugins/controlbox/styles/loginform.scss b/src/plugins/controlbox/styles/loginform.scss
@@ -48,7 +48,7 @@
 }
 
 .conversejs {
-    converse-chats {
+    converse-app-chat {
         &.converse-overlayed {
             #controlbox {
                 converse-login-form {
diff --git a/src/plugins/controlbox/tests/controlbox.js b/src/plugins/controlbox/tests/controlbox.js
@@ -47,7 +47,7 @@ describe("The Controlbox", function () {
             const chatview = _converse.chatboxviews.get(sender_jid);
             minimize(chatview.model);
 
-            const el = document.querySelector('converse-chats');
+            const el = document.querySelector('converse-app-chat');
             expect(el.querySelector('.restore-chat .message-count') === null).toBeTruthy();
             const rosterview = document.querySelector('converse-roster');
             expect(rosterview.querySelector('.msgs-indicator') === null).toBeTruthy();
diff --git a/src/plugins/headlines-view/styles/headlines-head.scss b/src/plugins/headlines-view/styles/headlines-head.scss
@@ -40,7 +40,7 @@
                 }
             }
 
-            converse-chats {
+            converse-app-chat {
                 &.converse-fullscreen {
                     .chatbox.headlines {
                         .chat-head {
diff --git a/src/plugins/headlines-view/styles/headlines.scss b/src/plugins/headlines-view/styles/headlines.scss
@@ -40,7 +40,7 @@
     }
 
 
-    converse-chats {
+    converse-app-chat {
         &.converse-fullscreen {
             .chatbox.headlines {
                 .box-flyout {
diff --git a/src/plugins/minimize/styles/minimize.scss b/src/plugins/minimize/styles/minimize.scss
@@ -1,5 +1,5 @@
 .conversejs {
-    converse-chats {
+    converse-app-chat {
         &.converse-overlayed {
             converse-minimized-chats {
                 order: 100;
diff --git a/src/plugins/muc-views/styles/index.scss b/src/plugins/muc-views/styles/index.scss
@@ -28,7 +28,7 @@ converse-muc-destroyed {
 }
 
 .conversejs {
-    converse-chats {
+    converse-app-chat {
         &.converse-overlayed {
             .chatbox {
                 &.chatroom {
diff --git a/src/plugins/muc-views/styles/muc-occupants.scss b/src/plugins/muc-views/styles/muc-occupants.scss
@@ -117,7 +117,7 @@
         }
     }
 
-    converse-chats{
+    converse-app-chat{
         &.converse-overlayed {
             converse-muc-occupants {
                 .occupants {
diff --git a/src/plugins/muc-views/styles/muc-sidebar.scss b/src/plugins/muc-views/styles/muc-sidebar.scss
@@ -15,7 +15,7 @@
         }
     }
 
-    converse-chats {
+    converse-app-chat {
         &.converse-overlayed {
             converse-muc-sidebar {
                 .sidebar-heading {
diff --git a/src/plugins/singleton/singleton.scss b/src/plugins/singleton/singleton.scss
@@ -6,8 +6,8 @@
 
 
 .conversejs {
-    converse-chats.converse-embedded,
-    converse-chats.converse-fullscreen  {
+    converse-app-chat.converse-embedded,
+    converse-app-chat.converse-fullscreen  {
         &.converse-singleton {
             .flyout {
                 border: none !important;
@@ -22,7 +22,7 @@
         }
     }
 
-    converse-chats.converse-fullscreen  {
+    converse-app-chat.converse-fullscreen  {
         &.converse-singleton {
             .chatbox {
                 @include make-col-ready();
diff --git a/src/plugins/todo/modals/add-todo-modal.js b/src/plugins/todo/modals/add-todo-modal.js
@@ -1,14 +1,8 @@
-
-import { _converse, api, converse } from '@converse/headless';
+import { _converse, api } from '@converse/headless';
 import BaseModal from 'plugins/modal/modal.js';
 import tplAddTodo from './templates/add-todo-modal.js';
 import { __ } from 'i18n';
 
-import '../styles/add-muc-modal.scss';
-
-const u = converse.env.utils;
-const { Strophe } = converse.env;
-
 export default class AddTodoModal extends BaseModal {
     initialize() {
         super.initialize();
@@ -30,97 +24,21 @@ export default class AddTodoModal extends BaseModal {
         return __('Create a new todo list');
     }
 
-    /**
-     * @param {HTMLFormElement} form
-     * @returns {{ name: string }}
-     */
-    parseDataFromEvent(form) {
-        const data = new FormData(form);
-        const name = /** @type {string} */ (data.get('name'))?.trim();
-        return { name };
-    }
-
-    /**
-     * Takes a string and returns a normalized lowercase value representing the node (localpart) of a Todo JID.
-     * Replaces all spaces with dashes, replaces diacritics with ASCII, and
-     * removes all characters besides letters and numbers and dashes.
-     * @param {string} s
-     * @returns {string}
-     */
-    normalizeNode(s) {
-        return s
-            .trim()
-            .replace(/\s+/g, '-')
-            .replace(/\u0142/g, 'l')
-            .replace(/[^\x00-\x7F]/g, (c) => c.normalize('NFD').replace(/[\u0300-\u036f]/g, ''))
-            .replace(/[^a-zA-Z0-9-]/g, '-')
-            .replace(/-+/g, '-')
-            .replace(/[^a-zA-Z0-9]$/g, '')
-            .toLowerCase();
-    }
-
     /**
      * @param {Event} ev
      */
     async createTodo(ev) {
         ev.preventDefault();
 
         const form = /** @type {HTMLFormElement} */ (ev.target);
+        const data = new FormData(form);
+        const name = data.get('name');
+        const jid = data.get('jid');
 
-        const data = this.parseDataFromEvent(form);
-        const name = data.name;
-
-        api.pubsub.nodes.create(jid, { ...settings, jid }, true);
+        api.pubsub.nodes.create(jid, name);
         form.reset();
         this.modal.hide();
     }
-
-    /**
-     * @param {string} jid
-     * @return {Promise<string>}
-     */
-    async validateMUCJID(jid) {
-        if (jid.length === 0) {
-            return __('Invalid groupchat address, it cannot be empty.');
-        }
-
-        const num_slashes = jid.split('/').length - 1;
-        if (num_slashes > 0) {
-            return __('Invalid groupchat address, a forward slash is not allowed.');
-        }
-
-        const num_ats = jid.split('@').length - 1;
-        if (num_ats > 1) {
-            return __('Invalid groupchat address, more than one @ sign is not allowed.');
-        }
-
-        if (jid.startsWith('@') || jid.endsWith('@')) {
-            return __('Invalid groupchat address, it cannot start or end with an @ sign.');
-        }
-
-        if (!jid.includes('@')) {
-            const muc_service = await u.muc.getDefaultMUCService();
-            if (!muc_service) {
-                return __(
-                    "No default groupchat service found. "+
-                    "You'll need to specify the full address, for example room@conference.example.org"
-                );
-            }
-        }
-
-        const policy = api.settings.get('muc_roomid_policy');
-        if (policy && api.settings.get('muc_domain')) {
-            if (api.settings.get('locked_muc_domain') || !u.isValidJID(jid)) {
-                jid = `${Strophe.escapeNode(jid)}@${api.settings.get('muc_domain')}`;
-            }
-            const muc_jid = Strophe.getNodeFromJid(jid);
-            const muc_domain = Strophe.getDomainFromJid(jid);
-            if (api.settings.get('muc_domain') === muc_domain && !policy.test(muc_jid)) {
-                return __('Groupchat id is invalid.');
-            }
-        }
-        return '';
-    }
 }
 
-api.elements.define('converse-add-muc-modal', AddMUCModal);
+api.elements.define('converse-add-todo-modal', AddTodoModal);
diff --git a/src/plugins/todo/plugin.js b/src/plugins/todo/plugin.js
@@ -6,7 +6,11 @@ converse.plugins.add('converse-app-todo', {
         api.apps.add({
             name: 'todo',
             render: () => {
-                return html`<converse-app-todo></converse-app-todo>`;
+                const extra_classes = api.settings.get('singleton') ? ['converse-singleton'] : [];
+                extra_classes.push(`converse-${api.settings.get('view_mode')}`);
+                return html`<converse-app-todo
+                    class="converse-chatboxes row justify-content-start g-0 ${extra_classes.join(' ')}"
+                ></converse-app-todo>`;
             },
             renderControlbox: () => {
                 return html`<converse-todo-lists></converse-todo-lists>`;
diff --git a/src/plugins/todo/templates/lists.js b/src/plugins/todo/templates/lists.js
@@ -1,5 +1,6 @@
 import { html } from 'lit';
 import { api, constants } from '@converse/headless';
+import '../modals/add-todo-modal.js';
 import { __ } from 'i18n';
 
 /**
@@ -13,12 +14,15 @@ export default (el) => {
     const is_closed = el.model.get('toggle_state') === constants.CLOSED;
 
     const btns = [
-        html`<a class="dropdown-item show-add-todo-modal" role="button"
-                @click="${(ev) => api.modal.show('converse-add-muc-modal', { 'model': el.model }, ev)}"
-                data-toggle="modal"
-                data-target="#add-todo-modal">
-                    <converse-icon class="fa fa-plus" size="1em"></converse-icon>
-                    ${i18n_title_new_todo}
+        html`<a
+            class="dropdown-item show-add-todo-modal"
+            role="button"
+            @click="${(ev) => api.modal.show('converse-add-todo-modal', { 'model': el.model }, ev)}"
+            data-toggle="modal"
+            data-target="#add-todo-modal"
+        >
+            <converse-icon class="fa fa-plus" size="1em"></converse-icon>
+            ${i18n_title_new_todo}
         </a>`,
     ];
 
diff --git a/src/shared/chat/styles/emoji.scss b/src/shared/chat/styles/emoji.scss
@@ -178,7 +178,7 @@
 }
 
 .conversejs {
-    converse-chats {
+    converse-app-chat {
         &.converse-overlayed  {
             converse-emoji-dropdown {
                 .dropdown-menu {
diff --git a/src/shared/chat/styles/unfurl.scss b/src/shared/chat/styles/unfurl.scss
diff --git a/src/shared/styles/messages.scss b/src/shared/styles/messages.scss

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@`
`18`	`18`
`19`	`19`
`20`	`20`	`.conversejs {`
`21`		`- converse-chats {`
	`21`	`+ converse-app-chat {`
`22`	`22`	`&.converse-overlayed {`
`23`	`23`	`> .row {`
`24`	`24`	`flex-direction: row-reverse;`
`@@ -60,7 +60,7 @@`
`60`	`60`
`61`	`61`	`@include media-breakpoint-down(sm) {`
`62`	`62`	`.conversejs {`
`63`		`- converse-chats {`
	`63`	`+ converse-app-chat {`
`64`	`64`	`width: 100%;`
`65`	`65`	`}`
`66`	`66`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ import { CustomElement } from 'shared/components/element.js';`
`3`	`3`	`import tplChats from './templates/chats.js';`
`4`	`4`
`5`	`5`
`6`		`-class ConverseChats extends CustomElement {`
	`6`	`+class ChatApp extends CustomElement {`
`7`	`7`
`8`	`8`	`initialize () {`
`9`	`9`	`this.model = _converse.state.chatboxes;`
`@@ -39,4 +39,4 @@ class ConverseChats extends CustomElement {`
`39`	`39`	`}`
`40`	`40`	`}`
`41`	`41`
`42`		`-api.elements.define('converse-chats', ConverseChats);`
	`42`	`+api.elements.define('converse-app-chat', ChatApp);`
Original file line number	Diff line number	Diff line change
`@@ -8,8 +8,8 @@`
`8`	`8`	`/* ***************** Overlay and embedded styles ************************* */`
`9`	`9`
`10`	`10`	`.conversejs {`
`11`		`- converse-chats.converse-embedded,`
`12`		`- converse-chats.converse-overlayed {`
	`11`	`+ converse-app-chat.converse-embedded,`
	`12`	`+ converse-app-chat.converse-overlayed {`
`13`	`13`	`.controlbox-head {`
`14`	`14`	`padding: 0.5em;`
`15`	`15`	`}`
`@@ -28,7 +28,7 @@`
`28`	`28`	`}`
`29`	`29`	`}`
`30`	`30`
`31`		`- converse-chats.converse-overlayed {`
	`31`	`+ converse-app-chat.converse-overlayed {`
`32`	`32`	`.chat-head, .box-flyout {`
`33`	`33`	`border-top-left-radius: var(--chatbox-border-radius);`
`34`	`34`	`border-top-right-radius: var(--chatbox-border-radius);`
`@@ -78,8 +78,8 @@`
`78`	`78`	`}`
`79`	`79`
`80`	`80`	`.conversejs {`
`81`		`- converse-chats.converse-embedded,`
`82`		`- converse-chats.converse-fullscreen {`
	`81`	`+ converse-app-chat.converse-embedded,`
	`82`	`+ converse-app-chat.converse-fullscreen {`
`83`	`83`	`.flyout {`
`84`	`84`	`border-radius: 0;`
`85`	`85`	`border:none;`
`@@ -94,7 +94,7 @@`
`94`	`94`	`}`
`95`	`95`	`}`
`96`	`96`
`97`		`- converse-chats.converse-fullscreen {`
	`97`	`+ converse-app-chat.converse-fullscreen {`
`98`	`98`	`&:not(.converse-singleton) {`
`99`	`99`	`.chatbox {`
`100`	`100`	`@include media-breakpoint-up(md) {`
`@@ -124,7 +124,7 @@`
`124`	`124`	`}`
`125`	`125`	`}`
`126`	`126`
`127`		`- converse-chats.converse-embedded {`
	`127`	`+ converse-app-chat.converse-embedded {`
`128`	`128`	`.chat-head {`
`129`	`129`	`font-size: var(--font-size-huge);`
`130`	`130`	`}`
`@@ -147,7 +147,7 @@`
`147`	`147`	`/* ***************** Fullpage styles ************************* */`
`148`	`148`
`149`	`149`	`.conversejs {`
`150`		`- converse-chats.converse-fullscreen {`
	`150`	`+ converse-app-chat.converse-fullscreen {`
`151`	`151`	`.chatbox-btn {`
`152`	`152`	`font-size: var(--fullpage-chatbox-button-size);`
`153`	`153`	`}`
`@@ -186,7 +186,7 @@`
`186`	`186`
`187`	`187`	`@include media-breakpoint-down(md) {`
`188`	`188`	`.conversejs {`
`189`		`- converse-chats:not(.converse-embedded) {`
	`189`	`+ converse-app-chat:not(.converse-embedded) {`
`190`	`190`	`> .row {`
`191`	`191`	`flex-direction: row-reverse;`
`192`	`192`	`}`
`@@ -208,8 +208,8 @@`
`208`	`208`	`}`
`209`	`209`	`}`
`210`	`210`
`211`		`- converse-chats.converse-overlayed,`
`212`		`- converse-chats.converse-fullscreen {`
	`211`	`+ converse-app-chat.converse-overlayed,`
	`212`	`+ converse-app-chat.converse-fullscreen {`
`213`	`213`	`.chat-head {`
`214`	`214`	`converse-controlbox-navback {`
`215`	`215`	`margin: auto 0;`
Original file line number	Diff line number	Diff line change
`@@ -164,7 +164,7 @@`
`164`	`164`	`}`
`165`	`165`
`166`	`166`	`.conversejs {`
`167`		`- converse-chats {`
	`167`	`+ converse-app-chat {`
`168`	`168`	`&.converse-overlayed {`
`169`	`169`	`display: flex;`
`170`	`170`	`flex-direction: row-reverse;`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@`
`48`	`48`	`}`
`49`	`49`
`50`	`50`	`.conversejs {`
`51`		`- converse-chats {`
	`51`	`+ converse-app-chat {`
`52`	`52`	`&.converse-overlayed {`
`53`	`53`	`#controlbox {`
`54`	`54`	`converse-login-form {`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@`
`40`	`40`	`}`
`41`	`41`	`}`
`42`	`42`
`43`		`- converse-chats {`
	`43`	`+ converse-app-chat {`
`44`	`44`	`&.converse-fullscreen {`
`45`	`45`	`.chatbox.headlines {`
`46`	`46`	`.chat-head {`