@ethora/chat-component-rn 26.5.14 → 26.5.15
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/commonjs/components/MainComponents/ChatWrapper.js +12 -0
- package/lib/commonjs/components/MainComponents/ChatWrapper.js.map +1 -1
- package/lib/commonjs/helpers/buildSeedRoom.js +18 -0
- package/lib/commonjs/helpers/buildSeedRoom.js.map +1 -0
- package/lib/commonjs/roomStore/Middleware/unreadMidlleware.js +20 -1
- package/lib/commonjs/roomStore/Middleware/unreadMidlleware.js.map +1 -1
- package/lib/module/components/MainComponents/ChatWrapper.js +13 -1
- package/lib/module/components/MainComponents/ChatWrapper.js.map +1 -1
- package/lib/module/helpers/buildSeedRoom.js +13 -0
- package/lib/module/helpers/buildSeedRoom.js.map +1 -0
- package/lib/module/roomStore/Middleware/unreadMidlleware.js +20 -1
- package/lib/module/roomStore/Middleware/unreadMidlleware.js.map +1 -1
- package/lib/typescript/components/MainComponents/ChatWrapper.d.ts.map +1 -1
- package/lib/typescript/helpers/buildSeedRoom.d.ts +3 -0
- package/lib/typescript/helpers/buildSeedRoom.d.ts.map +1 -0
- package/lib/typescript/roomStore/Middleware/unreadMidlleware.d.ts.map +1 -1
- package/package.json +1 -1
- package/src/components/MainComponents/ChatWrapper.tsx +19 -0
- package/src/helpers/buildSeedRoom.ts +12 -0
- package/src/roomStore/Middleware/unreadMidlleware.tsx +25 -1
|
@@ -25,6 +25,7 @@ var _useChatSettingState = require("../../hooks/useChatSettingState");
|
|
|
25
25
|
var _reactNative = require("react-native");
|
|
26
26
|
var _devLogger = require("../../utils/devLogger");
|
|
27
27
|
var _normalizeRoomJid = require("../../helpers/normalizeRoomJid");
|
|
28
|
+
var _buildSeedRoom = require("../../helpers/buildSeedRoom");
|
|
28
29
|
var _InteractionsOverlay = require("../MessageBubble/InteractionsOverlay");
|
|
29
30
|
var _jsxRuntime = require("react/jsx-runtime");
|
|
30
31
|
function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
|
|
@@ -117,6 +118,17 @@ const ChatWrapper = ({
|
|
|
117
118
|
}
|
|
118
119
|
client.setActiveRoomJid?.(activeRoomJID || null);
|
|
119
120
|
}, [client, activeRoomJID]);
|
|
121
|
+
const seededRoomJID = (0, _react.useMemo)(() => roomJID ? (0, _normalizeRoomJid.normalizeRoomJid)(roomJID, config?.xmppSettings?.conference) : '', [roomJID, config?.xmppSettings?.conference]);
|
|
122
|
+
const seededRoomMissing = !!seededRoomJID && !rooms[seededRoomJID];
|
|
123
|
+
(0, _react.useEffect)(() => {
|
|
124
|
+
if (!seededRoomJID || !seededRoomMissing) {
|
|
125
|
+
return;
|
|
126
|
+
}
|
|
127
|
+
(0, _devLogger.pushLog)('rn', `ChatWrapper: seeding minimal room for single-room JID ${seededRoomJID}`);
|
|
128
|
+
dispatch((0, _roomsSlice.addRoom)({
|
|
129
|
+
roomData: (0, _buildSeedRoom.buildSeedRoom)(seededRoomJID)
|
|
130
|
+
}));
|
|
131
|
+
}, [seededRoomJID, seededRoomMissing, dispatch]);
|
|
120
132
|
(0, _react.useEffect)(() => {
|
|
121
133
|
if (roomJID) {
|
|
122
134
|
dispatch((0, _roomsSlice.setCurrentRoom)({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["_react","_interopRequireWildcard","require","_reactRedux","_ChatRoom","_interopRequireDefault","_chatSettingsSlice","_ChatWrapperBox","_MediaModal","_ConnectionBanner","_Message","_xmppProvider","_Login","_Loader","_roomsSlice","_apiClient","_RoomList","_StyledComponents","_Modal","_ModalWrapper","_useChatSettingState","_reactNative","_devLogger","_normalizeRoomJid","_InteractionsOverlay","_jsxRuntime","e","__esModule","default","t","WeakMap","r","n","o","i","f","__proto__","has","get","set","hasOwnProperty","call","Object","defineProperty","getOwnPropertyDescriptor","ChatWrapper","MainComponentStyles","CustomMessageComponent","room","config","roomJID","user","activeModal","deleteModal","client","storedClient","useChatSettingState","isInited","setInited","useState","showModal","setShowModal","errorMsg","setErrorMsg","isChatVisible","setIsChatVisible","isSmallScreen","setIsSmallScreen","handleItemClick","value","dispatch","useDispatch","initializeClient","setClient","providerBootstrapStatus","initMode","useXmppClient","rooms","activeRoomJID","useSelector","state","activeMessage","useMemo","messages","find","message","handleChangeChat","chat","setCurrentRoom","jid","setIsLoading","chatJID","loading","setEditAction","isEdit","handleDeleteClick","roomJid","messageId","setDeleteModal","isDeleteModal","deleteMessageStanza","handleCloseDeleteModal","useEffect","xmppPassword","console","log","close","setActiveRoomJid","normalizeRoomJid","xmppSettings","conference","initXmmpClient","setConfig","hasUser","defaultWallet","walletAddress","initBeforeLoad","devPushLog","c","xmppUsername","getRoomsStanza","getChatsPrivateStoreRequestStanza","catch","err","warn","setStoreClient","refreshTokens","enabled","refresh","then","error","msg","response","data","String","haveCachedRooms","keys","length","haveUser","jsx","showRoomList","disableRooms","jsxs","Fragment","children","disableConnectionErrorOverlay","Overlay","View","style","padding","backgroundColor","borderRadius","maxWidth","alignItems","Text","fontSize","fontWeight","marginBottom","color","Pressable","onPress","DeviceEventEmitter","emit","pressed","paddingVertical","paddingHorizontal","ChatWrapperBox","InteractionsOverlayProvider","chats","values","onRoomClick","Message","handleBackClick","undefined","modal","setOpenModal","setActiveModal","ModalWrapper","title","description","buttonText","backgroundColorButton","handleClick","handleCloseModal","compact","StyledLoaderWrapper","colors","primary","exports"],"sourceRoot":"../../../../src","sources":["components/MainComponents/ChatWrapper.tsx"],"mappings":"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","ignoreList":[]}
|
|
1
|
+
{"version":3,"names":["_react","_interopRequireWildcard","require","_reactRedux","_ChatRoom","_interopRequireDefault","_chatSettingsSlice","_ChatWrapperBox","_MediaModal","_ConnectionBanner","_Message","_xmppProvider","_Login","_Loader","_roomsSlice","_apiClient","_RoomList","_StyledComponents","_Modal","_ModalWrapper","_useChatSettingState","_reactNative","_devLogger","_normalizeRoomJid","_buildSeedRoom","_InteractionsOverlay","_jsxRuntime","e","__esModule","default","t","WeakMap","r","n","o","i","f","__proto__","has","get","set","hasOwnProperty","call","Object","defineProperty","getOwnPropertyDescriptor","ChatWrapper","MainComponentStyles","CustomMessageComponent","room","config","roomJID","user","activeModal","deleteModal","client","storedClient","useChatSettingState","isInited","setInited","useState","showModal","setShowModal","errorMsg","setErrorMsg","isChatVisible","setIsChatVisible","isSmallScreen","setIsSmallScreen","handleItemClick","value","dispatch","useDispatch","initializeClient","setClient","providerBootstrapStatus","initMode","useXmppClient","rooms","activeRoomJID","useSelector","state","activeMessage","useMemo","messages","find","message","handleChangeChat","chat","setCurrentRoom","jid","setIsLoading","chatJID","loading","setEditAction","isEdit","handleDeleteClick","roomJid","messageId","setDeleteModal","isDeleteModal","deleteMessageStanza","handleCloseDeleteModal","useEffect","xmppPassword","console","log","close","setActiveRoomJid","seededRoomJID","normalizeRoomJid","xmppSettings","conference","seededRoomMissing","devPushLog","addRoom","roomData","buildSeedRoom","initXmmpClient","setConfig","hasUser","defaultWallet","walletAddress","initBeforeLoad","c","xmppUsername","getRoomsStanza","getChatsPrivateStoreRequestStanza","catch","err","warn","setStoreClient","refreshTokens","enabled","refresh","then","error","msg","response","data","String","haveCachedRooms","keys","length","haveUser","jsx","showRoomList","disableRooms","jsxs","Fragment","children","disableConnectionErrorOverlay","Overlay","View","style","padding","backgroundColor","borderRadius","maxWidth","alignItems","Text","fontSize","fontWeight","marginBottom","color","Pressable","onPress","DeviceEventEmitter","emit","pressed","paddingVertical","paddingHorizontal","ChatWrapperBox","InteractionsOverlayProvider","chats","values","onRoomClick","Message","handleBackClick","undefined","modal","setOpenModal","setActiveModal","ModalWrapper","title","description","buttonText","backgroundColorButton","handleClick","handleCloseModal","compact","StyledLoaderWrapper","colors","primary","exports"],"sourceRoot":"../../../../src","sources":["components/MainComponents/ChatWrapper.tsx"],"mappings":"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","ignoreList":[]}
|
|
@@ -0,0 +1,18 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
|
|
3
|
+
Object.defineProperty(exports, "__esModule", {
|
|
4
|
+
value: true
|
|
5
|
+
});
|
|
6
|
+
exports.buildSeedRoom = void 0;
|
|
7
|
+
const buildSeedRoom = jid => ({
|
|
8
|
+
id: jid.split('@')[0],
|
|
9
|
+
jid,
|
|
10
|
+
name: '',
|
|
11
|
+
title: '',
|
|
12
|
+
usersCnt: 0,
|
|
13
|
+
messages: [],
|
|
14
|
+
isLoading: false,
|
|
15
|
+
roomBg: null
|
|
16
|
+
});
|
|
17
|
+
exports.buildSeedRoom = buildSeedRoom;
|
|
18
|
+
//# sourceMappingURL=buildSeedRoom.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"names":["buildSeedRoom","jid","id","split","name","title","usersCnt","messages","isLoading","roomBg","exports"],"sourceRoot":"../../../src","sources":["helpers/buildSeedRoom.ts"],"mappings":";;;;;;AAEO,MAAMA,aAAa,GAAIC,GAAW,KAAa;EACpDC,EAAE,EAAED,GAAG,CAACE,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;EACrBF,GAAG;EACHG,IAAI,EAAE,EAAE;EACRC,KAAK,EAAE,EAAE;EACTC,QAAQ,EAAE,CAAC;EACXC,QAAQ,EAAE,EAAE;EACZC,SAAS,EAAE,KAAK;EAChBC,MAAM,EAAE;AACV,CAAC,CAAC;AAACC,OAAA,CAAAV,aAAA,GAAAA,aAAA","ignoreList":[]}
|
|
@@ -41,7 +41,7 @@ const isOwnMessage = (msg, selfXmpp, selfWallet) => {
|
|
|
41
41
|
if (!selfXmpp && !selfWallet) {
|
|
42
42
|
return false;
|
|
43
43
|
}
|
|
44
|
-
const candidates = [norm(msg?.user?.id), norm(msg?.user?.userJID), norm(msg?.user?.xmppUsername)
|
|
44
|
+
const candidates = [norm(msg?.user?.id), norm(msg?.user?.userJID), norm(msg?.user?.xmppUsername)].filter(Boolean);
|
|
45
45
|
if (candidates.length === 0) {
|
|
46
46
|
return false;
|
|
47
47
|
}
|
|
@@ -139,6 +139,25 @@ const unreadMiddleware = storeAPI => next => action => {
|
|
|
139
139
|
// own messages so MAM-replayed sends on re-login don't bump
|
|
140
140
|
// the user's own badge.
|
|
141
141
|
const unreadMessagesCount = room.messages?.filter(msg => msg.id !== 'delimiter-new' && !msg.pending && !isOwnMessage(msg, selfXmpp, selfWallet) && (0, _roomsSlice.msgSortableMs)(msg) > (room.lastViewedTimestamp || 0)).length;
|
|
142
|
+
const newerByTs = (room.messages || []).filter(m => m.id !== 'delimiter-new' && !m.pending && (0, _roomsSlice.msgSortableMs)(m) > (room.lastViewedTimestamp || 0));
|
|
143
|
+
if (newerByTs.length > 0 && (unreadMessagesCount || 0) === 0) {
|
|
144
|
+
const s = newerByTs[newerByTs.length - 1] || {};
|
|
145
|
+
console.log('[unread-diag] ownership suppressed', {
|
|
146
|
+
jid,
|
|
147
|
+
selfXmpp,
|
|
148
|
+
selfWallet,
|
|
149
|
+
newerByTs: newerByTs.length,
|
|
150
|
+
unreadAfterOwnFilter: unreadMessagesCount,
|
|
151
|
+
sample: {
|
|
152
|
+
id: s.id,
|
|
153
|
+
userId: s?.user?.id,
|
|
154
|
+
userJID: s?.user?.userJID,
|
|
155
|
+
xmppUsername: s?.user?.xmppUsername,
|
|
156
|
+
xmppFrom: s?.xmppFrom,
|
|
157
|
+
senderJID: s?.senderJID
|
|
158
|
+
}
|
|
159
|
+
});
|
|
160
|
+
}
|
|
142
161
|
if (room.unreadMessages !== unreadMessagesCount) {
|
|
143
162
|
storeAPI.dispatch((0, _roomsSlice.updateRoom)({
|
|
144
163
|
jid,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["_roomsSlice","require","triggerCache","norm","s","v","String","toLowerCase","split","replace","isOwnMessage","msg","selfXmpp","selfWallet","candidates","user","id","userJID","xmppUsername","
|
|
1
|
+
{"version":3,"names":["_roomsSlice","require","triggerCache","norm","s","v","String","toLowerCase","split","replace","isOwnMessage","msg","selfXmpp","selfWallet","candidates","user","id","userJID","xmppUsername","filter","Boolean","length","self","Set","c","has","TRIGGER_ACTIONS","unreadMiddleware","storeAPI","next","action","type","console","error","result","state","getState","rooms","visibleRoomJID","selfUser","chatSettingStore","walletAddress","Object","keys","forEach","jid","room","unreadMessages","dispatch","updateRoom","updates","lastViewedTimestamp","msgs","messages","currentMessagesLength","firstId","lastId","fingerprint","unreadMessagesCount","pending","msgSortableMs","newerByTs","m","log","unreadAfterOwnFilter","sample","userId","xmppFrom","senderJID","exports"],"sourceRoot":"../../../../src","sources":["roomStore/Middleware/unreadMidlleware.tsx"],"mappings":"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","ignoreList":[]}
|
|
@@ -11,7 +11,7 @@ import { Message } from '../MessageBubble/Message';
|
|
|
11
11
|
import { useXmppClient } from '../../context/xmppProvider';
|
|
12
12
|
import LoginForm from '../AuthForms/Login';
|
|
13
13
|
import Loader from '../styled/Loader';
|
|
14
|
-
import { setCurrentRoom, setEditAction, setIsLoading } from '../../roomStore/roomsSlice';
|
|
14
|
+
import { addRoom, setCurrentRoom, setEditAction, setIsLoading } from '../../roomStore/roomsSlice';
|
|
15
15
|
import { refresh } from '../../networking/apiClient';
|
|
16
16
|
import RoomList from './RoomList';
|
|
17
17
|
import { StyledLoaderWrapper } from '../styled/StyledComponents';
|
|
@@ -21,6 +21,7 @@ import { useChatSettingState } from '../../hooks/useChatSettingState';
|
|
|
21
21
|
import { DeviceEventEmitter, Pressable, Text, View } from 'react-native';
|
|
22
22
|
import { pushLog as devPushLog } from '../../utils/devLogger';
|
|
23
23
|
import { normalizeRoomJid } from '../../helpers/normalizeRoomJid';
|
|
24
|
+
import { buildSeedRoom } from '../../helpers/buildSeedRoom';
|
|
24
25
|
import { InteractionsOverlayProvider } from '../MessageBubble/InteractionsOverlay';
|
|
25
26
|
import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
|
|
26
27
|
const ChatWrapper = ({
|
|
@@ -111,6 +112,17 @@ const ChatWrapper = ({
|
|
|
111
112
|
}
|
|
112
113
|
client.setActiveRoomJid?.(activeRoomJID || null);
|
|
113
114
|
}, [client, activeRoomJID]);
|
|
115
|
+
const seededRoomJID = useMemo(() => roomJID ? normalizeRoomJid(roomJID, config?.xmppSettings?.conference) : '', [roomJID, config?.xmppSettings?.conference]);
|
|
116
|
+
const seededRoomMissing = !!seededRoomJID && !rooms[seededRoomJID];
|
|
117
|
+
useEffect(() => {
|
|
118
|
+
if (!seededRoomJID || !seededRoomMissing) {
|
|
119
|
+
return;
|
|
120
|
+
}
|
|
121
|
+
devPushLog('rn', `ChatWrapper: seeding minimal room for single-room JID ${seededRoomJID}`);
|
|
122
|
+
dispatch(addRoom({
|
|
123
|
+
roomData: buildSeedRoom(seededRoomJID)
|
|
124
|
+
}));
|
|
125
|
+
}, [seededRoomJID, seededRoomMissing, dispatch]);
|
|
114
126
|
useEffect(() => {
|
|
115
127
|
if (roomJID) {
|
|
116
128
|
dispatch(setCurrentRoom({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["React","useEffect","useMemo","useState","useDispatch","useSelector","ChatRoom","setActiveModal","setConfig","setDeleteModal","setStoreClient","ChatWrapperBox","Overlay","ConnectionBanner","Message","useXmppClient","LoginForm","Loader","setCurrentRoom","setEditAction","setIsLoading","refresh","RoomList","StyledLoaderWrapper","Modal","ModalWrapper","useChatSettingState","DeviceEventEmitter","Pressable","Text","View","pushLog","devPushLog","normalizeRoomJid","InteractionsOverlayProvider","jsx","_jsx","jsxs","_jsxs","Fragment","_Fragment","ChatWrapper","MainComponentStyles","CustomMessageComponent","room","config","roomJID","user","activeModal","deleteModal","client","storedClient","isInited","setInited","showModal","setShowModal","errorMsg","setErrorMsg","isChatVisible","setIsChatVisible","isSmallScreen","setIsSmallScreen","handleItemClick","value","dispatch","initializeClient","setClient","providerBootstrapStatus","initMode","rooms","activeRoomJID","state","activeMessage","messages","find","message","handleChangeChat","chat","jid","chatJID","loading","isEdit","handleDeleteClick","roomJid","messageId","isDeleteModal","deleteMessageStanza","handleCloseDeleteModal","xmppPassword","console","log","close","setActiveRoomJid","xmppSettings","conference","initXmmpClient","hasUser","defaultWallet","walletAddress","initBeforeLoad","c","xmppUsername","getRoomsStanza","getChatsPrivateStoreRequestStanza","catch","err","warn","refreshTokens","enabled","then","error","msg","response","data","String","haveCachedRooms","Object","keys","length","haveUser","showRoomList","disableRooms","children","disableConnectionErrorOverlay","style","padding","backgroundColor","borderRadius","maxWidth","alignItems","fontSize","fontWeight","marginBottom","color","onPress","emit","pressed","paddingVertical","paddingHorizontal","chats","values","onRoomClick","handleBackClick","undefined","modal","setOpenModal","title","description","buttonText","backgroundColorButton","handleClick","handleCloseModal","compact","colors","primary"],"sourceRoot":"../../../../src","sources":["components/MainComponents/ChatWrapper.tsx"],"mappings":"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","ignoreList":[]}
|
|
1
|
+
{"version":3,"names":["React","useEffect","useMemo","useState","useDispatch","useSelector","ChatRoom","setActiveModal","setConfig","setDeleteModal","setStoreClient","ChatWrapperBox","Overlay","ConnectionBanner","Message","useXmppClient","LoginForm","Loader","addRoom","setCurrentRoom","setEditAction","setIsLoading","refresh","RoomList","StyledLoaderWrapper","Modal","ModalWrapper","useChatSettingState","DeviceEventEmitter","Pressable","Text","View","pushLog","devPushLog","normalizeRoomJid","buildSeedRoom","InteractionsOverlayProvider","jsx","_jsx","jsxs","_jsxs","Fragment","_Fragment","ChatWrapper","MainComponentStyles","CustomMessageComponent","room","config","roomJID","user","activeModal","deleteModal","client","storedClient","isInited","setInited","showModal","setShowModal","errorMsg","setErrorMsg","isChatVisible","setIsChatVisible","isSmallScreen","setIsSmallScreen","handleItemClick","value","dispatch","initializeClient","setClient","providerBootstrapStatus","initMode","rooms","activeRoomJID","state","activeMessage","messages","find","message","handleChangeChat","chat","jid","chatJID","loading","isEdit","handleDeleteClick","roomJid","messageId","isDeleteModal","deleteMessageStanza","handleCloseDeleteModal","xmppPassword","console","log","close","setActiveRoomJid","seededRoomJID","xmppSettings","conference","seededRoomMissing","roomData","initXmmpClient","hasUser","defaultWallet","walletAddress","initBeforeLoad","c","xmppUsername","getRoomsStanza","getChatsPrivateStoreRequestStanza","catch","err","warn","refreshTokens","enabled","then","error","msg","response","data","String","haveCachedRooms","Object","keys","length","haveUser","showRoomList","disableRooms","children","disableConnectionErrorOverlay","style","padding","backgroundColor","borderRadius","maxWidth","alignItems","fontSize","fontWeight","marginBottom","color","onPress","emit","pressed","paddingVertical","paddingHorizontal","chats","values","onRoomClick","handleBackClick","undefined","modal","setOpenModal","title","description","buttonText","backgroundColorButton","handleClick","handleCloseModal","compact","colors","primary"],"sourceRoot":"../../../../src","sources":["components/MainComponents/ChatWrapper.tsx"],"mappings":"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","ignoreList":[]}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"names":["buildSeedRoom","jid","id","split","name","title","usersCnt","messages","isLoading","roomBg"],"sourceRoot":"../../../src","sources":["helpers/buildSeedRoom.ts"],"mappings":";;AAEA,OAAO,MAAMA,aAAa,GAAIC,GAAW,KAAa;EACpDC,EAAE,EAAED,GAAG,CAACE,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;EACrBF,GAAG;EACHG,IAAI,EAAE,EAAE;EACRC,KAAK,EAAE,EAAE;EACTC,QAAQ,EAAE,CAAC;EACXC,QAAQ,EAAE,EAAE;EACZC,SAAS,EAAE,KAAK;EAChBC,MAAM,EAAE;AACV,CAAC,CAAC","ignoreList":[]}
|
|
@@ -37,7 +37,7 @@ const isOwnMessage = (msg, selfXmpp, selfWallet) => {
|
|
|
37
37
|
if (!selfXmpp && !selfWallet) {
|
|
38
38
|
return false;
|
|
39
39
|
}
|
|
40
|
-
const candidates = [norm(msg?.user?.id), norm(msg?.user?.userJID), norm(msg?.user?.xmppUsername)
|
|
40
|
+
const candidates = [norm(msg?.user?.id), norm(msg?.user?.userJID), norm(msg?.user?.xmppUsername)].filter(Boolean);
|
|
41
41
|
if (candidates.length === 0) {
|
|
42
42
|
return false;
|
|
43
43
|
}
|
|
@@ -135,6 +135,25 @@ export const unreadMiddleware = storeAPI => next => action => {
|
|
|
135
135
|
// own messages so MAM-replayed sends on re-login don't bump
|
|
136
136
|
// the user's own badge.
|
|
137
137
|
const unreadMessagesCount = room.messages?.filter(msg => msg.id !== 'delimiter-new' && !msg.pending && !isOwnMessage(msg, selfXmpp, selfWallet) && msgSortableMs(msg) > (room.lastViewedTimestamp || 0)).length;
|
|
138
|
+
const newerByTs = (room.messages || []).filter(m => m.id !== 'delimiter-new' && !m.pending && msgSortableMs(m) > (room.lastViewedTimestamp || 0));
|
|
139
|
+
if (newerByTs.length > 0 && (unreadMessagesCount || 0) === 0) {
|
|
140
|
+
const s = newerByTs[newerByTs.length - 1] || {};
|
|
141
|
+
console.log('[unread-diag] ownership suppressed', {
|
|
142
|
+
jid,
|
|
143
|
+
selfXmpp,
|
|
144
|
+
selfWallet,
|
|
145
|
+
newerByTs: newerByTs.length,
|
|
146
|
+
unreadAfterOwnFilter: unreadMessagesCount,
|
|
147
|
+
sample: {
|
|
148
|
+
id: s.id,
|
|
149
|
+
userId: s?.user?.id,
|
|
150
|
+
userJID: s?.user?.userJID,
|
|
151
|
+
xmppUsername: s?.user?.xmppUsername,
|
|
152
|
+
xmppFrom: s?.xmppFrom,
|
|
153
|
+
senderJID: s?.senderJID
|
|
154
|
+
}
|
|
155
|
+
});
|
|
156
|
+
}
|
|
138
157
|
if (room.unreadMessages !== unreadMessagesCount) {
|
|
139
158
|
storeAPI.dispatch(updateRoom({
|
|
140
159
|
jid,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["updateRoom","msgSortableMs","triggerCache","norm","s","v","String","toLowerCase","split","replace","isOwnMessage","msg","selfXmpp","selfWallet","candidates","user","id","userJID","xmppUsername","
|
|
1
|
+
{"version":3,"names":["updateRoom","msgSortableMs","triggerCache","norm","s","v","String","toLowerCase","split","replace","isOwnMessage","msg","selfXmpp","selfWallet","candidates","user","id","userJID","xmppUsername","filter","Boolean","length","self","Set","c","has","TRIGGER_ACTIONS","unreadMiddleware","storeAPI","next","action","type","console","error","result","state","getState","rooms","visibleRoomJID","selfUser","chatSettingStore","walletAddress","Object","keys","forEach","jid","room","unreadMessages","dispatch","updates","lastViewedTimestamp","msgs","messages","currentMessagesLength","firstId","lastId","fingerprint","unreadMessagesCount","pending","newerByTs","m","log","unreadAfterOwnFilter","sample","userId","xmppFrom","senderJID"],"sourceRoot":"../../../../src","sources":["roomStore/Middleware/unreadMidlleware.tsx"],"mappings":"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","ignoreList":[]}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ChatWrapper.d.ts","sourceRoot":"","sources":["../../../../src/components/MainComponents/ChatWrapper.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAC,EAAE,EAA+B,MAAM,OAAO,CAAC;AAa9D,OAAO,EAAC,OAAO,EAAE,KAAK,EAAE,YAAY,EAAkB,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"ChatWrapper.d.ts","sourceRoot":"","sources":["../../../../src/components/MainComponents/ChatWrapper.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAC,EAAE,EAA+B,MAAM,OAAO,CAAC;AAa9D,OAAO,EAAC,OAAO,EAAE,KAAK,EAAE,YAAY,EAAkB,MAAM,mBAAmB,CAAC;AAyBhF,UAAU,gBAAgB;IACxB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,IAAI,CAAC,EAAE,KAAK,CAAC;IACb,SAAS,CAAC,EAAE;QAAC,KAAK,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAA;KAAC,CAAC;IAC9C,mBAAmB,CAAC,EAAE,KAAK,CAAC,aAAa,CAAC;IAC1C,sBAAsB,CAAC,EAAE,KAAK,CAAC,aAAa,CAAC,YAAY,CAAC,CAAC;IAC3D,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,QAAA,MAAM,WAAW,EAAE,EAAE,CAAC,gBAAgB,CA0arC,CAAC;AAEF,OAAO,EAAC,WAAW,EAAC,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"buildSeedRoom.d.ts","sourceRoot":"","sources":["../../../src/helpers/buildSeedRoom.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AAEvC,eAAO,MAAM,aAAa,GAAI,KAAK,MAAM,KAAG,KAS1C,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"unreadMidlleware.d.ts","sourceRoot":"","sources":["../../../../src/roomStore/Middleware/unreadMidlleware.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"unreadMidlleware.d.ts","sourceRoot":"","sources":["../../../../src/roomStore/Middleware/unreadMidlleware.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAiF9C,eAAO,MAAM,gBAAgB,EAAE,UAmH5B,CAAC"}
|
package/package.json
CHANGED
|
@@ -17,6 +17,7 @@ import LoginForm from '../AuthForms/Login';
|
|
|
17
17
|
import {RootState} from '../../roomStore';
|
|
18
18
|
import Loader from '../styled/Loader';
|
|
19
19
|
import {
|
|
20
|
+
addRoom,
|
|
20
21
|
setCurrentRoom,
|
|
21
22
|
setEditAction,
|
|
22
23
|
setIsLoading,
|
|
@@ -32,6 +33,7 @@ import {useChatSettingState} from '../../hooks/useChatSettingState';
|
|
|
32
33
|
import {DeviceEventEmitter, Pressable, Text, View} from 'react-native';
|
|
33
34
|
import {pushLog as devPushLog} from '../../utils/devLogger';
|
|
34
35
|
import {normalizeRoomJid} from '../../helpers/normalizeRoomJid';
|
|
36
|
+
import {buildSeedRoom} from '../../helpers/buildSeedRoom';
|
|
35
37
|
import {InteractionsOverlayProvider} from '../MessageBubble/InteractionsOverlay';
|
|
36
38
|
|
|
37
39
|
interface ChatWrapperProps {
|
|
@@ -127,6 +129,23 @@ const ChatWrapper: FC<ChatWrapperProps> = ({
|
|
|
127
129
|
client.setActiveRoomJid?.(activeRoomJID || null);
|
|
128
130
|
}, [client, activeRoomJID]);
|
|
129
131
|
|
|
132
|
+
const seededRoomJID = useMemo(
|
|
133
|
+
() =>
|
|
134
|
+
roomJID
|
|
135
|
+
? normalizeRoomJid(roomJID, config?.xmppSettings?.conference)
|
|
136
|
+
: '',
|
|
137
|
+
[roomJID, config?.xmppSettings?.conference],
|
|
138
|
+
);
|
|
139
|
+
const seededRoomMissing = !!seededRoomJID && !rooms[seededRoomJID];
|
|
140
|
+
useEffect(() => {
|
|
141
|
+
if (!seededRoomJID || !seededRoomMissing) {return;}
|
|
142
|
+
devPushLog(
|
|
143
|
+
'rn',
|
|
144
|
+
`ChatWrapper: seeding minimal room for single-room JID ${seededRoomJID}`,
|
|
145
|
+
);
|
|
146
|
+
dispatch(addRoom({roomData: buildSeedRoom(seededRoomJID)}));
|
|
147
|
+
}, [seededRoomJID, seededRoomMissing, dispatch]);
|
|
148
|
+
|
|
130
149
|
useEffect(() => {
|
|
131
150
|
if (roomJID) {
|
|
132
151
|
dispatch(
|
|
@@ -42,7 +42,6 @@ const isOwnMessage = (
|
|
|
42
42
|
norm((msg as any)?.user?.id),
|
|
43
43
|
norm((msg as any)?.user?.userJID),
|
|
44
44
|
norm((msg as any)?.user?.xmppUsername),
|
|
45
|
-
norm((msg as any)?.xmppFrom),
|
|
46
45
|
].filter(Boolean);
|
|
47
46
|
if (candidates.length === 0) {return false;}
|
|
48
47
|
const self = new Set(
|
|
@@ -158,6 +157,31 @@ export const unreadMiddleware: Middleware =
|
|
|
158
157
|
(room.lastViewedTimestamp || 0)
|
|
159
158
|
).length;
|
|
160
159
|
|
|
160
|
+
const newerByTs = (room.messages || []).filter(
|
|
161
|
+
(m: IMessage) =>
|
|
162
|
+
m.id !== 'delimiter-new' &&
|
|
163
|
+
!m.pending &&
|
|
164
|
+
msgSortableMs(m) > (room.lastViewedTimestamp || 0)
|
|
165
|
+
);
|
|
166
|
+
if (newerByTs.length > 0 && (unreadMessagesCount || 0) === 0) {
|
|
167
|
+
const s: any = newerByTs[newerByTs.length - 1] || {};
|
|
168
|
+
console.log('[unread-diag] ownership suppressed', {
|
|
169
|
+
jid,
|
|
170
|
+
selfXmpp,
|
|
171
|
+
selfWallet,
|
|
172
|
+
newerByTs: newerByTs.length,
|
|
173
|
+
unreadAfterOwnFilter: unreadMessagesCount,
|
|
174
|
+
sample: {
|
|
175
|
+
id: s.id,
|
|
176
|
+
userId: s?.user?.id,
|
|
177
|
+
userJID: s?.user?.userJID,
|
|
178
|
+
xmppUsername: s?.user?.xmppUsername,
|
|
179
|
+
xmppFrom: s?.xmppFrom,
|
|
180
|
+
senderJID: s?.senderJID,
|
|
181
|
+
},
|
|
182
|
+
});
|
|
183
|
+
}
|
|
184
|
+
|
|
161
185
|
if (room.unreadMessages !== unreadMessagesCount) {
|
|
162
186
|
storeAPI.dispatch(
|
|
163
187
|
updateRoom({
|