jschulthess
/
qortal-ui
forked from Qortal/qortal-ui
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

added tab notification and fixed websocket q-chat

qortal-ui-dev
Phillip 1 year ago
parent
02a78173a3
commit
22ca790f51
10 changed files with 1355 additions and 1116 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 7
      core/src/components/login-view/login-view.js
  2. 95
      core/src/components/show-plugin.js
  3. 15
      core/src/redux/app/actions/app-core.js
  4. 2
      core/src/redux/app/app-action-types.js
  5. 39
      core/src/redux/app/app-reducer.js
  6. 358
      plugins/plugins/core/components/ChatPage.js
  7. 144
      plugins/plugins/core/components/ChatScroller.js
  8. 3
      plugins/plugins/core/components/qdn-action-types.js
  9. 32
      plugins/plugins/core/qdn/browser/browser.src.js
  10. 40
      plugins/plugins/core/streams/streams.js

7
core/src/components/login-view/login-view.js
Unescape View File

@ -15,7 +15,7 @@ import './login-section.js'
import '../qort-theme-toggle.js'
import settings from '../../functional-components/settings-page.js'
import { addAutoLoadImageChat, removeAutoLoadImageChat, addChatLastSeen, allowQAPPAutoAuth, removeQAPPAutoAuth, removeQAPPAutoLists, allowQAPPAutoLists } from '../../redux/app/app-actions.js'
import { addAutoLoadImageChat, removeAutoLoadImageChat, addChatLastSeen, allowQAPPAutoAuth, removeQAPPAutoAuth, removeQAPPAutoLists, allowQAPPAutoLists, addTabInfo, setTabNotifications, setNewTab } from '../../redux/app/app-actions.js'
window.reduxStore = store
window.reduxAction = {
@ -25,7 +25,10 @@ window.reduxAction = {
allowQAPPAutoAuth: allowQAPPAutoAuth,
removeQAPPAutoAuth: removeQAPPAutoAuth,
allowQAPPAutoLists: allowQAPPAutoLists,
removeQAPPAutoLists: removeQAPPAutoLists
removeQAPPAutoLists: removeQAPPAutoLists,
addTabInfo: addTabInfo,
setTabNotifications: setTabNotifications,
setNewTab: setNewTab
}
const animationDuration = 0.7 // Seconds

95
core/src/components/show-plugin.js
Unescape View File

@ -6,9 +6,13 @@ import { addPluginRoutes } from '../plugins/addPluginRoutes.js'
import { repeat } from 'lit/directives/repeat.js';
import ShortUniqueId from 'short-unique-id';
import { setNewTab } from '../redux/app/app-actions.js'
import localForage from "localforage";
import '@material/mwc-icon'
const chatLastSeen = localForage.createInstance({
name: "chat-last-seen",
});
class ShowPlugin extends connect(store)(LitElement) {
static get properties() {
return {
@ -20,6 +24,9 @@ class ShowPlugin extends connect(store)(LitElement) {
currentTab: { type: Number },
tabs: { type: Array },
theme: { type: String, reflect: true },
tabInfo: { type: Object },
chatLastSeen: { type: Array },
chatHeads: { type: Array }
}
}
@ -50,7 +57,7 @@ class ShowPlugin extends connect(store)(LitElement) {
}
.hideIframe {
visibility: hidden;
display: none;
position: absolute;
zIndex: -10;
}
@ -58,7 +65,7 @@ class ShowPlugin extends connect(store)(LitElement) {
.showIframe {
zIndex: 1;
position: relative;
visibility: visible;
display: block;
}
.tabs {
@ -155,6 +162,20 @@ class ShowPlugin extends connect(store)(LitElement) {
color: #999;
--mdc-icon-size: 20px;
}
.count {
position: absolute;
background: red;
color: white;
padding: 5px;
font-size: 12px;
border-radius: 50%;
height: 10px;
width: 10px;
display: flex;
justify-content: center;
align-items: center;
}
`
}
@ -165,6 +186,9 @@ class ShowPlugin extends connect(store)(LitElement) {
this.tabs = []
this.uid = new ShortUniqueId()
this.theme = localStorage.getItem('qortalTheme') ? localStorage.getItem('qortalTheme') : 'light'
this.tabInfo = {}
this.chatLastSeen = []
this.chatHeads = []
}
async getUpdateComplete() {
@ -189,9 +213,44 @@ class ShowPlugin extends connect(store)(LitElement) {
return myPlug === undefined ? 'about:blank' : `${window.location.origin}/plugin/${myPlug.domain}/${myPlug.page}${this.linkParam}`
}
return html`
<div class="tabs">
${this.tabs.map((tab, index) => html`
${this.tabs.map((tab, index) => {
let title = ''
let count = 0
if (tab.myPlugObj && tab.myPlugObj.title) {
title = tab.myPlugObj.title
}
if (tab.myPlugObj && (tab.myPlugObj.url === 'websites' || tab.myPlugObj.url === 'qapps') && this.tabInfo[tab.id]) {
title = this.tabInfo[tab.id].name
}
if (tab.myPlugObj && (tab.myPlugObj.url === 'websites' || tab.myPlugObj.url === 'qapps') && this.tabInfo[tab.id]) {
count = this.tabInfo[tab.id].count
}
if (tab.myPlugObj && tab.myPlugObj.url === 'q-chat') {
for (const chat of this.chatHeads) {
const lastReadMessage = this.chatLastSeen.find((ch) => {
let id
if (chat.groupId === 0) {
id = chat.groupId
} else if (chat.groupId) {
id = chat.groupId
} else {
id = chat.address
}
return ch.key.includes(id)
})
if (lastReadMessage && lastReadMessage.timestamp < chat.timestamp) {
count = count + 1
}
}
}
return html`
<div
class="tab ${this.currentTab === index ? 'active' : ''}"
@click=${() => this.currentTab = index}
@ -200,15 +259,20 @@ class ShowPlugin extends connect(store)(LitElement) {
<div class="${this.currentTab === index ? "iconActive" : "iconInactive"}">
<mwc-icon>${tab.myPlugObj && tab.myPlugObj.mwcicon}</mwc-icon>
</div>
${count ? html`
<div class="count">${count}</div>
` : ''}
<div>
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
${tab.myPlugObj && tab.myPlugObj.title}
${title}
&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
</div>
<div class="close" @click=${() => { this.removeTab(index) }}>x</div>
</div>
</div>
`)}&nbsp;&nbsp;&nbsp;
`
})}&nbsp;&nbsp;&nbsp;
<button
class="add-tab-button"
title="Add Tab"
@ -227,7 +291,7 @@ class ShowPlugin extends connect(store)(LitElement) {
${repeat(this.tabs, (tab) => tab.id, (tab, index) => html`
<div class=${this.currentTab === index ? "showIframe" : "hideIframe"}>
<iframe src="${plugSrc(tab.myPlugObj)}" id="showPluginFrame${index}" style="width:100%;
<iframe src="${plugSrc(tab.myPlugObj)}" data-id=${tab.id} id="showPluginFrame${index}" style="width:100%;
height:calc(var(--window-height) - 102px);
border:0;
padding:0;
@ -321,7 +385,7 @@ class ShowPlugin extends connect(store)(LitElement) {
this.tabs = copiedTabs
}
stateChanged(state) {
async stateChanged(state) {
const split = state.app.url.split('/')
const newRegisteredUrls = state.app.registeredUrls
@ -352,6 +416,23 @@ class ShowPlugin extends connect(store)(LitElement) {
if (newLinkParam !== this.linkParam) {
this.linkParam = newLinkParam
}
if (this.tabInfo !== state.app.tabInfo) {
this.tabInfo = state.app.tabInfo
}
if (this.chatLastSeen !== state.app.chatLastSeen) {
this.chatLastSeen = state.app.chatLastSeen
}
if (state.app.chatHeads !== this.unModifiedChatHeads) {
let chatHeads = []
if (state.app.chatHeads && state.app.chatHeads.groups) {
chatHeads = [...chatHeads, ...state.app.chatHeads.groups]
}
if (state.app.chatHeads && state.app.chatHeads.direct) {
chatHeads = [...chatHeads, ...state.app.chatHeads.direct]
}
this.chatHeads = chatHeads
this.unModifiedChatHeads = state.app.chatHeads
}
if (state.app.newTab) {
const newTab = state.app.newTab

15
core/src/redux/app/actions/app-core.js
Unescape View File

@ -1,5 +1,5 @@
// Core App Actions here...
import { UPDATE_BLOCK_INFO, UPDATE_NODE_STATUS, UPDATE_NODE_INFO, CHAT_HEADS, ACCOUNT_INFO, ADD_AUTO_LOAD_IMAGES_CHAT, REMOVE_AUTO_LOAD_IMAGES_CHAT, ALLOW_QAPP_AUTO_AUTH, REMOVE_QAPP_AUTO_AUTH, SET_CHAT_LAST_SEEN, ADD_CHAT_LAST_SEEN, ALLOW_QAPP_AUTO_LISTS, REMOVE_QAPP_AUTO_LISTS, SET_NEW_TAB } from '../app-action-types.js'
import { UPDATE_BLOCK_INFO, UPDATE_NODE_STATUS, UPDATE_NODE_INFO, CHAT_HEADS, ACCOUNT_INFO, ADD_AUTO_LOAD_IMAGES_CHAT, REMOVE_AUTO_LOAD_IMAGES_CHAT, ALLOW_QAPP_AUTO_AUTH, REMOVE_QAPP_AUTO_AUTH, SET_CHAT_LAST_SEEN, ADD_CHAT_LAST_SEEN, ALLOW_QAPP_AUTO_LISTS, REMOVE_QAPP_AUTO_LISTS, SET_NEW_TAB, ADD_TAB_INFO, SET_TAB_NOTIFICATIONS } from '../app-action-types.js'
export const doUpdateBlockInfo = (blockObj) => {
return (dispatch, getState) => {
@ -127,3 +127,16 @@ export const setNewTab = (payload) => {
}
}
export const addTabInfo = (payload) => {
return {
type: ADD_TAB_INFO,
payload
}
}
export const setTabNotifications = (payload) => {
return {
type: SET_TAB_NOTIFICATIONS,
payload
}
}

2
core/src/redux/app/app-action-types.js
Unescape View File

@ -26,3 +26,5 @@ export const REMOVE_QAPP_AUTO_LISTS = 'REMOVE_QAPP_AUTO_LISTS'
export const SET_CHAT_LAST_SEEN = 'SET_CHAT_LAST_SEEN'
export const ADD_CHAT_LAST_SEEN = 'ADD_CHAT_LAST_SEEN'
export const SET_NEW_TAB = 'SET_NEW_TAB'
export const ADD_TAB_INFO = 'ADD_TAB_INFO'
export const SET_TAB_NOTIFICATIONS = 'SET_TAB_NOTIFICATIONS'

39
core/src/redux/app/app-reducer.js
Unescape View File

@ -1,6 +1,6 @@
// Loading state, login state, isNavDrawOpen state etc. None of this needs to be saved to localstorage.
import { loadStateFromLocalStorage, saveStateToLocalStorage } from '../../localStorageHelpers.js'
import { LOG_IN, LOG_OUT, NETWORK_CONNECTION_STATUS, INIT_WORKERS, ADD_PLUGIN_URL, ADD_PLUGIN, ADD_NEW_PLUGIN_URL, NAVIGATE, SELECT_ADDRESS, ACCOUNT_INFO, CHAT_HEADS, UPDATE_BLOCK_INFO, UPDATE_NODE_STATUS, UPDATE_NODE_INFO, LOAD_NODE_CONFIG, SET_NODE, ADD_NODE, PAGE_URL, ADD_AUTO_LOAD_IMAGES_CHAT, REMOVE_AUTO_LOAD_IMAGES_CHAT, ALLOW_QAPP_AUTO_AUTH, REMOVE_QAPP_AUTO_AUTH, SET_CHAT_LAST_SEEN, ADD_CHAT_LAST_SEEN, ALLOW_QAPP_AUTO_LISTS, REMOVE_QAPP_AUTO_LISTS, SET_NEW_TAB } from './app-action-types.js'
import { LOG_IN, LOG_OUT, NETWORK_CONNECTION_STATUS, INIT_WORKERS, ADD_PLUGIN_URL, ADD_PLUGIN, ADD_NEW_PLUGIN_URL, NAVIGATE, SELECT_ADDRESS, ACCOUNT_INFO, CHAT_HEADS, UPDATE_BLOCK_INFO, UPDATE_NODE_STATUS, UPDATE_NODE_INFO, LOAD_NODE_CONFIG, SET_NODE, ADD_NODE, PAGE_URL, ADD_AUTO_LOAD_IMAGES_CHAT, REMOVE_AUTO_LOAD_IMAGES_CHAT, ALLOW_QAPP_AUTO_AUTH, REMOVE_QAPP_AUTO_AUTH, SET_CHAT_LAST_SEEN, ADD_CHAT_LAST_SEEN, ALLOW_QAPP_AUTO_LISTS, REMOVE_QAPP_AUTO_LISTS, SET_NEW_TAB, ADD_TAB_INFO, SET_TAB_NOTIFICATIONS } from './app-action-types.js'
import { initWorkersReducer } from './reducers/init-workers.js'
import { loginReducer } from './reducers/login-reducer.js'
import { setNode, addNode } from './reducers/manage-node.js'
@ -47,7 +47,8 @@ const INITIAL_STATE = {
qAPPAutoAuth: loadStateFromLocalStorage('qAPPAutoAuth') || false,
qAPPAutoLists: loadStateFromLocalStorage('qAPPAutoLists') || false,
chatLastSeen: [],
newTab: null
newTab: null,
tabInfo: {}
}
export default (state = INITIAL_STATE, action) => {
@ -228,6 +229,40 @@ export default (state = INITIAL_STATE, action) => {
newTab: action.payload
}
}
case ADD_TAB_INFO: {
const newTabInfo = action.payload
if (state.tabInfo[newTabInfo.id] && state.tabInfo[newTabInfo.id].name && newTabInfo.name === state.tabInfo[newTabInfo.id].name) break
return {
...state,
tabInfo: {
...state.tabInfo,
[newTabInfo.id]: {
...newTabInfo,
count: 0
}
}
}
}
case SET_TAB_NOTIFICATIONS: {
const count = action.payload.count
const name = action.payload.name
const newTabInfo = {}
Object.keys(state.tabInfo).forEach((key) => {
const tab = state.tabInfo[key]
if (tab.name == name) {
newTabInfo[key] = {
...tab,
count
}
} else {
newTabInfo[key] = tab
}
})
return {
...state,
tabInfo: newTabInfo
}
}
default:
return state

358
plugins/plugins/core/components/ChatPage.js
Unescape View File

@ -1,5 +1,5 @@
import { LitElement, html, css } from 'lit';
import {animate} from '@lit-labs/motion';
import { animate } from '@lit-labs/motion';
import { Epml } from '../../../epml.js';
import { use, get, translate, registerTranslateConfig } from 'lit-translate';
import { generateHTML } from '@tiptap/core'
@ -7,7 +7,7 @@ import StarterKit from '@tiptap/starter-kit'
import Underline from '@tiptap/extension-underline';
import Placeholder from '@tiptap/extension-placeholder'
import Highlight from '@tiptap/extension-highlight'
import {unsafeHTML} from 'lit/directives/unsafe-html.js';
import { unsafeHTML } from 'lit/directives/unsafe-html.js';
import { Editor, Extension } from '@tiptap/core'
import * as zip from "@zip.js/zip.js";
import './ChatGifs/ChatGifs.js';
@ -91,28 +91,28 @@ class ChatPage extends LitElement {
webSocket: { attribute: false },
chatHeads: { type: Array },
forwardActiveChatHeadUrl: { type: Object },
openForwardOpen: {type: Boolean },
groupAdmin: {type: Array},
groupMembers: {type: Array},
shifted: {type: Boolean},
groupInfo: {type: Object},
setActiveChatHeadUrl: {attribute: false},
openForwardOpen: { type: Boolean },
groupAdmin: { type: Array },
groupMembers: { type: Array },
shifted: { type: Boolean },
groupInfo: { type: Object },
setActiveChatHeadUrl: { attribute: false },
userFound: { type: Array },
userFoundModalOpen: { type: Boolean },
webWorker: { type: Object },
webWorkerFile: { type: Object },
myTrimmedMeassage: { type: String },
editor: {type: Object},
currentEditor: {type: String},
isEnabledChatEnter: {type: Boolean},
editor: { type: Object },
currentEditor: { type: String },
isEnabledChatEnter: { type: Boolean },
openTipUser: { type: Boolean },
openUserInfo: { type: Boolean },
selectedHead: { type: Object },
userName: { type: String },
openGifModal: { type: Boolean },
gifsLoading: { type: Boolean },
goToRepliedMessage: {attribute: false},
isLoadingGoToRepliedMessage: {type: Object}
goToRepliedMessage: { attribute: false },
isLoadingGoToRepliedMessage: { type: Object }
}
}
@ -1268,7 +1268,7 @@ class ChatPage extends LitElement {
padding: 5px 0px;
}
`
}
}
constructor() {
super()
@ -1349,7 +1349,7 @@ class ChatPage extends LitElement {
}
setOpenGifModal(value){
setOpenGifModal(value) {
this.openGifModal = value
}
@ -1379,12 +1379,12 @@ class ChatPage extends LitElement {
};
}
toggleEnableChatEnter(){
localStorage.setItem('isEnabledChatEnter', !this.isEnabledChatEnter )
toggleEnableChatEnter() {
localStorage.setItem('isEnabledChatEnter', !this.isEnabledChatEnter)
this.isEnabledChatEnter = !this.isEnabledChatEnter
}
addGifs(gifs){
addGifs(gifs) {
this.gifsToBeAdded = [...this.gifsToBeAdded, ...gifs]
}
@ -1450,7 +1450,7 @@ class ChatPage extends LitElement {
.webWorkerImage=${this.webWorkerFile}
.setGifsLoading=${(val) => this.setGifsLoading(val)}
.sendMessage=${(val) => this._sendMessage(val)}
.setOpenGifModal=${(val)=> this.setOpenGifModal(val)}>
.setOpenGifModal=${(val) => this.setOpenGifModal(val)}>
</chat-gifs>
<div
class='last-message-ref'
@ -1459,7 +1459,7 @@ class ChatPage extends LitElement {
this.shadowRoot.querySelector("chat-scroller").shadowRoot.getElementById("downObserver")
.scrollIntoView({
behavior: 'smooth',
block: 'nearest',
});
}}>
</vaadin-icon>
@ -1531,13 +1531,13 @@ class ChatPage extends LitElement {
?isLoadingMessages=${this.isLoadingMessages}
?isEditMessageOpen=${this.isEditMessageOpen}
.editor=${this.editor}
.updatePlaceholder=${(editor, value)=> this.updatePlaceholder(editor, value)}
.updatePlaceholder=${(editor, value) => this.updatePlaceholder(editor, value)}
id="_chatEditorDOM"
.repliedToMessageObj=${this.repliedToMessageObj}
.toggleEnableChatEnter=${this.toggleEnableChatEnter}
?isEnabledChatEnter=${this.isEnabledChatEnter}
?openGifModal=${this.openGifModal}
.setOpenGifModal=${(val)=> this.setOpenGifModal(val)}
.setOpenGifModal=${(val) => this.setOpenGifModal(val)}
chatId=${this.chatId}
>
</chat-text-editor>
@ -1596,7 +1596,7 @@ class ChatPage extends LitElement {
?isLoadingMessages=${this.isLoadingMessages}
id="chatTextCaption"
.editor=${this.editorImage}
.updatePlaceholder=${(editor, value)=> this.updatePlaceholder(editor, value)}
.updatePlaceholder=${(editor, value) => this.updatePlaceholder(editor, value)}
>
</chat-text-editor>
</div>
@ -1609,7 +1609,7 @@ class ChatPage extends LitElement {
</button>
<button
class="modal-button"
@click=${()=> {
@click=${() => {
const chatTextEditor = this.shadowRoot.getElementById('chatTextCaption')
chatTextEditor.sendMessageFunc({
type: 'image',
@ -1649,7 +1649,7 @@ class ChatPage extends LitElement {
?isLoadingMessages=${this.isLoadingMessages}
id="chatAttachmentId"
.editor=${this.editorAttachment}
.updatePlaceholder=${(editor, value)=> this.updatePlaceholder(editor, value)}
.updatePlaceholder=${(editor, value) => this.updatePlaceholder(editor, value)}
>
</chat-text-editor>
</div>
@ -1688,7 +1688,7 @@ class ChatPage extends LitElement {
this.openForwardOpen = false;
this.forwardActiveChatHeadUrl = {};
this.requestUpdate();
} }
}}
style=${this.openForwardOpen ? "display: block" : "display: none"}>
<div>
<div class="dialog-container">
@ -1759,7 +1759,7 @@ class ChatPage extends LitElement {
return html`
<chat-select
activeChatHeadUrl=${this.forwardActiveChatHeadUrl.url}
.setActiveChatHeadUrl=${(val)=> {
.setActiveChatHeadUrl=${(val) => {
this.forwardActiveChatHeadUrl = {
...this.forwardActiveChatHeadUrl,
url: val
@ -1783,7 +1783,7 @@ class ChatPage extends LitElement {
</button>
<button
class="modal-button"
@click=${()=> {
@click=${() => {
this.sendForwardMessage()
}}
>
@ -1832,8 +1832,7 @@ class ChatPage extends LitElement {
this.setUserName("");
this.setSelectedHead({});
}}
style=${
this.openUserInfo ? "display: block" : "display: none"
style=${this.openUserInfo ? "display: block" : "display: none"
}>
<user-info
.setOpenUserInfo=${(val) => this.setOpenUserInfo(val)}
@ -1846,8 +1845,8 @@ class ChatPage extends LitElement {
</div>
<div class="chat-right-panel ${this.shifted ? "movedin" : "movedout"}" ${animate()}>
<chat-right-panel
.getMoreMembers=${(val)=> this.getMoreMembers(val)}
.toggle=${(val)=> this._toggle(val)}
.getMoreMembers=${(val) => this.getMoreMembers(val)}
.toggle=${(val) => this._toggle(val)}
.selectedAddress=${this.selectedAddress}
.groupMembers=${this.groupMembers}
.groupAdmin=${this.groupAdmin}
@ -1863,7 +1862,7 @@ class ChatPage extends LitElement {
`
}
async getMoreMembers(groupId){
async getMoreMembers(groupId) {
try {
const getMembers = await parentEpml.request("apiCall", {
type: "api",
@ -1903,7 +1902,7 @@ class ChatPage extends LitElement {
const elementChatImageId = this.shadowRoot.getElementById('chatTextCaption').shadowRoot.getElementById('newChat');
const elementChatAttachmentId = this.shadowRoot.getElementById('chatAttachmentId').shadowRoot.getElementById('newAttachmentChat');
this.editor = new Editor({
onUpdate: ()=> {
onUpdate: () => {
this.shadowRoot.getElementById('_chatEditorDOM').getMessageSize(this.editor.getJSON())
},
@ -1917,10 +1916,10 @@ class ChatPage extends LitElement {
}),
Extension.create({
name: 'shortcuts',
addKeyboardShortcuts:()=> {
addKeyboardShortcuts: () => {
return {
'Enter': ()=> {
if(this.isEnabledChatEnter){
'Enter': () => {
if (this.isEnabledChatEnter) {
const chatTextEditor = this.shadowRoot.getElementById('_chatEditorDOM')
chatTextEditor.sendMessageFunc({
})
@ -1929,7 +1928,7 @@ class ChatPage extends LitElement {
},
"Shift-Enter": () => {
if(this.isEnabledChatEnter){
if (this.isEnabledChatEnter) {
this.editor.commands.first(() => [
this.editor.commands.newlineInCode()
])
@ -1939,12 +1938,13 @@ class ChatPage extends LitElement {
}
}})
}
})
]
})
this.editorImage = new Editor({
onUpdate: ()=> {
onUpdate: () => {
this.shadowRoot.getElementById('chatTextCaption').getMessageSize(this.editorImage.getJSON())
},
element: elementChatImageId,
@ -1956,9 +1956,9 @@ class ChatPage extends LitElement {
placeholder: 'Write something …',
}),
Extension.create({
addKeyboardShortcuts:()=> {
addKeyboardShortcuts: () => {
return {
'Enter':() => {
'Enter': () => {
const chatTextEditor = this.shadowRoot.getElementById('chatTextCaption')
chatTextEditor.sendMessageFunc({
type: 'image'
@ -1966,7 +1966,8 @@ class ChatPage extends LitElement {
return true
}
}
}})
}
})
]
})
@ -1983,9 +1984,9 @@ class ChatPage extends LitElement {
placeholder: 'Write something …',
}),
Extension.create({
addKeyboardShortcuts:()=> {
addKeyboardShortcuts: () => {
return {
'Enter':()=> {
'Enter': () => {
const chatTextEditor = this.shadowRoot.getElementById('chatAttachmentId')
chatTextEditor.sendMessageFunc({
type: 'attachment'
@ -1993,42 +1994,76 @@ class ChatPage extends LitElement {
return true
}
}
}})
}
})
]
})
document.addEventListener('keydown', this.initialChat);
document.addEventListener('paste', this.pasteImage);
if(this.chatId){
window.parent.reduxStore.dispatch( window.parent.reduxAction.addChatLastSeen({
if (this.chatId) {
window.parent.reduxStore.dispatch(window.parent.reduxAction.addChatLastSeen({
key: this.chatId,
timestamp: Date.now()
}))
}
let callback = (entries, observer) => {
entries.forEach(entry => {
if (entry.isIntersecting) {
this.isPageVisible = true
if (this.chatId) {
window.parent.reduxStore.dispatch(window.parent.reduxAction.addChatLastSeen({
key: this.chatId,
timestamp: Date.now()
}))
}
} else {
this.isPageVisible = false
}
});
};
let options = {
root: null,
rootMargin: '0px',
threshold: 0.5
};
// Create the observer with the callback function and options
this.observer = new IntersectionObserver(callback, options);
const mainContainer = this.shadowRoot.querySelector('.main-container')
this.observer.observe(mainContainer);
}
disconnectedCallback() {
super.disconnectedCallback();
if(this.webSocket){
if (this.webSocket) {
this.webSocket.close(1000, 'switch chat')
this.webSocket= ''
this.webSocket = ''
}
if(this.webWorker){
if (this.webWorker) {
this.webWorker.terminate();
}
if(this.webWorkerFile){
if (this.webWorkerFile) {
this.webWorkerFile.terminate();
}
if(this.editor){
if (this.editor) {
this.editor.destroy()
}
if(this.editorImage){
if (this.editorImage) {
this.editorImage.destroy()
}
if (this.observer) {
this.observer.disconnect();
}
document.removeEventListener('keydown', this.initialChat);
document.removeEventListener('paste', this.pasteImage);
if(this.chatId){
window.parent.reduxStore.dispatch( window.parent.reduxAction.addChatLastSeen({
if (this.chatId) {
window.parent.reduxStore.dispatch(window.parent.reduxAction.addChatLastSeen({
key: this.chatId,
timestamp: Date.now()
}))
@ -2051,7 +2086,7 @@ class ChatPage extends LitElement {
}
async pasteImage (e) {
async pasteImage(e) {
const event = e;
const handleTransferIntoURL = (dataTransfer) => {
try {
@ -2071,8 +2106,8 @@ class ChatPage extends LitElement {
const item_list = await navigator.clipboard.read();
let image_type;
const item = item_list.find(item =>
item.types.some( type => {
if (type.startsWith( 'image/')) {
item.types.some(type => {
if (type.startsWith('image/')) {
image_type = type;
return true;
}
@ -2098,22 +2133,22 @@ class ChatPage extends LitElement {
}
async goToRepliedMessage(message, clickedOnMessage){
async goToRepliedMessage(message, clickedOnMessage) {
const findMessage = this.shadowRoot.querySelector('chat-scroller').shadowRoot.getElementById(message.signature)
if(findMessage){
if (findMessage) {
findMessage.scrollIntoView({ behavior: 'smooth', block: 'center' })
const findElement = findMessage.shadowRoot.querySelector('.message-parent')
if(findElement){
if (findElement) {
findElement.classList.add('blink-bg')
setTimeout(()=> {
setTimeout(() => {
findElement.classList.remove('blink-bg')
}, 2000)
}
return
}
if((message.timestamp - this.messagesRendered[0].timestamp) > 86400000){
if ((message.timestamp - this.messagesRendered[0].timestamp) > 86400000) {
let errorMsg = get("chatpage.cchange66")
parentEpml.request('showSnackBar', `${errorMsg}`)
return
@ -2122,9 +2157,9 @@ class ChatPage extends LitElement {
if((message.timestamp - this.messagesRendered[0].timestamp) < 86400000){
if ((message.timestamp - this.messagesRendered[0].timestamp) < 86400000) {
const findOriginalMessage = this.shadowRoot.querySelector('chat-scroller').shadowRoot.getElementById(clickedOnMessage.signature)
if(findOriginalMessage){
if (findOriginalMessage) {
const messageClientRect = findOriginalMessage.getBoundingClientRect()
this.isLoadingGoToRepliedMessage = {
...this.isLoadingGoToRepliedMessage,
@ -2136,16 +2171,16 @@ class ChatPage extends LitElement {
}
await this.getOldMessageDynamic(0, this.messagesRendered[0].timestamp, message.timestamp - 7200000)
const findMessage = this.shadowRoot.querySelector('chat-scroller').shadowRoot.getElementById(message.signature)
if(findMessage){
if (findMessage) {
this.isLoadingGoToRepliedMessage = {
...this.isLoadingGoToRepliedMessage,
loading: false
}
findMessage.scrollIntoView({block: 'center' })
findMessage.scrollIntoView({ block: 'center' })
const findElement = findMessage.shadowRoot.querySelector('.message-parent')
if(findElement){
if (findElement) {
findElement.classList.add('blink-bg')
setTimeout(()=> {
setTimeout(() => {
findElement.classList.remove('blink-bg')
}, 2000)
}
@ -2194,7 +2229,7 @@ class ChatPage extends LitElement {
}
}
setForwardProperties(forwardedMessage){
setForwardProperties(forwardedMessage) {
this.openForwardOpen = true
this.forwardedMessage = forwardedMessage
}
@ -2255,7 +2290,7 @@ class ChatPage extends LitElement {
this.initChatEditor();
}
async initUpdate(){
async initUpdate() {
this.pageNumber = 1
const getAddressPublicKey = () => {
@ -2301,7 +2336,7 @@ class ChatPage extends LitElement {
const isRecipient = this.chatId.includes('direct') === true ? true : false;
const groupId = this.chatId.split('/')[1];
if(!isRecipient && groupId.toString() !== '0'){
if (!isRecipient && groupId.toString() !== '0') {
try {
const getMembers = await parentEpml.request("apiCall", {
@ -2379,7 +2414,7 @@ class ChatPage extends LitElement {
const isEnabledChatEnter = localStorage.getItem('isEnabledChatEnter')
if(isEnabledChatEnter){
if (isEnabledChatEnter) {
this.isEnabledChatEnter = isEnabledChatEnter === 'false' ? false : true
}
@ -2406,14 +2441,14 @@ class ChatPage extends LitElement {
}
}
async getName (recipient) {
async getName(recipient) {
try {
const getNames = await parentEpml.request("apiCall", {
type: "api",
url: `/names/address/${recipient}`,
});
if (Array.isArray(getNames) && getNames.length > 0 ) {
if (Array.isArray(getNames) && getNames.length > 0) {
return getNames[0].name
} else {
return ''
@ -2425,14 +2460,14 @@ class ChatPage extends LitElement {
}
async renderPlaceholder() {
const getName = async (recipient)=> {
const getName = async (recipient) => {
try {
const getNames = await parentEpml.request("apiCall", {
type: "api",
url: `/names/address/${recipient}`,
});
if (Array.isArray(getNames) && getNames.length > 0 ) {
if (Array.isArray(getNames) && getNames.length > 0) {
return getNames[0].name
} else {
return ''
@ -2443,7 +2478,7 @@ class ChatPage extends LitElement {
}
}
let userName = ""
if(this.isReceipient){
if (this.isReceipient) {
userName = await getName(this._chatId);
}
const mstring = get("chatpage.cchange8");
@ -2461,12 +2496,12 @@ class ChatPage extends LitElement {
.setRepliedToMessageObj=${(val) => this.setRepliedToMessageObj(val)}
.setEditedMessageObj=${(val) => this.setEditedMessageObj(val)}
.sendMessage=${(val) => this._sendMessage(val)}
.sendMessageForward=${(messageText, typeMessage, chatReference, isForward, forwardParams)=> this.sendMessage(messageText, typeMessage, chatReference, isForward, forwardParams)}
.sendMessageForward=${(messageText, typeMessage, chatReference, isForward, forwardParams) => this.sendMessage(messageText, typeMessage, chatReference, isForward, forwardParams)}
.showLastMessageRefScroller=${(val) => this.showLastMessageRefScroller(val)}
.emojiPicker=${this.emojiPicker}
?isLoadingMessages=${this.isLoadingOldMessages}
.setIsLoadingMessages=${(val) => this.setIsLoadingMessages(val)}
.setForwardProperties=${(forwardedMessage)=> this.setForwardProperties(forwardedMessage)}
.setForwardProperties=${(forwardedMessage) => this.setForwardProperties(forwardedMessage)}
.setOpenPrivateMessage=${(val) => this.setOpenPrivateMessage(val)}
.setOpenTipUser=${(val) => this.setOpenTipUser(val)}
.setOpenUserInfo=${(val) => this.setOpenUserInfo(val)}
@ -2474,13 +2509,13 @@ class ChatPage extends LitElement {
.setSelectedHead=${(val) => this.setSelectedHead(val)}
?openTipUser=${this.openTipUser}
.selectedHead=${this.selectedHead}
.goToRepliedMessage=${(val, val2)=> this.goToRepliedMessage(val, val2)}
.getOldMessageAfter=${(val)=> this.getOldMessageAfter(val)}
.goToRepliedMessage=${(val, val2) => this.goToRepliedMessage(val, val2)}
.getOldMessageAfter=${(val) => this.getOldMessageAfter(val)}
>
</chat-scroller>
`
}
setIsLoadingMessages(val){
setIsLoadingMessages(val) {
this.isLoadingOldMessages = val
}
async getUpdateComplete() {
@ -2499,7 +2534,7 @@ class ChatPage extends LitElement {
return true;
}
updatePlaceholder(editor, text){
updatePlaceholder(editor, text) {
editor.extensionManager.extensions.forEach((extension) => {
if (extension.name === "placeholder") {
@ -2537,7 +2572,7 @@ class ChatPage extends LitElement {
await this.getUpdateComplete();
const viewElement = this.shadowRoot.querySelector('chat-scroller').shadowRoot.getElementById('viewElement');
if(viewElement){
if (viewElement) {
viewElement.scrollTop = 200
}
@ -2572,7 +2607,7 @@ class ChatPage extends LitElement {
await this.getUpdateComplete();
const viewElement = this.shadowRoot.querySelector('chat-scroller').shadowRoot.getElementById('viewElement');
if(viewElement){
if (viewElement) {
viewElement.scrollTop = 200
}
@ -2612,9 +2647,9 @@ class ChatPage extends LitElement {
await this.getUpdateComplete();
const marginElements = Array.from(this.shadowRoot.querySelector('chat-scroller').shadowRoot.querySelectorAll('message-template'));
const findElement = marginElements.find((item)=> item.messageObj.signature === scrollElement.messageObj.signature)
const findElement = marginElements.find((item) => item.messageObj.signature === scrollElement.messageObj.signature)
if(findElement){
if (findElement) {
findElement.scrollIntoView({ behavior: 'auto', block: 'center' });
}
@ -2645,9 +2680,9 @@ class ChatPage extends LitElement {
this.isLoadingOldMessages = false
await this.getUpdateComplete();
const marginElements = Array.from(this.shadowRoot.querySelector('chat-scroller').shadowRoot.querySelectorAll('message-template'));
const findElement = marginElements.find((item)=> item.messageObj.signature === scrollElement.messageObj.signature)
const findElement = marginElements.find((item) => item.messageObj.signature === scrollElement.messageObj.signature)
if(findElement){
if (findElement) {
findElement.scrollIntoView({ behavior: 'auto', block: 'center' });
}
@ -2683,9 +2718,9 @@ class ChatPage extends LitElement {
await this.getUpdateComplete();
const marginElements = Array.from(this.shadowRoot.querySelector('chat-scroller').shadowRoot.querySelectorAll('message-template'));
const findElement = marginElements.find((item)=> item.messageObj.signature === scrollElement.messageObj.signature)
const findElement = marginElements.find((item) => item.messageObj.signature === scrollElement.messageObj.signature)
if(findElement){
if (findElement) {
findElement.scrollIntoView({ behavior: 'auto', block: 'center' });
}
@ -2709,16 +2744,16 @@ class ChatPage extends LitElement {
_publicKey: this._publicKey
})
this.messagesRendered = [ ...this.messagesRendered, ...replacedMessages].sort(function (a, b) {
this.messagesRendered = [...this.messagesRendered, ...replacedMessages].sort(function (a, b) {
return a.timestamp
- b.timestamp
})
this.isLoadingOldMessages = false
await this.getUpdateComplete();
const marginElements = Array.from(this.shadowRoot.querySelector('chat-scroller').shadowRoot.querySelectorAll('message-template'));
const findElement = marginElements.find((item)=> item.messageObj.signature === scrollElement.messageObj.signature)
const findElement = marginElements.find((item) => item.messageObj.signature === scrollElement.messageObj.signature)
if(findElement){
if (findElement) {
findElement.scrollIntoView({ behavior: 'auto', block: 'center' });
}
@ -2770,12 +2805,12 @@ class ChatPage extends LitElement {
isNotInitial: true
})
const renderEachMessage = replacedMessages.map(async(msg)=> {
const renderEachMessage = replacedMessages.map(async (msg) => {
await this.renderNewMessage(msg)
})
await Promise.all(renderEachMessage)
if(this.chatId){
window.parent.reduxStore.dispatch( window.parent.reduxAction.addChatLastSeen({
if (this.chatId && this.isPageVisible) {
window.parent.reduxStore.dispatch(window.parent.reduxAction.addChatLastSeen({
key: this.chatId,
timestamp: Date.now()
}))
@ -2793,7 +2828,7 @@ class ChatPage extends LitElement {
setRepliedToMessageObj(messageObj) {
this.editor.commands.focus('end')
this.repliedToMessageObj = {...messageObj};
this.repliedToMessageObj = { ...messageObj };
this.editedMessageObj = null;
this.requestUpdate();
}
@ -2802,7 +2837,7 @@ class ChatPage extends LitElement {
setEditedMessageObj(messageObj) {
this.editor.commands.focus('end')
this.editedMessageObj = {...messageObj};
this.editedMessageObj = { ...messageObj };
this.repliedToMessageObj = null;
this.requestUpdate();
}
@ -2828,12 +2863,14 @@ class ChatPage extends LitElement {
*/
async renderNewMessage(newMessage) {
if(newMessage.chatReference){
const findOriginalMessageIndex = this.messagesRendered.findIndex(msg=> msg.signature === newMessage.chatReference || (msg.chatReference && msg.chatReference === newMessage.chatReference) )
if(findOriginalMessageIndex !== -1 && this.messagesRendered[findOriginalMessageIndex].sender === newMessage.sender){
if (newMessage.chatReference) {
const findOriginalMessageIndex = this.messagesRendered.findIndex(msg => msg.signature === newMessage.chatReference || (msg.chatReference && msg.chatReference === newMessage.chatReference))
if (findOriginalMessageIndex !== -1 && this.messagesRendered[findOriginalMessageIndex].sender === newMessage.sender) {
const newMessagesRendered = [...this.messagesRendered]
newMessagesRendered[findOriginalMessageIndex] = {...newMessage, timestamp: newMessagesRendered[findOriginalMessageIndex].timestamp, senderName: newMessagesRendered[findOriginalMessageIndex].senderName,
sender: newMessagesRendered[findOriginalMessageIndex].sender, editedTimestamp: newMessage.timestamp }
newMessagesRendered[findOriginalMessageIndex] = {
...newMessage, timestamp: newMessagesRendered[findOriginalMessageIndex].timestamp, senderName: newMessagesRendered[findOriginalMessageIndex].senderName,
sender: newMessagesRendered[findOriginalMessageIndex].sender, editedTimestamp: newMessage.timestamp
}
this.messagesRendered = newMessagesRendered
await this.getUpdateComplete();
}
@ -2869,7 +2906,7 @@ class ChatPage extends LitElement {
* @param {Object} encodedMessageObj
*
*/
decodeMessage(encodedMessageObj, isReceipient, _publicKey ) {
decodeMessage(encodedMessageObj, isReceipient, _publicKey) {
let isReceipientVar;
let _publicKeyVar;
try {
@ -2906,6 +2943,7 @@ class ChatPage extends LitElement {
async fetchChatMessages(chatId) {
const initDirect = async (cid, noInitial) => {
let timeoutId
let initial = 0
let directSocketTimeout
@ -2932,8 +2970,13 @@ class ChatPage extends LitElement {
// Message Event
this.webSocket.onmessage = async (e) => {
if (e.data === 'pong') {
clearTimeout(timeoutId);
directSocketTimeout = setTimeout(pingDirectSocket, 45000)
return
}
if (initial === 0) {
if(noInitial) return
if (noInitial) return
const cachedData = null
let getInitialMessages = []
if (cachedData && cachedData.length !== 0) {
@ -2958,7 +3001,7 @@ class ChatPage extends LitElement {
} else {
try {
if(e.data){
if (e.data) {
this.processMessages(JSON.parse(e.data), false)
}
} catch (error) {
@ -2972,7 +3015,7 @@ class ChatPage extends LitElement {
// Closed Event
this.webSocket.onclose = (e) => {
clearTimeout(directSocketTimeout)
if(e.reason === 'switch chat') return
if (e.reason === 'switch chat') return
restartDirectWebSocket()
}
@ -2983,10 +3026,13 @@ class ChatPage extends LitElement {
const pingDirectSocket = () => {
this.webSocket.send('ping')
directSocketTimeout = setTimeout(pingDirectSocket, 295000)
timeoutId = setTimeout(() => {
this.webSocket.close();
clearTimeout(directSocketTimeout)
}, 5000);
}
};
const restartDirectWebSocket = () => {
const noInitial = true
@ -2999,6 +3045,7 @@ class ChatPage extends LitElement {
}
const initGroup = (gId, noInitial) => {
let timeoutId
let groupId = Number(gId)
let initial = 0
@ -3029,9 +3076,13 @@ class ChatPage extends LitElement {
// Message Event
this.webSocket.onmessage = async (e) => {
if (e.data === 'pong') {
clearTimeout(timeoutId);
groupSocketTimeout = setTimeout(pingGroupSocket, 45000)
return
}
if (initial === 0) {
if(noInitial) return
if (noInitial) return
const cachedData = null;
let getInitialMessages = []
if (cachedData && cachedData.length !== 0) {
@ -3071,19 +3122,22 @@ class ChatPage extends LitElement {
// Closed Event
this.webSocket.onclose = (e) => {
clearTimeout(groupSocketTimeout)
if(e.reason === 'switch chat') return
if (e.reason === 'switch chat') return
restartGroupWebSocket()
}
// Error Event
this.webSocket.onerror = () => {
clearTimeout(groupSocketTimeout)
this.webSocket.close();
}
const pingGroupSocket = () => {
this.webSocket.send('ping')
groupSocketTimeout = setTimeout(pingGroupSocket, 295000)
timeoutId = setTimeout(() => {
this.webSocket.close();
clearTimeout(groupSocketTimeout)
}, 5000); // Close the WebSocket connection if no pong message is received within 5 seconds.
}
};
@ -3105,22 +3159,22 @@ class ChatPage extends LitElement {
// Add to the messages... TODO: Save messages to localstorage and fetch from it to make it persistent...
}
resetChatEditor(){
if(this.currentEditor === '_chatEditorDOM'){
resetChatEditor() {
if (this.currentEditor === '_chatEditorDOM') {
this.editor.commands.setContent('')
}
if(this.currentEditor === 'newChat'){
if (this.currentEditor === 'newChat') {
this.editorImage.commands.setContent('')
}
if(this.currentEditor === 'newAttachmentChat'){
if (this.currentEditor === 'newAttachmentChat') {
this.editorAttachment.commands.setContent('')
}
}
async _sendMessage(outSideMsg, msg) {
if(this.isReceipient){
if (this.isReceipient) {
let hasPublicKey = true
if(!this._publicKey.hasPubKey){
if (!this._publicKey.hasPubKey) {
hasPublicKey = false
try {
const res = await parentEpml.request('apiCall', {
@ -3141,7 +3195,7 @@ class ChatPage extends LitElement {
} catch (error) {
}
if(!hasPublicKey || !this._publicKey.hasPubKey){
if (!hasPublicKey || !this._publicKey.hasPubKey) {
let err4string = get("chatpage.cchange39");
parentEpml.request('showSnackBar', `${err4string}`)
return
@ -3159,14 +3213,14 @@ class ChatPage extends LitElement {
this.isLoading = true;
const trimmedMessage = msg
const getName = async (recipient)=> {
const getName = async (recipient) => {
try {
const getNames = await parentEpml.request("apiCall", {
type: "api",
url: `/names/address/${recipient}`,
});
if (Array.isArray(getNames) && getNames.length > 0 ) {
if (Array.isArray(getNames) && getNames.length > 0) {
return getNames[0].name
} else {
return ''
@ -3191,7 +3245,7 @@ class ChatPage extends LitElement {
this.webWorkerFile = new WebWorkerFile();
const b64toBlob = (b64Data, contentType='', sliceSize=512) => {
const b64toBlob = (b64Data, contentType = '', sliceSize = 512) => {
const byteCharacters = atob(b64Data);
const byteArrays = [];
@ -3207,7 +3261,7 @@ class ChatPage extends LitElement {
byteArrays.push(byteArray);
}
const blob = new Blob(byteArrays, {type: contentType});
const blob = new Blob(byteArrays, { type: contentType });
return blob;
}
const blob = b64toBlob(str, 'image/png');
@ -3231,7 +3285,7 @@ class ChatPage extends LitElement {
try {
await publishData({
registeredName: userName,
file : compressedFile,
file: compressedFile,
service: 'QCHAT_IMAGE',
identifier: identifier,
parentEpml,
@ -3248,7 +3302,7 @@ class ChatPage extends LitElement {
typeMessage = 'edit';
let chatReference = outSideMsg.editedMessageObj.signature;
if(outSideMsg.editedMessageObj.chatReference){
if (outSideMsg.editedMessageObj.chatReference) {
chatReference = outSideMsg.editedMessageObj.chatReference;
}
@ -3280,7 +3334,7 @@ class ChatPage extends LitElement {
this.webWorkerFile = new WebWorkerFile();
const b64toBlob = (b64Data, contentType='', sliceSize=512) => {
const b64toBlob = (b64Data, contentType = '', sliceSize = 512) => {
const byteCharacters = atob(b64Data);
const byteArrays = [];
@ -3296,7 +3350,7 @@ class ChatPage extends LitElement {
byteArrays.push(byteArray);
}
const blob = new Blob(byteArrays, {type: contentType});
const blob = new Blob(byteArrays, { type: contentType });
return blob;
}
@ -3339,7 +3393,7 @@ class ChatPage extends LitElement {
typeMessage = 'edit';
let chatReference = outSideMsg.editedMessageObj.signature;
if(outSideMsg.editedMessageObj.chatReference){
if (outSideMsg.editedMessageObj.chatReference) {
chatReference = outSideMsg.editedMessageObj.chatReference;
}
@ -3380,10 +3434,10 @@ class ChatPage extends LitElement {
const identifier = `qchat_${id}`;
let compressedFile = '';
await new Promise(resolve => {
new Compressor( image, {
new Compressor(image, {
quality: .6,
maxWidth: 1200,
success(result){
success(result) {
const file = new File([result], "name", {
type: image.type
});
@ -3405,9 +3459,9 @@ class ChatPage extends LitElement {
try {
await publishData({
registeredName: userName,
file : compressedFile,
file: compressedFile,
service: 'QCHAT_IMAGE',
identifier : identifier,
identifier: identifier,
parentEpml,
metaData: undefined,
uploadType: 'file',
@ -3487,9 +3541,9 @@ class ChatPage extends LitElement {
try {
await publishData({
registeredName: userName,
file : attachment,
file: attachment,
service: 'QCHAT_ATTACHMENT',
identifier : identifier,
identifier: identifier,
parentEpml,
metaData: undefined,
uploadType: 'file',
@ -3539,11 +3593,11 @@ class ChatPage extends LitElement {
}
let reactions = message.reactions || []
const findEmojiIndex = reactions.findIndex((reaction)=> reaction.type === outSideMsg.reaction)
if(findEmojiIndex !== -1){
const findEmojiIndex = reactions.findIndex((reaction) => reaction.type === outSideMsg.reaction)
if (findEmojiIndex !== -1) {
let users = reactions[findEmojiIndex].users || []
const findUserIndex = users.findIndex((user)=> user.address === this.selectedAddress.address )
if(findUserIndex !== -1){
const findUserIndex = users.findIndex((user) => user.address === this.selectedAddress.address)
if (findUserIndex !== -1) {
users.splice(findUserIndex, 1)
} else {
users.push({
@ -3556,7 +3610,7 @@ class ChatPage extends LitElement {
qty: users.length,
users
}
if(users.length === 0){
if (users.length === 0) {
reactions.splice(findEmojiIndex, 1)
}
} else {
@ -3581,7 +3635,7 @@ class ChatPage extends LitElement {
}
else if (this.repliedToMessageObj) {
let chatReference = this.repliedToMessageObj.signature;
if(this.repliedToMessageObj.chatReference){
if (this.repliedToMessageObj.chatReference) {
chatReference = this.repliedToMessageObj.chatReference;
}
typeMessage = 'reply';
@ -3597,7 +3651,7 @@ class ChatPage extends LitElement {
typeMessage = 'edit'
let chatReference = this.editedMessageObj.signature
if(this.editedMessageObj.chatReference){
if (this.editedMessageObj.chatReference) {
chatReference = this.editedMessageObj.chatReference
}
@ -3686,9 +3740,9 @@ class ChatPage extends LitElement {
const sendForwardRequest = async () => {
const userInput = this.shadowRoot.getElementById("sendTo").value.trim();
if(!userInput && !this.forwardActiveChatHeadUrl.url) {
if (!userInput && !this.forwardActiveChatHeadUrl.url) {
let err4string = get("chatpage.cchange65");
getSendChatResponse(false, true, err4string );
getSendChatResponse(false, true, err4string);
return
}
let publicKey = {
@ -3794,7 +3848,7 @@ class ChatPage extends LitElement {
const recipientAddress = this.forwardActiveChatHeadUrl.url.split('/')[1];
this.openForwardOpen = false;
if (isRecipient === true) {
if(!publicKey.hasPubKey){
if (!publicKey.hasPubKey) {
let err4string = get("chatpage.cchange39");
parentEpml.request('showSnackBar', `${err4string}`);
getSendChatResponse(false);
@ -3857,7 +3911,7 @@ class ChatPage extends LitElement {
let chatBytesArray = null;
await new Promise((res) => {
worker.postMessage({chatBytes, path, difficulty});
worker.postMessage({ chatBytes, path, difficulty });
worker.onmessage = e => {
chatBytesArray = e.data.chatBytesArray;
nonce = e.data.nonce;
@ -3877,7 +3931,7 @@ class ChatPage extends LitElement {
const getSendChatResponse = (response, isForward, customErrorMessage) => {
if (response === true) {
this.resetChatEditor()
if(isForward){
if (isForward) {
let successString = get("blockpage.bcchange15");
parentEpml.request('showSnackBar', `${successString}`);
}
@ -3896,7 +3950,7 @@ class ChatPage extends LitElement {
let err2string = get("chatpage.cchange21");
parentEpml.request('showSnackBar', `${customErrorMessage || err2string}`);
}
if(isForward && response !== true){
if (isForward && response !== true) {
this.isLoading = false;
return
}

144
plugins/plugins/core/components/ChatScroller.js
Unescape View File

@ -2,7 +2,7 @@ import { LitElement, html, css } from 'lit';
import { render } from 'lit/html.js';
import { repeat } from 'lit/directives/repeat.js';
import { translate, get } from 'lit-translate';
import {unsafeHTML} from 'lit/directives/unsafe-html.js';
import { unsafeHTML } from 'lit/directives/unsafe-html.js';
import { chatStyles } from './ChatScroller-css.js'
import { Epml } from "../../../epml";
import { cropAddress } from "../../utils/cropAddress";
@ -24,10 +24,12 @@ import axios from "axios";
import StarterKit from '@tiptap/starter-kit'
import Underline from '@tiptap/extension-underline';
import Highlight from '@tiptap/extension-highlight'
import ShortUniqueId from 'short-unique-id';
const parentEpml = new Epml({ type: 'WINDOW', source: window.parent })
let toggledMessage = {}
const uid = new ShortUniqueId()
const getApiKey = () => {
const myNode = window.parent.reduxStore.getState().app.nodeConfig.knownNodes[window.parent.reduxStore.getState().app.nodeConfig.node];
let apiKey = myNode.apiKey;
@ -113,7 +115,20 @@ function processText(input) {
if (path) {
query = query + `&path=${path}`
}
window.location = `../../qdn/browser/index.html${query}`
window.parent.reduxStore.dispatch(window.parent.reduxAction.setNewTab({
url: `qdn/browser/index.html${query}`,
id: uid(),
myPlugObj: {
"url": service === 'WEBSITE' ? "websites" : "qapps",
"domain": "core",
"page": `qdn/browser/index.html${query}`,
"title": name,
"mwcicon": service === 'WEBSITE' ? 'vaadin:desktop' : 'open_in_browser',
"menus": [],
"parent": false
}
}))
} catch (error) {
console.log({ error })
}
@ -157,7 +172,7 @@ class ChatScroller extends LitElement {
sendMessageForward: { attribute: false },
showLastMessageRefScroller: { attribute: false },
emojiPicker: { attribute: false },
isLoadingMessages: { type: Boolean},
isLoadingMessages: { type: Boolean },
setIsLoadingMessages: { attribute: false },
chatId: { type: String },
setForwardProperties: { attribute: false },
@ -171,8 +186,8 @@ class ChatScroller extends LitElement {
userName: { type: String },
selectedHead: { type: Object },
goToRepliedMessage: { attribute: false },
getOldMessageAfter: {attribute: false},
listSeenMessages: {type: Array}
getOldMessageAfter: { attribute: false },
listSeenMessages: { type: Array }
}
}
@ -189,10 +204,10 @@ class ChatScroller extends LitElement {
this.hideMessages = JSON.parse(localStorage.getItem("MessageBlockedAddresses") || "[]")
this.openTipUser = false;
this.openUserInfo = false;
this.listSeenMessages= []
this.listSeenMessages = []
}
addSeenMessage(val){
addSeenMessage(val) {
this.listSeenMessages.push(val)
}
@ -210,7 +225,7 @@ class ChatScroller extends LitElement {
firstMessageInChat = false;
}
message = {...message, firstMessageInChat}
message = { ...message, firstMessageInChat }
if (lastGroupedMessage) {
timestamp = lastGroupedMessage.timestamp;
@ -267,7 +282,7 @@ class ChatScroller extends LitElement {
.setUserName=${(val) => this.setUserName(val)}
id=${message.signature}
.goToRepliedMessage=${this.goToRepliedMessage}
.addSeenMessage=${(val)=> this.addSeenMessage(val)}
.addSeenMessage=${(val) => this.addSeenMessage(val)}
.listSeenMessages=${this.listSeenMessages}
chatId=${this.chatId}
>
@ -280,19 +295,19 @@ class ChatScroller extends LitElement {
}
shouldUpdate(changedProperties) {
if(changedProperties.has('isLoadingMessages')){
if (changedProperties.has('isLoadingMessages')) {
return true
}
if(changedProperties.has('chatId') && changedProperties.get('chatId')){
if (changedProperties.has('chatId') && changedProperties.get('chatId')) {
return true
}
if(changedProperties.has('openTipUser')){
if (changedProperties.has('openTipUser')) {
return true
}
if(changedProperties.has('openUserInfo')){
if (changedProperties.has('openUserInfo')) {
return true
}
if(changedProperties.has('userName')){
if (changedProperties.has('userName')) {
return true
}
// Only update element if prop1 changed.
@ -339,7 +354,7 @@ class ChatScroller extends LitElement {
_upObserverhandler(entries) {
if (entries[0].isIntersecting) {
if(this.messages.length < 20){
if (this.messages.length < 20) {
return
}
this.setIsLoadingMessages(true);
@ -413,11 +428,11 @@ class MessageTemplate extends LitElement {
setToggledMessage: { attribute: false },
setForwardProperties: { attribute: false },
viewImage: { type: Boolean },
setOpenPrivateMessage : { attribute: false },
setOpenPrivateMessage: { attribute: false },
setOpenTipUser: { attribute: false },
setOpenUserInfo: { attribute: false },
setUserName: { attribute: false },
openTipUser:{ type: Boolean },
openTipUser: { type: Boolean },
goToRepliedMessage: { attribute: false },
listSeenMessages: { type: Array },
addSeenMessage: { attribute: false },
@ -480,12 +495,12 @@ class MessageTemplate extends LitElement {
const myNode = window.parent.reduxStore.getState().app.nodeConfig.knownNodes[window.parent.reduxStore.getState().app.nodeConfig.node];
const nodeUrl = myNode.protocol + '://' + myNode.domain + ':' + myNode.port;
try{
axios.get(`${nodeUrl}/arbitrary/QCHAT_ATTACHMENT/${attachment.name}/${attachment.identifier}?apiKey=${myNode.apiKey}`, { responseType: 'blob'})
.then(response =>{
try {
axios.get(`${nodeUrl}/arbitrary/QCHAT_ATTACHMENT/${attachment.name}/${attachment.identifier}?apiKey=${myNode.apiKey}`, { responseType: 'blob' })
.then(response => {
let filename = attachment.attachmentName;
let blob = new Blob([response.data], { type:"application/octet-stream" });
this.saveFileToDisk(blob , filename);
let blob = new Blob([response.data], { type: "application/octet-stream" });
this.saveFileToDisk(blob, filename);
})
} catch (error) {
console.error(error);
@ -511,9 +526,9 @@ class MessageTemplate extends LitElement {
}
}
firstUpdated(){
firstUpdated() {
const autoSeeChatList = window.parent.reduxStore.getState().app.autoLoadImageChats
if(autoSeeChatList.includes(this.chatId) || this.listSeenMessages.includes(this.messageObj.signature)){
if (autoSeeChatList.includes(this.chatId) || this.listSeenMessages.includes(this.messageObj.signature)) {
this.viewImage = true
}
@ -542,7 +557,7 @@ class MessageTemplate extends LitElement {
let attachment = null;
try {
const parsedMessageObj = JSON.parse(this.messageObj.decodedMessage);
if(+parsedMessageObj.version > 1 && parsedMessageObj.messageText){
if (+parsedMessageObj.version > 1 && parsedMessageObj.messageText) {
messageVersion2 = generateHTML(parsedMessageObj.messageText, [
StarterKit,
Underline,
@ -598,8 +613,8 @@ class MessageTemplate extends LitElement {
const createImage = (imageUrl) => {
const imageHTMLRes = new Image();
imageHTMLRes.src = imageUrl;
imageHTMLRes.style= "max-width:45vh; max-height:40vh; border-radius: 5px; cursor: pointer";
imageHTMLRes.onclick= () => {
imageHTMLRes.style = "max-width:45vh; max-height:40vh; border-radius: 5px; cursor: pointer";
imageHTMLRes.onclick = () => {
this.openDialogImage = true;
}
imageHTMLRes.onload = () => {
@ -624,8 +639,8 @@ class MessageTemplate extends LitElement {
const createGif = (gif) => {
const gifHTMLRes = new Image();
gifHTMLRes.src = gif;
gifHTMLRes.style= "max-width:45vh; max-height:40vh; border-radius: 5px; cursor: pointer";
gifHTMLRes.onclick= () => {
gifHTMLRes.style = "max-width:45vh; max-height:40vh; border-radius: 5px; cursor: pointer";
gifHTMLRes.onclick = () => {
this.openDialogGif = true;
}
gifHTMLRes.onload = () => {
@ -639,8 +654,8 @@ class MessageTemplate extends LitElement {
}, 500);
} else {
gifHTMLRes.src = '/img/chain.png';
gifHTMLRes.style= "max-width:45vh; max-height:20vh; border-radius: 5px; filter: opacity(0.5)";
gifHTMLRes.onclick= () => {}
gifHTMLRes.style = "max-width:45vh; max-height:20vh; border-radius: 5px; filter: opacity(0.5)";
gifHTMLRes.onclick = () => { }
this.isGifLoaded = true
}
};
@ -655,7 +670,7 @@ class MessageTemplate extends LitElement {
if (this.viewImage || this.myAddress === this.messageObj.sender) {
imageHTML = createImage(imageUrl);
imageHTMLDialog = createImage(imageUrl)
imageHTMLDialog.style= "height: auto; max-height: 80vh; width: auto; max-width: 80vw; object-fit: contain; border-radius: 5px";
imageHTMLDialog.style = "height: auto; max-height: 80vh; width: auto; max-width: 80vw; object-fit: contain; border-radius: 5px";
}
}
@ -663,10 +678,10 @@ class MessageTemplate extends LitElement {
const myNode = window.parent.reduxStore.getState().app.nodeConfig.knownNodes[window.parent.reduxStore.getState().app.nodeConfig.node];
const nodeUrl = myNode.protocol + '://' + myNode.domain + ':' + myNode.port;
gifUrl = `${nodeUrl}/arbitrary/${gif.service}/${gif.name}/${gif.identifier}?filepath=${gif.filePath}&apiKey=${myNode.apiKey}`;
if (this.viewImage || this.myAddress === this.messageObj.sender){
if (this.viewImage || this.myAddress === this.messageObj.sender) {
gifHTML = createGif(gifUrl);
gifHTMLDialog = createGif(gifUrl)
gifHTMLDialog.style= "height: auto; max-height: 80vh; width: auto; max-width: 80vw; object-fit: contain; border-radius: 5px";
gifHTMLDialog.style = "height: auto; max-height: 80vh; width: auto; max-width: 80vw; object-fit: contain; border-radius: 5px";
}
}
@ -750,7 +765,7 @@ class MessageTemplate extends LitElement {
`}
<div
class="${`message-subcontainer2
${this.myAddress === this.messageObj.sender && "message-myBg" }
${this.myAddress === this.messageObj.sender && "message-myBg"}
${(((this.isFirstMessage === true && this.isSingleMessageInGroup === false) ||
(this.isSingleMessageInGroup === true && this.isLastMessageInGroup === true)) && this.myAddress !== this.messageObj.sender)
? 'message-triangle'
@ -799,7 +814,7 @@ class MessageTemplate extends LitElement {
</div>
${repliedToData && html`
<div class="original-message"
@click=${()=> {
@click=${() => {
this.goToRepliedMessage(repliedToData, this.messageObj)
}}>
<p
@ -807,7 +822,7 @@ class MessageTemplate extends LitElement {
class=${this.myAddress !== repliedToData.sender
? "original-message-sender"
: "message-data-my-name"}>
${repliedToData.senderName ? repliedToData.senderName : cropAddress(repliedToData.sender) }
${repliedToData.senderName ? repliedToData.senderName : cropAddress(repliedToData.sender)}
</p>
<p class="replied-message">
${version && version.toString() === '1' ? html`
@ -822,7 +837,7 @@ class MessageTemplate extends LitElement {
`}
${image && !isImageDeleted && !this.viewImage && this.myAddress !== this.messageObj.sender ? html`
<div
@click=${()=> {
@click=${() => {
this.viewImage = true
this.addSeenMessage(this.messageObj.signature)
}}
@ -841,7 +856,7 @@ class MessageTemplate extends LitElement {
`: ''}
${image && !isImageDeleted && (this.viewImage || this.myAddress === this.messageObj.sender) ? html`
<div
class=${[`image-container`, !this.isImageLoaded ? 'defaultSize' : '', !this.isImageLoaded ? 'hideImg': ''].join(' ')}
class=${[`image-container`, !this.isImageLoaded ? 'defaultSize' : '', !this.isImageLoaded ? 'hideImg' : ''].join(' ')}
style=${this.isFirstMessage && "margin-top: 10px;"}>
${imageHTML}
${this.myAddress === this.messageObj.sender ? html`
@ -858,7 +873,7 @@ class MessageTemplate extends LitElement {
` : html``}
${gif && !this.viewImage && this.myAddress !== this.messageObj.sender ? html`
<div
@click=${()=> {
@click=${() => {
this.viewImage = true
}}
class=${[`image-container`, !this.isImageLoaded ? 'defaultSize' : ''].join(' ')}
@ -923,7 +938,7 @@ class MessageTemplate extends LitElement {
<div
id="messageContent"
class="message"
style=${(image && replacedMessage !== "") &&"margin-top: 15px;"}>
style=${(image && replacedMessage !== "") && "margin-top: 15px;"}>
${+version > 1 ? messageVersion2WithLink ? html`${messageVersion2WithLink}` : html`
${unsafeHTML(messageVersion2)}
` : ''}
@ -968,7 +983,7 @@ class MessageTemplate extends LitElement {
.showBlockUserModal=${() => this.showBlockUserModal()}
.showBlockIconFunc=${(props) => this.showBlockIconFunc(props)}
.showBlockAddressIcon=${this.showBlockAddressIcon}
.originalMessage=${{...this.messageObj, message}}
.originalMessage=${{ ...this.messageObj, message }}
.setRepliedToMessageObj=${this.setRepliedToMessageObj}
.setEditedMessageObj=${this.setEditedMessageObj}
.myAddress=${this.myAddress}
@ -989,7 +1004,7 @@ class MessageTemplate extends LitElement {
</div>
<div class="message-reactions" style="${reactions.length > 0 &&
'margin-top: 10px; margin-bottom: 5px;'}">
${reactions.map((reaction, index)=> {
${reactions.map((reaction, index) => {
return html`
<span
@click=${() => this.sendMessage({
@ -1045,7 +1060,7 @@ class MessageTemplate extends LitElement {
? reaction.users[0].name
: cropAddress(reaction.users[0].address)} ${get("chatpage.cchange74")} ${reaction.type}`
)
: "" }>
: ""}>
</vaadin-tooltip>
</span>
`
@ -1067,7 +1082,7 @@ class MessageTemplate extends LitElement {
<mwc-dialog
id="showDialogPublicKey"
?open=${this.openDialogImage}
@closed=${()=> {
@closed=${() => {
this.openDialogImage = false
}}>
<div class="dialog-header"></div>
@ -1078,7 +1093,7 @@ class MessageTemplate extends LitElement {
slot="primaryAction"
dialogAction="cancel"
class="red"
@click=${()=>{
@click=${() => {
this.openDialogImage = false
}}
@ -1089,7 +1104,7 @@ class MessageTemplate extends LitElement {
<mwc-dialog
id="showDialogPublicKey"
?open=${this.openDialogGif}
@closed=${()=> {
@closed=${() => {
this.openDialogGif = false
}}>
<div class="dialog-header"></div>
@ -1100,7 +1115,7 @@ class MessageTemplate extends LitElement {
slot="primaryAction"
dialogAction="cancel"
class="red"
@click=${()=>{
@click=${() => {
this.openDialogGif = false
}}
@ -1111,7 +1126,7 @@ class MessageTemplate extends LitElement {
<mwc-dialog
hideActions
?open=${this.openDeleteImage}
@closed=${()=> {
@closed=${() => {
this.openDeleteImage = false;
}}>
<div class="delete-image-msg">
@ -1136,7 +1151,7 @@ class MessageTemplate extends LitElement {
<mwc-dialog
hideActions
?open=${this.openDeleteAttachment}
@closed=${()=> {
@closed=${() => {
this.openDeleteAttachment = false;
}}>
<div class="delete-image-msg">
@ -1155,7 +1170,8 @@ class MessageTemplate extends LitElement {
name: attachment.name,
identifier: attachment.identifier,
editedMessageObj: this.messageObj,
})}
})
}
}>
Yes
</button>
@ -1171,14 +1187,14 @@ class ChatMenu extends LitElement {
static get properties() {
return {
menuItems: { type: Array },
showPrivateMessageModal: {attribute: false},
showBlockUserModal: {attribute: false},
showPrivateMessageModal: { attribute: false },
showBlockUserModal: { attribute: false },
toblockaddress: { type: String, attribute: true },
showBlockIconFunc: {attribute: false},
showBlockIconFunc: { attribute: false },
showBlockAddressIcon: { type: Boolean },
originalMessage: { type: Object },
setRepliedToMessageObj: {attribute: false},
setEditedMessageObj: {attribute: false},
setRepliedToMessageObj: { attribute: false },
setEditedMessageObj: { attribute: false },
myAddress: { type: Object },
emojiPicker: { attribute: false },
sendMessage: { attribute: false },
@ -1196,8 +1212,8 @@ class ChatMenu extends LitElement {
constructor() {
super();
this.showPrivateMessageModal = () => {};
this.showBlockUserModal = () => {};
this.showPrivateMessageModal = () => { };
this.showBlockUserModal = () => { };
}
static get styles() {
@ -1217,12 +1233,12 @@ class ChatMenu extends LitElement {
}
}
versionErrorSnack(){
versionErrorSnack() {
let errorMsg = get("chatpage.cchange34")
parentEpml.request('showSnackBar', `${errorMsg}`)
}
async messageForwardFunc(){
async messageForwardFunc() {
let parsedMessageObj = {}
let publicKey = {
hasPubKey: false,
@ -1272,7 +1288,7 @@ class ChatMenu extends LitElement {
class=${`menu-icon reaction ${!this.firstMessageInChat ? "tooltip" : ""}`}
data-text="${translate("blockpage.bcchange13")}"
@click=${(e) => {
if(this.version === '0'){
if (this.version === '0') {
this.versionErrorSnack()
return
}
@ -1318,7 +1334,7 @@ class ChatMenu extends LitElement {
this.versionErrorSnack()
return
}
this.setRepliedToMessageObj({...this.originalMessage, version: this.version});
this.setRepliedToMessageObj({ ...this.originalMessage, version: this.version });
}}">
<vaadin-icon icon="vaadin:reply" slot="icon"></vaadin-icon>
</div>
@ -1330,7 +1346,7 @@ class ChatMenu extends LitElement {
class=${`menu-icon ${!this.firstMessageInChat ? "tooltip" : ""}`}
data-text="${translate("blockpage.bcchange12")}"
@click=${() => {
if (this.version === '0'){
if (this.version === '0') {
this.versionErrorSnack()
return
}

3
plugins/plugins/core/components/qdn-action-types.js
Unescape View File

@ -45,3 +45,6 @@ export const DECRYPT_DATA = 'DECRYPT_DATA'
// SAVE_FILE
export const SAVE_FILE = 'SAVE_FILE'
//SET_TAB_NOTIFICATIONS
export const SET_TAB_NOTIFICATIONS = 'SET_TAB_NOTIFICATIONS'

32
plugins/plugins/core/qdn/browser/browser.src.js
Unescape View File

@ -892,10 +892,42 @@ class WebBrowser extends LitElement {
this.service = data.service;
this.identifier = data.identifier;
this.displayUrl = url;
const frame = window.frameElement
let tabId = ""
if (frame && frame.dataset.id) {
tabId = frame.dataset.id
}
if (data.name === 'Q-Mail') {
localStorage.setItem("Q-Mail-last-visited", Date.now())
}
window.parent.reduxStore.dispatch(window.parent.reduxAction.addTabInfo({
name: data.name,
service: data.service,
id: tabId ? tabId : ""
}))
return;
case actions.SET_TAB_NOTIFICATIONS: {
const { count } = data
if (isNaN(count)) {
response['error'] = 'count is not a number'
break
}
if (count === undefined) {
response['error'] = 'missing count'
break
}
window.parent.reduxStore.dispatch(window.parent.reduxAction.setTabNotifications({
name: this.name,
count: count
}))
response = true
break
}
case actions.PUBLISH_QDN_RESOURCE: {
// optional fields: encrypt:boolean recipientPublicKey:string

40
plugins/plugins/core/streams/streams.js
Unescape View File

@ -115,6 +115,7 @@ let closeGracefully = false
let onceLoggedIn = false
let retryOnClose = false
let canPing = false
let timeoutId
parentEpml.subscribe('logged_in', async isLoggedIn => {
@ -127,18 +128,16 @@ parentEpml.subscribe('logged_in', async isLoggedIn => {
if (window.parent.location.protocol === "https:") {
activeChatSocketLink = `wss://${nodeUrl}/websockets/chat/active/${window.parent.reduxStore.getState().app.selectedAddress.address}`;
activeChatSocketLink = `wss://${nodeUrl}/websockets/chat/active/${window.parent.reduxStore.getState().app.selectedAddress.address}?encoding=BASE64`;
} else {
activeChatSocketLink = `ws://${nodeUrl}/websockets/chat/active/${window.parent.reduxStore.getState().app.selectedAddress.address}`;
activeChatSocketLink = `ws://${nodeUrl}/websockets/chat/active/${window.parent.reduxStore.getState().app.selectedAddress.address}?encoding=BASE64`;
}
const activeChatSocket = new WebSocket(activeChatSocketLink);
// Open Connection
activeChatSocket.onopen = () => {
console.log(`[SOCKET]: Connected.`);
socketObject = activeChatSocket
initial = initial + 1
@ -147,28 +146,26 @@ parentEpml.subscribe('logged_in', async isLoggedIn => {
// Message Event
activeChatSocket.onmessage = (e) => {
if (e.data === 'pong') {
clearTimeout(timeoutId);
activeChatSocketTimeout = setTimeout(pingActiveChatSocket, 45000)
return
}
try {
chatHeadWatcher(JSON.parse(e.data))
} catch (error) {
}
}
// Closed Event
activeChatSocket.onclose = () => {
console.log(`[SOCKET]: CLOSED`);
clearInterval(activeChatSocketTimeout)
if (closeGracefully === false && initial <= 52) {
if (initial <= 52) {
parentEpml.request('showSnackBar', "Connection to the Qortal Core was lost, is your Core running ?")
if (closeGracefully === false) {
retryOnClose = true
setTimeout(pingActiveChatSocket, 10000)
initial = initial + 1
} else {
parentEpml.request('showSnackBar', "Cannot connect to the Qortal Core, restart UI and Core!")
}
}
}
@ -188,18 +185,21 @@ parentEpml.subscribe('logged_in', async isLoggedIn => {
initChatHeadSocket()
onceLoggedIn = true
activeChatSocketTimeout = setTimeout(pingActiveChatSocket, 295000)
activeChatSocketTimeout = setTimeout(pingActiveChatSocket, 45000)
} else if (retryOnClose) {
retryOnClose = false
clearTimeout(activeChatSocketTimeout)
initChatHeadSocket()
onceLoggedIn = true
activeChatSocketTimeout = setTimeout(pingActiveChatSocket, 295000)
activeChatSocketTimeout = setTimeout(pingActiveChatSocket, 45000)
} else if (canPing) {
socketObject.send('ping')
activeChatSocketTimeout = setTimeout(pingActiveChatSocket, 295000)
timeoutId = setTimeout(() => {
socketObject.close();
clearTimeout(activeChatSocketTimeout)
}, 5000);
}
} else {

Write Preview
Loading…
Cancel
Save