-
+
+
+ ${repliedToData && html`
+
+ `}
+
this.showBlockUserModal()}
.showBlockIconFunc=${(props) => this.showBlockIconFunc(props)}
.showBlockAddressIcon=${this.showBlockAddressIcon}
+ .originalMessageSignature=${this.messageObj.signature}
+ .setRepliedToSignature=${this.setRepliedToSignature}
+ .repliedToSignature=${this.repliedToSignature}
@blur=${() => this.showBlockIconFunc(false)}
>
@@ -250,7 +299,10 @@ class ChatMenu extends LitElement {
showBlockUserModal: {type: Function},
toblockaddress: { type: String, attribute: true },
showBlockIconFunc: {type: Function},
- showBlockAddressIcon: {type: Boolean}
+ showBlockAddressIcon: {type: Boolean},
+ originalMessageSignature: {type: String},
+ setRepliedToSignature: {type: Function},
+ repliedToSignature: {type: String},
}
}
@@ -278,13 +330,16 @@ class ChatMenu extends LitElement {
render() {
return html`
- {
@@ -475,7 +474,7 @@ class ChatPage extends LitElement {
} else {
const getInitialMessages = await parentEpml.request('apiCall', {
type: 'api',
- url: `/chat/messages?txGroupId=${Number(this._chatId)}&limit=20&reverse=true&before=${scrollElement.messageObj.timestamp}`,
+ url: `/chat/messages?txGroupId=${Number(this._chatId)}&limit=20&reverse=true&before=${scrollElement.messageObj.timestamp}&haschatreference=false`,
});
@@ -504,7 +503,7 @@ class ChatPage extends LitElement {
async processMessages(messages, isInitial) {
const findNewMessages = messages.map(async(msg)=> {
- console.log({msg})
+
let msgItem = msg
try {
const response = await parentEpml.request('apiCall', {
@@ -521,7 +520,7 @@ class ChatPage extends LitElement {
editedTimestamp : response[0].timestamp
}
}
- console.log({response})
+
} catch (error) {
console.log(error)
}
@@ -547,7 +546,7 @@ class ChatPage extends LitElement {
const findNewMessages2 = decodedMessages.map(async(msg)=> {
- console.log({msg})
+
let parsedMessageObj = msg
try {
parsedMessageObj = JSON.parse(msg.decodedMessage)
@@ -622,15 +621,58 @@ class ChatPage extends LitElement {
setTimeout(() => this.downElementObserver(), 500)
} else {
- messages.forEach((eachMessage) => {
-
- const _eachMessage = this.decodeMessage(eachMessage)
-
-
- this.renderNewMessage(_eachMessage)
+
+ const findNewMessages2 = messages.map(async(msg)=> {
+ const _eachMessage = this.decodeMessage(msg)
+ let parsedMessageObj = _eachMessage
+ try {
+ parsedMessageObj = JSON.parse(_eachMessage.decodedMessage)
+ } catch (error) {
+ return msg
+ }
+
+
+ let msgItem = _eachMessage
+ try {
+ if(parsedMessageObj.repliedTo){
+ const response = await parentEpml.request('apiCall', {
+ type: 'api',
+ url: `/chat/messages?chatreference=${parsedMessageObj.repliedTo}&reverse=true&involving=${_eachMessage.recipient}&involving=${_eachMessage.sender}`,
+ });
+
+ if(response && Array.isArray(response) && response.length !== 0){
+
+ msgItem = {
+ ..._eachMessage,
+ repliedToData : this.decodeMessage(response[0])
+ }
+ } else {
+ const response2 = await parentEpml.request('apiCall', {
+ type: 'api',
+ url: `/chat/messages?reference=${parsedMessageObj.repliedTo}&reverse=true&involving=${_eachMessage.recipient}&involving=${_eachMessage.sender}`,
+ });
+ if(response2 && Array.isArray(response2) && response2.length !== 0){
+
+ msgItem = {
+ ..._eachMessage,
+ repliedToData : this.decodeMessage(response2[0])
+ }
+ }
+ }
+
+ }
+
+
+ } catch (error) {
+ console.log(error)
+ }
+
+
+ this.renderNewMessage(msgItem)
})
+ await Promise.all(findNewMessages2)
// this.newMessages = this.newMessages.concat(_newMessages)
@@ -654,11 +696,9 @@ class ChatPage extends LitElement {
// set edited message in chat editor
setEditedMessageObj(messageObj) {
- console.log(messageObj, "Edited Message Object Here")
this.editedMessageObj = {...messageObj};
this.repliedToMessageObj = null;
this.requestUpdate();
- console.log(this.editedMessageObj);
}
closeEditMessageContainer() {
@@ -725,7 +765,17 @@ class ChatPage extends LitElement {
}
async renderNewMessage(newMessage) {
+ if(newMessage.chatReference){
+ const findOriginalMessageIndex = this.messagesRendered.findIndex(msg=> msg.reference === newMessage.chatReference || (msg.chatReference && msg.chatReference === newMessage.chatReference) )
+ if(findOriginalMessageIndex !== -1){
+ const newMessagesRendered = [...this.messagesRendered]
+ newMessagesRendered[findOriginalMessageIndex] = {...newMessage, timestamp: newMessagesRendered[findOriginalMessageIndex].timestamp, editedTimestamp: newMessage.timestamp }
+ this.messagesRendered = newMessagesRendered
+ await this.getUpdateComplete();
+ }
+ return
+ }
const viewElement = this.shadowRoot.querySelector('chat-scroller').shadowRoot.getElementById('viewElement');
if (newMessage.sender === this.selectedAddress.address) {
@@ -761,11 +811,11 @@ class ChatPage extends LitElement {
if (this.isReceipient === true) {
// direct chat
- if (encodedMessageObj.isEncrypted === true && this._publicKey.hasPubKey === true) {
+ if (encodedMessageObj.isEncrypted === true && this._publicKey.hasPubKey === true && encodedMessageObj.data) {
let decodedMessage = window.parent.decryptChatMessage(encodedMessageObj.data, window.parent.reduxStore.getState().app.selectedAddress.keyPair.privateKey, this._publicKey.key, encodedMessageObj.reference)
decodedMessageObj = { ...encodedMessageObj, decodedMessage }
- } else if (encodedMessageObj.isEncrypted === false) {
+ } else if (encodedMessageObj.isEncrypted === false && encodedMessageObj.data) {
let bytesArray = window.parent.Base58.decode(encodedMessageObj.data)
let decodedMessage = new TextDecoder('utf-8').decode(bytesArray)
@@ -821,7 +871,6 @@ class ChatPage extends LitElement {
// Message Event
directSocket.onmessage = async (e) => {
-
if (initial === 0) {
const isReceipient = this.chatId.includes('direct')
@@ -835,13 +884,13 @@ class ChatPage extends LitElement {
const lastMessage = cachedData[cachedData.length - 1]
const newMessages = await parentEpml.request('apiCall', {
type: 'api',
- url: `/chat/messages?involving=${window.parent.reduxStore.getState().app.selectedAddress.address}&involving=${cid}&limit=20&reverse=true&after=${lastMessage.timestamp}`,
+ url: `/chat/messages?involving=${window.parent.reduxStore.getState().app.selectedAddress.address}&involving=${cid}&limit=20&reverse=true&after=${lastMessage.timestamp}&haschatreference=false`,
});
getInitialMessages = [...cachedData, ...newMessages]
} else {
getInitialMessages = await parentEpml.request('apiCall', {
type: 'api',
- url: `/chat/messages?involving=${window.parent.reduxStore.getState().app.selectedAddress.address}&involving=${cid}&limit=20&reverse=true`,
+ url: `/chat/messages?involving=${window.parent.reduxStore.getState().app.selectedAddress.address}&involving=${cid}&limit=20&reverse=true&haschatreference=false`,
});
@@ -852,8 +901,10 @@ class ChatPage extends LitElement {
initial = initial + 1
} else {
-
- this.processMessages(JSON.parse(e.data), false)
+ if(e.data){
+ this.processMessages(JSON.parse(e.data), false)
+ }
+
}
}
@@ -921,14 +972,14 @@ class ChatPage extends LitElement {
const newMessages = await parentEpml.request('apiCall', {
type: 'api',
- url: `/chat/messages?txGroupId=${groupId}&limit=20&reverse=true&after=${lastMessage.timestamp}`,
+ url: `/chat/messages?txGroupId=${groupId}&limit=20&reverse=true&after=${lastMessage.timestamp}&haschatreference=false`,
});
getInitialMessages = [...cachedData, ...newMessages]
} else {
getInitialMessages = await parentEpml.request('apiCall', {
type: 'api',
- url: `/chat/messages?txGroupId=${groupId}&limit=20&reverse=true`,
+ url: `/chat/messages?txGroupId=${groupId}&limit=20&reverse=true&haschatreference=false`,
});
@@ -939,8 +990,10 @@ class ChatPage extends LitElement {
initial = initial + 1
} else {
-
- this.processMessages(JSON.parse(e.data), false)
+ if(e.data){
+ this.processMessages(JSON.parse(e.data), false)
+ }
+
}
}
@@ -991,12 +1044,11 @@ class ChatPage extends LitElement {
this.isLoading = true;
this.chatEditor.disable();
const messageText = this.mirrorChatInput.value;
-
// Format and Sanitize Message
const sanitizedMessage = messageText.replace(/ /gi, ' ').replace(//gi, '\n');
const trimmedMessage = sanitizedMessage.trim();
- console.log('is replied', this.repliedToMessageObj)
+
if (/^\s*$/.test(trimmedMessage)) {
this.isLoading = false;
@@ -1014,7 +1066,7 @@ class ChatPage extends LitElement {
}
typeMessage = 'reply'
const messageObject = {
- messageText,
+ messageText: trimmedMessage,
images: [''],
repliedTo: chatReference,
version: 1
@@ -1022,23 +1074,31 @@ class ChatPage extends LitElement {
const stringifyMessageObject = JSON.stringify(messageObject)
this.sendMessage(stringifyMessageObject, typeMessage );
} else if (this.editedMessageObj) {
- let chatReference = this.repliedToMessageObj.reference
+ typeMessage = 'edit'
+ let chatReference = this.editedMessageObj.reference
- if(this.repliedToMessageObj.chatReference){
- chatReference = this.repliedToMessageObj.chatReference
+ if(this.editedMessageObj.chatReference){
+ chatReference = this.editedMessageObj.chatReference
}
- typeMessage = 'reply'
+
+ let message = ""
+ try {
+ const parsedMessageObj = JSON.parse(this.editedMessageObj.decodedMessage)
+ message = parsedMessageObj
+
+ } catch (error) {
+ message = this.messageObj.decodedMessage
+ }
const messageObject = {
- messageText,
- images: [''],
- repliedTo: chatReference,
- version: 1
+ ...message,
+ messageText: trimmedMessage,
+
}
const stringifyMessageObject = JSON.stringify(messageObject)
this.sendMessage(stringifyMessageObject, typeMessage, chatReference);
} else {
const messageObject = {
- messageText,
+ messageText: trimmedMessage,
images: [''],
repliedTo: '',
version: 1
@@ -1049,7 +1109,7 @@ class ChatPage extends LitElement {
}
async sendMessage(messageText, typeMessage, chatReference) {
- console.log({messageText}, 'hello')
+
this.isLoading = true;
let _reference = new Uint8Array(64);
@@ -1074,7 +1134,7 @@ class ChatPage extends LitElement {
isText: 1
}
});
- console.log({chatResponse})
+
_computePow(chatResponse)
} else {
let groupResponse = await parentEpml.request('chat', {
diff --git a/qortal-ui-plugins/plugins/core/components/ChatScroller.js b/qortal-ui-plugins/plugins/core/components/ChatScroller.js
index db991014..3db65871 100644
--- a/qortal-ui-plugins/plugins/core/components/ChatScroller.js
+++ b/qortal-ui-plugins/plugins/core/components/ChatScroller.js
@@ -44,7 +44,6 @@ class ChatScroller extends LitElement {
render() {
- console.log({messages: this.messages})
return html`
`
) : html``
@@ -273,7 +274,6 @@ class ChatPage extends LitElement {
}
async firstUpdated() {
- const keys = await messagesCache.keys()
// TODO: Load and fetch messages from localstorage (maybe save messages to localstorage...)
@@ -282,7 +282,6 @@ class ChatPage extends LitElement {
this.emojiPickerHandler = this.shadowRoot.querySelector('.emoji-button');
this.mirrorChatInput = this.shadowRoot.getElementById('messageBox');
this.chatMessageInput = this.shadowRoot.getElementById('_chatEditorDOM');
-
document.addEventListener('keydown', (e) => {
if (!this.chatEditor.content.body.matches(':focus')) {
// WARNING: Deprecated methods from KeyBoard Event
@@ -387,9 +386,7 @@ class ChatPage extends LitElement {
}
async updated(changedProperties) {
- if (changedProperties.has('messagesRendered')) {
- let data = {}
-
+ if (changedProperties.has('messagesRendered')) {
const chatReference1 = this.isReceipient ? 'direct' : 'group';
const chatReference2 = this._chatId
if (chatReference1 && chatReference2) {
@@ -501,14 +498,18 @@ class ChatPage extends LitElement {
}
async processMessages(messages, isInitial) {
-
+ const isReceipient = this.chatId.includes('direct')
const findNewMessages = messages.map(async(msg)=> {
-
+
let msgItem = msg
try {
+ let msgQuery = `&involving=${msg.recipient}&involving=${msg.sender}`
+ if(!isReceipient){
+ msgQuery = `&txGroupId=${msg.txGroupId}`
+ }
const response = await parentEpml.request('apiCall', {
type: 'api',
- url: `/chat/messages?chatreference=${msg.reference}&reverse=true&involving=${msg.recipient}&involving=${msg.sender}`,
+ url: `/chat/messages?chatreference=${msg.reference}&reverse=true${msgQuery}`,
});
if(response && Array.isArray(response) && response.length !== 0){
@@ -557,10 +558,14 @@ class ChatPage extends LitElement {
let msgItem = msg
try {
+ let msgQuery = `&involving=${msg.recipient}&involving=${msg.sender}`
+ if(!isReceipient){
+ msgQuery = `&txGroupId=${msg.txGroupId}`
+ }
if(parsedMessageObj.repliedTo){
const response = await parentEpml.request('apiCall', {
type: 'api',
- url: `/chat/messages?chatreference=${parsedMessageObj.repliedTo}&reverse=true&involving=${msg.recipient}&involving=${msg.sender}`,
+ url: `/chat/messages?chatreference=${parsedMessageObj.repliedTo}&reverse=true${msgQuery}`,
});
if(response && Array.isArray(response) && response.length !== 0){
@@ -573,7 +578,7 @@ class ChatPage extends LitElement {
const response2 = await parentEpml.request('apiCall', {
type: 'api',
- url: `/chat/messages?reference=${parsedMessageObj.repliedTo}&reverse=true&involving=${msg.recipient}&involving=${msg.sender}`,
+ url: `/chat/messages?reference=${parsedMessageObj.repliedTo}&reverse=true${msgQuery}`,
});
if(response2 && Array.isArray(response2) && response2.length !== 0){
@@ -603,12 +608,7 @@ class ChatPage extends LitElement {
- b.timestamp
})
- const adjustMessages = () => {
-
- let __msg = [...this._messages]
- this._messages = []
- this._initialMessages = __msg
- }
+
// TODO: Determine number of initial messages by screen height...
this._initialMessages = this._messages
@@ -633,11 +633,16 @@ class ChatPage extends LitElement {
let msgItem = _eachMessage
+
+ let msgQuery = `&involving=${_eachMessage.recipient}&involving=${_eachMessage.sender}`
+ if(!isReceipient){
+ msgQuery = `&txGroupId=${_eachMessage.txGroupId}`
+ }
try {
if(parsedMessageObj.repliedTo){
const response = await parentEpml.request('apiCall', {
type: 'api',
- url: `/chat/messages?chatreference=${parsedMessageObj.repliedTo}&reverse=true&involving=${_eachMessage.recipient}&involving=${_eachMessage.sender}`,
+ url: `/chat/messages?chatreference=${parsedMessageObj.repliedTo}&reverse=true${msgQuery}`,
});
if(response && Array.isArray(response) && response.length !== 0){
@@ -650,7 +655,7 @@ class ChatPage extends LitElement {
const response2 = await parentEpml.request('apiCall', {
type: 'api',
- url: `/chat/messages?reference=${parsedMessageObj.repliedTo}&reverse=true&involving=${_eachMessage.recipient}&involving=${_eachMessage.sender}`,
+ url: `/chat/messages?reference=${parsedMessageObj.repliedTo}&reverse=true${msgQuery}`,
});
if(response2 && Array.isArray(response2) && response2.length !== 0){
@@ -686,6 +691,73 @@ class ChatPage extends LitElement {
}
// set replied to message in chat editor
+
+
+ getMessageSize(message){
+ try {
+
+ const messageText = message
+ // Format and Sanitize Message
+ const sanitizedMessage = messageText.replace(/ /gi, ' ').replace(//gi, '\n');
+ const trimmedMessage = sanitizedMessage.trim();
+ let messageObject = {};
+
+ if (this.repliedToMessageObj) {
+ let chatReference = this.repliedToMessageObj.reference
+
+ if(this.repliedToMessageObj.chatReference){
+ chatReference = this.repliedToMessageObj.chatReference
+ }
+
+ messageObject = {
+ messageText: trimmedMessage,
+ images: [''],
+ repliedTo: chatReference,
+ version: 1
+ }
+
+ } else if (this.editedMessageObj) {
+
+
+
+
+ let message = ""
+ try {
+ const parsedMessageObj = JSON.parse(this.editedMessageObj.decodedMessage)
+ message = parsedMessageObj
+
+ } catch (error) {
+ message = this.messageObj.decodedMessage
+ }
+ messageObject = {
+ ...message,
+ messageText: trimmedMessage,
+
+ }
+
+ } else {
+ messageObject = {
+ messageText: trimmedMessage,
+ images: [''],
+ repliedTo: '',
+ version: 1
+ }
+
+
+ }
+
+
+ const stringified = JSON.stringify(messageObject)
+ console.log({stringified})
+ const size = new Blob([stringified]).size;
+ this.chatMessageSize = size
+
+
+ } catch (error) {
+ console.error(error)
+ }
+
+ }
setRepliedToMessageObj(messageObj) {
this.repliedToMessageObj = {...messageObj};
@@ -1144,7 +1216,8 @@ class ChatPage extends LitElement {
timestamp: Date.now(),
groupID: Number(this._chatId),
hasReceipient: 0,
- hasChatReference: 0,
+ hasChatReference: typeMessage === 'edit' ? 1 : 0,
+ chatReference: chatReference,
message: messageText,
lastReference: reference,
proofOfWorkNonce: 0,
@@ -1190,6 +1263,8 @@ class ChatPage extends LitElement {
this.isLoading = false;
this.chatEditor.enable();
+ this.closeEditMessageContainer()
+ this.closeRepliedToContainer()
};
// Exec..
@@ -1406,7 +1481,8 @@ class ChatPage extends LitElement {
['drop', 'contextmenu', 'mouseup', 'click', 'touchend', 'keydown', 'blur', 'paste'].map(function (event) {
editor.content.body.addEventListener(event, function (e) {
-
+
+ editorConfig.getMessageSize(editorConfig.mirrorElement.value)
if (e.type === 'click') {
e.preventDefault();
@@ -1517,6 +1593,7 @@ class ChatPage extends LitElement {
};
const editorConfig = {
+ getMessageSize: this.getMessageSize,
mirrorElement: this.mirrorChatInput,
editableElement: this.chatMessageInput,
sendFunc: this._sendMessage,
diff --git a/qortal-ui-plugins/plugins/core/components/ChatScroller.js b/qortal-ui-plugins/plugins/core/components/ChatScroller.js
index 3db65871..0182fba8 100644
--- a/qortal-ui-plugins/plugins/core/components/ChatScroller.js
+++ b/qortal-ui-plugins/plugins/core/components/ChatScroller.js
@@ -44,6 +44,8 @@ class ChatScroller extends LitElement {
render() {
+ console.log({messages: this.messages})
+
return html`
+
Date: Mon, 24 Oct 2022 18:33:02 +0300
Subject: [PATCH 007/123] rough draft reply logic
---
qortal-ui-crypto/api/constants.js | 2 +-
.../api/transactions/chat/ChatTransaction.js | 5 +-
.../plugins/core/components/ChatPage.js | 125 ++++++++++++++++--
.../plugins/core/components/ChatScroller.js | 27 ++--
4 files changed, 131 insertions(+), 28 deletions(-)
diff --git a/qortal-ui-crypto/api/constants.js b/qortal-ui-crypto/api/constants.js
index b3fa7cd4..6193f595 100644
--- a/qortal-ui-crypto/api/constants.js
+++ b/qortal-ui-crypto/api/constants.js
@@ -249,7 +249,7 @@ const ERROR_CODES = {
1000: "Not yet released."
}
-const CHAT_REFERENCE_FEATURE_TRIGGER_TIMESTAMP = 9999999999999
+const CHAT_REFERENCE_FEATURE_TRIGGER_TIMESTAMP = 0
const QORT_DECIMALS = 1e8
diff --git a/qortal-ui-crypto/api/transactions/chat/ChatTransaction.js b/qortal-ui-crypto/api/transactions/chat/ChatTransaction.js
index a53a0f81..d368e8ca 100644
--- a/qortal-ui-crypto/api/transactions/chat/ChatTransaction.js
+++ b/qortal-ui-crypto/api/transactions/chat/ChatTransaction.js
@@ -82,16 +82,17 @@ export default class ChatTransaction extends ChatBase {
this._isText,
this._feeBytes
)
-
+ console.log('updated test')
// After the feature trigger timestamp we need to include chat reference
if (new Date(this._timestamp).getTime() >= CHAT_REFERENCE_FEATURE_TRIGGER_TIMESTAMP) {
params.push(this._hasChatReference)
if (this._hasChatReference[0] == 1) {
+ console.log('past through', this._chatReference)
params.push(this._chatReference)
}
}
-
+ console.log({params})
return params;
}
}
diff --git a/qortal-ui-plugins/plugins/core/components/ChatPage.js b/qortal-ui-plugins/plugins/core/components/ChatPage.js
index 59a784da..0ce9de05 100644
--- a/qortal-ui-plugins/plugins/core/components/ChatPage.js
+++ b/qortal-ui-plugins/plugins/core/components/ChatPage.js
@@ -503,9 +503,36 @@ class ChatPage extends LitElement {
async processMessages(messages, isInitial) {
+ const findNewMessages = messages.map(async(msg)=> {
+ console.log({msg})
+ let msgItem = msg
+ try {
+ const response = await parentEpml.request('apiCall', {
+ type: 'api',
+ url: `/chat/messages?chatreference=${msg.reference}&reverse=true&involving=${msg.recipient}&involving=${msg.sender}`,
+ });
+
+ if(response && Array.isArray(response) && response.length !== 0){
+ let responseItem = {...response[0]}
+ delete responseItem.timestamp
+ msgItem = {
+ ...msg,
+ ...responseItem,
+ editedTimestamp : response[0].timestamp
+ }
+ }
+ console.log({response})
+ } catch (error) {
+ console.log(error)
+ }
+
+ return msgItem
+ })
+ const updateMessages = await Promise.all(findNewMessages)
+
if (isInitial) {
- this.messages = messages.map((eachMessage) => {
+ const decodedMessages = updateMessages.map((eachMessage) => {
if (eachMessage.isText === true) {
this.messageSignature = eachMessage.signature
@@ -518,7 +545,61 @@ class ChatPage extends LitElement {
}
})
- this._messages = [...this.messages].sort(function (a, b) {
+
+ const findNewMessages2 = decodedMessages.map(async(msg)=> {
+ console.log({msg})
+ let parsedMessageObj = msg
+ try {
+ parsedMessageObj = JSON.parse(msg.decodedMessage)
+ } catch (error) {
+ return msg
+ }
+
+
+ let msgItem = msg
+ try {
+ if(parsedMessageObj.repliedTo){
+ const response = await parentEpml.request('apiCall', {
+ type: 'api',
+ url: `/chat/messages?chatreference=${parsedMessageObj.repliedTo}&reverse=true&involving=${msg.recipient}&involving=${msg.sender}`,
+ });
+
+ if(response && Array.isArray(response) && response.length !== 0){
+
+ msgItem = {
+ ...msg,
+ repliedToData : this.decodeMessage(response[0])
+ }
+ } else {
+
+ const response2 = await parentEpml.request('apiCall', {
+ type: 'api',
+ url: `/chat/messages?reference=${parsedMessageObj.repliedTo}&reverse=true&involving=${msg.recipient}&involving=${msg.sender}`,
+ });
+
+ if(response2 && Array.isArray(response2) && response2.length !== 0){
+
+ msgItem = {
+ ...msg,
+ repliedToData : this.decodeMessage(response2[0])
+ }
+ }
+ }
+
+ }
+
+
+ } catch (error) {
+ console.log(error)
+ }
+
+ return msgItem
+ })
+ const updateMessages2 = await Promise.all(findNewMessages2)
+
+
+
+ this._messages = updateMessages2.sort(function (a, b) {
return a.timestamp
- b.timestamp
})
@@ -905,7 +986,8 @@ class ChatPage extends LitElement {
// need whole original message object, transform the data and put it in local storage
// create new var called repliedToData and use that to modify the UI
// find specific object property in local
-
+ let typeMessage = 'regular';
+
this.isLoading = true;
this.chatEditor.disable();
const messageText = this.mirrorChatInput.value;
@@ -914,6 +996,8 @@ class ChatPage extends LitElement {
const sanitizedMessage = messageText.replace(/ /gi, ' ').replace(//gi, '\n');
const trimmedMessage = sanitizedMessage.trim();
+ console.log('is replied', this.repliedToMessageObj)
+
if (/^\s*$/.test(trimmedMessage)) {
this.isLoading = false;
this.chatEditor.enable();
@@ -923,14 +1007,35 @@ class ChatPage extends LitElement {
let err1string = get("chatpage.cchange24");
parentEpml.request('showSnackBar', `${err1string}`);
} else if (this.repliedToMessageObj) {
+ let chatReference = this.repliedToMessageObj.reference
+
+ if(this.repliedToMessageObj.chatReference){
+ chatReference = this.repliedToMessageObj.chatReference
+ }
+ typeMessage = 'reply'
const messageObject = {
messageText,
images: [''],
- repliedTo: this.repliedToMessageObj.signature,
+ repliedTo: chatReference,
version: 1
}
const stringifyMessageObject = JSON.stringify(messageObject)
- this.sendMessage(stringifyMessageObject);
+ this.sendMessage(stringifyMessageObject, typeMessage );
+ } else if (this.editedMessageObj) {
+ let chatReference = this.repliedToMessageObj.reference
+
+ if(this.repliedToMessageObj.chatReference){
+ chatReference = this.repliedToMessageObj.chatReference
+ }
+ typeMessage = 'reply'
+ const messageObject = {
+ messageText,
+ images: [''],
+ repliedTo: chatReference,
+ version: 1
+ }
+ const stringifyMessageObject = JSON.stringify(messageObject)
+ this.sendMessage(stringifyMessageObject, typeMessage, chatReference);
} else {
const messageObject = {
messageText,
@@ -939,11 +1044,12 @@ class ChatPage extends LitElement {
version: 1
}
const stringifyMessageObject = JSON.stringify(messageObject)
- this.sendMessage(stringifyMessageObject);
+ this.sendMessage(stringifyMessageObject, typeMessage);
}
}
- async sendMessage(messageText) {
+ async sendMessage(messageText, typeMessage, chatReference) {
+ console.log({messageText}, 'hello')
this.isLoading = true;
let _reference = new Uint8Array(64);
@@ -959,7 +1065,8 @@ class ChatPage extends LitElement {
timestamp: Date.now(),
recipient: this._chatId,
recipientPublicKey: this._publicKey.key,
- hasChatReference: 0,
+ hasChatReference: typeMessage === 'edit' ? 1 : 0,
+ chatReference: chatReference,
message: messageText,
lastReference: reference,
proofOfWorkNonce: 0,
@@ -967,7 +1074,7 @@ class ChatPage extends LitElement {
isText: 1
}
});
-
+ console.log({chatResponse})
_computePow(chatResponse)
} else {
let groupResponse = await parentEpml.request('chat', {
diff --git a/qortal-ui-plugins/plugins/core/components/ChatScroller.js b/qortal-ui-plugins/plugins/core/components/ChatScroller.js
index 14d314be..db991014 100644
--- a/qortal-ui-plugins/plugins/core/components/ChatScroller.js
+++ b/qortal-ui-plugins/plugins/core/components/ChatScroller.js
@@ -44,6 +44,7 @@ class ChatScroller extends LitElement {
render() {
+ console.log({messages: this.messages})
return html`
+
From e5d470843a827e432e31e818aba9ca9a63ab57c6 Mon Sep 17 00:00:00 2001
From: Phillip Lang Martinez
Date: Sat, 24 Sep 2022 19:39:01 +0300
Subject: [PATCH 003/123] save messages locally and load them if they exist
---
qortal-ui-plugins/package.json | 5 +-
.../plugins/core/components/ChatPage.js | 165 +++++++++++++++---
2 files changed, 140 insertions(+), 30 deletions(-)
diff --git a/qortal-ui-plugins/package.json b/qortal-ui-plugins/package.json
index af41573a..6a05c76c 100644
--- a/qortal-ui-plugins/package.json
+++ b/qortal-ui-plugins/package.json
@@ -19,7 +19,8 @@
"dependencies": {
"@material/mwc-list": "0.27.0",
"@material/mwc-select": "0.27.0",
- "emoji-picker-js": "https://github.com/Qortal/emoji-picker-js"
+ "emoji-picker-js": "https://github.com/Qortal/emoji-picker-js",
+ "localforage": "^1.10.0"
},
"devDependencies": {
"@babel/core": "7.19.1",
@@ -62,4 +63,4 @@
"engines": {
"node": ">=14.17.0"
}
-}
\ No newline at end of file
+}
diff --git a/qortal-ui-plugins/plugins/core/components/ChatPage.js b/qortal-ui-plugins/plugins/core/components/ChatPage.js
index f07cebdd..970029f3 100644
--- a/qortal-ui-plugins/plugins/core/components/ChatPage.js
+++ b/qortal-ui-plugins/plugins/core/components/ChatPage.js
@@ -2,7 +2,7 @@ import { LitElement, html, css } from 'lit'
import { render } from 'lit/html.js'
import { Epml } from '../../../epml.js'
import { use, get, translate, translateUnsafeHTML, registerTranslateConfig } from 'lit-translate'
-
+import localForage from "localforage";
registerTranslateConfig({
loader: lang => fetch(`/language/${lang}.json`).then(res => res.json())
})
@@ -20,6 +20,10 @@ import '@material/mwc-button'
import '@material/mwc-dialog'
import '@material/mwc-icon'
+const messagesCache = localForage.createInstance({
+ name: "messages-cache",
+});
+
const parentEpml = new Epml({ type: 'WINDOW', source: window.parent })
class ChatPage extends LitElement {
@@ -152,9 +156,12 @@ class ChatPage extends LitElement {
`
}
- firstUpdated() {
+ async firstUpdated() {
+ const keys = await messagesCache.keys()
+ console.log({ keys })
// TODO: Load and fetch messages from localstorage (maybe save messages to localstorage...)
+
// this.changeLanguage();
this.emojiPickerHandler = this.shadowRoot.querySelector('.emoji-button');
this.mirrorChatInput = this.shadowRoot.getElementById('messageBox');
@@ -263,6 +270,20 @@ class ChatPage extends LitElement {
parentEpml.imReady();
}
+ async updated(changedProperties) {
+ if (changedProperties.has('messagesRendered')) {
+ let data = {}
+ console.log('chatId', this._chatId)
+ console.log(this.isReceipient)
+ const chatReference1 = this.isReceipient ? 'direct' : 'group';
+ const chatReference2 = this._chatId
+ if (chatReference1 && chatReference2) {
+ await messagesCache.setItem(`${chatReference1}-${chatReference2}`, this.messagesRendered);
+ }
+
+ }
+ }
+
changeLanguage() {
const checkLanguage = localStorage.getItem('qortalLanguage')
@@ -293,25 +314,60 @@ class ChatPage extends LitElement {
async getOldMessage(scrollElement) {
- if (this._messages.length <= 15 && this._messages.length >= 1) { // 15 is the default number of messages...
- let __msg = [...this._messages]
- this._messages = []
- this.messagesRendered = [...__msg, ...this.messagesRendered]
+
+
+ if (this.isReceipient) {
+ const getInitialMessages = await parentEpml.request('apiCall', {
+ type: 'api',
+ url: `/chat/messages?involving=${window.parent.reduxStore.getState().app.selectedAddress.address}&involving=${this._chatId}&limit=20&reverse=true&before=${scrollElement.messageObj.timestamp}`,
+ });
+
+ const decodeMsgs = getInitialMessages.map((eachMessage) => {
+
+ return this.decodeMessage(eachMessage)
+
+
+
+
+
+ })
+
+ this.messagesRendered = [...decodeMsgs, ...this.messagesRendered].sort(function (a, b) {
+ return a.timestamp
+ - b.timestamp
+ })
await this.getUpdateComplete();
scrollElement.scrollIntoView({ behavior: 'auto', block: 'center' });
- return { oldMessages: __msg, scrollElement: scrollElement }
- } else if (this._messages.length > 15) {
- this.messagesRendered = [...this._messages.splice(this._messages.length - 15), ...this.messagesRendered]
- await this.getUpdateComplete();
- scrollElement.scrollIntoView({ behavior: 'auto', block: 'center' });
- return { oldMessages: this._messages.splice(this._messages.length - 15), scrollElement: scrollElement }
} else {
+ const getInitialMessages = await parentEpml.request('apiCall', {
+ type: 'api',
+ url: `/chat/messages?txGroupId=${Number(this._chatId)}&limit=20&reverse=true&before=${scrollElement.messageObj.timestamp}`,
+ });
+
+
+ const decodeMsgs = getInitialMessages.map((eachMessage) => {
+
+ return this.decodeMessage(eachMessage)
+
+
+
+
+
+ })
+
+ this.messagesRendered = [...decodeMsgs, ...this.messagesRendered].sort(function (a, b) {
+ return a.timestamp
+ - b.timestamp
+ })
+ await this.getUpdateComplete();
+
+ scrollElement.scrollIntoView({ behavior: 'auto', block: 'center' });
- return false
}
+
}
async processMessages(messages, isInitial) {
@@ -344,7 +400,7 @@ class ChatPage extends LitElement {
}
// TODO: Determine number of initial messages by screen height...
- this._messages.length <= 15 ? adjustMessages() : this._initialMessages = this._messages.splice(this._messages.length - 15);
+ this._initialMessages = this._messages
this.messagesRendered = this._initialMessages
@@ -423,27 +479,27 @@ class ChatPage extends LitElement {
}
}
- async renderNewMessage(newMessage) {
+ async renderNewMessage(newMessage) {
const viewElement = this.shadowRoot.querySelector('chat-scroller').shadowRoot.getElementById('viewElement');
if (newMessage.sender === this.selectedAddress.address) {
- this.messagesRendered = [...this.messagesRendered, newMessage]
- await this.getUpdateComplete();
+ this.messagesRendered = [...this.messagesRendered, newMessage]
+ await this.getUpdateComplete();
viewElement.scrollTop = viewElement.scrollHeight;
} else if (this.isUserDown) {
// Append the message and scroll to the bottom if user is down the page
- this.messagesRendered = [...this.messagesRendered, newMessage]
- await this.getUpdateComplete();
+ this.messagesRendered = [...this.messagesRendered, newMessage]
+ await this.getUpdateComplete();
viewElement.scrollTop = viewElement.scrollHeight;
} else {
- this.messagesRendered = [...this.messagesRendered, newMessage]
- await this.getUpdateComplete();
+ this.messagesRendered = [...this.messagesRendered, newMessage]
+ await this.getUpdateComplete();
this.showNewMesssageBar();
}
@@ -487,7 +543,7 @@ class ChatPage extends LitElement {
async fetchChatMessages(chatId) {
- const initDirect = (cid) => {
+ const initDirect = async (cid) => {
let initial = 0
@@ -507,6 +563,9 @@ class ChatPage extends LitElement {
directSocketLink = `ws://${nodeUrl}/websockets/chat/messages?involving=${window.parent.reduxStore.getState().app.selectedAddress.address}&involving=${cid}`;
}
+
+
+
const directSocket = new WebSocket(directSocketLink);
// Open Connection
@@ -516,13 +575,37 @@ class ChatPage extends LitElement {
}
// Message Event
- directSocket.onmessage = (e) => {
+ directSocket.onmessage = async (e) => {
if (initial === 0) {
+ const isReceipient = this.chatId.includes('direct')
+
+
+ const chatReference1 = isReceipient ? 'direct' : 'group';
+ const chatReference2 = this.chatId.split('/')[1];
+ const cachedData = await messagesCache.getItem(`${chatReference1}-${chatReference2}`);
+
+ let getInitialMessages = []
+ if (cachedData && cachedData.length !== 0) {
+ const lastMessage = cachedData[cachedData.length - 1]
+ const newMessages = await parentEpml.request('apiCall', {
+ type: 'api',
+ url: `/chat/messages?involving=${window.parent.reduxStore.getState().app.selectedAddress.address}&involving=${cid}&limit=20&reverse=true&after=${lastMessage.timestamp}`,
+ });
+ getInitialMessages = [...cachedData, ...newMessages]
+ } else {
+ getInitialMessages = await parentEpml.request('apiCall', {
+ type: 'api',
+ url: `/chat/messages?involving=${window.parent.reduxStore.getState().app.selectedAddress.address}&involving=${cid}&limit=20&reverse=true`,
+ });
+
+
+ }
+
+ this.processMessages(getInitialMessages, true)
- this.isLoadingMessages = true
- this.processMessages(JSON.parse(e.data), true)
initial = initial + 1
+
} else {
this.processMessages(JSON.parse(e.data), false)
@@ -578,12 +661,38 @@ class ChatPage extends LitElement {
}
// Message Event
- groupSocket.onmessage = (e) => {
+ groupSocket.onmessage = async (e) => {
if (initial === 0) {
+ const isGroup = this.chatId.includes('group')
+ const chatReference1 = isGroup ? 'group' : 'direct';
+ const chatReference2 = this.chatId.split('/')[1];
+
+ const cachedData = await messagesCache.getItem(`${chatReference1}-${chatReference2}`);
+
+ let getInitialMessages = []
+ if (cachedData && cachedData.length !== 0) {
+
+ const lastMessage = cachedData[cachedData.length - 1]
+
+ const newMessages = await parentEpml.request('apiCall', {
+ type: 'api',
+ url: `/chat/messages?txGroupId=${groupId}&limit=20&reverse=true&after=${lastMessage.timestamp}`,
+ });
+
+ getInitialMessages = [...cachedData, ...newMessages]
+ } else {
+ getInitialMessages = await parentEpml.request('apiCall', {
+ type: 'api',
+ url: `/chat/messages?txGroupId=${groupId}&limit=20&reverse=true`,
+ });
+
+
+ }
+
+
+ this.processMessages(getInitialMessages, true)
- this.isLoadingMessages = true
- this.processMessages(JSON.parse(e.data), true)
initial = initial + 1
} else {
From 2a3da268081819befa2fd0172f94e223d5f356d8 Mon Sep 17 00:00:00 2001
From: Justin Ferrari <‘justinwesleyferrari@gmail.com’>
Date: Sun, 2 Oct 2022 10:29:31 -0500
Subject: [PATCH 004/123] Finished design of the replies
---
.../plugins/core/components/ChatPage.js | 130 ++++++++++++++----
.../core/components/ChatScroller-css.js | 36 ++++-
.../plugins/core/components/ChatScroller.js | 36 +++--
3 files changed, 156 insertions(+), 46 deletions(-)
diff --git a/qortal-ui-plugins/plugins/core/components/ChatPage.js b/qortal-ui-plugins/plugins/core/components/ChatPage.js
index d572a6cb..52a09501 100644
--- a/qortal-ui-plugins/plugins/core/components/ChatPage.js
+++ b/qortal-ui-plugins/plugins/core/components/ChatPage.js
@@ -46,7 +46,7 @@ class ChatPage extends LitElement {
hideNewMesssageBar: { attribute: false },
chatEditorPlaceholder: { type: String },
messagesRendered: { type: Array },
- repliedToSignature: { type: String },
+ repliedToMessageObj: { type: Object },
}
}
@@ -64,12 +64,11 @@ class ChatPage extends LitElement {
.chat-text-area .typing-area {
display: flex;
- flex-direction: row;
+ flex-direction: column;
position: absolute;
bottom: 0;
width: 98%;
box-sizing: border-box;
- padding: 5px;
margin-bottom: 8px;
border: 1px solid var(--black);
border-radius: 10px;
@@ -91,10 +90,67 @@ class ChatPage extends LitElement {
border: none;
}
+ .repliedTo-container {
+ display: flex;
+ flex-direction: row;
+ justify-content: space-between;
+ align-items: center;
+ padding: 10px 20px 8px 10px;
+ }
+
+ .repliedTo-subcontainer {
+ display: flex;
+ flex-direction: row;
+ align-items: center;
+ gap: 15px;
+ }
+
+ .repliedTo-message {
+ display: flex;
+ flex-direction: column;
+ gap: 5px;
+ }
+
+
+ .senderName {
+ margin: 0;
+ color: var(--mdc-theme-primary);
+ font-weight: bold;
+ }
+
+ .original-message {
+ margin: 0;
+ }
+
+ .reply-icon {
+ width: 20px;
+ color: var(--mdc-theme-primary);
+ }
+
+ .close-icon {
+ color: #676b71;
+ width: 25px;
+ transition: all 0.1s ease-in-out;
+ }
+
+ .close-icon:hover {
+ cursor: pointer;
+ color: #494c50;
+ }
+
+ .chat-text-area .typing-area .chatbar {
+ width: auto;
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ height: auto;
+ padding: 5px;
+ }
+
.chat-text-area .typing-area .emoji-button {
width: 45px;
height: 40px;
- padding: 5px;
+ padding-top: 4px;
border: none;
outline: none;
background: transparent;
@@ -136,20 +192,38 @@ class ChatPage extends LitElement {
this.isPasteMenuOpen = false
this.chatEditorPlaceholder = this.renderPlaceholder()
this.messagesRendered = []
- this.repliedToSignature = ''
+ this.repliedToMessageObj = null
}
-
+
render() {
-
return html`
${this.isLoadingMessages ? html` {};
this.showBlockUserModal = () => {};
}
@@ -338,14 +343,27 @@ class ChatMenu extends LitElement {
+ ${this.myAddress === this.originalMessage.sender ? (
+ html`
+
+ `
+ ) : html``}
From 912bfffabd95c66df47b23943de2b63942960d18 Mon Sep 17 00:00:00 2001
From: Phillip Lang Martinez ${translate("chatpage.cchange22")}
` : this.renderChatScroller(this._initialMessages)}
- this.showPrivateMessageModal()}
- .showBlockUserModal=${() => this.showBlockUserModal()}
- .showBlockIconFunc=${(props) => this.showBlockIconFunc(props)}
- .showBlockAddressIcon=${this.showBlockAddressIcon}
- .originalMessage=${this.messageObj}
- .setRepliedToMessageObj=${this.setRepliedToMessageObj}
- .focusChatEditor=${this.focusChatEditor}
- @blur=${() => this.showBlockIconFunc(false)}
- >
-
+ this.showPrivateMessageModal()}
+ .showBlockUserModal=${() => this.showBlockUserModal()}
+ .showBlockIconFunc=${(props) => this.showBlockIconFunc(props)}
+ .showBlockAddressIcon=${this.showBlockAddressIcon}
+ .originalMessage=${this.messageObj}
+ .setRepliedToMessageObj=${this.setRepliedToMessageObj}
+ .setEditedMessageObj=${this.setEditedMessageObj}
+ .focusChatEditor=${this.focusChatEditor}
+ .myAddress=${this.myAddress}
+ @blur=${() => this.showBlockIconFunc(false)}
+ >
+
-
-
-
+
`
@@ -291,8 +365,8 @@ class ChatPage extends LitElement {
.emojiPicker=${this.emojiPicker}
.escapeHTML=${escape}
.getOldMessage=${this.getOldMessage}
- .setRepliedToSignature=${this.setRepliedToSignature}
- .repliedToSignature=${this.repliedToSignature}
+ .setRepliedToMessageObj=${(val) => this.setRepliedToMessageObj(val)}
+ .focusChatEditor=${() => this.focusChatEditor()}
>
`
}
@@ -397,10 +471,22 @@ class ChatPage extends LitElement {
}
}
+
+ async setRepliedToMessageObj(messageObj) {
+ console.log(messageObj, "Replied To Message Object Here")
+ this.repliedToMessageObj = {...messageObj};
+ this.requestUpdate();
+ await this.updateComplete;
+ console.log(this.repliedToMessageObj);
+ }
- setRepliedToSignature(messageSignature) {
- console.log(messageSignature, "Replied To Message Signature Here")
- this.repliedToSignature = messageSignature;
+ closeRepliedToContainer() {
+ this.repliedToMessageObj = null;
+ this.requestUpdate();
+ }
+
+ focusChatEditor() {
+ this.chatEditor.focus();
}
/**
@@ -454,10 +540,6 @@ class ChatPage extends LitElement {
async renderNewMessage(newMessage) {
const viewElement = this.shadowRoot.querySelector('chat-scroller').shadowRoot.getElementById('viewElement');
- const downObserver = this.shadowRoot.querySelector('chat-scroller').shadowRoot.getElementById('downObserver');
- const li = document.createElement('li');
- li.innerHTML = this.chatMessageTemplate(newMessage);
- li.id = newMessage.signature;
if (newMessage.sender === this.selectedAddress.address) {
@@ -683,11 +765,11 @@ class ChatPage extends LitElement {
this.chatEditor.enable();
let err1string = get("chatpage.cchange24");
parentEpml.request('showSnackBar', `${err1string}`);
- } else if(this.repliedToSignature) {
+ } else if (this.repliedToMessageObj) {
const messageObject = {
messageText,
images: [''],
- repliedTo: this.repliedToSignature,
+ repliedTo: this.repliedToMessageObj.signature,
version: 1
}
const stringifyMessageObject = JSON.stringify(messageObject)
diff --git a/qortal-ui-plugins/plugins/core/components/ChatScroller-css.js b/qortal-ui-plugins/plugins/core/components/ChatScroller-css.js
index 898144a8..1be44de6 100644
--- a/qortal-ui-plugins/plugins/core/components/ChatScroller-css.js
+++ b/qortal-ui-plugins/plugins/core/components/ChatScroller-css.js
@@ -17,6 +17,10 @@ export const chatStyles = css`
--mdc-theme-secondary: var(--mdc-theme-primary);
}
+ * :focus-visible {
+ outline: none;
+ }
+
*::-webkit-scrollbar-track {
background: var(--scrollbarBG);
}
@@ -110,6 +114,8 @@ export const chatStyles = css`
.original-message {
position: relative;
+ display: flex;
+ flex-direction: column;
color: black;
line-height: 19px;
overflow-wrap: break-word;
@@ -120,8 +126,6 @@ export const chatStyles = css`
background-color: rgba(209, 209, 209, 0.79);
padding: 8px 5px 8px 25px;
white-space: nowrap;
- overflow: hidden;
- text-overflow: ellipsis;
}
.original-message:before {
@@ -131,7 +135,18 @@ export const chatStyles = css`
left: 10px;
height: 75%;
width: 2.6px;
- background-color: rgb(14, 190, 240);
+ background-color: var(--mdc-theme-primary);
+ }
+
+ .original-message-sender {
+ margin: 0 0 5px 0;
+ color: var(--mdc-theme-primary);
+ }
+
+ .replied-message {
+ margin: 0;
+ overflow: hidden;
+ text-overflow: ellipsis;
}
.message {
@@ -166,7 +181,7 @@ export const chatStyles = css`
display: none;
position: absolute;
top: -38px;
- right: 20px;
+ right: 25px;
}
.emoji {
@@ -229,6 +244,10 @@ export const chatStyles = css`
position: relative;
}
+ .container:focus-visible {
+ outline: none;
+ }
+
.menu-icon {
width: 100%;
padding: 5px;
@@ -238,6 +257,7 @@ export const chatStyles = css`
}
.menu-icon:hover {
+ border-radius: 5px;
background-color: #dad9d9;
transition: all 0.1s ease-in-out;
cursor: pointer;
@@ -249,11 +269,12 @@ export const chatStyles = css`
.tooltip:before {
content: attr(data-text);
+ display: none;
position: absolute;
top: -47px;
left: 50%;
transform: translateX(-50%);
- width: 90px;
+ width: auto;
padding: 10px;
border-radius: 10px;
background:#fff;
@@ -262,7 +283,8 @@ export const chatStyles = css`
box-shadow: rgba(149, 157, 165, 0.2) 0px 8px 24px;
font-size: 12px;
z-index: 5;
- display: none;
+ white-space: nowrap;
+ overflow: hidden;
}
.tooltip:hover:before {
@@ -285,7 +307,7 @@ export const chatStyles = css`
}
.block-user-container {
- display: block;
+ display: none;
position: absolute;
left: -5px;
}
diff --git a/qortal-ui-plugins/plugins/core/components/ChatScroller.js b/qortal-ui-plugins/plugins/core/components/ChatScroller.js
index f8a05c56..b8b52c9f 100644
--- a/qortal-ui-plugins/plugins/core/components/ChatScroller.js
+++ b/qortal-ui-plugins/plugins/core/components/ChatScroller.js
@@ -25,8 +25,8 @@ class ChatScroller extends LitElement {
initialMessages: { type: Array }, // First set of messages to load.. 15 messages max ( props )
messages: { type: Array },
hideMessages: { type: Array },
- setRepliedToSignature: {type: Function},
- repliedToSignature: {type: String},
+ setRepliedToMessageObj: { type: Function },
+ focusChatEditor: { type: Function }
}
}
@@ -55,8 +55,8 @@ class ChatScroller extends LitElement {
.escapeHTML=${this.escapeHTML}
.messageObj=${message}
.hideMessages=${this.hideMessages}
- .setRepliedToSignature=${this.setRepliedToSignature}
- .repliedToSignature=${this.repliedToSignature}
+ .setRepliedToMessageObj=${this.setRepliedToMessageObj}
+ .focusChatEditor=${this.focusChatEditor}
>
`
)}
@@ -149,8 +149,8 @@ class MessageTemplate extends LitElement {
openDialogPrivateMessage: {type: Boolean},
openDialogBlockUser: {type: Boolean},
showBlockAddressIcon: { type: Boolean },
- setRepliedToSignature: {type: Function},
- repliedToSignature: {type: String},
+ setRepliedToMessageObj: { type: Function },
+ focusChatEditor: { type: Function },
}
}
@@ -193,7 +193,6 @@ class MessageTemplate extends LitElement {
}
render() {
- console.log(this.messageObj, "here244")
const hidemsg = this.hideMessages
let message = ""
let repliedToData = null
@@ -252,7 +251,8 @@ class MessageTemplate extends LitElement {
`}
@@ -340,6 +379,13 @@ class ChatPage extends LitElement {
parentEpml.imReady();
}
+ updated(changedProperties) {
+ if (changedProperties && changedProperties.has('editedMessageObj')) {
+ console.log('yo123')
+ this.chatEditor.insertText(this.editedMessageObj.decodedMessage)
+ }
+ }
+
changeLanguage() {
const checkLanguage = localStorage.getItem('qortalLanguage')
@@ -366,6 +412,7 @@ class ChatPage extends LitElement {
.escapeHTML=${escape}
.getOldMessage=${this.getOldMessage}
.setRepliedToMessageObj=${(val) => this.setRepliedToMessageObj(val)}
+ .setEditedMessageObj=${(val) => this.setEditedMessageObj(val)}
.focusChatEditor=${() => this.focusChatEditor()}
>
`
@@ -471,15 +518,31 @@ class ChatPage extends LitElement {
}
}
+
+ // set replied to message in chat editor
- async setRepliedToMessageObj(messageObj) {
- console.log(messageObj, "Replied To Message Object Here")
+ setRepliedToMessageObj(messageObj) {
this.repliedToMessageObj = {...messageObj};
+ this.editedMessageObj = null;
this.requestUpdate();
- await this.updateComplete;
- console.log(this.repliedToMessageObj);
}
+ // set edited message in chat editor
+
+ setEditedMessageObj(messageObj) {
+ console.log(messageObj, "Edited Message Object Here")
+ this.editedMessageObj = {...messageObj};
+ this.repliedToMessageObj = null;
+ this.requestUpdate();
+ console.log(this.editedMessageObj);
+ }
+
+ closeEditMessageContainer() {
+ this.editedMessageObj = null;
+ this.chatEditor.resetValue();
+ this.requestUpdate();
+ }
+
closeRepliedToContainer() {
this.repliedToMessageObj = null;
this.requestUpdate();
diff --git a/qortal-ui-plugins/plugins/core/components/ChatScroller-css.js b/qortal-ui-plugins/plugins/core/components/ChatScroller-css.js
index 1be44de6..3e56949f 100644
--- a/qortal-ui-plugins/plugins/core/components/ChatScroller-css.js
+++ b/qortal-ui-plugins/plugins/core/components/ChatScroller-css.js
@@ -181,7 +181,7 @@ export const chatStyles = css`
display: none;
position: absolute;
top: -38px;
- right: 25px;
+ right: 5px;
}
.emoji {
@@ -235,12 +235,10 @@ export const chatStyles = css`
display: flex;
flex-direction: row;
align-items: center;
- gap: 5px;
background-color: white;
border: 1px solid #dad9d9;
border-radius: 5px;
height:100%;
- width: 100px;
position: relative;
}
@@ -250,7 +248,7 @@ export const chatStyles = css`
.menu-icon {
width: 100%;
- padding: 5px;
+ padding: 5px 7px;
display: flex;
align-items: center;
font-size: 13px;
@@ -307,7 +305,7 @@ export const chatStyles = css`
}
.block-user-container {
- display: none;
+ display: block;
position: absolute;
left: -5px;
}
diff --git a/qortal-ui-plugins/plugins/core/components/ChatScroller.js b/qortal-ui-plugins/plugins/core/components/ChatScroller.js
index b8b52c9f..14d314be 100644
--- a/qortal-ui-plugins/plugins/core/components/ChatScroller.js
+++ b/qortal-ui-plugins/plugins/core/components/ChatScroller.js
@@ -26,6 +26,7 @@ class ChatScroller extends LitElement {
messages: { type: Array },
hideMessages: { type: Array },
setRepliedToMessageObj: { type: Function },
+ setEditedMessageObj: { type: Function },
focusChatEditor: { type: Function }
}
}
@@ -56,6 +57,7 @@ class ChatScroller extends LitElement {
.messageObj=${message}
.hideMessages=${this.hideMessages}
.setRepliedToMessageObj=${this.setRepliedToMessageObj}
+ .setEditedMessageObj=${this.setEditedMessageObj}
.focusChatEditor=${this.focusChatEditor}
>
`
@@ -150,6 +152,7 @@ class MessageTemplate extends LitElement {
openDialogBlockUser: {type: Boolean},
showBlockAddressIcon: { type: Boolean },
setRepliedToMessageObj: { type: Function },
+ setEditedMessageObj: { type: Function },
focusChatEditor: { type: Function },
}
}
@@ -258,21 +261,23 @@ class MessageTemplate extends LitElement {
-
+ ${this.repliedToMessageObj && html`
+
+ this.closeRepliedToContainer()}
+ >
+
+ `}
+
+
+
+
+ -
@@ -202,20 +203,7 @@ class MessageTemplate extends LitElement {
try {
const parsedMessageObj = JSON.parse(this.messageObj.decodedMessage)
message = parsedMessageObj.messageText
- repliedToData = {
- "timestamp": 1663419371885,
- "txGroupId": 0,
- "reference": "5LuncmE2RsGVdQizkZLnjgqU8QozR2hHhkiSujUgywEfqAvm6RW4xZ7c9XjuMnb76bNmX2ntRNhnBF4ErvawM1dW",
- "senderPublicKey": "xmZXCYzGU2t3S6Ehm2zp4pVm83q9d143NKRgmiU1dXW",
- "sender": "Qj9aLrdK2FLQY6YssRQUkDmXNJCko2zF7e",
- "senderName": "GiseleH",
- "data": "3JLP9vViLoRPJ1Pqt2uC6Ufqf7wgTrs4HuV4Ltgwdnf5ekcBCCf5MTm2Sg3sXHeuVnCpoJAyVdqgAbr7tcBoq3soNZTjteusXjjW3NSMNcJEAadaTYC68xGXGmvK1jRyioPqGaKiXKzR2jPPRV5SyiPd66788Z2Rqt3VQB98rvronX5w5tE9UUWRor6bmMeVL3dj7fHYhLPPE5VBpCS9Eskti7vnTgDUQxnjfr",
- "isText": true,
- "isEncrypted": false,
- "signature": "3jWvhQKSDt4Zqeup5sLfyNksVVphFW5iF11PsTZzXQLCCPH9pDMqwNoKE2oe3DPYz47VbbLgJaAWMVA44z9dUr9U",
- "decodedMessage": "for TrentB512 who computer crashed your registered name in qortal for your level 3 account was TrentB512 https://exqlorer.com/address/Qf58otnEXeoyvD7dvYmfEGpQ64oMD3uvwM"
-
- }
+ repliedToData = this.messageObj.repliedToData
} catch (error) {
message = this.messageObj.decodedMessage
}
@@ -238,7 +226,14 @@ class MessageTemplate extends LitElement {
} else {
nameMenu = html`${this.messageObj.senderName ? this.messageObj.senderName : this.messageObj.sender}`
}
-
+ if(repliedToData){
+ try {
+ const parsedMsg = JSON.parse(repliedToData.decodedMessage)
+ repliedToData.decodedMessage = parsedMsg
+ } catch (error) {
+
+ }
+ }
return hideit ? html`` : html`
-
@@ -219,7 +218,10 @@ class MessageTemplate extends LitElement {
const nodeUrl = myNode.protocol + '://' + myNode.domain + ':' + myNode.port
const avatarUrl = `${nodeUrl}/arbitrary/THUMBNAIL/${this.messageObj.senderName}/qortal_avatar?async=true&apiKey=${myNode.apiKey}`
avatarImg = html`
`
}
+
if (this.messageObj.sender === this.myAddress) {
nameMenu = html`${this.messageObj.senderName ? this.messageObj.senderName : this.messageObj.sender}`
@@ -265,7 +267,7 @@ class MessageTemplate extends LitElement {
.showBlockUserModal=${() => this.showBlockUserModal()}
.showBlockIconFunc=${(props) => this.showBlockIconFunc(props)}
.showBlockAddressIcon=${this.showBlockAddressIcon}
- .originalMessage=${this.messageObj}
+ .originalMessage=${{...this.messageObj, message}}
.setRepliedToMessageObj=${this.setRepliedToMessageObj}
.setEditedMessageObj=${this.setEditedMessageObj}
.focusChatEditor=${this.focusChatEditor}
diff --git a/qortal-ui-plugins/plugins/core/components/ChatWelcomePage.js b/qortal-ui-plugins/plugins/core/components/ChatWelcomePage.js
index 782db47f..14735c00 100644
--- a/qortal-ui-plugins/plugins/core/components/ChatWelcomePage.js
+++ b/qortal-ui-plugins/plugins/core/components/ChatWelcomePage.js
@@ -402,7 +402,13 @@ class ChatWelcomePage extends LitElement {
};
const sendMessageRequest = async (isEncrypted, _publicKey) => {
-
+ const messageObject = {
+ messageText,
+ images: [''],
+ repliedTo: '',
+ version: 1
+ }
+ const stringifyMessageObject = JSON.stringify(messageObject)
let chatResponse = await parentEpml.request('chat', {
type: 18,
nonce: this.selectedAddress.nonce,
@@ -411,7 +417,7 @@ class ChatWelcomePage extends LitElement {
recipient: recipient,
recipientPublicKey: _publicKey,
hasChatReference: 0,
- message: messageText,
+ message: stringifyMessageObject,
lastReference: reference,
proofOfWorkNonce: 0,
isEncrypted: isEncrypted,
diff --git a/qortal-ui-plugins/plugins/core/components/NameMenu.js b/qortal-ui-plugins/plugins/core/components/NameMenu.js
index 17c39a88..9b1a9635 100644
--- a/qortal-ui-plugins/plugins/core/components/NameMenu.js
+++ b/qortal-ui-plugins/plugins/core/components/NameMenu.js
@@ -521,7 +521,13 @@ class NameMenu extends LitElement {
};
const sendMessageRequest = async (isEncrypted, _publicKey) => {
-
+ const messageObject = {
+ messageText,
+ images: [''],
+ repliedTo: '',
+ version: 1
+ }
+ const stringifyMessageObject = JSON.stringify(messageObject)
let chatResponse = await parentEpml.request('chat', {
type: 18,
nonce: this.selectedAddress.nonce,
@@ -530,7 +536,7 @@ class NameMenu extends LitElement {
recipient: recipient,
recipientPublicKey: _publicKey,
hasChatReference: 0,
- message: messageText,
+ message: stringifyMessageObject,
lastReference: reference,
proofOfWorkNonce: 0,
isEncrypted: isEncrypted,
diff --git a/qortal-ui-plugins/plugins/core/messaging/q-chat/q-chat.src.js b/qortal-ui-plugins/plugins/core/messaging/q-chat/q-chat.src.js
index 0eddc863..5de97d52 100644
--- a/qortal-ui-plugins/plugins/core/messaging/q-chat/q-chat.src.js
+++ b/qortal-ui-plugins/plugins/core/messaging/q-chat/q-chat.src.js
@@ -811,7 +811,13 @@ class Chat extends LitElement {
};
const sendMessageRequest = async (isEncrypted, _publicKey) => {
-
+ const messageObject = {
+ messageText,
+ images: [''],
+ repliedTo: '',
+ version: 1
+ }
+ const stringifyMessageObject = JSON.stringify(messageObject)
let chatResponse = await parentEpml.request('chat', {
type: 18,
nonce: this.selectedAddress.nonce,
@@ -820,7 +826,7 @@ class Chat extends LitElement {
recipient: recipient,
recipientPublicKey: _publicKey,
hasChatReference: 0,
- message: messageText,
+ message: stringifyMessageObject,
lastReference: reference,
proofOfWorkNonce: 0,
isEncrypted: isEncrypted,
From f749d8907736c71c676460c33b6efcb0522f10c7 Mon Sep 17 00:00:00 2001
From: Phillip Lang Martinez -
@@ -75,6 +77,16 @@ class ChatScroller extends LitElement {
`
}
+ shouldUpdate(changedProperties) {
+ // Only update element if prop1 changed.
+ return changedProperties.has('messages');
+ }
+
+ async updated(changedProperties) {
+
+ console.log({changedProperties})
+ }
+
async firstUpdated() {
this.viewElement = this.shadowRoot.getElementById('viewElement')
this.upObserverElement = this.shadowRoot.getElementById('upObserver')
From e708ffef82f55573170dbaba6aebd3de4b08aa9b Mon Sep 17 00:00:00 2001
From: Phillip Lang Martinez
-
-
- ${this.repliedToMessageObj && html`
-
-
-
-
-
${this.repliedToMessageObj.senderName ? this.repliedToMessageObj.senderName : this.repliedToMessageObj.sender}
- +
+
+
${this.myAddress === this.originalMessage.sender ? (
html`
+ ${this.isLoadingMessages ? html`
+ ${translate("chatpage.cchange22")}
` : this.renderChatScroller(this._initialMessages)} +
+ ${translate("welcomepage.wcchange6")}
+ {
+ this._sendMessage();
+ }
+ }>
+ ${translate("welcomepage.wcchange6")}
{
- let myRes
+ let myRes;
let myNameRes = await parentEpml.request('apiCall', {
type: 'api',
url: `/names/${receiverName}`
- })
-
+ });
if (myNameRes.error === 401) {
- myRes = false
+ myRes = false;
} else {
- myRes = myNameRes
- }
+ myRes = myNameRes;
+ };
+ return myRes;
+ };
- return myRes
- }
+ const myNameRes = await validateName(_recipient);
- const myNameRes = await validateName(_recipient)
if (!myNameRes) {
-
- recipient = _recipient
+ recipient = _recipient;
} else {
-
- recipient = myNameRes.owner
- }
+ recipient = myNameRes.owner;
+ };
let _reference = new Uint8Array(64);
window.crypto.getRandomValues(_reference);
- let sendTimestamp = Date.now()
+ let sendTimestamp = Date.now();
- let reference = window.parent.Base58.encode(_reference)
+ let reference = window.parent.Base58.encode(_reference);
const getAddressPublicKey = async () => {
- let isEncrypted
- let _publicKey
+ let isEncrypted;
+ let _publicKey;
let addressPublicKey = await parentEpml.request('apiCall', {
type: 'api',
url: `/addresses/publickey/${recipient}`
})
-
if (addressPublicKey.error === 102) {
- _publicKey = false
+ _publicKey = false;
// Do something here...
- let err1string = get("welcomepage.wcchange7")
- parentEpml.request('showSnackBar', `${err1string}`)
- this.isLoading = false
+ let err1string = get("welcomepage.wcchange7");
+ parentEpml.request('showSnackBar', `${err1string}`);
+ this.isLoading = false;
} else if (addressPublicKey !== false) {
- isEncrypted = 1
- _publicKey = addressPublicKey
- sendMessageRequest(isEncrypted, _publicKey)
+ isEncrypted = 1;
+ _publicKey = addressPublicKey;
+ sendMessageRequest(isEncrypted, _publicKey);
} else {
- isEncrypted = 0
- _publicKey = this.selectedAddress.address
- sendMessageRequest(isEncrypted, _publicKey)
- }
+ isEncrypted = 0;
+ _publicKey = this.selectedAddress.address;
+ sendMessageRequest(isEncrypted, _publicKey);
+ };
};
const sendMessageRequest = async (isEncrypted, _publicKey) => {
@@ -407,8 +405,8 @@ class ChatWelcomePage extends LitElement {
images: [''],
repliedTo: '',
version: 1
- }
- const stringifyMessageObject = JSON.stringify(messageObject)
+ };
+ const stringifyMessageObject = JSON.stringify(messageObject);
let chatResponse = await parentEpml.request('chat', {
type: 18,
nonce: this.selectedAddress.nonce,
@@ -424,7 +422,6 @@ class ChatWelcomePage extends LitElement {
isText: 1
}
})
-
_computePow(chatResponse)
}
diff --git a/qortal-ui-plugins/plugins/core/components/NameMenu.js b/qortal-ui-plugins/plugins/core/components/NameMenu.js
index 9b1a9635..8e1363c6 100644
--- a/qortal-ui-plugins/plugins/core/components/NameMenu.js
+++ b/qortal-ui-plugins/plugins/core/components/NameMenu.js
@@ -232,7 +232,11 @@ class NameMenu extends LitElement {
${translate("welcomepage.wcchange6")}
+ {
+ this._sendMessage();
+ }
+ }>
+ ${translate("welcomepage.wcchange6")}
Date: Sun, 30 Oct 2022 01:00:31 +0300
Subject: [PATCH 014/123] added reactions
---
.../plugins/core/components/ChatPage.js | 59 ++++++++++++++--
.../core/components/ChatScroller-css.js | 9 +++
.../plugins/core/components/ChatScroller.js | 69 ++++++++++++++++---
3 files changed, 123 insertions(+), 14 deletions(-)
diff --git a/qortal-ui-plugins/plugins/core/components/ChatPage.js b/qortal-ui-plugins/plugins/core/components/ChatPage.js
index f0168fc7..26a2d7d2 100644
--- a/qortal-ui-plugins/plugins/core/components/ChatPage.js
+++ b/qortal-ui-plugins/plugins/core/components/ChatPage.js
@@ -315,7 +315,6 @@ class ChatPage extends LitElement {
// Attach Event Handler
this.emojiPickerHandler.addEventListener('click', () => this.emojiPicker.togglePicker(this.emojiPickerHandler));
-
window.addEventListener('storage', () => {
const checkLanguage = localStorage.getItem('qortalLanguage')
use(checkLanguage)
@@ -429,6 +428,7 @@ class ChatPage extends LitElement {
.setRepliedToMessageObj=${(val) => this.setRepliedToMessageObj(val)}
.setEditedMessageObj=${(val) => this.setEditedMessageObj(val)}
.focusChatEditor=${() => this.focusChatEditor()}
+ .sendMessage=${(val)=> this._sendMessage(val)}
>
`
}
@@ -991,7 +991,7 @@ class ChatPage extends LitElement {
// Add to the messages... TODO: Save messages to localstorage and fetch from it to make it persistent...
}
- _sendMessage() {
+ _sendMessage(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
@@ -1007,9 +1007,58 @@ class ChatPage extends LitElement {
const sanitizedMessage = messageText.replace(/ /gi, ' ').replace(//gi, '\n');
const trimmedMessage = sanitizedMessage.trim();
-
+ if(outSideMsg && outSideMsg.type === 'reaction'){
+ typeMessage = 'edit'
+ let chatReference = outSideMsg.editedMessageObj.reference
- if (/^\s*$/.test(trimmedMessage)) {
+ if(outSideMsg.editedMessageObj.chatReference){
+ chatReference = outSideMsg.editedMessageObj.chatReference
+ }
+
+ let message = ""
+ try {
+ const parsedMessageObj = JSON.parse(outSideMsg.editedMessageObj.decodedMessage)
+ message = parsedMessageObj
+
+ } catch (error) {
+ message = outSideMsg.editedMessageObj.decodedMessage
+ }
+
+ let reactions = message.reactions || []
+ const findEmojiIndex = reactions.findIndex((reaction)=> reaction.type === outSideMsg.reaction)
+ if(findEmojiIndex !== -1){
+ let users = reactions[findEmojiIndex].users || []
+ const findUserIndex = users.find((user)=> user === this.selectedAddress.address )
+ if(findUserIndex !== -1){
+ users.splice(findUserIndex, 1)
+ } else {
+ users.push(this.selectedAddress.address)
+ }
+ reactions[findEmojiIndex] = {
+ ...reactions[findEmojiIndex],
+ qty: users.length,
+ users
+ }
+ if(users.length === 0){
+ reactions.splice(findEmojiIndex, 1)
+ }
+ } else {
+ reactions = [...reactions, {
+ type: outSideMsg.reaction,
+ qty: 1,
+ 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();
} else if (trimmedMessage.length >= 256) {
@@ -1046,7 +1095,7 @@ class ChatPage extends LitElement {
message = parsedMessageObj
} catch (error) {
- message = this.messageObj.decodedMessage
+ message = this.editedMessageObj.decodedMessage
}
const messageObject = {
...message,
diff --git a/qortal-ui-plugins/plugins/core/components/ChatScroller-css.js b/qortal-ui-plugins/plugins/core/components/ChatScroller-css.js
index 3e56949f..6e633de8 100644
--- a/qortal-ui-plugins/plugins/core/components/ChatScroller-css.js
+++ b/qortal-ui-plugins/plugins/core/components/ChatScroller-css.js
@@ -320,4 +320,13 @@ export const chatStyles = css`
padding: 3px 8px;
box-shadow: rgba(77, 77, 82, 0.2) 0px 7px 29px 0px;
}
+
+ .reactions-bg {
+ background-color: #3C4048;
+ border-radius: 10px;
+ padding: 4px;
+ color: white;
+ margin-right: 10px;
+ cursor: pointer
+ }
`
diff --git a/qortal-ui-plugins/plugins/core/components/ChatScroller.js b/qortal-ui-plugins/plugins/core/components/ChatScroller.js
index 0182fba8..5fe748a8 100644
--- a/qortal-ui-plugins/plugins/core/components/ChatScroller.js
+++ b/qortal-ui-plugins/plugins/core/components/ChatScroller.js
@@ -13,6 +13,8 @@ import '@vaadin/icon';
import '@material/mwc-button';
import '@material/mwc-dialog';
import '@material/mwc-icon';
+import { EmojiPicker } from 'emoji-picker-js';
+
const parentEpml = new Epml({ type: 'WINDOW', source: window.parent })
class ChatScroller extends LitElement {
@@ -27,7 +29,8 @@ class ChatScroller extends LitElement {
hideMessages: { type: Array },
setRepliedToMessageObj: { type: Function },
setEditedMessageObj: { type: Function },
- focusChatEditor: { type: Function }
+ focusChatEditor: { type: Function },
+ sendMessage: { type: Function}
}
}
@@ -44,8 +47,6 @@ class ChatScroller extends LitElement {
render() {
- console.log({messages: this.messages})
-
return html`
@@ -317,7 +329,9 @@ class ChatMenu extends LitElement {
setRepliedToMessageObj: { type: Function },
setEditedMessageObj: { type: Function },
focusChatEditor: { type: Function },
- myAddress: { type: Object }
+ myAddress: { type: Object },
+ emojiPicker: { attribute: false },
+ sendMessage: {type: Function}
}
}
@@ -341,6 +355,34 @@ class ChatMenu extends LitElement {
console.error('Copy to clipboard error:', err)
}
}
+
+
+
+ firstUpdated(){
+ this.emojiPicker = new EmojiPicker({
+ style: "twemoji",
+ twemojiBaseUrl: '/emoji/',
+ showPreview: false,
+ showVariants: false,
+ showAnimation: false,
+ position: 'top-start',
+ boxShadow: 'rgba(4, 4, 5, 0.15) 0px 0px 0px 1px, rgba(0, 0, 0, 0.24) 0px 8px 16px 0px'
+ });
+
+ this.emojiPicker.on('emoji', selection => {
+ this.sendMessage({
+ type: 'reaction',
+ editedMessageObj: this.originalMessage,
+ reaction: selection.emoji,
+
+
+ })
+
+ });
+
+ }
+
+
render() {
return html`
@@ -360,6 +402,15 @@ class ChatMenu extends LitElement {
}}">
+ ${this.repliedToMessageObj && html`
+ this.closeRepliedToContainer()}
- >
-
- `}
- ${this.editedMessageObj && html`
-
+ this.closeRepliedToContainer()}
+ >
-
+
+
+
-
@@ -274,7 +278,6 @@ class ChatPage extends LitElement {
}
async firstUpdated() {
-
// TODO: Load and fetch messages from localstorage (maybe save messages to localstorage...)
@@ -385,6 +388,7 @@ class ChatPage extends LitElement {
parentEpml.imReady();
}
+
async updated(changedProperties) {
if (changedProperties.has('messagesRendered')) {
const chatReference1 = this.isReceipient ? 'direct' : 'group';
diff --git a/qortal-ui-plugins/plugins/core/components/ChatWelcomePage.js b/qortal-ui-plugins/plugins/core/components/ChatWelcomePage.js
index 14735c00..3d99c340 100644
--- a/qortal-ui-plugins/plugins/core/components/ChatWelcomePage.js
+++ b/qortal-ui-plugins/plugins/core/components/ChatWelcomePage.js
@@ -230,7 +230,11 @@ class ChatWelcomePage extends LitElement {
-
-
-
- `}
-
-
-
@@ -61,6 +62,7 @@ class ChatScroller extends LitElement {
.setRepliedToMessageObj=${this.setRepliedToMessageObj}
.setEditedMessageObj=${this.setEditedMessageObj}
.focusChatEditor=${this.focusChatEditor}
+ .sendMessage=${this.sendMessage}
>
`
)}
@@ -82,11 +84,6 @@ class ChatScroller extends LitElement {
return changedProperties.has('messages');
}
- async updated(changedProperties) {
-
- console.log({changedProperties})
- }
-
async firstUpdated() {
this.viewElement = this.shadowRoot.getElementById('viewElement')
this.upObserverElement = this.shadowRoot.getElementById('upObserver')
@@ -166,6 +163,7 @@ class MessageTemplate extends LitElement {
setRepliedToMessageObj: { type: Function },
setEditedMessageObj: { type: Function },
focusChatEditor: { type: Function },
+ sendMessage: { type: Function }
}
}
@@ -210,11 +208,14 @@ class MessageTemplate extends LitElement {
render() {
const hidemsg = this.hideMessages
let message = ""
+ let reactions = []
let repliedToData = null
try {
const parsedMessageObj = JSON.parse(this.messageObj.decodedMessage)
message = parsedMessageObj.messageText
repliedToData = this.messageObj.repliedToData
+ reactions = parsedMessageObj.reactions || []
+
} catch (error) {
message = this.messageObj.decodedMessage
}
@@ -269,6 +270,16 @@ class MessageTemplate extends LitElement {
`}
+
+ ${reactions.map((reaction)=> {
+ return html` this.sendMessage({
+ type: 'reaction',
+ editedMessageObj: this.messageObj,
+ reaction: reaction.type,
+ })} class="reactions-bg" >${reaction.type} ${reaction.qty}`
+ })}
Date: Sat, 29 Oct 2022 22:11:40 -0500
Subject: [PATCH 015/123] Continued UI Edit Message
---
.../plugins/core/components/ChatPage.js | 50 ++++++++++++-------
.../core/components/ChatScroller-css.js | 2 +-
2 files changed, 34 insertions(+), 18 deletions(-)
diff --git a/qortal-ui-plugins/plugins/core/components/ChatPage.js b/qortal-ui-plugins/plugins/core/components/ChatPage.js
index 63a0dad5..8dc7083f 100644
--- a/qortal-ui-plugins/plugins/core/components/ChatPage.js
+++ b/qortal-ui-plugins/plugins/core/components/ChatPage.js
@@ -53,7 +53,8 @@ class ChatPage extends LitElement {
messagesRendered: { type: Array },
repliedToMessageObj: { type: Object },
editedMessageObj: { type: Object },
- chatMessageSize: { type: String}
+ chatMessageSize: { type: String },
+ iframeHeight: { type: Number }
}
}
@@ -63,6 +64,12 @@ class ChatPage extends LitElement {
scroll-behavior: smooth;
}
+ .chat-container {
+ display: grid;
+ grid-template-rows: minmax(66%, 92vh) minmax(40px, auto);
+ max-height: 100%;
+ }
+
.chat-text-area {
display: flex;
justify-content: center;
@@ -72,8 +79,6 @@ class ChatPage extends LitElement {
.chat-text-area .typing-area {
display: flex;
flex-direction: column;
- position: absolute;
- bottom: 0;
width: 98%;
box-sizing: border-box;
margin-bottom: 8px;
@@ -90,8 +95,6 @@ class ChatPage extends LitElement {
.chat-text-area .typing-area .chat-editor {
border-color: transparent;
flex: 1;
- max-height: 40px;
- height: 40px;
margin: 0;
padding: 0;
border: none;
@@ -210,11 +213,12 @@ class ChatPage extends LitElement {
this.messagesRendered = []
this.repliedToMessageObj = null
this.editedMessageObj = null
+ this.iframeHeight = 40;
}
render() {
return html`
-
+
${this.isLoadingMessages ? html`
@@ -256,7 +260,8 @@ class ChatPage extends LitElement {
`}
${translate("chatpage.cchange22")}
` : this.renderChatScroller(this._initialMessages)}
-
+
@@ -281,7 +286,6 @@ class ChatPage extends LitElement {
async firstUpdated() {
// TODO: Load and fetch messages from localstorage (maybe save messages to localstorage...)
-
// this.changeLanguage();
this.emojiPickerHandler = this.shadowRoot.querySelector('.emoji-button');
this.mirrorChatInput = this.shadowRoot.getElementById('messageBox');
@@ -403,6 +407,16 @@ class ChatPage extends LitElement {
this.chatEditor.insertText(this.editedMessageObj.message)
}
+
+ if (changedProperties && changedProperties.has('iframeHeight')) {
+ console.log({iframeHeight: this.iframeHeight})
+ }
+ }
+
+ calculateIFrameHeight(height) {
+ console.log(height, "height here")
+ this.iframeHeight = height;
+ this.requestUpdate();
}
changeLanguage() {
@@ -446,9 +460,6 @@ class ChatPage extends LitElement {
async getOldMessage(scrollElement) {
-
-
-
if (this.isReceipient) {
const getInitialMessages = await parentEpml.request('apiCall', {
type: 'api',
@@ -575,9 +586,6 @@ class ChatPage extends LitElement {
}
}
- // set replied to message in chat editor
-
-
getMessageSize(message){
try {
@@ -643,6 +651,8 @@ class ChatPage extends LitElement {
}
+ // set replied to message in chat editor
+
setRepliedToMessageObj(messageObj) {
this.repliedToMessageObj = {...messageObj};
this.editedMessageObj = null;
@@ -821,9 +831,6 @@ class ChatPage extends LitElement {
directSocketLink = `ws://${nodeUrl}/websockets/chat/messages?involving=${window.parent.reduxStore.getState().app.selectedAddress.address}&involving=${cid}`;
}
-
-
-
const directSocket = new WebSocket(directSocketLink);
// Open Connection
@@ -1404,6 +1411,14 @@ class ChatPage extends LitElement {
if (e.type === 'keydown') {
+ console.log(editorConfig.editableElement.contentDocument.body.scrollHeight);
+
+ if (editorConfig.editableElement.contentDocument.body.scrollHeight > 40) {
+ editorConfig.calculateIFrameHeight(editorConfig.editableElement.contentDocument.body.scrollHeight);
+ } else {
+ editorConfig.calculateIFrameHeight(40);
+ };
+
// Handle Enter
if (e.keyCode === 13 && !e.shiftKey) {
@@ -1484,6 +1499,7 @@ class ChatPage extends LitElement {
const editorConfig = {
getMessageSize: this.getMessageSize,
+ calculateIFrameHeight: this.calculateIFrameHeight,
mirrorElement: this.mirrorChatInput,
editableElement: this.chatMessageInput,
sendFunc: this._sendMessage,
diff --git a/qortal-ui-plugins/plugins/core/components/ChatScroller-css.js b/qortal-ui-plugins/plugins/core/components/ChatScroller-css.js
index 3e56949f..8e1429c1 100644
--- a/qortal-ui-plugins/plugins/core/components/ChatScroller-css.js
+++ b/qortal-ui-plugins/plugins/core/components/ChatScroller-css.js
@@ -65,7 +65,7 @@ export const chatStyles = css`
.chat-list {
overflow-y: auto;
overflow-x: hidden;
- height: 92vh;
+ height: 100%;
box-sizing: border-box;
}
From af71ec3508f51f6441529f1f513d30bddf066f64 Mon Sep 17 00:00:00 2001
From: Phillip Lang Martinez
Date: Mon, 31 Oct 2022 18:56:45 +0200
Subject: [PATCH 016/123] image functionality rough draft
---
qortal-ui-core/language/us.json | 3 +-
qortal-ui-plugins/package.json | 4 +-
.../plugins/core/components/ChatPage.js | 266 +++++++++++++++++-
.../core/components/ChatScroller-css.js | 18 ++
.../plugins/core/components/ChatScroller.js | 49 +++-
.../plugins/utils/publish-image.js | 166 +++++++++++
6 files changed, 479 insertions(+), 27 deletions(-)
create mode 100644 qortal-ui-plugins/plugins/utils/publish-image.js
diff --git a/qortal-ui-core/language/us.json b/qortal-ui-core/language/us.json
index 9dd5365e..8f0b9c8e 100644
--- a/qortal-ui-core/language/us.json
+++ b/qortal-ui-core/language/us.json
@@ -509,7 +509,8 @@
"bcchange9": "Private Message",
"bcchange10": "More",
"bcchange11": "Reply",
- "bcchange12": "Edit"
+ "bcchange12": "Edit",
+ "bcchange13": "Reaction"
},
"grouppage": {
"gchange1": "Qortal Groups",
diff --git a/qortal-ui-plugins/package.json b/qortal-ui-plugins/package.json
index 5e2e61cf..c81ac3c8 100644
--- a/qortal-ui-plugins/package.json
+++ b/qortal-ui-plugins/package.json
@@ -19,8 +19,10 @@
"dependencies": {
"@material/mwc-list": "0.27.0",
"@material/mwc-select": "0.27.0",
+ "compressorjs": "^1.1.1",
"emoji-picker-js": "https://github.com/Qortal/emoji-picker-js",
- "localforage": "^1.10.0"
+ "localforage": "^1.10.0",
+ "short-unique-id": "^4.4.4"
},
"devDependencies": {
"@babel/core": "7.19.3",
diff --git a/qortal-ui-plugins/plugins/core/components/ChatPage.js b/qortal-ui-plugins/plugins/core/components/ChatPage.js
index 26a2d7d2..6f32da0b 100644
--- a/qortal-ui-plugins/plugins/core/components/ChatPage.js
+++ b/qortal-ui-plugins/plugins/core/components/ChatPage.js
@@ -6,6 +6,8 @@ import localForage from "localforage";
registerTranslateConfig({
loader: lang => fetch(`/language/${lang}.json`).then(res => res.json())
})
+import ShortUniqueId from 'short-unique-id';
+import Compressor from 'compressorjs';
import { escape, unescape } from 'html-escaper';
import { inputKeyCodes } from '../../utils/keyCodes.js'
@@ -20,6 +22,7 @@ import '@material/mwc-button'
import '@material/mwc-dialog'
import '@material/mwc-icon'
import { replaceMessagesEdited } from '../../utils/replace-messages-edited.js';
+import { publishData } from '../../utils/publish-image.js';
const messagesCache = localForage.createInstance({
name: "messages-cache",
@@ -53,7 +56,8 @@ class ChatPage extends LitElement {
messagesRendered: { type: Array },
repliedToMessageObj: { type: Object },
editedMessageObj: { type: Object },
- chatMessageSize: { type: String}
+ chatMessageSize: { type: Number},
+ imageFile: {type: Object}
}
}
@@ -189,6 +193,8 @@ class ChatPage extends LitElement {
super()
this.getOldMessage = this.getOldMessage.bind(this)
this._sendMessage = this._sendMessage.bind(this)
+ this.insertImage = this.insertImage.bind(this)
+ this.getMessageSize = this.getMessageSize.bind(this)
this._downObserverhandler = this._downObserverhandler.bind(this)
this.selectedAddress = {}
this.chatId = ''
@@ -210,11 +216,54 @@ class ChatPage extends LitElement {
this.messagesRendered = []
this.repliedToMessageObj = null
this.editedMessageObj = null
+ this.chatMessageSize = 5
+ this.imageFile = null
+ this.uid = new ShortUniqueId();
}
render() {
return html`
${this.isLoadingMessages ? html`
+ {
+
+ this._sendMessage({
+ type: 'image',
+ imageFile: this.imageFile,
+ caption: 'This is a caption'
+
+
+ })
+ }}
+ >
+ send
+
+ {
+
+ this.imageFile = null
+ }}
+ >
+ ${translate("general.close")}
+
+
${translate("chatpage.cchange22")}
` : this.renderChatScroller(this._initialMessages)} +
+
+
+
+ hello
+ ${this.imageFile && html`
+ })
+ `}
+
+
+
${this.repliedToMessageObj && html`
@@ -274,8 +323,18 @@ class ChatPage extends LitElement {
`
}
- async firstUpdated() {
+
+ insertImage(file){
+ this.imageFile = file
+
+
+ }
+
+
+
+ async firstUpdated() {
+
// TODO: Load and fetch messages from localstorage (maybe save messages to localstorage...)
@@ -627,11 +686,10 @@ class ChatPage extends LitElement {
}
-
const stringified = JSON.stringify(messageObject)
const size = new Blob([stringified]).size;
this.chatMessageSize = size
-
+
} catch (error) {
console.error(error)
@@ -991,7 +1049,7 @@ class ChatPage extends LitElement {
// Add to the messages... TODO: Save messages to localstorage and fetch from it to make it persistent...
}
- _sendMessage(outSideMsg) {
+ async _sendMessage(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
@@ -1006,8 +1064,161 @@ class ChatPage extends LitElement {
// Format and Sanitize Message
const sanitizedMessage = messageText.replace(/ /gi, ' ').replace(//gi, '\n');
const trimmedMessage = sanitizedMessage.trim();
+
+ const getName = async (recipient)=> {
+ try {
+
+ const getNames = await parentEpml.request("apiCall", {
+ type: "api",
+ url: `/names/address/${recipient}`,
+ })
+ if(Array.isArray(getNames) && getNames.length > 0 ){
+ return getNames[0].name
+ } else {
+ return ''
+ }
+ } catch (error) {
+ return ""
+ }
+ }
- if(outSideMsg && outSideMsg.type === 'reaction'){
+ if(outSideMsg && outSideMsg.type === 'delete'){
+ const userName = outSideMsg.name
+ const identifier = outSideMsg.identifier
+ let compressedFile = ''
+ var str =
+ "iVBORw0KGgoAAAANSUhEUgAAAsAAAAGMAQMAAADuk4YmAAAAA1BMVEX///+nxBvIAAAAAXRSTlMAQObYZgAAADlJREFUeF7twDEBAAAAwiD7p7bGDlgYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAGJrAABgPqdWQAAAABJRU5ErkJggg==";
+
+ 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 = b64toBlob(str, 'image/png');
+
+ await new Promise(resolve =>{
+ new Compressor( blob, {
+ quality: 0.6,
+ maxWidth: 500,
+ success(result){
+ console.log({result})
+ const file = new File([result], "name", {
+ type: 'image/png'
+ });
+ console.log({file})
+ compressedFile = file
+ resolve()
+ },
+ error(err) {
+ console.log(err.message);
+ },
+ })
+ })
+ try {
+ console.log({userName, compressedFile, identifier, selectedAddress: this.selectedAddress})
+ await publishData({
+ registeredName: userName ,
+ file : compressedFile ,
+ service: 'IMAGE',
+ identifier : identifier,
+ parentEpml,
+ metaData: undefined,
+ uploadType: 'file',
+ selectedAddress: this.selectedAddress
+ })
+ } catch (error) {
+ console.error(error)
+ }
+
+
+
+ typeMessage = 'edit'
+ let chatReference = outSideMsg.editedMessageObj.reference
+
+ if(outSideMsg.editedMessageObj.chatReference){
+ chatReference = outSideMsg.editedMessageObj.chatReference
+ }
+
+ let message = ""
+ try {
+ const parsedMessageObj = JSON.parse(outSideMsg.editedMessageObj.decodedMessage)
+ message = parsedMessageObj
+
+ } catch (error) {
+ message = outSideMsg.editedMessageObj.decodedMessage
+ }
+ const messageObject = {
+ ...message,
+ isImageDeleted: true
+ }
+ const stringifyMessageObject = JSON.stringify(messageObject)
+ this.sendMessage(stringifyMessageObject, typeMessage, chatReference);
+
+
+ }
+ else if(outSideMsg && outSideMsg.type === 'image'){
+ const userName = await getName(this.selectedAddress.address)
+ const id = this.uid();
+ const identifier = `qchat_${id}`
+ let compressedFile = ''
+ await new Promise(resolve =>{
+ new Compressor( outSideMsg.imageFile, {
+ quality: 0.6,
+ maxWidth: 500,
+ success(result){
+ const file = new File([result], "name", {
+ type: outSideMsg.imageFile.type
+ });
+ compressedFile = file
+ resolve()
+ },
+ error(err) {
+ console.log(err.message);
+ },
+ })
+ })
+
+ await publishData({
+ registeredName: userName ,
+ file : compressedFile ,
+ service: 'IMAGE',
+ identifier : identifier,
+ parentEpml,
+ metaData: undefined,
+ uploadType: 'file',
+ selectedAddress: this.selectedAddress
+ })
+ const messageObject = {
+ messageText: outSideMsg.caption,
+ images: [{
+ service: "IMAGE",
+ name: userName,
+ identifier: identifier
+ }],
+ isImageDeleted: false,
+ repliedTo: '',
+ version: 1
+ }
+ const stringifyMessageObject = JSON.stringify(messageObject)
+ this.sendMessage(stringifyMessageObject, typeMessage);
+
+
+
+ } else if(outSideMsg && outSideMsg.type === 'reaction'){
typeMessage = 'edit'
let chatReference = outSideMsg.editedMessageObj.reference
@@ -1261,10 +1472,12 @@ class ChatPage extends LitElement {
return arr.length === 0
}
+
+
initChatEditor() {
const ChatEditor = function (editorConfig) {
-
+
const ChatEditor = function () {
const editor = this;
editor.init();
@@ -1411,11 +1624,14 @@ class ChatPage extends LitElement {
editor.mirror.value = unescapedValue;
};
- ChatEditor.prototype.listenChanges = function () {
+ ChatEditor.prototype.listenChanges = function () {
const editor = this;
- ['drop', 'contextmenu', 'mouseup', 'click', 'touchend', 'keydown', 'blur', 'paste'].map(function (event) {
- editor.content.body.addEventListener(event, function (e) {
+ const events = ['drop', 'contextmenu', 'mouseup', 'click', 'touchend', 'keydown', 'blur', 'paste']
+
+ for (let i = 0; i < events.length; i++) {
+ const event = events[i]
+ editor.content.body.addEventListener(event, async function (e) {
editorConfig.getMessageSize(editorConfig.mirrorElement.value)
if (e.type === 'click') {
@@ -1425,10 +1641,29 @@ class ChatPage extends LitElement {
}
if (e.type === 'paste') {
+
e.preventDefault();
-
+ const item_list = await navigator.clipboard.read();
+ let image_type; // we will feed this later
+ const item = item_list.find( item => // choose the one item holding our image
+ item.types.some( type => { // does this item have our type
+ if( type.startsWith( 'image/' ) ) {
+ image_type = type; // store which kind of image type it is
+ return true;
+ }
+ } )
+ );
+ const blob = item && await item.getType( image_type );
+ var file = new File([blob], "name", {
+ type: image_type
+ });
+
+ editorConfig.insertImage(file)
+
+
+
navigator.clipboard.readText().then(clipboardText => {
-
+
let escapedText = editorConfig.escape(clipboardText);
editor.insertText(escapedText);
@@ -1496,7 +1731,7 @@ class ChatPage extends LitElement {
editor.updateMirror();
});
- });
+ }
editor.content.addEventListener('click', function (event) {
@@ -1535,7 +1770,10 @@ class ChatPage extends LitElement {
emojiPicker: this.emojiPicker,
escape: escape,
unescape: unescape,
- placeholder: this.chatEditorPlaceholder
+ placeholder: this.chatEditorPlaceholder,
+ imageFile: this.imageFile,
+ requestUpdate: this.requestUpdate,
+ insertImage: this.insertImage
};
this.chatEditor = new ChatEditor(editorConfig);
}
diff --git a/qortal-ui-plugins/plugins/core/components/ChatScroller-css.js b/qortal-ui-plugins/plugins/core/components/ChatScroller-css.js
index 6e633de8..52456c95 100644
--- a/qortal-ui-plugins/plugins/core/components/ChatScroller-css.js
+++ b/qortal-ui-plugins/plugins/core/components/ChatScroller-css.js
@@ -329,4 +329,22 @@ export const chatStyles = css`
margin-right: 10px;
cursor: pointer
}
+
+ .image-container {
+ display: flex;
+ }
+ .image-delete-icon {
+ margin-left: 5px;
+ height: 20px;
+ cursor: pointer;
+ visibility: hidden;
+ transition: .2s all;
+ opacity: .8
+ }
+ .image-delete-icon:hover {
+ opacity: 1
+ }
+ .message-parent:hover .image-delete-icon {
+ visibility: visible;
+ }
`
diff --git a/qortal-ui-plugins/plugins/core/components/ChatScroller.js b/qortal-ui-plugins/plugins/core/components/ChatScroller.js
index 5fe748a8..be2c9acb 100644
--- a/qortal-ui-plugins/plugins/core/components/ChatScroller.js
+++ b/qortal-ui-plugins/plugins/core/components/ChatScroller.js
@@ -210,19 +210,26 @@ class MessageTemplate extends LitElement {
let message = ""
let reactions = []
let repliedToData = null
+ let image = null
+ let isImageDeleted = false
try {
const parsedMessageObj = JSON.parse(this.messageObj.decodedMessage)
message = parsedMessageObj.messageText
repliedToData = this.messageObj.repliedToData
+ isImageDeleted = parsedMessageObj.isImageDeleted
reactions = parsedMessageObj.reactions || []
-
+ if(parsedMessageObj.images && Array.isArray(parsedMessageObj.images) && parsedMessageObj.images.length > 0){
+ image = parsedMessageObj.images[0]
+ }
} catch (error) {
message = this.messageObj.decodedMessage
}
let avatarImg = ''
+ let imageHTML = ''
let nameMenu = ''
let levelFounder = ''
let hideit = hidemsg.includes(this.messageObj.sender)
+
levelFounder = html`
`
+ }
if (this.messageObj.sender === this.myAddress) {
@@ -268,9 +282,21 @@ class MessageTemplate extends LitElement {
`}
+ ${image && !isImageDeleted ? html`
+ `
}
+
+ if(image){
+ 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 imageUrl = `${nodeUrl}/arbitrary/${image.service}/${image.name}/${image.identifier}?async=true&apiKey=${myNode.apiKey}`
+ imageHTML = html`
+ ${imageHTML} this.sendMessage({
+ type: 'delete',
+ name: image.name,
+ identifier: image.identifier,
+ editedMessageObj: this.messageObj,
+
+ })}
+ class="image-delete-icon" icon="vaadin:close" slot="icon">
+
+ ` : html``}
${reactions.map((reaction)=> {
@@ -387,6 +413,15 @@ class ChatMenu extends LitElement {
render() {
return html`
+
@@ -402,15 +437,7 @@ class ChatMenu extends LitElement {
}}">
-
+
${this.myAddress === this.originalMessage.sender ? (
html`
{
+ const myNode =
+ window.parent.reduxStore.getState().app.nodeConfig.knownNodes[
+ window.parent.reduxStore.getState().app.nodeConfig.node
+ ]
+ let apiKey = myNode.apiKey
+ return apiKey
+}
+
+export const publishData = async ({
+ registeredName,
+ path,
+ file,
+ service,
+ identifier,
+ parentEpml,
+ metaData,
+ uploadType,
+ selectedAddress,
+}) => {
+ const validateName = async (receiverName) => {
+ let nameRes = await parentEpml.request("apiCall", {
+ type: "api",
+ url: `/names/${receiverName}`,
+ })
+
+ return nameRes
+ }
+
+ const convertBytesForSigning = async (transactionBytesBase58) => {
+ let convertedBytes = await parentEpml.request("apiCall", {
+ type: "api",
+ method: "POST",
+ url: `/transactions/convert`,
+ body: `${transactionBytesBase58}`,
+ })
+ return convertedBytes
+ }
+
+ const signAndProcess = async (transactionBytesBase58) => {
+ let convertedBytesBase58 = await convertBytesForSigning(
+ transactionBytesBase58
+ )
+ if (convertedBytesBase58.error) {
+ return
+ }
+
+ const convertedBytes =
+ window.parent.Base58.decode(convertedBytesBase58)
+ const _convertedBytesArray = Object.keys(convertedBytes).map(
+ function (key) {
+ return convertedBytes[key]
+ }
+ )
+ const convertedBytesArray = new Uint8Array(_convertedBytesArray)
+ const convertedBytesHash = new window.parent.Sha256()
+ .process(convertedBytesArray)
+ .finish().result
+ const hashPtr = window.parent.sbrk(32, window.parent.heap)
+ const hashAry = new Uint8Array(
+ window.parent.memory.buffer,
+ hashPtr,
+ 32
+ )
+
+ hashAry.set(convertedBytesHash)
+ const difficulty = 14
+ const workBufferLength = 8 * 1024 * 1024
+ const workBufferPtr = window.parent.sbrk(
+ workBufferLength,
+ window.parent.heap
+ )
+ let nonce = window.parent.computePow(
+ hashPtr,
+ workBufferPtr,
+ workBufferLength,
+ difficulty
+ )
+ let response = await parentEpml.request("sign_arbitrary", {
+ nonce: selectedAddress.nonce,
+ arbitraryBytesBase58: transactionBytesBase58,
+ arbitraryBytesForSigningBase58: convertedBytesBase58,
+ arbitraryNonce: nonce,
+ })
+ let myResponse = { error: "" }
+ if (response === false) {
+ return
+ } else {
+ myResponse = response
+ }
+
+ return myResponse
+ }
+
+ const validate = async () => {
+ let validNameRes = await validateName(registeredName)
+ if (validNameRes.error) {
+ return
+ }
+ let transactionBytes = await uploadData(registeredName, path, file)
+ if (transactionBytes.error) {
+ return
+ } else if (
+ transactionBytes.includes("Error 500 Internal Server Error")
+ ) {
+ return
+ }
+
+ let signAndProcessRes = await signAndProcess(transactionBytes)
+ if (signAndProcessRes.error) {
+ return
+ }
+ }
+
+ const uploadData = async (registeredName, path, file) => {
+ if (identifier != null && identifier.trim().length > 0) {
+ let postBody = path
+ let urlSuffix = ""
+ if (file != null) {
+ // If we're sending zipped data, make sure to use the /zip version of the POST /arbitrary/* API
+ if (uploadType === "zip") {
+ urlSuffix = "/zip"
+ }
+ // If we're sending file data, use the /base64 version of the POST /arbitrary/* API
+ else if (uploadType === "file") {
+ urlSuffix = "/base64"
+ }
+
+ // Base64 encode the file to work around compatibility issues between javascript and java byte arrays
+ let fileBuffer = new Uint8Array(await file.arrayBuffer())
+ postBody = Buffer.from(fileBuffer).toString("base64")
+ }
+
+ // Optional metadata
+
+ // let title = encodeURIComponent(metaData.title || "")
+ // let description = encodeURIComponent(metaData.description || "")
+ // let category = encodeURIComponent(metaData.category || "")
+ // let tag1 = encodeURIComponent(metaData.tag1 || "")
+ // let tag2 = encodeURIComponent(metaData.tag2 || "")
+ // let tag3 = encodeURIComponent(metaData.tag3 || "")
+ // let tag4 = encodeURIComponent(metaData.tag4 || "")
+ // let tag5 = encodeURIComponent(metaData.tag5 || "")
+
+ // let metadataQueryString = `title=${title}&description=${description}&category=${category}&tags=${tag1}&tags=${tag2}&tags=${tag3}&tags=${tag4}&tags=${tag5}`
+
+ let uploadDataUrl = `/arbitrary/${service}/${registeredName}${urlSuffix}?apiKey=${getApiKey()}`
+ if (identifier != null && identifier.trim().length > 0) {
+ uploadDataUrl = `/arbitrary/${service}/${registeredName}/${identifier}${urlSuffix}?apiKey=${getApiKey()}`
+ }
+ let uploadDataRes = await parentEpml.request("apiCall", {
+ type: "api",
+ method: "POST",
+ url: `${uploadDataUrl}`,
+ body: `${postBody}`,
+ })
+ return uploadDataRes
+ }
+
+
+
+
+
+ }
+ await validate()
+}
From 0f557b705708448ead627c3ecbf5aa76fca35a56 Mon Sep 17 00:00:00 2001
From: Justin Ferrari <‘justinwesleyferrari@gmail.com’>
Date: Mon, 31 Oct 2022 23:04:09 -0500
Subject: [PATCH 017/123] Continued chateditor logic
---
.../plugins/core/components/ChatPage.js | 35 ++++++++-----------
1 file changed, 14 insertions(+), 21 deletions(-)
diff --git a/qortal-ui-plugins/plugins/core/components/ChatPage.js b/qortal-ui-plugins/plugins/core/components/ChatPage.js
index 7f0834a3..68462224 100644
--- a/qortal-ui-plugins/plugins/core/components/ChatPage.js
+++ b/qortal-ui-plugins/plugins/core/components/ChatPage.js
@@ -54,7 +54,7 @@ class ChatPage extends LitElement {
repliedToMessageObj: { type: Object },
editedMessageObj: { type: Object },
chatMessageSize: { type: String },
- iframeHeight: { type: Number }
+ iframeHeight: { type: Number }
}
}
@@ -66,13 +66,15 @@ class ChatPage extends LitElement {
.chat-container {
display: grid;
- grid-template-rows: minmax(66%, 92vh) minmax(40px, auto);
+ grid-template-rows: minmax(6%, 92vh) minmax(40px, auto);
max-height: 100%;
}
.chat-text-area {
display: flex;
justify-content: center;
+ min-height: 60px;
+ max-height: 100%;
overflow: hidden;
}
@@ -93,8 +95,10 @@ class ChatPage extends LitElement {
}
.chat-text-area .typing-area .chat-editor {
+ display: flex;
+ max-height: -webkit-fill-available;
+ width: 100%;
border-color: transparent;
- flex: 1;
margin: 0;
padding: 0;
border: none;
@@ -161,9 +165,10 @@ class ChatPage extends LitElement {
width: auto;
display: flex;
justify-content: center;
- align-items: center;
+ align-items: flex-end;
height: auto;
padding: 5px;
+ overflow-y: hidden;
}
.chat-text-area .typing-area .emoji-button {
@@ -193,6 +198,7 @@ class ChatPage extends LitElement {
this.getOldMessage = this.getOldMessage.bind(this)
this._sendMessage = this._sendMessage.bind(this)
this._downObserverhandler = this._downObserverhandler.bind(this)
+ this.calculateIFrameHeight = this.calculateIFrameHeight.bind(this)
this.selectedAddress = {}
this.chatId = ''
this.myAddress = ''
@@ -222,7 +228,7 @@ class ChatPage extends LitElement {
${this.isLoadingMessages ? html`
- ${translate("chatpage.cchange22")}
` : this.renderChatScroller(this._initialMessages)}
+
${this.repliedToMessageObj && html`
@@ -285,7 +291,6 @@ class ChatPage extends LitElement {
async firstUpdated() {
// TODO: Load and fetch messages from localstorage (maybe save messages to localstorage...)
-
// this.changeLanguage();
this.emojiPickerHandler = this.shadowRoot.querySelector('.emoji-button');
this.mirrorChatInput = this.shadowRoot.getElementById('messageBox');
@@ -403,19 +408,13 @@ class ChatPage extends LitElement {
}
if (changedProperties && changedProperties.has('editedMessageObj')) {
-
this.chatEditor.insertText(this.editedMessageObj.message)
}
-
- if (changedProperties && changedProperties.has('iframeHeight')) {
- console.log({iframeHeight: this.iframeHeight})
- }
}
calculateIFrameHeight(height) {
console.log(height, "height here")
this.iframeHeight = height;
- this.requestUpdate();
}
changeLanguage() {
@@ -1459,15 +1458,9 @@ class ChatPage extends LitElement {
}
if (e.type === 'keydown') {
-
- console.log(editorConfig.editableElement.contentDocument.body.scrollHeight);
-
- if (editorConfig.editableElement.contentDocument.body.scrollHeight > 40) {
- editorConfig.calculateIFrameHeight(editorConfig.editableElement.contentDocument.body.scrollHeight);
- } else {
- editorConfig.calculateIFrameHeight(40);
- };
-
+ console.log(editorConfig.mirrorElement.scrollHeight);
+ editorConfig.calculateIFrameHeight(editorConfig.editableElement.contentDocument.body.scrollHeight);
+
// Handle Enter
if (e.keyCode === 13 && !e.shiftKey) {
From 0c04aa7c8894a4df2cc444d095e6735aa7b87a98 Mon Sep 17 00:00:00 2001
From: Phillip Lang Martinez
Date: Tue, 1 Nov 2022 19:04:49 +0200
Subject: [PATCH 018/123] onerror img and img popup
---
img/chain.png | Bin 0 -> 178236 bytes
.../plugins/core/components/ChatPage.js | 1 +
.../core/components/ChatScroller-css.js | 6 ++
.../plugins/core/components/ChatScroller.js | 65 +++++++++++++++++-
4 files changed, 69 insertions(+), 3 deletions(-)
create mode 100644 img/chain.png
diff --git a/img/chain.png b/img/chain.png
new file mode 100644
index 0000000000000000000000000000000000000000..79eb8e15d1aa763cb561caa27064d8d9792aebf6
GIT binary patch
literal 178236
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