@@ -877,41 +1182,58 @@ class ChatPage extends LitElement {
}
}
+ connectedCallback() {
+ super.connectedCallback();
+ this.webWorker = new WebWorker();
+ this.webWorkerImage = new WebWorkerImage();
+ }
+
+ disconnectedCallback() {
+ super.disconnectedCallback();
+ this.webWorker.terminate();
+ this.webWorkerImage.terminate();
+ }
+
+ async userSearch() {
+ const nameValue = this.shadowRoot.getElementById('sendTo').value;
+ if (!nameValue) {
+ this.userFound = [];
+ this.userFoundModalOpen = true;
+ return;
+ }
+ try {
+ const result = await parentEpml.request('apiCall', {
+ type: 'api',
+ url: `/names/${nameValue}`
+ })
+ if (result.error === 401) {
+ this.userFound = [];
+ } else {
+ this.userFound = [
+ ...this.userFound,
+ result,
+ ];
+ }
+ this.userFoundModalOpen = true;
+ } catch (error) {
+ console.error(error);
+ let err4string = get("chatpage.cchange35");
+ parentEpml.request('showSnackBar', `${err4string}`)
+ }
+ }
+
setForwardProperties(forwardedMessage){
this.openForwardOpen = true
this.forwardedMessage = forwardedMessage
}
-
- async sendForwardMessage(){
- let parsedMessageObj = {}
- let publicKey = {
- hasPubKey: false,
- key: ''
- }
+
+ async sendForwardMessage() {
+ let parsedMessageObj = {};
try {
parsedMessageObj = JSON.parse(this.forwardedMessage);
-
- } catch (error) {
- parsedMessageObj = {}
- }
-
- try {
- const res = await parentEpml.request('apiCall', {
- type: 'api',
- url: `/addresses/publickey/${this.forwardChatId}`
- })
- if (res.error === 102) {
- publicKey.key = ''
- publicKey.hasPubKey = false
- } else if (res !== false) {
- publicKey.key = res
- publicKey.hasPubKey = true
- } else {
- publicKey.key = ''
- publicKey.hasPubKey = false
- }
- } catch (error) {
-
+ }
+ catch (error) {
+ parsedMessageObj = {};
}
try {
@@ -920,17 +1242,10 @@ class ChatPage extends LitElement {
type: 'forward'
}
delete message.reactions
- const stringifyMessageObject = JSON.stringify(message)
- this.sendMessage(stringifyMessageObject, undefined, '', true, {
- isReceipient: true,
- chatId: 'Qdxha59Cm1Ty4QkKMBWPnKrNigcDCDk6eq',
- publicKey: {
- hasPubKey: false,
- key: ''
- }
- })
+ const stringifyMessageObject = JSON.stringify(message);
+ this.sendMessage(stringifyMessageObject, undefined, '', true)
} catch (error) {
- console.log({error})
+ console.log({error});
}
}
@@ -950,9 +1265,6 @@ class ChatPage extends LitElement {
if (file.type.includes('image')) {
this.imageFile = file;
this.chatEditor.disable();
- // this.changeMsgInput('newChat')
- // this.initChatEditor();
- // this.chatEditor.disable();
return;
}
parentEpml.request('showSnackBar', get("chatpage.cchange28"));
@@ -1121,9 +1433,16 @@ class ChatPage extends LitElement {
}
}
+
if (changedProperties && changedProperties.has('chatId') && changedProperties.get('chatId')) {
await this.initUpdate()
}
+
+ if (changedProperties && changedProperties.has('openForwardOpen')) {
+ if (this.openForwardOpen === true) {
+ this.chatEditor.disable();
+ }
+ }
}
@@ -1189,6 +1508,7 @@ async getName (recipient) {
?isLoadingMessages=${this.isLoadingOldMessages}
.setIsLoadingMessages=${(val) => this.setIsLoadingMessages(val)}
.setForwardProperties=${(forwardedMessage)=> this.setForwardProperties(forwardedMessage)}
+ .setOpenPrivateMessage=${(val) => this.setOpenPrivateMessage(val)}
>
`
@@ -1400,7 +1720,7 @@ async getName (recipient) {
this.messagesRendered = [...this.messagesRendered, newMessage]
await this.getUpdateComplete();
- this.showNewMesssageBar();
+ this.showNewMessageBar();
}
}
@@ -1639,7 +1959,39 @@ async getName (recipient) {
}
async _sendMessage(outSideMsg) {
+ if(this.isReceipient){
+ let hasPublicKey = true
+ if(!this._publicKey.hasPubKey){
+ hasPublicKey = false
+ try {
+ const res = await parentEpml.request('apiCall', {
+ type: 'api',
+ url: `/addresses/publickey/${this.selectedAddress.address}`
+ })
+ if (res.error === 102) {
+ this._publicKey.key = ''
+ this._publicKey.hasPubKey = false
+ } else if (res !== false) {
+ this._publicKey.key = res
+ this._publicKey.hasPubKey = true
+ hasPublicKey = true
+ } else {
+ this._publicKey.key = ''
+ this._publicKey.hasPubKey = false
+ }
+ } catch (error) {
+ console.error(error);
+ }
+ if(!hasPublicKey || !this._publicKey.hasPubKey){
+ let err4string = get("chatpage.cchange39");
+ parentEpml.request('showSnackBar', `${err4string}`)
+ return
+ }
+
+ }
+ }
+ console.log(outSideMsg);
// have params to determine if it's a reply or not
// have variable to determine if it's a response, holds signature in constructor
// need original message signature
@@ -1647,7 +1999,7 @@ async getName (recipient) {
// create new var called repliedToData and use that to modify the UI
// find specific object property in local
let typeMessage = 'regular';
-
+ let workerImage;
this.isLoading = true;
this.chatEditor.disable();
this.chatEditorNewChat.disable()
@@ -1680,26 +2032,32 @@ async getName (recipient) {
const identifier = outSideMsg.identifier
let compressedFile = ''
var str = "iVBORw0KGgoAAAANSUhEUgAAAsAAAAGMAQMAAADuk4YmAAAAA1BMVEX///+nxBvIAAAAAXRSTlMAQObYZgAAADlJREFUeF7twDEBAAAAwiD7p7bGDlgYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAGJrAABgPqdWQAAAABJRU5ErkJggg==";
+
+ if (this.webWorkerImage) {
+ workerImage = this.webWorkerImage;
+ } else {
+ this.webWorkerImage = new WebWorkerImage();
+ }
- const b64toBlob = (b64Data, contentType='', sliceSize=512) => {
- const byteCharacters = atob(b64Data);
- const byteArrays = [];
-
- for (let offset = 0; offset < byteCharacters.length; offset += sliceSize) {
- const slice = byteCharacters.slice(offset, offset + sliceSize);
-
- const byteNumbers = new Array(slice.length);
- for (let i = 0; i < slice.length; i++) {
- byteNumbers[i] = slice.charCodeAt(i);
- }
-
- const byteArray = new Uint8Array(byteNumbers);
- byteArrays.push(byteArray);
+ const b64toBlob = (b64Data, contentType='', sliceSize=512) => {
+ const byteCharacters = atob(b64Data);
+ const byteArrays = [];
+
+ for (let offset = 0; offset < byteCharacters.length; offset += sliceSize) {
+ const slice = byteCharacters.slice(offset, offset + sliceSize);
+
+ const byteNumbers = new Array(slice.length);
+ for (let i = 0; i < slice.length; i++) {
+ byteNumbers[i] = slice.charCodeAt(i);
+ }
+
+ const byteArray = new Uint8Array(byteNumbers);
+ byteArrays.push(byteArray);
+ }
+
+ const blob = new Blob(byteArrays, {type: contentType});
+ return blob;
}
-
- const blob = new Blob(byteArrays, {type: contentType});
- return blob;
- }
const blob = b64toBlob(str, 'image/png');
await new Promise(resolve => {
new Compressor(blob, {
@@ -1728,7 +2086,7 @@ async getName (recipient) {
metaData: undefined,
uploadType: 'file',
selectedAddress: this.selectedAddress,
- worker: new WebWorkerImage()
+ worker: workerImage
})
this.isDeletingImage = false
} catch (error) {
@@ -1772,6 +2130,13 @@ async getName (recipient) {
this.chatEditorNewChat.enable()
return;
}
+
+ if (this.webWorkerImage) {
+ workerImage = this.webWorkerImage;
+ } else {
+ this.webWorkerImage = new WebWorkerImage();
+ }
+
const image = this.imageFile
const id = this.uid();
const identifier = `qchat_${id}`;
@@ -1811,7 +2176,7 @@ async getName (recipient) {
metaData: undefined,
uploadType: 'file',
selectedAddress: this.selectedAddress,
- worker: new WebWorkerImage()
+ worker: workerImage
});
this.isUploadingImage = false;
this.imageFile = null;
@@ -1883,35 +2248,31 @@ async getName (recipient) {
users: [this.selectedAddress.address]
}]
}
-
const messageObject = {
...message,
reactions
-
}
const stringifyMessageObject = JSON.stringify(messageObject)
this.sendMessage(stringifyMessageObject, typeMessage, chatReference);
-
} else if (/^\s*$/.test(trimmedMessage)) {
this.isLoading = false;
this.chatEditor.enable();
- this.chatEditorNewChat.enable()
+ this.chatEditorNewChat.enable();
}
else if (this.repliedToMessageObj) {
- let chatReference = this.repliedToMessageObj.reference
-
+ let chatReference = this.repliedToMessageObj.reference;
if(this.repliedToMessageObj.chatReference){
- chatReference = this.repliedToMessageObj.chatReference
+ chatReference = this.repliedToMessageObj.chatReference;
}
- typeMessage = 'reply'
+ typeMessage = 'reply';
const messageObject = {
messageText: trimmedMessage,
images: [''],
repliedTo: chatReference,
version: 1
}
- const stringifyMessageObject = JSON.stringify(messageObject)
- this.sendMessage(stringifyMessageObject, typeMessage );
+ const stringifyMessageObject = JSON.stringify(messageObject);
+ this.sendMessage(stringifyMessageObject, typeMessage);
} else if (this.editedMessageObj) {
typeMessage = 'edit'
let chatReference = this.editedMessageObj.reference
@@ -1947,7 +2308,7 @@ async getName (recipient) {
}
}
- async sendMessage(messageText, typeMessage, chatReference, isForward, forwardParams) {
+ async sendMessage(messageText, typeMessage, chatReference, isForward) {
this.isLoading = true;
let _reference = new Uint8Array(64);
@@ -1967,7 +2328,7 @@ async getName (recipient) {
message: messageText,
lastReference: reference,
proofOfWorkNonce: 0,
- isEncrypted: this._publicKey.hasPubKey === false ? 0 : 1,
+ isEncrypted: 1,
isText: 1
}
});
@@ -1996,26 +2357,80 @@ async getName (recipient) {
};
const sendForwardRequest = async () => {
- const { publicKey } = forwardParams
+ let publicKey = {
+ hasPubKey: false,
+ key: ''
+ };
- const isRecipient = this.forwardActiveChatHeadUrl.includes('direct') === true ? true : false;
+ if (this.forwardActiveChatHeadUrl.url) {
+ const activeChatHeadAddress = this.forwardActiveChatHeadUrl.url.split('/')[1]
+ try {
+ const res = await parentEpml.request('apiCall', {
+ type: 'api',
+ url: `/addresses/publickey/${activeChatHeadAddress}`
+ })
+
+ if (res.error === 102) {
+ publicKey.key = ''
+ publicKey.hasPubKey = false
+ } else if (res !== false) {
+ publicKey.key = res
+ publicKey.hasPubKey = true
+ } else {
+ publicKey.key = ''
+ publicKey.hasPubKey = false
+ }
+ } catch (error) {
+ console.error(error);
+ }
+ }
+
+ if (!this.forwardActiveChatHeadUrl && this.shadowRoot.getElementById("sendTo").value !== "") {
+ try {
+ const res = await parentEpml.request('apiCall', {
+ type: 'api',
+ url: `/addresses/publickey/${this.shadowRoot.getElementById("sendTo").value}`
+ })
+ if (res.error === 102) {
+ publicKey.key = ''
+ publicKey.hasPubKey = false
+ } else if (res !== false) {
+ publicKey.key = res
+ publicKey.hasPubKey = true
+ } else {
+ publicKey.key = ''
+ publicKey.hasPubKey = false
+ }
+ } catch (error) {
+ console.error(error);
+ }
+ }
+
+ const isRecipient = this.forwardActiveChatHeadUrl.url.includes('direct') === true ? true : false;
- const chatId = this.forwardActiveChatHeadUrl.split('/')[1];
- this.openForwardOpen = false
+ const recipientAddress = this.forwardActiveChatHeadUrl.url.split('/')[1];
+ this.openForwardOpen = false;
+ this.chatEditor.enable();
if (isRecipient === true) {
+ if(!publicKey.hasPubKey){
+ let err4string = get("chatpage.cchange39");
+ parentEpml.request('showSnackBar', `${err4string}`)
+ getSendChatResponse(false)
+ return
+ }
let chatResponse = await parentEpml.request('chat', {
type: 18,
nonce: this.selectedAddress.nonce,
params: {
timestamp: Date.now(),
- recipient: chatId,
+ recipient: recipientAddress,
recipientPublicKey: publicKey.key,
hasChatReference: 0,
chatReference: "",
message: messageText,
lastReference: reference,
proofOfWorkNonce: 0,
- isEncrypted: publicKey.hasPubKey === false ? 0 : 1,
+ isEncrypted: 1,
isText: 1
}
});
@@ -2027,7 +2442,7 @@ async getName (recipient) {
nonce: this.selectedAddress.nonce,
params: {
timestamp: Date.now(),
- groupID: Number(chatId),
+ groupID: Number(recipientAddress),
hasReceipient: 0,
hasChatReference: 0,
chatReference: chatReference,
@@ -2045,28 +2460,35 @@ async getName (recipient) {
const _computePow = async (chatBytes, isForward) => {
const difficulty = this.balance === 0 ? 12 : 8;
+
const path = window.parent.location.origin + '/memory-pow/memory-pow.wasm.full'
- const worker = new WebWorker();
- let nonce = null
- let chatBytesArray = null
+
+ let worker;
+
+ if (this.webWorker) {
+ worker = this.webWorker;
+ } else {
+ this.webWorker = new WebWorker();
+ }
+
+ let nonce = null;
+
+ let chatBytesArray = null;
+
await new Promise((res, rej) => {
worker.postMessage({chatBytes, path, difficulty});
-
worker.onmessage = e => {
- worker.terminate()
- chatBytesArray = e.data.chatBytesArray
- nonce = e.data.nonce
- res()
-
+ chatBytesArray = e.data.chatBytesArray;
+ nonce = e.data.nonce;
+ res();
}
- })
+ });
let _response = await parentEpml.request('sign_chat', {
nonce: this.selectedAddress.nonce,
chatBytesArray: chatBytesArray,
chatNonce: nonce
});
-
getSendChatResponse(_response, isForward);
};
@@ -2095,9 +2517,9 @@ async getName (recipient) {
this.forwardActiveChatHeadUrl = ""
};
- if(isForward){
+ if (isForward) {
sendForwardRequest();
- return
+ return;
}
sendMessageRequest();
}
@@ -2115,7 +2537,7 @@ async getName (recipient) {
if (entries[0].isIntersecting) {
this.setIsUserDown(true)
- this.hideNewMesssageBar()
+ this.hideNewMessageBar()
} else {
this.setIsUserDown(false)
diff --git a/qortal-ui-plugins/plugins/core/components/ChatRightPanel.js b/qortal-ui-plugins/plugins/core/components/ChatRightPanel.js
index 402fe2cf..2366400e 100644
--- a/qortal-ui-plugins/plugins/core/components/ChatRightPanel.js
+++ b/qortal-ui-plugins/plugins/core/components/ChatRightPanel.js
@@ -23,8 +23,8 @@ class ChatRightPanel extends LitElement {
groupAdmin: { attribute: false },
groupMembers: { attribute: false },
selectedHead: { type: Object },
- toggle: {attribute: false},
- getMoreMembers:{attribute: false}
+ toggle: { attribute: false },
+ getMoreMembers:{ attribute: false }
}
}
@@ -44,80 +44,135 @@ class ChatRightPanel extends LitElement {
this.downObserverElement = ''
}
- static get styles() {
- return css`
- .top-bar-icon {
- cursor: pointer;
- height: 18px;
- width: 18px;
- transition: 0.2s all;
- }
- .top-bar-icon:hover {
- color: var(--black);
- }
- .modal-button {
- font-family: Roboto, sans-serif;
- font-size: 16px;
- color: var(--mdc-theme-primary);
- background-color: transparent;
- padding: 8px 10px;
- border-radius: 5px;
- border: none;
- transition: all 0.3s ease-in-out;
- }
- .close-row {
- width: 100%;
- display: flex;
- justify-content: flex-end;
- height: 50px;
- flex:0
+static get styles() {
+return css`
+ .top-bar-icon {
+ cursor: pointer;
+ height: 18px;
+ width: 18px;
+ transition: 0.2s all;
+ }
- }
- .container-body {
- width: 100%;
- display: flex;
- flex-direction: column;
- flex-grow: 1;
- overflow:auto;
- margin-top: 15px;
- padding: 0px 5px;
- box-sizing: border-box;
- }
- .container-body::-webkit-scrollbar-track {
- background-color: whitesmoke;
- border-radius: 7px;
- }
-
- .container-body::-webkit-scrollbar {
- width: 6px;
- border-radius: 7px;
- background-color: whitesmoke;
- }
-
- .container-body::-webkit-scrollbar-thumb {
- background-color: rgb(180, 176, 176);
- border-radius: 7px;
- transition: all 0.3s ease-in-out;
- }
-
- .container-body::-webkit-scrollbar-thumb:hover {
- background-color: rgb(148, 146, 146);
- cursor: pointer;
- }
- p {
- color: var(--black);
- margin: 0px;
- padding: 0px;
- word-break: break-all;
- }
- .container {
- display: flex;
- width: 100%;
- flex-direction: column;
- height: 100%;
- }
- `
- }
+ .top-bar-icon:hover {
+ color: var(--black);
+ }
+
+ .modal-button {
+ font-family: Roboto, sans-serif;
+ font-size: 16px;
+ color: var(--mdc-theme-primary);
+ background-color: transparent;
+ padding: 8px 10px;
+ border-radius: 5px;
+ border: none;
+ transition: all 0.3s ease-in-out;
+ }
+
+ .close-row {
+ width: 100%;
+ display: flex;
+ justify-content: flex-end;
+ height: 50px;
+ flex:0
+
+ }
+
+ .container-body {
+ width: 100%;
+ display: flex;
+ flex-direction: column;
+ flex-grow: 1;
+ overflow:auto;
+ margin-top: 5px;
+ padding: 0px 6px;
+ box-sizing: border-box;
+ }
+
+ .container-body::-webkit-scrollbar-track {
+ background-color: whitesmoke;
+ border-radius: 7px;
+ }
+
+ .container-body::-webkit-scrollbar {
+ width: 6px;
+ border-radius: 7px;
+ background-color: whitesmoke;
+ }
+
+ .container-body::-webkit-scrollbar-thumb {
+ background-color: rgb(180, 176, 176);
+ border-radius: 7px;
+ transition: all 0.3s ease-in-out;
+ }
+
+ .container-body::-webkit-scrollbar-thumb:hover {
+ background-color: rgb(148, 146, 146);
+ cursor: pointer;
+ }
+
+ p {
+ color: var(--black);
+ margin: 0px;
+ padding: 0px;
+ word-break: break-all;
+ }
+
+ .container {
+ display: flex;
+ width: 100%;
+ flex-direction: column;
+ height: 100%;
+ }
+
+ .chat-right-panel-label {
+ font-family: Montserrat, sans-serif;
+ color: var(--group-header);
+ padding: 5px;
+ font-size: 13px;
+ user-select: none;
+ }
+
+ .group-info {
+ display: flex;
+ flex-direction: column;
+ justify-content: flex-start;
+ gap: 10px;
+ }
+
+ .group-name {
+ font-family: Raleway, sans-serif;
+ font-size: 20px;
+ color: var(--chat-bubble-msg-color);
+ text-align: center;
+ user-select: none;
+ }
+
+ .group-description {
+ font-family: Roboto, sans-serif;
+ color: var(--chat-bubble-msg-color);
+ letter-spacing: 0.3px;
+ font-weight: 300;
+ font-size: 14px;
+ margin-top: 15px;
+ word-break: break-word;
+ user-select: none;
+ }
+
+ .group-subheader {
+ font-family: Montserrat, sans-serif;
+ font-size: 14px;
+ color: var(--chat-bubble-msg-color);
+ }
+
+ .group-data {
+ font-family: Roboto, sans-serif;
+ letter-spacing: 0.3px;
+ font-weight: 300;
+ font-size: 14px;
+ color: var(--chat-bubble-msg-color);
+ }
+`
+}
firstUpdated() {
this.viewElement = this.shadowRoot.getElementById('viewElement');
@@ -167,20 +222,20 @@ class ChatRightPanel extends LitElement {
}
async unitFee(txType) {
- const myNode = window.parent.reduxStore.getState().app.nodeConfig.knownNodes[window.parent.reduxStore.getState().app.nodeConfig.node]
- const nodeUrl = myNode.protocol + '://' + myNode.domain + ':' + myNode.port
- const url = `${nodeUrl}/transactions/unitfee?txType=${txType}`
- let fee = null
+ const myNode = window.parent.reduxStore.getState().app.nodeConfig.knownNodes[window.parent.reduxStore.getState().app.nodeConfig.node];
+ const nodeUrl = myNode.protocol + '://' + myNode.domain + ':' + myNode.port;
+ const url = `${nodeUrl}/transactions/unitfee?txType=${txType}`;
+ let fee = null;
try {
- const res = await fetch(url)
- const data = await res.json()
- fee = (Number(data) / 1e8).toFixed(3)
+ const res = await fetch(url);
+ const data = await res.json();
+ fee = (Number(data) / 1e8).toFixed(3);
} catch (error) {
- fee = null
+ fee = null;
}
- return fee
+ return fee;
}
async getLastRef() {
@@ -188,7 +243,7 @@ class ChatRightPanel extends LitElement {
type: "api",
url: `/addresses/lastreference/${this.selectedAddress.address}`,
})
- return myRef
+ return myRef;
}
getTxnRequestResponse(txnResponse, reference) {
@@ -381,7 +436,8 @@ class ChatRightPanel extends LitElement {
}
}
render() {
- console.log('this.groupMembers', this.groupMembers)
+ console.log('this.groupMembers', this.groupMembers);
+ console.log(5, "Chat Right Panel Here");
const owner = this.groupAdmin.filter((admin)=> admin.address === this.leaveGroupObj.owner)
return html`
@@ -389,42 +445,44 @@ class ChatRightPanel extends LitElement {
this.toggle(false)} style="margin: 0px 10px" icon="vaadin:close" slot="icon">
-
${this.leaveGroupObj && this.leaveGroupObj.groupName}
-
${this.leaveGroupObj && this.leaveGroupObj.description}
-
Members: ${this.leaveGroupObj && this.leaveGroupObj.memberCount}
-
-
Date created : ${new Date(this.leaveGroupObj.created).toLocaleDateString("en-US")}
-
-
Group Owner
- ${owner.map((item) => {
- return html`
{}}
- chatInfo=${JSON.stringify(item)}
- >`
- })}
-
Admins
- ${this.groupAdmin.map((item) => {
- return html`
{}}
- chatInfo=${JSON.stringify(item)}
- >`
- })}
-
Members
- ${this.groupMembers.map((item) => {
- return html`
{
- console.log({ val })
- this.selectedHead = val
- this.isOpenLeaveModal = true
- }}
- chatInfo=${JSON.stringify(item)}
- >`
- })}
-
+
${this.leaveGroupObj && this.leaveGroupObj.groupName}
+
+
${this.leaveGroupObj && this.leaveGroupObj.description}
+
+
+
+
+
GROUP OWNER
+ ${owner.map((item) => {
+ return html`
{}}
+ chatInfo=${JSON.stringify(item)}
+ >`
+ })}
+
ADMINS
+ ${this.groupAdmin.map((item) => {
+ return html`
{}}
+ chatInfo=${JSON.stringify(item)}
+ >`
+ })}
+
MEMBERS
+ ${this.groupMembers.map((item) => {
+ return html`
{
+ console.log({ val })
+ this.selectedHead = val
+ this.isOpenLeaveModal = true
+ }}
+ chatInfo=${JSON.stringify(item)}
+ >`
+ })}
+
+
