Rename ChatRoomOccupant to MUCOccupant

src/headless/index.js

@@ -13,9 +13,8 @@ dayjs.extend(advancedFormat);
 
 /* START: Removable components
  * --------------------
- * Any of the following components may be removed if they're not needed.
+ * The following components may be removed if they're not needed.
  */
-
 import "./plugins/bookmarks/index.js";  // XEP-0199 XMPP Ping
 import "./plugins/bosh/index.js";       // XEP-0206 BOSH
 import "./plugins/caps/index.js";       // XEP-0115 Entity Capabilities

src/headless/plugins/chatboxes/chatboxes.js

@@ -1,4 +1,6 @@
 /**
+ * @typedef {import('../../plugins/chat/model.js').default} ChatBox
+ * @typedef {import('../../plugins/muc/muc').default} MUC
  * @typedef {import('@converse/skeletor').Model} Model
  */
 import _converse from '../../shared/_converse.js';
@@ -24,9 +26,9 @@ class ChatBoxes extends Collection {
         /**
          * Triggered once all chat boxes have been recreated from the browser cache
          * @event _converse#chatBoxesFetched
-         * @type { object }
-         * @property { _converse.ChatBox | _converse.ChatRoom } chatbox
-         * @property { Element } stanza
+         * @type {object}
+         * @property {ChatBox|MUC} chatbox
+         * @property {Element} stanza
          * @example _converse.api.listen.on('chatBoxesFetched', obj => { ... });
          * @example _converse.api.waitUntil('chatBoxesFetched').then(() => { ... });
          */

src/headless/plugins/muc/index.js

@@ -9,8 +9,8 @@ import '../emoji/index.js';
 import MUCMessage from './message.js';
 import MUCMessages from './messages.js';
 import MUC from './muc.js';
-import ChatRoomOccupant from './occupant.js';
-import ChatRoomOccupants from './occupants.js';
+import MUCOccupant from './occupant.js';
+import MUCOccupants from './occupants.js';
 import affiliations_api from './affiliations/api.js';
 import muc_api from './api.js';
 import _converse from '../../shared/_converse.js';
@@ -188,19 +188,22 @@ converse.plugins.add('converse-muc', {
         const legacy_exports = {
             ChatRoom: MUC,
             ChatRoomMessage: MUCMessage,
+            ChatRoomMessages: MUCMessages,
+            ChatRoomOccupant: MUCOccupant,
+            ChatRoomOccupants: MUCOccupants,
         };
         Object.assign(_converse, legacy_exports);
 
         const exports = {
             MUC,
             MUCMessage,
-            ChatRoomOccupants,
-            ChatRoomOccupant,
+            MUCMessages,
+            MUCOccupant,
+            MUCOccupants,
             getAssignableAffiliations,
             getDefaultMUCNickname,
             isInfoVisible,
             onDirectMUCInvitation,
-            ChatRoomMessages: MUCMessages,
         };
         Object.assign(_converse.exports, exports);
         Object.assign(_converse, exports); // XXX DEPRECATED

src/headless/plugins/muc/muc.js

@@ -1,7 +1,7 @@
 /**
  * @module:headless-plugins-muc-muc
  * @typedef {import('./message.js').default} MUCMessage
- * @typedef {import('./occupant.js').default} ChatRoomOccupant
+ * @typedef {import('./occupant.js').default} MUCOccupant
  * @typedef {import('./affiliations/utils.js').NonOutcastAffiliation} NonOutcastAffiliation
  * @typedef {module:plugin-muc-parsers.MemberListItem} MemberListItem
  * @typedef {module:plugin-chat-parsers.MessageAttributes} MessageAttributes
@@ -396,7 +396,7 @@ class MUC extends ChatBox {
     }
 
     getMessagesCollection () {
-        return new _converse.exports.ChatRoomMessages();
+        return new _converse.exports.MUCMessages();
     }
 
     restoreSession () {
@@ -429,7 +429,7 @@ class MUC extends ChatBox {
     }
 
     initOccupants () {
-        this.occupants = new _converse.exports.ChatRoomOccupants();
+        this.occupants = new _converse.exports.MUCOccupants();
         const bare_jid = _converse.session.get('bare_jid');
         const id = `converse.occupants-${bare_jid}${this.get('jid')}`;
         this.occupants.browserStorage = createStore(id, 'session');
@@ -1473,10 +1473,10 @@ class MUC extends ChatBox {
     }
 
     /**
-     * Get the {@link ChatRoomOccupant} instance which
+     * Get the {@link MUCOccupant} instance which
      * represents the current user.
      * @method MUC#getOwnOccupant
-     * @returns {ChatRoomOccupant}
+     * @returns {MUCOccupant}
      */
     getOwnOccupant () {
         return this.occupants.getOwnOccupant();
@@ -1517,7 +1517,7 @@ class MUC extends ChatBox {
     /**
      * Send an IQ stanza to modify an occupant's role
      * @method MUC#setRole
-     * @param {ChatRoomOccupant} occupant
+     * @param {MUCOccupant} occupant
      * @param {string} role
      * @param {string} reason
      * @param {function} onSuccess - callback for a succesful response
@@ -1546,7 +1546,7 @@ class MUC extends ChatBox {
     /**
      * @method MUC#getOccupant
      * @param {string} nickname_or_jid - The nickname or JID of the occupant to be returned
-     * @returns {ChatRoomOccupant}
+     * @returns {MUCOccupant}
      */
     getOccupant (nickname_or_jid) {
         return u.isValidJID(nickname_or_jid)
@@ -1595,7 +1595,7 @@ class MUC extends ChatBox {
      * @private
      * @method MUC#getOccupantsSortedBy
      * @param {string} attr - The attribute to sort the returned array by
-     * @returns {ChatRoomOccupant[]}
+     * @returns {MUCOccupant[]}
      */
     getOccupantsSortedBy (attr) {
         return Array.from(this.occupants.models).sort((a, b) =>

src/headless/plugins/muc/occupant.js

@@ -3,10 +3,10 @@ import { Model } from '@converse/skeletor';
 /**
  * Represents a participant in a MUC
  * @class
- * @namespace _converse.ChatRoomOccupant
+ * @namespace _converse.MUCOccupant
  * @memberOf _converse
  */
-class ChatRoomOccupant extends Model {
+class MUCOccupant extends Model {
 
     constructor (attributes, options) {
         super(attributes, options);
@@ -55,4 +55,4 @@ class ChatRoomOccupant extends Model {
     }
 }
 
-export default ChatRoomOccupant;
+export default MUCOccupant;

src/headless/plugins/muc/occupants.js

@@ -1,7 +1,7 @@
 /**
  * @typedef {module:plugin-muc-parsers.MemberListItem} MemberListItem
  */
-import ChatRoomOccupant from './occupant.js';
+import MUCOccupant from './occupant.js';
 import _converse from '../../shared/_converse.js';
 import log from '../../log';
 import api, { converse } from '../../shared/api/index.js';
@@ -15,12 +15,11 @@ const { u } = converse.env;
 
 
 /**
- * A list of {@link _converse.ChatRoomOccupant} instances, representing participants in a MUC.
+ * A list of {@link MUCOccupant} instances, representing participants in a MUC.
  * @class
- * @namespace _converse.ChatRoomOccupants
  * @memberOf _converse
  */
-class ChatRoomOccupants extends Collection {
+class MUCOccupants extends Collection {
 
     constructor (attrs, options) {
         super(
@@ -31,7 +30,7 @@ class ChatRoomOccupants extends Collection {
     }
 
     get model() {
-        return ChatRoomOccupant;
+        return MUCOccupant;
     }
 
     initialize() {
@@ -130,7 +129,7 @@ class ChatRoomOccupants extends Collection {
      *
      * Lookup by occupant_id is done first, then jid, and then nick.
      *
-     * @method _converse.ChatRoomOccupants#findOccupant
+     * @method _converse.MUCOccupants#findOccupant
      * @param { OccupantData } data
      */
     findOccupant (data) {
@@ -144,10 +143,10 @@ class ChatRoomOccupants extends Collection {
     }
 
     /**
-     * Get the {@link ChatRoomOccupant} instance which
+     * Get the {@link MUCOccupant} instance which
      * represents the current user.
-     * @method _converse.ChatRoomOccupants#getOwnOccupant
-     * @returns {ChatRoomOccupant}
+     * @method _converse.MUCOccupants#getOwnOccupant
+     * @returns {MUCOccupant}
      */
     getOwnOccupant () {
         const bare_jid = _converse.session.get('bare_jid');
@@ -159,4 +158,4 @@ class ChatRoomOccupants extends Collection {
 }
 
 
-export default ChatRoomOccupants;
+export default MUCOccupants;

src/headless/plugins/vcard/utils.js

@@ -1,16 +1,16 @@
 /**
- * @typedef {import('../muc/occupant.js').default} ChatRoomOccupant
- * @typedef {import('../chat/model-with-contact.js').default} ModelWithContact
+ * @typedef {import('../../plugins/muc/message').default} MUCMessage
  * @typedef {import('../../plugins/status/status').default} XMPPStatus
  * @typedef {import('../../plugins/vcard/vcards').default} VCards
- * @typedef {import('../../plugins/muc/message').default} MUCMessage
+ * @typedef {import('../chat/model-with-contact.js').default} ModelWithContact
+ * @typedef {import('../muc/occupant.js').default} MUCOccupant
  */
 import _converse from '../../shared/_converse.js';
 import api, { converse } from '../../shared/api/index.js';
 import log from "../../log.js";
 import { initStorage } from '../../utils/storage.js';
 import { shouldClearCache } from '../../utils/session.js';
-import { isElement } from 'utils/html.js';
+import { isElement } from '../../utils/html.js';
 
 const { Strophe, $iq, u } = converse.env;
 
@@ -62,7 +62,7 @@ export function createStanza (type, jid, vcard_el) {
 
 
 /**
- * @param {ChatRoomOccupant} occupant
+ * @param {MUCOccupant} occupant
  */
 export function onOccupantAvatarChanged (occupant) {
     const hash = occupant.get('image_hash');
@@ -102,6 +102,9 @@ export async function setVCardOnModel (model) {
 }
 
 
+/**
+ * @param {MUCOccupant} occupant
+ */
 function getVCardForOccupant (occupant) {
     const { vcards, xmppstatus } = _converse.state;
     const muc = occupant?.collection?.chatroom;
@@ -121,7 +124,7 @@ function getVCardForOccupant (occupant) {
 }
 
 /**
- * @param {ChatRoomOccupant} occupant
+ * @param {MUCOccupant} occupant
  */
 export async function setVCardOnOccupant (occupant) {
     await api.waitUntil('VCardsInitialized');

src/headless/shared/chat/utils.js

@@ -1,10 +1,10 @@
 /**
  * @module:headless-shared-chat-utils
- * @typedef {import('../../plugins/muc/muc.js').default} MUC
- * @typedef {import('../../plugins/chat/model.js').default} ChatBox
  * @typedef {import('../../plugins/chat/message.js').default} Message
- * @typedef {module:headless-shared-parsers.MediaURLMetadata} MediaURLMetadata
+ * @typedef {import('../../plugins/chat/model.js').default} ChatBox
+ * @typedef {import('../../plugins/muc/muc.js').default} MUC
  * @typedef {module:headless-shared-chat-utils.MediaURLData} MediaURLData
+ * @typedef {module:headless-shared-parsers.MediaURLMetadata} MediaURLMetadata
  */
 import debounce from 'lodash-es/debounce.js';
 import api, { converse } from '../../shared/api/index.js';

src/headless/types/plugins/chatboxes/chatboxes.d.ts

@@ -1,4 +1,6 @@
 export default ChatBoxes;
+export type ChatBox = import('../../plugins/chat/model.js').default;
+export type MUC = import('../../plugins/muc/muc').default;
 export type Model = import('@converse/skeletor').Model;
 declare class ChatBoxes extends Collection {
     /**

src/headless/types/plugins/muc/muc.d.ts

@@ -1,6 +1,6 @@
 export default MUC;
 export type MUCMessage = import('./message.js').default;
-export type ChatRoomOccupant = import('./occupant.js').default;
+export type MUCOccupant = import('./occupant.js').default;
 export type NonOutcastAffiliation = import('./affiliations/utils.js').NonOutcastAffiliation;
 export type MemberListItem = any;
 export type MessageAttributes = any;
@@ -323,12 +323,12 @@ declare class MUC extends ChatBox {
      */
     private getOwnAffiliation;
     /**
-     * Get the {@link ChatRoomOccupant} instance which
+     * Get the {@link MUCOccupant} instance which
      * represents the current user.
      * @method MUC#getOwnOccupant
-     * @returns {ChatRoomOccupant}
+     * @returns {MUCOccupant}
      */
-    getOwnOccupant(): ChatRoomOccupant;
+    getOwnOccupant(): MUCOccupant;
     /**
      * Send a presence stanza to update the user's nickname in this MUC.
      * @param { String } nick
@@ -337,19 +337,19 @@ declare class MUC extends ChatBox {
     /**
      * Send an IQ stanza to modify an occupant's role
      * @method MUC#setRole
-     * @param {ChatRoomOccupant} occupant
+     * @param {MUCOccupant} occupant
      * @param {string} role
      * @param {string} reason
      * @param {function} onSuccess - callback for a succesful response
      * @param {function} onError - callback for an error response
      */
-    setRole(occupant: ChatRoomOccupant, role: string, reason: string, onSuccess: Function, onError: Function): any;
+    setRole(occupant: MUCOccupant, role: string, reason: string, onSuccess: Function, onError: Function): any;
     /**
      * @method MUC#getOccupant
      * @param {string} nickname_or_jid - The nickname or JID of the occupant to be returned
-     * @returns {ChatRoomOccupant}
+     * @returns {MUCOccupant}
      */
-    getOccupant(nickname_or_jid: string): ChatRoomOccupant;
+    getOccupant(nickname_or_jid: string): MUCOccupant;
     /**
      * Return an array of occupant models that have the required role
      * @method MUC#getOccupantsWithRole
@@ -377,7 +377,7 @@ declare class MUC extends ChatBox {
      * @private
      * @method MUC#getOccupantsSortedBy
      * @param {string} attr - The attribute to sort the returned array by
-     * @returns {ChatRoomOccupant[]}
+     * @returns {MUCOccupant[]}
      */
     private getOccupantsSortedBy;
     /**

src/headless/types/plugins/muc/occupant.d.ts

@@ -1,11 +1,11 @@
-export default ChatRoomOccupant;
+export default MUCOccupant;
 /**
  * Represents a participant in a MUC
  * @class
- * @namespace _converse.ChatRoomOccupant
+ * @namespace _converse.MUCOccupant
  * @memberOf _converse
  */
-declare class ChatRoomOccupant extends Model {
+declare class MUCOccupant extends Model {
     constructor(attributes: any, options: any);
     vcard: any;
     defaults(): {

src/headless/types/plugins/muc/occupants.d.ts

@@ -1,15 +1,14 @@
-export default ChatRoomOccupants;
+export default MUCOccupants;
 export type MemberListItem = any;
 /**
- * A list of {@link _converse.ChatRoomOccupant} instances, representing participants in a MUC.
+ * A list of {@link MUCOccupant} instances, representing participants in a MUC.
  * @class
- * @namespace _converse.ChatRoomOccupants
  * @memberOf _converse
  */
-declare class ChatRoomOccupants extends Collection {
+declare class MUCOccupants extends Collection {
     constructor(attrs: any, options: any);
     chatroom: any;
-    get model(): typeof ChatRoomOccupant;
+    get model(): typeof MUCOccupant;
     create(attrs: any, options: any): false | Model | import("@converse/skeletor/src/types/collection.js").Attributes | (Promise<any> & {
         isResolved: boolean;
         isPending: boolean;
@@ -35,7 +34,7 @@ declare class ChatRoomOccupants extends Collection {
      *
      * Lookup by occupant_id is done first, then jid, and then nick.
      *
-     * @method _converse.ChatRoomOccupants#findOccupant
+     * @method _converse.MUCOccupants#findOccupant
      * @param { OccupantData } data
      */
     findOccupant(data: {
@@ -47,14 +46,14 @@ declare class ChatRoomOccupants extends Collection {
         occupant_id?: string;
     }): any;
     /**
-     * Get the {@link ChatRoomOccupant} instance which
+     * Get the {@link MUCOccupant} instance which
      * represents the current user.
-     * @method _converse.ChatRoomOccupants#getOwnOccupant
-     * @returns {ChatRoomOccupant}
+     * @method _converse.MUCOccupants#getOwnOccupant
+     * @returns {MUCOccupant}
      */
-    getOwnOccupant(): ChatRoomOccupant;
+    getOwnOccupant(): MUCOccupant;
 }
 import { Collection } from "@converse/skeletor";
-import ChatRoomOccupant from "./occupant.js";
+import MUCOccupant from "./occupant.js";
 import { Model } from "@converse/skeletor";
 //# sourceMappingURL=occupants.d.ts.map

src/headless/types/plugins/vcard/utils.d.ts

@@ -5,17 +5,17 @@
  */
 export function createStanza(type: "get" | "set" | "result", jid: string, vcard_el?: Element): any;
 /**
- * @param {ChatRoomOccupant} occupant
+ * @param {MUCOccupant} occupant
  */
-export function onOccupantAvatarChanged(occupant: ChatRoomOccupant): void;
+export function onOccupantAvatarChanged(occupant: MUCOccupant): void;
 /**
  * @param {ModelWithContact} model
  */
 export function setVCardOnModel(model: ModelWithContact): Promise<void>;
 /**
- * @param {ChatRoomOccupant} occupant
+ * @param {MUCOccupant} occupant
  */
-export function setVCardOnOccupant(occupant: ChatRoomOccupant): Promise<void>;
+export function setVCardOnOccupant(occupant: MUCOccupant): Promise<void>;
 /**
  * @param {MUCMessage} message
  */
@@ -33,9 +33,9 @@ export function getVCard(jid: string): Promise<{
     vcard: any;
     vcard_error: string;
 }>;
-export type ChatRoomOccupant = import('../muc/occupant.js').default;
-export type ModelWithContact = import('../chat/model-with-contact.js').default;
+export type MUCMessage = import('../../plugins/muc/message').default;
 export type XMPPStatus = import('../../plugins/status/status').default;
 export type VCards = import('../../plugins/vcard/vcards').default;
-export type MUCMessage = import('../../plugins/muc/message').default;
+export type ModelWithContact = import('../chat/model-with-contact.js').default;
+export type MUCOccupant = import('../muc/occupant.js').default;
 //# sourceMappingURL=utils.d.ts.map

src/headless/types/shared/chat/utils.d.ts

@@ -23,9 +23,9 @@ export function getMediaURLs(arr: Array<MediaURLMetadata>, text: string, offset?
  */
 export function handleCorrection(model: ChatBox | MUC, attrs: object): Promise<Message | void>;
 export const debouncedPruneHistory: any;
-export type MUC = import('../../plugins/muc/muc.js').default;
-export type ChatBox = import('../../plugins/chat/model.js').default;
 export type Message = import('../../plugins/chat/message.js').default;
-export type MediaURLMetadata = any;
+export type ChatBox = import('../../plugins/chat/model.js').default;
+export type MUC = import('../../plugins/muc/muc.js').default;
 export type MediaURLData = any;
+export type MediaURLMetadata = any;
 //# sourceMappingURL=utils.d.ts.map

src/plugins/muc-views/tests/member-lists.js

@@ -67,7 +67,7 @@ describe("A Groupchat", function () {
 
             const muc_jid = 'lounge@montague.lit';
             const sent_IQs = _converse.api.connection.get().IQ_stanzas;
-            spyOn(_converse.ChatRoomOccupants.prototype, 'fetchMembers').and.callThrough();
+            spyOn(_converse.exports.MUCOccupants.prototype, 'fetchMembers').and.callThrough();
             // Join MUC without an affiliation
             const model = await mock.openAndEnterChatRoom(_converse, muc_jid, 'romeo', [], [], true, {}, 'none', 'participant');
             await u.waitUntil(() => model.occupants.fetchMembers.calls.count());
@@ -161,7 +161,7 @@ describe("Someone being invited to a groupchat", function () {
             mock.initConverse(['chatBoxesFetched'], {}, async function (_converse) {
 
         await mock.waitForRoster(_converse, 'current', 0);
-        spyOn(_converse.ChatRoomOccupants.prototype, 'fetchMembers').and.callThrough();
+        spyOn(_converse.exports.MUCOccupants.prototype, 'fetchMembers').and.callThrough();
         const sent_IQs = _converse.api.connection.get().IQ_stanzas;
         const muc_jid = 'coven@chat.shakespeare.lit';
         const nick = 'romeo';

src/plugins/muc-views/tests/modtools.js

@@ -84,7 +84,7 @@ describe("The groupchat moderator tool", function () {
         const submit = form.querySelector('.btn-primary');
         submit.click();
 
-        spyOn(_converse.ChatRoomOccupants.prototype, 'fetchMembers').and.callThrough();
+        spyOn(_converse.MUCOccupants.prototype, 'fetchMembers').and.callThrough();
         const sent_IQ = _converse.api.connection.get().IQ_stanzas.pop();
         expect(Strophe.serialize(sent_IQ)).toBe(
             `<iq id="${sent_IQ.getAttribute('id')}" to="lounge@montague.lit" type="set" xmlns="jabber:client">`+

src/shared/chat/utils.js

@@ -1,5 +1,6 @@
 /**
- * @typedef {import('../../headless/plugins/chat/message.js').default} Message
+ * @typedef {import('@converse/headless/plugins/chat/message').default} Message
+ * @typedef {import('../../plugins/muc-views/muc.js').default} MUCView
  */
 import debounce from 'lodash-es/debounce';
 import tplNewDay from "./templates/new-day.js";
@@ -109,7 +110,7 @@ function _markScrolled (ev) {
         /**
          * Triggered once the chat's message area has been scrolled to the top
          * @event _converse#chatBoxScrolledUp
-         * @property { _converse.ChatBoxView | _converse.ChatRoomView } view
+         * @property { _converse.ChatBoxView | MUCView } view
          * @example _converse.api.listen.on('chatBoxScrolledUp', obj => { ... });
          */
         api.trigger('chatBoxScrolledUp', el);

src/types/headless/plugins/muc/muc.d.ts

@@ -1,6 +1,6 @@
 export default MUC;
 export type MUCMessage = import('./message.js').default;
-export type ChatRoomOccupant = import('./occupant.js').default;
+export type MUCOccupant = import('./occupant.js').default;
 export type NonOutcastAffiliation = import('./affiliations/utils.js').NonOutcastAffiliation;
 export type MemberListItem = any;
 export type MessageAttributes = any;
@@ -323,12 +323,12 @@ declare class MUC extends ChatBox {
      */
     private getOwnAffiliation;
     /**
-     * Get the {@link ChatRoomOccupant} instance which
+     * Get the {@link MUCOccupant} instance which
      * represents the current user.
      * @method MUC#getOwnOccupant
-     * @returns {ChatRoomOccupant}
+     * @returns {MUCOccupant}
      */
-    getOwnOccupant(): ChatRoomOccupant;
+    getOwnOccupant(): MUCOccupant;
     /**
      * Send a presence stanza to update the user's nickname in this MUC.
      * @param { String } nick
@@ -337,19 +337,19 @@ declare class MUC extends ChatBox {
     /**
      * Send an IQ stanza to modify an occupant's role
      * @method MUC#setRole
-     * @param {ChatRoomOccupant} occupant
+     * @param {MUCOccupant} occupant
      * @param {string} role
      * @param {string} reason
      * @param {function} onSuccess - callback for a succesful response
      * @param {function} onError - callback for an error response
      */
-    setRole(occupant: ChatRoomOccupant, role: string, reason: string, onSuccess: Function, onError: Function): any;
+    setRole(occupant: MUCOccupant, role: string, reason: string, onSuccess: Function, onError: Function): any;
     /**
      * @method MUC#getOccupant
      * @param {string} nickname_or_jid - The nickname or JID of the occupant to be returned
-     * @returns {ChatRoomOccupant}
+     * @returns {MUCOccupant}
      */
-    getOccupant(nickname_or_jid: string): ChatRoomOccupant;
+    getOccupant(nickname_or_jid: string): MUCOccupant;
     /**
      * Return an array of occupant models that have the required role
      * @method MUC#getOccupantsWithRole
@@ -377,7 +377,7 @@ declare class MUC extends ChatBox {
      * @private
      * @method MUC#getOccupantsSortedBy
      * @param {string} attr - The attribute to sort the returned array by
-     * @returns {ChatRoomOccupant[]}
+     * @returns {MUCOccupant[]}
      */
     private getOccupantsSortedBy;
     /**

src/types/headless/plugins/muc/occupant.d.ts

@@ -1,11 +1,11 @@
-export default ChatRoomOccupant;
+export default MUCOccupant;
 /**
  * Represents a participant in a MUC
  * @class
- * @namespace _converse.ChatRoomOccupant
+ * @namespace _converse.MUCOccupant
  * @memberOf _converse
  */
-declare class ChatRoomOccupant extends Model {
+declare class MUCOccupant extends Model {
     constructor(attributes: any, options: any);
     vcard: any;
     defaults(): {

src/types/headless/shared/chat/utils.d.ts

@@ -23,9 +23,9 @@ export function getMediaURLs(arr: Array<MediaURLMetadata>, text: string, offset?
  */
 export function handleCorrection(model: ChatBox | MUC, attrs: object): Promise<Message | void>;
 export const debouncedPruneHistory: any;
-export type MUC = import('../../plugins/muc/muc.js').default;
-export type ChatBox = import('../../plugins/chat/model.js').default;
 export type Message = import('../../plugins/chat/message.js').default;
-export type MediaURLMetadata = any;
+export type ChatBox = import('../../plugins/chat/model.js').default;
+export type MUC = import('../../plugins/muc/muc.js').default;
 export type MediaURLData = any;
+export type MediaURLMetadata = any;
 //# sourceMappingURL=utils.d.ts.map