RanchiMall/messenger
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Code refactoring

Browse Source
This commit is contained in:
sairaj mote 2023-03-19 19:38:14 +05:30
parent 8ea6bfcc0c
commit 5f5bccabcd
1 changed files with 13 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
index.html
View File

@ -2998,9 +2998,9 @@
} }
for (let messageId in messagesData) { for (let messageId in messagesData) {
const { category, floID, time, message, sender, groupID, admin, name, pipeID, unconfirmed } = messagesData[messageId] const { category, floID, time, message, sender, groupID, admin, name, pipeID, unconfirmed } = messagesData[messageId]
console.log('messageData', messagesData[messageId]) const chatAddress = floID || groupID || pipeID
// code to run if a chat is opened // code to run if a chat is opened
if (activeChat && (activeChat.address === (floID || groupID || pipeID) || floCrypto.toFloID(activeChat.address) === (floID || groupID || pipeID))) { if (activeChat && (activeChat.address === chatAddress || activeChat.address === floCrypto.toFloID(chatAddress))) {
if (!sentByMe && sender && sender === floDapps.user.id) { if (!sentByMe && sender && sender === floDapps.user.id) {
// if message is sent by me, then dont add it to the chat // if message is sent by me, then dont add it to the chat
} else { } else {
@ -3015,14 +3015,14 @@
document.getElementById('warn_no_encryption')?.remove() document.getElementById('warn_no_encryption')?.remove()
} }
} }
let chatCard = getChatCard(floID || groupID || pipeID) let chatCard = getChatCard(chatAddress)
if (chatCard) { if (chatCard) {
if (admin) { if (admin) {
if (name) if (name)
chatCard.querySelector('.name').textContent = name chatCard.querySelector('.name').textContent = name
} }
const topChatCard = getRef('chats_list').children[0] const topChatCard = getRef('chats_list').children[0]
if ((floID || groupID || pipeID) !== topChatCard.dataset.floAddress && (floID || groupID || pipeID) !== floCrypto.toFloID(topChatCard.dataset.floAddress)) { if (chatAddress !== topChatCard.dataset.floAddress && chatAddress !== floCrypto.toFloID(topChatCard.dataset.floAddress)) {
const cloneContact = chatCard.cloneNode(true) const cloneContact = chatCard.cloneNode(true)
chatCard.remove() chatCard.remove()
getRef('chats_list').animate([ getRef('chats_list').animate([
@ -3042,22 +3042,14 @@
], animOptions) ], animOptions)
} }
} else { } else {
const chatType = floID ? 'chat' : groupID ? 'group' : 'pipeline'
if (floID) { if (floID) {
try { if (!(floID in messenger.chats) && !(floCrypto.toFloID(floID) in messenger.chats)) {
if (!(floID in messenger.chats) && !(floCrypto.toFloID(floID) in messenger.chats)) { await messenger.addChat(floID).catch(err => console.error(err))
console.log('adding chat', floID)
await messenger.addChat(floID)
}
getRef('chats_list').prepend(html.node`${render.contactCard(floID, { type: 'chat', prepend: true, markUnread: true, ref: getRef('chats_list') })}`)
} catch (e) {
console.error(e)
} }
} else if (groupID) {
getRef('chats_list').prepend(html.node`${render.contactCard(groupID, { type: 'group', prepend: true, markUnread: true, ref: getRef('chats_list') })}`)
} else {
getRef('chats_list').prepend(html.node`${render.contactCard(pipeID, { type: 'pipeline', prepend: true, markUnread: true, ref: getRef('chats_list') })}`)
} }
chatCard = getRef('chats_list').children[0] getRef('chats_list').prepend(html.node`${render.contactCard(chatAddress, { type: chatType, prepend: true, markUnread: true, ref: getRef('chats_list') })}`)
chatCard = getRef('chats_list').firstElementChild
if (sentByMe) { if (sentByMe) {
chatCard.classList.add('active') chatCard.classList.add('active')
} }
@ -3076,20 +3068,20 @@
if (chatCard.querySelector('.time')) if (chatCard.querySelector('.time'))
chatCard.querySelector('.time').textContent = getFormattedTime(time, 'relative') chatCard.querySelector('.time').textContent = getFormattedTime(time, 'relative')
if (activeChat.address === (floID || groupID || pipeID)) { if (activeChat.address === chatAddress) {
if (chatScrollInfo.isScrolledUp) if (chatScrollInfo.isScrolledUp)
getRef('scroll_to_bottom').classList.add('new-message') getRef('scroll_to_bottom').classList.add('new-message')
else { else {
if (document.hasFocus()) { if (document.hasFocus()) {
messenger.removeMark((floID || groupID || pipeID), 'unread') messenger.removeMark(chatAddress, 'unread')
setTimeout(() => { setTimeout(() => {
document.title = 'RanchiMall Messenger' document.title = 'RanchiMall Messenger'
getChatCard(floID || groupID || pipeID).classList.remove('unread') getChatCard(chatAddress).classList.remove('unread')
}, 1000); }, 1000);
} }
} }
} else { } else {
getChatCard(floID || groupID || pipeID).classList.add('unread') getChatCard(chatAddress).classList.add('unread')
} }
} }
} }