@ethora/chat-component-rn 26.7.4 → 26.7.5

package/src/hooks/useSendMessage.tsx

@@ -10,7 +10,11 @@ import {
   markMessageFailed,
 } from '../roomStore/roomHeapSlice';
 import { uploadFileV2 } from '../networking/api-requests/auth.api';
-import { enqueueOutboundSend, removeOutboundSend } from '../networking/outboundQueue';
+import {
+  enqueueOutboundSend,
+  markOutboundSentLive,
+  removeOutboundSend,
+} from '../networking/outboundQueue';
 import { RootState, store } from '../roomStore';
 import { getGlobalXmppClient } from '../utils/clientRegistry';
 import { useEventHandlers } from './useEventHandlers';
@@ -304,15 +308,36 @@ export const useSendMessage = (_configOverride?: IConfig) => {
         }
 
         replaySend(effectiveClient);
+        // The stanza is on the wire from here on. Mark the buffered copy
+        // so a later reconnect flush won't blind-replay it — see
+        // markOutboundSentLive / flushOutboundSends. Customer-reported #31.
+        markOutboundSentLive(optimisticId);
         try {
-          effectiveClient.ensureStreamAlive?.();
+          // Throttled + config-gated: a burst of sends starts at most one
+          // probe, and a single missed probe no longer tears the stream
+          // down. See ensureStreamAliveAfterSend / ensureStreamAlive.
+          effectiveClient.ensureStreamAliveAfterSend?.();
         } catch {}
-        await handleMessageSent({
-          message,
-          roomJID: activeRoomJID,
-          user,
-          messageType: 'text',
-        });
+        // Post-send notification ONLY. Deliberately outside the try below:
+        // `handleMessageSent` re-throws whatever the host app's
+        // `eventHandlers.onMessageSent` callback throws, and this runs
+        // AFTER the stanza was already delivered — letting that reach the
+        // catch marked a delivered message "Failed → tap to retry" purely
+        // because a consumer's analytics/webhook hook was slow or errored.
+        // Customer-reported #31 ("delivered but shows as failed").
+        try {
+          await handleMessageSent({
+            message,
+            roomJID: activeRoomJID,
+            user,
+            messageType: 'text',
+          });
+        } catch (notifyError) {
+          console.warn(
+            'onMessageSent handler threw after a successful send; not failing the message',
+            notifyError
+          );
+        }
       } catch (error) {
         clearTimeout(watchdogTimer);
         // Same reasoning as the watchdog: once the bubble shows failed,
@@ -580,7 +605,7 @@ export const useSendMessage = (_configOverride?: IConfig) => {
               id
             );
             try {
-              effectiveMediaClient.ensureStreamAlive?.();
+              effectiveMediaClient.ensureStreamAliveAfterSend?.();
             } catch {}
           } else {
             const anyMediaClient: any =
@@ -603,21 +628,32 @@ export const useSendMessage = (_configOverride?: IConfig) => {
           }
         }
 
-        await handleMessageSent({
-          message: 'media',
-          roomJID: activeRoomJID,
-          user,
-          messageType: 'media',
-          metadata: {
-            isReply,
-            isChecked,
-            mainMessage,
-            fileData: data,
-            fileType: type,
-            messageId: id,
-            uploadResults: response.data.results,
-          },
-        });
+        // Post-send notification ONLY — see the text path: the upload and
+        // stanza send have already succeeded here, so a throw from the
+        // host's `onMessageSent` callback must not flip this to "Failed".
+        // Customer-reported #31.
+        try {
+          await handleMessageSent({
+            message: 'media',
+            roomJID: activeRoomJID,
+            user,
+            messageType: 'media',
+            metadata: {
+              isReply,
+              isChecked,
+              mainMessage,
+              fileData: data,
+              fileType: type,
+              messageId: id,
+              uploadResults: response.data.results,
+            },
+          });
+        } catch (notifyError) {
+          console.warn(
+            'onMessageSent handler threw after a successful media send; not failing the message',
+            notifyError
+          );
+        }
       } catch (error: any) {
         // Upload (or stanza send) threw an explicit error. Clear the
         // watchdog so it doesn't double-fire `markMessageFailed`.

package/src/i18n/strings.ts

@@ -15,8 +15,6 @@ export type UiStringTable = Record<string, string>;
 
 const en: UiStringTable = {
   'search.placeholder': 'Search...',
-  'search.members': 'Search members',
-  'search.noResults': 'Nobody found',
   'input.placeholder': 'Type message',
   'room.created': 'Room created',
   'room.empty': 'This chat is empty',
@@ -91,10 +89,6 @@ const en: UiStringTable = {
   'action.add': 'Add',
   'action.backToCreation': 'Back to creation',
   'action.report': 'Report',
-  'action.search': 'Search',
-  'action.edit': 'Edit',
-  'action.deleteAndLeave': 'Delete and Leave',
-  'status.banned': 'banned',
   'status.connecting': 'Connecting…',
   'status.noInternet': 'No internet connection',
   'translation.translating': 'Translating…',
@@ -106,10 +100,7 @@ const en: UiStringTable = {
   'translation.modeManual': 'Manual',
   'language.select': 'Select language',
   'modal.newChat.title': 'Create New Chat',
-  'modal.newChat.roomNamePlaceholder': 'Chat name',
-  'modal.newChat.descriptionPlaceholder': 'Description (optional)',
-  'modal.newChat.createButton': 'Create new chat',
-  'modal.newChat.nameTooShort': 'Chat name must be at least 3 characters.',
+  'modal.newChat.roomNamePlaceholder': 'Enter Room Name',
   'modal.newChat.chatTypePlaceholder': 'Select chat type',
   'modal.newChat.selectUsersTitle': 'Select users to add to Chat',
   'modal.selectUsers.title': 'Select Users (max 20)',
@@ -151,8 +142,6 @@ const en: UiStringTable = {
   'action.call': 'Call',
   'action.audioCall': 'Audio call',
   'action.copyUserId': 'Copy User Id',
-  'action.account': 'Account',
-  'action.share': 'Share',
   'action.deleteChat': 'Delete chat',
   'action.appointAsAdmin': 'Appoint as an admin',
   'action.moreOptions': 'More Options',
@@ -171,21 +160,12 @@ const en: UiStringTable = {
   'auth.anonymousLoginMessage': 'You are logged in anonymously!',
   'modal.profile.title': 'Profile',
   'modal.profile.about': 'About',
-  'modal.profile.language': 'Language',
-  'modal.profile.media': 'Media',
-  'modal.profile.documents': 'Documents',
-  'modal.profile.noFiles': 'Nothing here yet',
   'modal.profile.noDescription': 'No description',
   'modal.chatProfile.title': 'Chat Profile',
   'modal.chatProfile.description': 'Description',
   'modal.chatProfile.chatType': 'Chat type',
   'modal.chatProfile.memberCountSingular': '{count} member',
   'modal.chatProfile.memberCountPlural': '{count} members',
-  'modal.chatProfile.addMembers': 'Add Members',
-  'modal.chatProfile.removePhoto': 'Remove photo',
-  'modal.chatProfile.membersLabel': 'Members: {count}',
-  'modal.chatProfile.membersUnavailable': 'Member list unavailable',
-  'modal.chatProfile.removeMember': 'Remove from this chat?',
   'modal.deleteChat.title': 'Delete this chat ?',
   'modal.addMembers.title': 'Add New Member',
   'modal.addMembers.userIdPlaceholder': 'Enter User Id',
@@ -243,8 +223,6 @@ const en: UiStringTable = {
 
 const fr: UiStringTable = {
   'search.placeholder': 'Rechercher...',
-  'search.members': 'Rechercher des membres',
-  'search.noResults': 'Personne trouvée',
   'input.placeholder': 'Écrire un message',
   'room.created': 'Salon créé',
   'room.empty': 'Ce salon est vide',
@@ -319,10 +297,6 @@ const fr: UiStringTable = {
   'action.add': 'Ajouter',
   'action.backToCreation': 'Retour à la création',
   'action.report': 'Signaler',
-  'action.search': 'Rechercher',
-  'action.edit': 'Modifier',
-  'action.deleteAndLeave': 'Supprimer et quitter',
-  'status.banned': 'banni',
   'status.connecting': 'Connexion…',
   'status.noInternet': 'Pas de connexion internet',
   'translation.translating': 'Traduction…',
@@ -335,9 +309,6 @@ const fr: UiStringTable = {
   'language.select': 'Choisir la langue',
   'modal.newChat.title': 'Créer une discussion',
   'modal.newChat.roomNamePlaceholder': 'Nom du salon',
-  'modal.newChat.descriptionPlaceholder': 'Description (facultatif)',
-  'modal.newChat.createButton': 'Créer la discussion',
-  'modal.newChat.nameTooShort': 'Le nom doit contenir au moins 3 caractères.',
   'modal.newChat.chatTypePlaceholder': 'Choisir le type de discussion',
   'modal.newChat.selectUsersTitle': 'Sélectionner des utilisateurs à ajouter',
   'modal.selectUsers.title': 'Sélectionner des utilisateurs (max 20)',
@@ -379,8 +350,6 @@ const fr: UiStringTable = {
   'action.call': 'Appeler',
   'action.audioCall': 'Appel audio',
   'action.copyUserId': "Copier l'ID utilisateur",
-  'action.account': 'Compte',
-  'action.share': 'Partager',
   'action.deleteChat': 'Supprimer la discussion',
   'action.appointAsAdmin': 'Nommer administrateur',
   'action.moreOptions': "Plus d'options",
@@ -399,21 +368,12 @@ const fr: UiStringTable = {
   'auth.anonymousLoginMessage': 'Vous êtes connecté anonymement !',
   'modal.profile.title': 'Profil',
   'modal.profile.about': 'À propos',
-  'modal.profile.language': 'Langue',
-  'modal.profile.media': 'Médias',
-  'modal.profile.documents': 'Documents',
-  'modal.profile.noFiles': 'Rien pour le moment',
   'modal.profile.noDescription': 'Aucune description',
   'modal.chatProfile.title': 'Profil de la discussion',
   'modal.chatProfile.description': 'Description',
   'modal.chatProfile.chatType': 'Type de discussion',
   'modal.chatProfile.memberCountSingular': '{count} membre',
   'modal.chatProfile.memberCountPlural': '{count} membres',
-  'modal.chatProfile.addMembers': 'Ajouter des membres',
-  'modal.chatProfile.removePhoto': 'Supprimer la photo',
-  'modal.chatProfile.membersLabel': 'Membres : {count}',
-  'modal.chatProfile.membersUnavailable': 'Liste des membres indisponible',
-  'modal.chatProfile.removeMember': 'Retirer de cette discussion ?',
   'modal.deleteChat.title': 'Supprimer cette discussion ?',
   'modal.addMembers.title': 'Ajouter un nouveau membre',
   'modal.addMembers.userIdPlaceholder': "Entrez l'ID utilisateur",
@@ -471,8 +431,6 @@ const fr: UiStringTable = {
 
 const es: UiStringTable = {
   'search.placeholder': 'Buscar...',
-  'search.members': 'Buscar miembros',
-  'search.noResults': 'No se encontró a nadie',
   'input.placeholder': 'Escribe un mensaje',
   'room.created': 'Sala creada',
   'room.empty': 'Este chat está vacío',
@@ -547,10 +505,6 @@ const es: UiStringTable = {
   'action.add': 'Añadir',
   'action.backToCreation': 'Volver a la creación',
   'action.report': 'Reportar',
-  'action.search': 'Buscar',
-  'action.edit': 'Editar',
-  'action.deleteAndLeave': 'Eliminar y salir',
-  'status.banned': 'bloqueado',
   'status.connecting': 'Conectando…',
   'status.noInternet': 'Sin conexión a internet',
   'translation.translating': 'Traduciendo…',
@@ -563,9 +517,6 @@ const es: UiStringTable = {
   'language.select': 'Seleccionar idioma',
   'modal.newChat.title': 'Crear nuevo chat',
   'modal.newChat.roomNamePlaceholder': 'Nombre de la sala',
-  'modal.newChat.descriptionPlaceholder': 'Descripción (opcional)',
-  'modal.newChat.createButton': 'Crear chat',
-  'modal.newChat.nameTooShort': 'El nombre debe tener al menos 3 caracteres.',
   'modal.newChat.chatTypePlaceholder': 'Selecciona el tipo de chat',
   'modal.newChat.selectUsersTitle': 'Selecciona usuarios para añadir al chat',
   'modal.selectUsers.title': 'Seleccionar usuarios (máx. 20)',
@@ -607,8 +558,6 @@ const es: UiStringTable = {
   'action.call': 'Llamar',
   'action.audioCall': 'Llamada de audio',
   'action.copyUserId': 'Copiar ID de usuario',
-  'action.account': 'Cuenta',
-  'action.share': 'Compartir',
   'action.deleteChat': 'Eliminar chat',
   'action.appointAsAdmin': 'Nombrar administrador',
   'action.moreOptions': 'Más opciones',
@@ -627,21 +576,12 @@ const es: UiStringTable = {
   'auth.anonymousLoginMessage': '¡Has iniciado sesión de forma anónima!',
   'modal.profile.title': 'Perfil',
   'modal.profile.about': 'Acerca de',
-  'modal.profile.language': 'Idioma',
-  'modal.profile.media': 'Multimedia',
-  'modal.profile.documents': 'Documentos',
-  'modal.profile.noFiles': 'Todavía no hay nada',
   'modal.profile.noDescription': 'Sin descripción',
   'modal.chatProfile.title': 'Perfil del chat',
   'modal.chatProfile.description': 'Descripción',
   'modal.chatProfile.chatType': 'Tipo de chat',
   'modal.chatProfile.memberCountSingular': '{count} miembro',
   'modal.chatProfile.memberCountPlural': '{count} miembros',
-  'modal.chatProfile.addMembers': 'Añadir miembros',
-  'modal.chatProfile.removePhoto': 'Quitar la foto',
-  'modal.chatProfile.membersLabel': 'Miembros: {count}',
-  'modal.chatProfile.membersUnavailable': 'Lista de miembros no disponible',
-  'modal.chatProfile.removeMember': '¿Quitar de este chat?',
   'modal.deleteChat.title': '¿Eliminar este chat?',
   'modal.addMembers.title': 'Añadir nuevo miembro',
   'modal.addMembers.userIdPlaceholder': 'Introduce el ID de usuario',
@@ -699,8 +639,6 @@ const es: UiStringTable = {
 
 const pt: UiStringTable = {
   'search.placeholder': 'Pesquisar...',
-  'search.members': 'Pesquisar membros',
-  'search.noResults': 'Ninguém encontrado',
   'input.placeholder': 'Escreva uma mensagem',
   'room.created': 'Sala criada',
   'room.empty': 'Este chat está vazio',
@@ -775,10 +713,6 @@ const pt: UiStringTable = {
   'action.add': 'Adicionar',
   'action.backToCreation': 'Voltar à criação',
   'action.report': 'Denunciar',
-  'action.search': 'Pesquisar',
-  'action.edit': 'Editar',
-  'action.deleteAndLeave': 'Eliminar e sair',
-  'status.banned': 'banido',
   'status.connecting': 'A ligar…',
   'status.noInternet': 'Sem ligação à internet',
   'translation.translating': 'A traduzir…',
@@ -791,9 +725,6 @@ const pt: UiStringTable = {
   'language.select': 'Selecionar idioma',
   'modal.newChat.title': 'Criar novo chat',
   'modal.newChat.roomNamePlaceholder': 'Nome da sala',
-  'modal.newChat.descriptionPlaceholder': 'Descrição (opcional)',
-  'modal.newChat.createButton': 'Criar conversa',
-  'modal.newChat.nameTooShort': 'O nome deve ter pelo menos 3 caracteres.',
   'modal.newChat.chatTypePlaceholder': 'Selecione o tipo de chat',
   'modal.newChat.selectUsersTitle': 'Selecione utilizadores para adicionar ao chat',
   'modal.selectUsers.title': 'Selecionar utilizadores (máx. 20)',
@@ -835,8 +766,6 @@ const pt: UiStringTable = {
   'action.call': 'Ligar',
   'action.audioCall': 'Chamada de áudio',
   'action.copyUserId': 'Copiar ID do utilizador',
-  'action.account': 'Conta',
-  'action.share': 'Partilhar',
   'action.deleteChat': 'Eliminar chat',
   'action.appointAsAdmin': 'Nomear administrador',
   'action.moreOptions': 'Mais opções',
@@ -855,21 +784,12 @@ const pt: UiStringTable = {
   'auth.anonymousLoginMessage': 'Iniciou sessão anonimamente!',
   'modal.profile.title': 'Perfil',
   'modal.profile.about': 'Sobre',
-  'modal.profile.language': 'Idioma',
-  'modal.profile.media': 'Multimédia',
-  'modal.profile.documents': 'Documentos',
-  'modal.profile.noFiles': 'Ainda não há nada aqui',
   'modal.profile.noDescription': 'Sem descrição',
   'modal.chatProfile.title': 'Perfil do chat',
   'modal.chatProfile.description': 'Descrição',
   'modal.chatProfile.chatType': 'Tipo de chat',
   'modal.chatProfile.memberCountSingular': '{count} membro',
   'modal.chatProfile.memberCountPlural': '{count} membros',
-  'modal.chatProfile.addMembers': 'Adicionar membros',
-  'modal.chatProfile.removePhoto': 'Remover foto',
-  'modal.chatProfile.membersLabel': 'Membros: {count}',
-  'modal.chatProfile.membersUnavailable': 'Lista de membros indisponível',
-  'modal.chatProfile.removeMember': 'Remover deste chat?',
   'modal.deleteChat.title': 'Eliminar este chat?',
   'modal.addMembers.title': 'Adicionar novo membro',
   'modal.addMembers.userIdPlaceholder': 'Introduza o ID do utilizador',
@@ -927,8 +847,6 @@ const pt: UiStringTable = {
 
 const ht: UiStringTable = {
   'search.placeholder': 'Chèche...',
-  'search.members': 'Chèche manm',
-  'search.noResults': 'Pa jwenn pèsonn',
   'input.placeholder': 'Ekri yon mesaj',
   'room.created': 'Sal la kreye',
   'room.empty': 'Chat sa a vid',
@@ -1003,10 +921,6 @@ const ht: UiStringTable = {
   'action.add': 'Ajoute',
   'action.backToCreation': 'Retounen nan kreyasyon',
   'action.report': 'Rapòte',
-  'action.search': 'Chèche',
-  'action.edit': 'Modifye',
-  'action.deleteAndLeave': 'Efase epi kite',
-  'status.banned': 'bloke',
   'status.connecting': 'Koneksyon…',
   'status.noInternet': 'Pa gen koneksyon entènèt',
   'translation.translating': 'Ap tradui…',
@@ -1019,9 +933,6 @@ const ht: UiStringTable = {
   'language.select': 'Chwazi lang',
   'modal.newChat.title': 'Kreye yon nouvo chat',
   'modal.newChat.roomNamePlaceholder': 'Antre non sal la',
-  'modal.newChat.descriptionPlaceholder': 'Deskripsyon (opsyonèl)',
-  'modal.newChat.createButton': 'Kreye chat la',
-  'modal.newChat.nameTooShort': 'Non an dwe gen omwen 3 karaktè.',
   'modal.newChat.chatTypePlaceholder': 'Chwazi tip chat la',
   'modal.newChat.selectUsersTitle': 'Chwazi itilizatè pou ajoute nan chat la',
   'modal.selectUsers.title': 'Chwazi itilizatè (maksimòm 20)',
@@ -1063,8 +974,6 @@ const ht: UiStringTable = {
   'action.call': 'Rele',
   'action.audioCall': 'Apèl odyo',
   'action.copyUserId': 'Kopye ID itilizatè a',
-  'action.account': 'Kont',
-  'action.share': 'Pataje',
   'action.deleteChat': 'Efase chat la',
   'action.appointAsAdmin': 'Nonmen kòm administratè',
   'action.moreOptions': 'Plis opsyon',
@@ -1083,21 +992,12 @@ const ht: UiStringTable = {
   'auth.anonymousLoginMessage': 'Ou konekte anonim!',
   'modal.profile.title': 'Pwofil',
   'modal.profile.about': 'Konsènan',
-  'modal.profile.language': 'Lang',
-  'modal.profile.media': 'Medya',
-  'modal.profile.documents': 'Dokiman',
-  'modal.profile.noFiles': 'Poko gen anyen',
   'modal.profile.noDescription': 'Pa gen deskripsyon',
   'modal.chatProfile.title': 'Pwofil chat la',
   'modal.chatProfile.description': 'Deskripsyon',
   'modal.chatProfile.chatType': 'Tip chat',
   'modal.chatProfile.memberCountSingular': '{count} manm',
   'modal.chatProfile.memberCountPlural': '{count} manm',
-  'modal.chatProfile.addMembers': 'Ajoute manm',
-  'modal.chatProfile.removePhoto': 'Retire foto a',
-  'modal.chatProfile.membersLabel': 'Manm: {count}',
-  'modal.chatProfile.membersUnavailable': 'Lis manm yo pa disponib',
-  'modal.chatProfile.removeMember': 'Retire nan chat sa a?',
   'modal.deleteChat.title': 'Efase chat sa a?',
   'modal.addMembers.title': 'Ajoute yon nouvo manm',
   'modal.addMembers.userIdPlaceholder': 'Antre ID itilizatè a',
@@ -1155,8 +1055,6 @@ const ht: UiStringTable = {
 
 const zh: UiStringTable = {
   'search.placeholder': '搜索...',
-  'search.members': '搜索成员',
-  'search.noResults': '未找到成员',
   'input.placeholder': '输入消息',
   'room.created': '聊天室已创建',
   'room.empty': '此聊天为空',
@@ -1231,10 +1129,6 @@ const zh: UiStringTable = {
   'action.add': '添加',
   'action.backToCreation': '返回创建',
   'action.report': '举报',
-  'action.search': '搜索',
-  'action.edit': '编辑',
-  'action.deleteAndLeave': '删除并退出',
-  'status.banned': '已封禁',
   'status.connecting': '连接中…',
   'status.noInternet': '无网络连接',
   'translation.translating': '翻译中…',
@@ -1247,9 +1141,6 @@ const zh: UiStringTable = {
   'language.select': '选择语言',
   'modal.newChat.title': '创建新聊天',
   'modal.newChat.roomNamePlaceholder': '输入聊天室名称',
-  'modal.newChat.descriptionPlaceholder': '描述（可选）',
-  'modal.newChat.createButton': '创建聊天',
-  'modal.newChat.nameTooShort': '名称至少需要 3 个字符。',
   'modal.newChat.chatTypePlaceholder': '选择聊天类型',
   'modal.newChat.selectUsersTitle': '选择要添加到聊天的用户',
   'modal.selectUsers.title': '选择用户（最多 20 个）',
@@ -1291,8 +1182,6 @@ const zh: UiStringTable = {
   'action.call': '通话',
   'action.audioCall': '语音通话',
   'action.copyUserId': '复制用户 ID',
-  'action.account': '账户',
-  'action.share': '分享',
   'action.deleteChat': '删除聊天',
   'action.appointAsAdmin': '设为管理员',
   'action.moreOptions': '更多选项',
@@ -1311,21 +1200,12 @@ const zh: UiStringTable = {
   'auth.anonymousLoginMessage': '您已匿名登录！',
   'modal.profile.title': '个人资料',
   'modal.profile.about': '简介',
-  'modal.profile.language': '语言',
-  'modal.profile.media': '媒体',
-  'modal.profile.documents': '文件',
-  'modal.profile.noFiles': '这里还没有内容',
   'modal.profile.noDescription': '暂无简介',
   'modal.chatProfile.title': '聊天资料',
   'modal.chatProfile.description': '描述',
   'modal.chatProfile.chatType': '聊天类型',
   'modal.chatProfile.memberCountSingular': '{count} 位成员',
   'modal.chatProfile.memberCountPlural': '{count} 位成员',
-  'modal.chatProfile.addMembers': '添加成员',
-  'modal.chatProfile.removePhoto': '移除图片',
-  'modal.chatProfile.membersLabel': '成员：{count}',
-  'modal.chatProfile.membersUnavailable': '成员列表不可用',
-  'modal.chatProfile.removeMember': '将其移出该聊天？',
   'modal.deleteChat.title': '删除此聊天？',
   'modal.addMembers.title': '添加新成员',
   'modal.addMembers.userIdPlaceholder': '输入用户 ID',

package/src/main.ts

@@ -32,7 +32,7 @@ export { XmppProvider } from './context/xmppProvider';
 // Hooks that consumers usually need (badge counts, logout, push, etc.).
 export { useUnread } from './hooks/useUnreadMessagesCounter';
 export { useChatRoomFocus } from './hooks/useChatRoomFocus';
-export { logoutService, useLogout } from './hooks/useLogout';
+export { logoutService } from './hooks/useLogout';
 export { useQRCodeChat, handleQRChatId } from './hooks/useQRCodeChatHandler';
 export { resendMessage } from './utils/resendMessage';
 // Font loader, exposed so hosts can also load the font outside <Chat> if needed.

package/src/networking/api-requests/user.api.ts

@@ -74,74 +74,3 @@ export async function updateProfile(fd: FormData): Promise<{ user: User }> {
     throw new Error('Error updating profile');
   }
 }
-
-/** One entry of `GET /v2/files/`, normalised for the UI. */
-export interface UserFile {
-  id: string;
-  name: string;
-  url: string;
-  mimetype: string;
-  createdAt?: string;
-  size?: number;
-}
-
-/**
- * Files uploaded by the signed-in user (the JWT owner) — the profile
- * screen's Media and Documents tabs.
- *
- * v2 answers `{ results, pagination }` and, for backward compatibility,
- * also `{ limit, offset, total, items }`; older deployments only have the
- * legacy shape. Read whichever is there instead of betting on one. Field
- * names vary the same way between deployments (`location` vs `locations[]`,
- * `originalname` vs `filename`), so each one falls through its aliases and
- * anything without a usable URL is dropped rather than rendered as a dead
- * row.
- */
-export async function getUserFiles(options?: {
-  limit?: number;
-  offset?: number;
-}): Promise<UserFile[]> {
-  const token = store.getState().chatSettingStore.user.token || '';
-  const response = await http.get('/v2/files/', {
-    params: {
-      limit: options?.limit ?? 100,
-      offset: options?.offset ?? 0,
-    },
-    headers: { Authorization: token },
-  });
-
-  const payload = response?.data ?? {};
-  const rows: any[] = payload.results ?? payload.items ?? [];
-
-  return rows
-    .map((row: any): UserFile | null => {
-      const url = row?.location || row?.locations?.[0] || row?.url || '';
-      if (!url) {return null;}
-      return {
-        id: String(row?._id ?? row?.id ?? url),
-        name:
-          row?.originalname ||
-          row?.filename ||
-          row?.documentName ||
-          row?.name ||
-          url.split('/').pop() ||
-          'file',
-        url,
-        mimetype: row?.mimetype || row?.mimeType || row?.type || '',
-        createdAt: row?.createdAt || row?.updatedAt,
-        size: typeof row?.size === 'number' ? row.size : undefined,
-      };
-    })
-    .filter(Boolean) as UserFile[];
-}
-
-/** Images and video go to the Media tab, everything else to Documents. */
-export const isMediaFile = (file: UserFile): boolean => {
-  const mime = (file.mimetype || '').toLowerCase();
-  if (mime.startsWith('image/') || mime.startsWith('video/')) {return true;}
-  if (mime) {return false;}
-  // Deployments that don't store a mimetype still name the file.
-  return /\.(jpe?g|png|gif|webp|heic|heif|mp4|mov|m4v|3gp|avi|mkv)$/i.test(
-    file.name
-  );
-};

package/src/networking/outboundQueue.ts

@@ -46,6 +46,21 @@ export interface QueuedSend {
    * OUTBOUND_QUEUE_TTL_MS when omitted.
    */
   ttlMs?: number;
+  /**
+   * True once the stanza was actually written to a live, online stream.
+   *
+   * Such a send has most likely reached the server already — only its
+   * echo may still be in flight. Blind-replaying it on the next 'online'
+   * event is what produced real duplicates on the recipient side: a send
+   * is followed by a liveness probe which, at the time, force-reconnected
+   * a perfectly healthy but quiet stream on a single missed 4s round trip
+   * — and the resulting reconnect flushed the queue. (That probe has since
+   * been throttled and confirmation-gated, but this guard is the one that
+   * actually makes a duplicate impossible.) The queue exists for
+   * sends that never made it onto the wire, so those are the only ones
+   * safe to replay unattended. Customer-reported #31.
+   */
+  sentLive?: boolean;
   /** Replays the original send against a live, online client. */
   send: (client: OutboundQueueClient) => void;
 }
@@ -88,6 +103,14 @@ export function flushOutboundSends(
       // Stale — the send watchdog owns the failure; don't duplicate.
       continue;
     }
+    if (item.sentLive) {
+      // Already written to a live stream: the server very likely has it
+      // and we'd be sending a second copy. Let the pending watchdog own
+      // this one — if no echo ever arrives it surfaces as "Failed → tap
+      // to retry" and the USER decides, which is what the customer asked
+      // for ("a message the server accepted is never sent again").
+      continue;
+    }
     try {
       item.send(client);
     } catch (err) {
@@ -103,6 +126,12 @@ export function flushOutboundSends(
  * the send went through, so the buffered replay is no longer needed and must
  * not fire on a later reconnect. No-op if the id isn't queued.
  */
+export function markOutboundSentLive(optimisticId: string): void {
+  if (!optimisticId) {return;}
+  const item = queue.find((q) => q.optimisticId === optimisticId);
+  if (item) {item.sentLive = true;}
+}
+
 export function removeOutboundSend(optimisticId: string): void {
   if (!optimisticId) {return;}
   const idx = queue.findIndex((q) => q.optimisticId === optimisticId);

package/src/networking/stanzaHandlers.ts

@@ -246,7 +246,15 @@ const onMessageHistory = async (stanza: any) => {
       mergedAttrs,
       body,
       id,
-      stanza.attrs.from,
+      // `innerFrom` (the forwarded message's own `room@conference/nick`),
+      // NOT the outer MAM envelope's `from` — for an archive query the
+      // envelope is the BARE room jid with no resource, so passing it here
+      // stripped the sender out of `xmppFrom` and left `roomJid` derived
+      // from a value that carries no occupant identity. The correct
+      // occupant jid is already computed above for the senderJID fallback;
+      // use the same one so the archived copy carries the same sender
+      // identity the realtime path produces. Customer-reported #32.
+      innerFrom,
       !!deleted
     );