{
@@ -1688,7 +1726,6 @@ class ChatPage extends LitElement {
name: name ? name : undefined
}
} catch (error) {
- console.log(error)
}
return memberItem
@@ -1703,7 +1740,6 @@ class ChatPage extends LitElement {
name: name ? name : undefined
}
} catch (error) {
- console.log(error)
}
return memberItem
@@ -1713,7 +1749,6 @@ class ChatPage extends LitElement {
this.groupMembers = membersWithName
this.groupInfo = getGroupInfo
} catch (error) {
- console.error(error)
}
}
@@ -1748,7 +1783,7 @@ class ChatPage extends LitElement {
if(isEnabledChatEnter){
this.isEnabledChatEnter = isEnabledChatEnter === 'false' ? false : true
}
- await this.initUpdate()
+
}
async updated(changedProperties) {
@@ -1760,16 +1795,13 @@ class ChatPage extends LitElement {
}
}
- if (changedProperties && changedProperties.has('chatId') && changedProperties.get('chatId')) {
- await this.initUpdate()
- }
if (changedProperties && changedProperties.has('isLoading')) {
- if (this.isLoading === true && this.currentEditor === '_chatEditorDOM') {
+ if (this.isLoading === true && this.currentEditor === '_chatEditorDOM' && this.editor && this.editor.setEditable) {
this.editor.setEditable(false)
}
- if (this.isLoading === false && this.currentEditor === '_chatEditorDOM') {
+ if (this.isLoading === false && this.currentEditor === '_chatEditorDOM' && this.editor && this.editor.setEditable) {
this.editor.setEditable(true)
}
}
@@ -1844,7 +1876,7 @@ class ChatPage extends LitElement {
.setSelectedHead=${(val) => this.setSelectedHead(val)}
?openTipUser=${this.openTipUser}
.selectedHead=${this.selectedHead}
- .goToRepliedMessage=${(val)=> this.goToRepliedMessage(val)}
+ .goToRepliedMessage=${(val, val2)=> this.goToRepliedMessage(val, val2)}
.getOldMessageAfter=${(val)=> this.getOldMessageAfter(val)}
>
@@ -2270,7 +2302,7 @@ class ChatPage extends LitElement {
async fetchChatMessages(chatId) {
- const initDirect = async (cid) => {
+ const initDirect = async (cid, noInitial) => {
let initial = 0
let directSocketTimeout
@@ -2290,17 +2322,15 @@ class ChatPage extends LitElement {
}
this.webSocket = new WebSocket(directSocketLink);
-
// Open Connection
this.webSocket.onopen = () => {
-
setTimeout(pingDirectSocket, 50)
}
// Message Event
this.webSocket.onmessage = async (e) => {
if (initial === 0) {
-
+ if(noInitial) return
const cachedData = null
let getInitialMessages = []
if (cachedData && cachedData.length !== 0) {
@@ -2332,8 +2362,10 @@ class ChatPage extends LitElement {
}
// Closed Event
- this.webSocket.onclose = () => {
+ this.webSocket.onclose = (e) => {
clearTimeout(directSocketTimeout)
+ if(e.reason === 'switch chat') return
+ restartDirectWebSocket()
}
// Error Event
@@ -2348,8 +2380,17 @@ class ChatPage extends LitElement {
}
};
+ const restartDirectWebSocket = () => {
+ const noInitial = true
+ setTimeout(() => initDirect(chatId, noInitial), 50)
+ }
+ const restartGroupWebSocket = () => {
+ const noInitial = true
+ let groupChatId = Number(chatId)
+ setTimeout(() => initGroup(groupChatId, noInitial), 50)
+ }
- const initGroup = (gId) => {
+ const initGroup = (gId, noInitial) => {
let groupId = Number(gId)
let initial = 0
@@ -2382,7 +2423,7 @@ class ChatPage extends LitElement {
this.webSocket.onmessage = async (e) => {
if (initial === 0) {
-
+ if(noInitial) return
const cachedData = null;
let getInitialMessages = []
if (cachedData && cachedData.length !== 0) {
@@ -2417,8 +2458,10 @@ class ChatPage extends LitElement {
}
// Closed Event
- this.webSocket.onclose = () => {
+ this.webSocket.onclose = (e) => {
clearTimeout(groupSocketTimeout)
+ if(e.reason === 'switch chat') return
+ restartGroupWebSocket()
}
// Error Event
@@ -2482,7 +2525,6 @@ class ChatPage extends LitElement {
this._publicKey.hasPubKey = false
}
} catch (error) {
- console.error(error);
}
if(!hasPublicKey || !this._publicKey.hasPubKey){
diff --git a/qortal-ui-plugins/plugins/core/components/ChatScroller.js b/qortal-ui-plugins/plugins/core/components/ChatScroller.js
index eddcb8b6..1337aef4 100644
--- a/qortal-ui-plugins/plugins/core/components/ChatScroller.js
+++ b/qortal-ui-plugins/plugins/core/components/ChatScroller.js
@@ -384,7 +384,6 @@ class MessageTemplate extends LitElement {
repliedToData = this.messageObj.repliedToData;
isImageDeleted = parsedMessageObj.isImageDeleted;
reactions = parsedMessageObj.reactions || [];
- console.log(reactions, 'reactions here');
version = parsedMessageObj.version;
isForwarded = parsedMessageObj.type === 'forward';
isEdited = parsedMessageObj.isEdited && true;
@@ -474,7 +473,6 @@ class MessageTemplate extends LitElement {
const parsedMsg = JSON.parse(repliedToData.decodedMessage);
repliedToData.decodedMessage = parsedMsg;
} catch (error) {
- console.error(error);
}
}
@@ -563,7 +561,7 @@ class MessageTemplate extends LitElement {
${repliedToData && html`
{
- this.goToRepliedMessage(repliedToData)
+ this.goToRepliedMessage(repliedToData, this.messageObj)
}}>
{
- // clearTimeout(typingTimer);
- // if (nameInput.value) {
- // console.log("typing started!");
- // typingTimer = setTimeout(this.userSearch, doneTypingInterval);
- // }
- // });
-
- const getDataFromURL = () => {
- let tempUrl = document.location.href
- let splitedUrl = decodeURI(tempUrl).split('?')
- let urlData = splitedUrl[1]
- if (urlData !== undefined) {
- this.chatId = urlData
- }
- }
+
const runFunctionsAfterPageLoad = () => {
// Functions to exec after render while waiting for page info...
@@ -526,7 +511,6 @@ class Chat extends LitElement {
}
this.userFoundModalOpen = true;
} catch (error) {
- console.error(error);
let err4string = get("chatpage.cchange35");
parentEpml.request('showSnackBar', `${err4string}`)
}
@@ -767,7 +751,6 @@ class Chat extends LitElement {
})
this.groupInvites = pendingGroupInvites;
} catch (error) {
- console.error(error);
let err4string = get("chatpage.cchange61");
parentEpml.request('showSnackBar', `${err4string}`)
}
@@ -876,9 +859,10 @@ class Chat extends LitElement {
}
setChatHeads(chatObj) {
-
- let groupList = chatObj.groups.map(group => group.groupId === 0 ? { groupId: group.groupId, url: `group/${group.groupId}`, groupName: "Qortal General Chat", timestamp: group.timestamp === undefined ? 2 : group.timestamp } : { ...group, timestamp: group.timestamp === undefined ? 1 : group.timestamp, url: `group/${group.groupId}` })
- let directList = chatObj.direct.map(dc => {
+ const chatObjGroups = Array.isArray(chatObj.groups) ? chatObj.groups : [];
+ const chatObjDirect = Array.isArray(chatObj.direct) ? chatObj.direct : [];
+ let groupList = chatObjGroups.map(group => group.groupId === 0 ? { groupId: group.groupId, url: `group/${group.groupId}`, groupName: "Qortal General Chat", timestamp: group.timestamp === undefined ? 2 : group.timestamp } : { ...group, timestamp: group.timestamp === undefined ? 1 : group.timestamp, url: `group/${group.groupId}` })
+ let directList = chatObjDirect.map(dc => {
return { ...dc, url: `direct/${dc.address}` }
})
const compareNames = (a, b) => {
diff --git a/qortal-ui-plugins/plugins/utils/replace-messages-edited.js b/qortal-ui-plugins/plugins/utils/replace-messages-edited.js
index 7ee2cb06..b55e8848 100644
--- a/qortal-ui-plugins/plugins/utils/replace-messages-edited.js
+++ b/qortal-ui-plugins/plugins/utils/replace-messages-edited.js
@@ -21,7 +21,7 @@ export const replaceMessagesEdited = async ({
let responseItem = { ...response[0] }
const decodeResponseItem = decodeMessageFunc(responseItem, isReceipient, _publicKey)
delete decodeResponseItem.timestamp
- console.log({msg})
+
msgItem = {
...msg,
...decodeResponseItem,
@@ -31,7 +31,6 @@ export const replaceMessagesEdited = async ({
}
}
} catch (error) {
- console.log(error)
}
return msgItem
@@ -42,7 +41,6 @@ export const replaceMessagesEdited = async ({
try {
parsedMessageObj = JSON.parse(msg.decodedMessage)
} catch (error) {
- console.log('error')
return msg
}
let msgItem = msg
@@ -98,7 +96,6 @@ export const replaceMessagesEdited = async ({
}
}
} catch (error) {
- console.log(error)
}
return msgItem