Qortal/qortal-ui
1
0
Fork 0
mirror of https://github.com/Qortal/qortal-ui.git synced 2025-04-17 08:35:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'main/master' into feature/gif-repos-upadate

Browse Source
This commit is contained in:
Phillip 2023-02-17 15:48:29 +02:00
commit 65e4dee56a
7 changed files with 1927 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
qortal-ui-core/package.json
View File

@ -83,4 +83,4 @@
"engines": {
"node": ">=18.12.1"
}
}
}

32
qortal-ui-plugins/plugins/core/components/ChatPage.js
View File

@ -1474,7 +1474,7 @@ class ChatPage extends LitElement {
${this.repliedToMessageObj.version.toString() === '1' ? html`
${this.repliedToMessageObj.message}
` : ''}
${this.repliedToMessageObj.version.toString() === '2'
${+this.repliedToMessageObj.version > 1
? html`
${unsafeHTML(generateHTML(this.repliedToMessageObj.message,
[
@ -2099,7 +2099,7 @@ class ChatPage extends LitElement {
}
async goToRepliedMessage(message, clickedOnMessage){
const findMessage = this.shadowRoot.querySelector('chat-scroller').shadowRoot.getElementById(message.reference)
const findMessage = this.shadowRoot.querySelector('chat-scroller').shadowRoot.getElementById(message.signature)
if(findMessage){
findMessage.scrollIntoView({ behavior: 'smooth', block: 'center' })
@ -2123,7 +2123,7 @@ class ChatPage extends LitElement {
if((message.timestamp - this.messagesRendered[0].timestamp) < 86400000){
const findOriginalMessage = this.shadowRoot.querySelector('chat-scroller').shadowRoot.getElementById(clickedOnMessage.reference)
const findOriginalMessage = this.shadowRoot.querySelector('chat-scroller').shadowRoot.getElementById(clickedOnMessage.signature)
if(findOriginalMessage){
const messageClientRect = findOriginalMessage.getBoundingClientRect()
this.isLoadingGoToRepliedMessage = {
@ -2135,7 +2135,7 @@ class ChatPage extends LitElement {
}
}
await this.getOldMessageDynamic(0, this.messagesRendered[0].timestamp, message.timestamp - 7200000)
const findMessage = this.shadowRoot.querySelector('chat-scroller').shadowRoot.getElementById(message.reference)
const findMessage = this.shadowRoot.querySelector('chat-scroller').shadowRoot.getElementById(message.signature)
if(findMessage){
this.isLoadingGoToRepliedMessage = {
...this.isLoadingGoToRepliedMessage,
@ -2612,7 +2612,7 @@ class ChatPage extends LitElement {
await this.getUpdateComplete();
const marginElements = Array.from(this.shadowRoot.querySelector('chat-scroller').shadowRoot.querySelectorAll('message-template'));
const findElement = marginElements.find((item)=> item.messageObj.reference === scrollElement.messageObj.reference)
const findElement = marginElements.find((item)=> item.messageObj.signature === scrollElement.messageObj.signature)
if(findElement){
findElement.scrollIntoView({ behavior: 'auto', block: 'center' });
@ -2645,7 +2645,7 @@ class ChatPage extends LitElement {
this.isLoadingOldMessages = false
await this.getUpdateComplete();
const marginElements = Array.from(this.shadowRoot.querySelector('chat-scroller').shadowRoot.querySelectorAll('message-template'));
const findElement = marginElements.find((item)=> item.messageObj.reference === scrollElement.messageObj.reference)
const findElement = marginElements.find((item)=> item.messageObj.signature === scrollElement.messageObj.signature)
if(findElement){
findElement.scrollIntoView({ behavior: 'auto', block: 'center' });
@ -2683,7 +2683,7 @@ class ChatPage extends LitElement {
await this.getUpdateComplete();
const marginElements = Array.from(this.shadowRoot.querySelector('chat-scroller').shadowRoot.querySelectorAll('message-template'));
const findElement = marginElements.find((item)=> item.messageObj.reference === scrollElement.messageObj.reference)
const findElement = marginElements.find((item)=> item.messageObj.signature === scrollElement.messageObj.signature)
if(findElement){
findElement.scrollIntoView({ behavior: 'auto', block: 'center' });
@ -2716,7 +2716,7 @@ class ChatPage extends LitElement {
this.isLoadingOldMessages = false
await this.getUpdateComplete();
const marginElements = Array.from(this.shadowRoot.querySelector('chat-scroller').shadowRoot.querySelectorAll('message-template'));
const findElement = marginElements.find((item)=> item.messageObj.reference === scrollElement.messageObj.reference)
const findElement = marginElements.find((item)=> item.messageObj.signature === scrollElement.messageObj.signature)
if(findElement){
findElement.scrollIntoView({ behavior: 'auto', block: 'center' });
@ -2828,7 +2828,7 @@ 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) )
const findOriginalMessageIndex = this.messagesRendered.findIndex(msg=> msg.signature === newMessage.chatReference || (msg.chatReference && msg.chatReference === newMessage.chatReference) )
if(findOriginalMessageIndex !== -1){
const newMessagesRendered = [...this.messagesRendered]
newMessagesRendered[findOriginalMessageIndex] = {...newMessage, timestamp: newMessagesRendered[findOriginalMessageIndex].timestamp, senderName: newMessagesRendered[findOriginalMessageIndex].senderName,
@ -3240,7 +3240,7 @@ class ChatPage extends LitElement {
return
}
typeMessage = 'edit';
let chatReference = outSideMsg.editedMessageObj.reference;
let chatReference = outSideMsg.editedMessageObj.signature;
if(outSideMsg.editedMessageObj.chatReference){
chatReference = outSideMsg.editedMessageObj.chatReference;
@ -3330,7 +3330,7 @@ class ChatPage extends LitElement {
return
}
typeMessage = 'edit';
let chatReference = outSideMsg.editedMessageObj.reference;
let chatReference = outSideMsg.editedMessageObj.signature;
if(outSideMsg.editedMessageObj.chatReference){
chatReference = outSideMsg.editedMessageObj.chatReference;
@ -3512,7 +3512,7 @@ class ChatPage extends LitElement {
} else if (outSideMsg && outSideMsg.type === 'reaction') {
const userName = await getName(this.selectedAddress.address);
typeMessage = 'edit';
let chatReference = outSideMsg.editedMessageObj.reference;
let chatReference = outSideMsg.editedMessageObj.signature;
if (outSideMsg.editedMessageObj.chatReference) {
chatReference = outSideMsg.editedMessageObj.chatReference;
@ -3570,7 +3570,7 @@ class ChatPage extends LitElement {
}
else if (this.repliedToMessageObj) {
let chatReference = this.repliedToMessageObj.reference;
let chatReference = this.repliedToMessageObj.signature;
if(this.repliedToMessageObj.chatReference){
chatReference = this.repliedToMessageObj.chatReference;
}
@ -3579,13 +3579,13 @@ class ChatPage extends LitElement {
messageText: trimmedMessage,
images: [''],
repliedTo: chatReference,
version: 2
version: 3
}
const stringifyMessageObject = JSON.stringify(messageObject);
this.sendMessage(stringifyMessageObject, typeMessage);
} else if (this.editedMessageObj) {
typeMessage = 'edit'
let chatReference = this.editedMessageObj.reference
let chatReference = this.editedMessageObj.signature
if(this.editedMessageObj.chatReference){
chatReference = this.editedMessageObj.chatReference
@ -3611,7 +3611,7 @@ class ChatPage extends LitElement {
messageText: trimmedMessage,
images: [''],
repliedTo: '',
version: 2
version: 3
}
const stringifyMessageObject = JSON.stringify(messageObject)

30
qortal-ui-plugins/plugins/core/components/ChatScroller.js
View File

@ -125,7 +125,7 @@ class ChatScroller extends LitElement {
${formattedMessages.map((formattedMessage) => {
return repeat(
formattedMessage.messages,
(message) => message.reference,
(message) => message.signature,
(message, indexMessage) => html`
<message-template
.emojiPicker=${this.emojiPicker}
@ -145,7 +145,7 @@ class ChatScroller extends LitElement {
.setOpenTipUser=${(val) => this.setOpenTipUser(val)}
.setOpenUserInfo=${(val) => this.setOpenUserInfo(val)}
.setUserName=${(val) => this.setUserName(val)}
id=${message.reference}
id=${message.signature}
.goToRepliedMessage=${this.goToRepliedMessage}
.addSeenMessage=${(val)=> this.addSeenMessage(val)}
.listSeenMessages=${this.listSeenMessages}
@ -370,7 +370,7 @@ class MessageTemplate extends LitElement {
}
firstUpdated(){
const autoSeeChatList = window.parent.reduxStore.getState().app?.autoLoadImageChats
if(autoSeeChatList.includes(this.chatId) || this.listSeenMessages.includes(this.messageObj.reference)){
if(autoSeeChatList.includes(this.chatId) || this.listSeenMessages.includes(this.messageObj.signature)){
this.viewImage = true
}
@ -398,17 +398,13 @@ class MessageTemplate extends LitElement {
let attachment = null;
try {
const parsedMessageObj = JSON.parse(this.messageObj.decodedMessage);
if (parsedMessageObj.version.toString() === '2' && parsedMessageObj.messageText) {
try {
messageVersion2 = generateHTML(parsedMessageObj.messageText, [
StarterKit,
Underline,
Highlight
// other extensions …
])
} catch (error) {
console.error(error);
}
if(+parsedMessageObj.version > 1 && parsedMessageObj.messageText){
messageVersion2 = generateHTML(parsedMessageObj.messageText, [
StarterKit,
Underline,
Highlight
// other extensions …
])
}
message = parsedMessageObj.messageText;
repliedToData = this.messageObj.repliedToData;
@ -652,7 +648,7 @@ class MessageTemplate extends LitElement {
${version.toString() === '1' ? html`
${repliedToData.decodedMessage.messageText}
` : ''}
${version.toString() === '2' ? html`
${+version > 1 ? html`
${unsafeHTML(generateHTML(repliedToData.decodedMessage.messageText, [
StarterKit,
Underline,
@ -668,7 +664,7 @@ class MessageTemplate extends LitElement {
<div
@click=${()=> {
this.viewImage = true
this.addSeenMessage(this.messageObj.reference)
this.addSeenMessage(this.messageObj.signature)
}}
class=${[`image-container`, !this.isImageLoaded ? 'defaultSize' : ''].join(' ')}
style=${this.isFirstMessage && "margin-top: 10px;"}>
@ -768,7 +764,7 @@ class MessageTemplate extends LitElement {
id="messageContent"
class="message"
style=${(image && replacedMessage !== "") &&"margin-top: 15px;"}>
${version.toString() === '2' ? html`
${+version > 1 ? html`
${unsafeHTML(messageVersion2)}
` : ''}
${version.toString() === '1' ? html`

8
qortal-ui-plugins/plugins/core/components/ChatTextEditor.js
View File

@ -673,7 +673,7 @@ mwc-checkbox::shadow .mdc-checkbox::after, mwc-checkbox::shadow .mdc-checkbox::b
let messageObject = {};
if (this.repliedToMessageObj) {
let chatReference = this.repliedToMessageObj.reference;
let chatReference = this.repliedToMessageObj.signature;
if (this.repliedToMessageObj.chatReference) {
chatReference = this.repliedToMessageObj.chatReference;
}
@ -681,7 +681,7 @@ mwc-checkbox::shadow .mdc-checkbox::after, mwc-checkbox::shadow .mdc-checkbox::b
messageText: trimmedMessage,
images: [''],
repliedTo: chatReference,
version: 2
version: 3
}
} else if (this.editedMessageObj) {
let message = "";
@ -704,7 +704,7 @@ mwc-checkbox::shadow .mdc-checkbox::after, mwc-checkbox::shadow .mdc-checkbox::b
identifier: '123456'
}],
repliedTo: '',
version: 2
version: 3
};
} else if (this.attachment && this.iframeId === 'newAttachmentChat') {
messageObject = {
@ -724,7 +724,7 @@ mwc-checkbox::shadow .mdc-checkbox::after, mwc-checkbox::shadow .mdc-checkbox::b
messageText: trimmedMessage,
images: [''],
repliedTo: '',
version: 2
version: 3
};
}

1869
qortal-ui-plugins/plugins/core/components/qortal-info-view.js Normal file
View File

File diff suppressed because it is too large Load Diff

2
qortal-ui-plugins/plugins/core/messaging/q-chat/q-chat.src.js
View File

@ -562,7 +562,7 @@ class Chat extends LitElement {
messageText: trimmedMessage,
images: [''],
repliedTo: '',
version: 2
version: 3
}
const stringifyMessageObject = JSON.stringify(messageObject)
this.sendMessage(stringifyMessageObject);

36
qortal-ui-plugins/plugins/utils/replace-messages-edited.js
View File

@ -14,7 +14,7 @@ export const replaceMessagesEdited = async ({
}
const response = await parentEpml.request("apiCall", {
type: "api",
url: `/chat/messages?chatreference=${msg.reference}&reverse=true${msgQuery}`,
url: `/chat/messages?chatreference=${msg.signature}&reverse=true${msgQuery}`,
})
if (response && Array.isArray(response) && response.length !== 0) {
@ -50,24 +50,36 @@ export const replaceMessagesEdited = async ({
msgQuery = `&txGroupId=${msg.txGroupId}`
}
if (parsedMessageObj.repliedTo) {
const originalReply = await parentEpml.request("apiCall", {
type: "api",
url: `/chat/messages?reference=${parsedMessageObj.repliedTo}&reverse=true${msgQuery}`,
})
console.log({parsedMessageObj})
let originalReply
if(+parsedMessageObj.version > 2){
originalReply = await parentEpml.request("apiCall", {
type: "api",
url: `/chat/message/${parsedMessageObj.repliedTo}`,
})
}
if(+parsedMessageObj.version < 3){
originalReply = await parentEpml.request("apiCall", {
type: "api",
url: `/chat/messages?reference=${parsedMessageObj.repliedTo}&reverse=true${msgQuery}`,
})
}
const response = await parentEpml.request("apiCall", {
type: "api",
url: `/chat/messages?chatreference=${parsedMessageObj.repliedTo}&reverse=true${msgQuery}`,
})
const originalReplyMessage = originalReply.timestamp ? originalReply : originalReply.length !== 0 ? originalReply[0] : null
if (
originalReply &&
Array.isArray(originalReply) &&
originalReply.length !== 0 &&
originalReplyMessage &&
response &&
Array.isArray(response) &&
response.length !== 0
) {
const decodeOriginalReply = decodeMessageFunc(originalReply[0], isReceipient, _publicKey)
const decodeOriginalReply = decodeMessageFunc(originalReplyMessage, isReceipient, _publicKey)
const decodeUpdatedReply = decodeMessageFunc(response[0], isReceipient, _publicKey)
const formattedRepliedToData = {
@ -83,14 +95,12 @@ export const replaceMessagesEdited = async ({
if (
originalReply &&
Array.isArray(originalReply) &&
originalReply.length !== 0
originalReplyMessage
) {
msgItem = {
...msg,
repliedToData: decodeMessageFunc(originalReply[0], isReceipient, _publicKey),
repliedToData: decodeMessageFunc(originalReplyMessage, isReceipient, _publicKey),
}
}
}