|
|
|
@ -77,7 +77,6 @@ class ChatScroller extends LitElement { |
|
|
|
<ul id="viewElement" class="chat-list clearfix"> |
|
|
|
<ul id="viewElement" class="chat-list clearfix"> |
|
|
|
<div id="upObserver"></div> |
|
|
|
<div id="upObserver"></div> |
|
|
|
${formattedMessages.map((formattedMessage) => { |
|
|
|
${formattedMessages.map((formattedMessage) => { |
|
|
|
|
|
|
|
|
|
|
|
return repeat( |
|
|
|
return repeat( |
|
|
|
formattedMessage.messages, |
|
|
|
formattedMessage.messages, |
|
|
|
(message) => message.reference, |
|
|
|
(message) => message.reference, |
|
|
|
@ -91,51 +90,13 @@ return repeat( |
|
|
|
.setEditedMessageObj=${this.setEditedMessageObj} |
|
|
|
.setEditedMessageObj=${this.setEditedMessageObj} |
|
|
|
.focusChatEditor=${this.focusChatEditor} |
|
|
|
.focusChatEditor=${this.focusChatEditor} |
|
|
|
.sendMessage=${this.sendMessage} |
|
|
|
.sendMessage=${this.sendMessage} |
|
|
|
?isfirstmessage=${indexMessage === 0} |
|
|
|
?isFirstMessage=${indexMessage === 0} |
|
|
|
?isSingleMessageInGroup=${formattedMessage.messages.length > 1} |
|
|
|
?isSingleMessageInGroup=${formattedMessage.messages.length > 1} |
|
|
|
|
|
|
|
?isLastMessageInGroup=${indexMessage === formattedMessage.messages.length - 1} |
|
|
|
> |
|
|
|
> |
|
|
|
</message-template>` |
|
|
|
</message-template>` |
|
|
|
) |
|
|
|
) |
|
|
|
})} |
|
|
|
})} |
|
|
|
<!-- ${repeat( |
|
|
|
|
|
|
|
testMessages, |
|
|
|
|
|
|
|
(testMessage)=> testMessage.signature, |
|
|
|
|
|
|
|
(testMessage)=> { |
|
|
|
|
|
|
|
return repeat( |
|
|
|
|
|
|
|
testMessage.messages, |
|
|
|
|
|
|
|
(message) => message.reference, |
|
|
|
|
|
|
|
(message, indexMessage) => html` |
|
|
|
|
|
|
|
<message-template
|
|
|
|
|
|
|
|
.emojiPicker=${this.emojiPicker}
|
|
|
|
|
|
|
|
.escapeHTML=${this.escapeHTML}
|
|
|
|
|
|
|
|
.messageObj=${message}
|
|
|
|
|
|
|
|
.hideMessages=${this.hideMessages} |
|
|
|
|
|
|
|
.setRepliedToMessageObj=${this.setRepliedToMessageObj} |
|
|
|
|
|
|
|
.setEditedMessageObj=${this.setEditedMessageObj} |
|
|
|
|
|
|
|
.focusChatEditor=${this.focusChatEditor} |
|
|
|
|
|
|
|
.sendMessage=${this.sendMessage} |
|
|
|
|
|
|
|
?isfirstmessage=${indexMessage === 0} |
|
|
|
|
|
|
|
> |
|
|
|
|
|
|
|
</message-template>` |
|
|
|
|
|
|
|
) |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
)} --> |
|
|
|
|
|
|
|
<!-- ${repeat( |
|
|
|
|
|
|
|
this.messages, |
|
|
|
|
|
|
|
(message) => message.reference, |
|
|
|
|
|
|
|
(message) => html` |
|
|
|
|
|
|
|
<message-template
|
|
|
|
|
|
|
|
.emojiPicker=${this.emojiPicker}
|
|
|
|
|
|
|
|
.escapeHTML=${this.escapeHTML}
|
|
|
|
|
|
|
|
.messageObj=${message}
|
|
|
|
|
|
|
|
.hideMessages=${this.hideMessages} |
|
|
|
|
|
|
|
.setRepliedToMessageObj=${this.setRepliedToMessageObj} |
|
|
|
|
|
|
|
.setEditedMessageObj=${this.setEditedMessageObj} |
|
|
|
|
|
|
|
.focusChatEditor=${this.focusChatEditor} |
|
|
|
|
|
|
|
.sendMessage=${this.sendMessage} |
|
|
|
|
|
|
|
> |
|
|
|
|
|
|
|
</message-template>` |
|
|
|
|
|
|
|
)} --> |
|
|
|
|
|
|
|
<div id='downObserver'></div> |
|
|
|
<div id='downObserver'></div> |
|
|
|
<div class='last-message-ref'> |
|
|
|
<div class='last-message-ref'> |
|
|
|
<vaadin-icon class='arrow-down-icon' icon='vaadin:arrow-circle-down' slot='icon' @click=${() => { |
|
|
|
<vaadin-icon class='arrow-down-icon' icon='vaadin:arrow-circle-down' slot='icon' @click=${() => { |
|
|
|
@ -237,7 +198,8 @@ class MessageTemplate extends LitElement { |
|
|
|
openDialogImage: { type: Function }, |
|
|
|
openDialogImage: { type: Function }, |
|
|
|
isImageLoaded: { type: Boolean }, |
|
|
|
isImageLoaded: { type: Boolean }, |
|
|
|
isFirstMessage: { type: Boolean }, |
|
|
|
isFirstMessage: { type: Boolean }, |
|
|
|
isSingleMessageInGroup: {type: Boolean} |
|
|
|
isSingleMessageInGroup: { type: Boolean }, |
|
|
|
|
|
|
|
isLastMessageInGroup: { type: Boolean }, |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
@ -253,6 +215,7 @@ class MessageTemplate extends LitElement { |
|
|
|
this.isImageLoaded = false |
|
|
|
this.isImageLoaded = false |
|
|
|
this.isFirstMessage = false |
|
|
|
this.isFirstMessage = false |
|
|
|
this.isSingleMessageInGroup = false |
|
|
|
this.isSingleMessageInGroup = false |
|
|
|
|
|
|
|
this.isLastMessageInGroup = false |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
static styles = [chatStyles] |
|
|
|
static styles = [chatStyles] |
|
|
|
@ -284,15 +247,15 @@ class MessageTemplate extends LitElement { |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
render() { |
|
|
|
render() { |
|
|
|
console.log('isFirst', this.isFirstMessage) |
|
|
|
console.log('isFirst', this.isFirstMessage); |
|
|
|
const hidemsg = this.hideMessages |
|
|
|
console.log("is single message in group", this.isSingleMessageInGroup); |
|
|
|
let message = "" |
|
|
|
const hidemsg = this.hideMessages; |
|
|
|
let reactions = [] |
|
|
|
let message = ""; |
|
|
|
let repliedToData = null |
|
|
|
let reactions = []; |
|
|
|
let image = null |
|
|
|
let repliedToData = null; |
|
|
|
let isImageDeleted = false |
|
|
|
let image = null; |
|
|
|
|
|
|
|
let isImageDeleted = false; |
|
|
|
try { |
|
|
|
try { |
|
|
|
const parsedMessageObj = JSON.parse(this.messageObj.decodedMessage); |
|
|
|
const parsedMessageObj = JSON.parse(this.messageObj.decodedMessage); |
|
|
|
message = parsedMessageObj.messageText; |
|
|
|
message = parsedMessageObj.messageText; |
|
|
|
@ -329,14 +292,13 @@ class MessageTemplate extends LitElement { |
|
|
|
imageHTMLRes.src = imageUrl; |
|
|
|
imageHTMLRes.src = imageUrl; |
|
|
|
imageHTMLRes.style= "max-width:45vh; max-height:40vh; border-radius: 5px; cursor: pointer"; |
|
|
|
imageHTMLRes.style= "max-width:45vh; max-height:40vh; border-radius: 5px; cursor: pointer"; |
|
|
|
imageHTMLRes.onclick= () => { |
|
|
|
imageHTMLRes.onclick= () => { |
|
|
|
this.openDialogImage = true |
|
|
|
this.openDialogImage = true; |
|
|
|
} |
|
|
|
} |
|
|
|
imageHTMLRes.onload = () => { |
|
|
|
imageHTMLRes.onload = () => { |
|
|
|
this.isImageLoaded = true |
|
|
|
this.isImageLoaded = true; |
|
|
|
} |
|
|
|
} |
|
|
|
imageHTMLRes.onerror = () => {
|
|
|
|
imageHTMLRes.onerror = () => {
|
|
|
|
|
|
|
|
console.log('inputRef', this.imageFetches); |
|
|
|
console.log('inputRef', this.imageFetches) |
|
|
|
|
|
|
|
if (this.imageFetches < 4) { |
|
|
|
if (this.imageFetches < 4) { |
|
|
|
setTimeout(() => { |
|
|
|
setTimeout(() => { |
|
|
|
this.imageFetches = this.imageFetches + 1; |
|
|
|
this.imageFetches = this.imageFetches + 1; |
|
|
|
@ -379,17 +341,54 @@ class MessageTemplate extends LitElement { |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
return hideit ? html`<li class="clearfix"></li>` : html` |
|
|
|
return hideit ? html`<li class="clearfix"></li>` : html` |
|
|
|
<li class="clearfix message-parent"> |
|
|
|
<li
|
|
|
|
|
|
|
|
class="clearfix message-parent"
|
|
|
|
|
|
|
|
style="${(this.isSingleMessageInGroup === true && this.isLastMessageInGroup === false && reactions.length === 0) ?
|
|
|
|
|
|
|
|
'padding-bottom: 0;'
|
|
|
|
|
|
|
|
: null}
|
|
|
|
|
|
|
|
${this.isFirstMessage && 'margin-top: 20px;'}"> |
|
|
|
|
|
|
|
${this.isFirstMessage ? ( |
|
|
|
|
|
|
|
html` |
|
|
|
<div class="message-data ${this.messageObj.sender === this.myAddress ? "" : ""}"> |
|
|
|
<div class="message-data ${this.messageObj.sender === this.myAddress ? "" : ""}"> |
|
|
|
<span class="message-data-name">${nameMenu}</span> |
|
|
|
<span class="message-data-name">${nameMenu}</span> |
|
|
|
<span class="message-data-level">${levelFounder}</span> |
|
|
|
<span class="message-data-level">${levelFounder}</span> |
|
|
|
<span class="message-data-time"><message-time timestamp=${this.messageObj.timestamp}></message-time></span> |
|
|
|
<span class="message-data-time"><message-time timestamp=${this.messageObj.timestamp}></message-time></span> |
|
|
|
</div> |
|
|
|
</div> |
|
|
|
|
|
|
|
` |
|
|
|
|
|
|
|
) : null} |
|
|
|
|
|
|
|
<div> |
|
|
|
|
|
|
|
<div
|
|
|
|
|
|
|
|
class="message-container"
|
|
|
|
|
|
|
|
style="${(this.isSingleMessageInGroup === true && this.isLastMessageInGroup === false) && 'margin-bottom: 0'}"> |
|
|
|
|
|
|
|
<div class="message-subcontainer1"> |
|
|
|
|
|
|
|
${(this.isSingleMessageInGroup === false ||
|
|
|
|
|
|
|
|
(this.isSingleMessageInGroup === true && this.isLastMessageInGroup === true))
|
|
|
|
|
|
|
|
? ( |
|
|
|
|
|
|
|
html` |
|
|
|
<div class="message-data-avatar"> |
|
|
|
<div class="message-data-avatar"> |
|
|
|
${avatarImg} |
|
|
|
${avatarImg} |
|
|
|
</div> |
|
|
|
</div> |
|
|
|
<div class="message-container"> |
|
|
|
` |
|
|
|
<div class="message-subcontainer"> |
|
|
|
) :
|
|
|
|
|
|
|
|
html` |
|
|
|
|
|
|
|
<div class="message-data-avatar"></div> |
|
|
|
|
|
|
|
`}
|
|
|
|
|
|
|
|
<div
|
|
|
|
|
|
|
|
class="${`message-subcontainer2
|
|
|
|
|
|
|
|
${((this.isFirstMessage === true && this.isSingleMessageInGroup === false) ||
|
|
|
|
|
|
|
|
(this.isSingleMessageInGroup === true && this.isLastMessageInGroup === true)) &&
|
|
|
|
|
|
|
|
'message-triangle'}`}"
|
|
|
|
|
|
|
|
style="${(this.isSingleMessageInGroup === true && this.isLastMessageInGroup === false) ? 'margin-bottom: 0;' : null} |
|
|
|
|
|
|
|
${(this.isFirstMessage === true && this.isSingleMessageInGroup === false && this.isLastMessageInGroup === false)
|
|
|
|
|
|
|
|
? 'border-radius: 25px 25px 25px 0px;' |
|
|
|
|
|
|
|
: (this.isFirstMessage === false && this.isSingleMessageInGroup === true && this.isLastMessageInGroup === false) |
|
|
|
|
|
|
|
? 'border-radius: 8px 25px 25px 8px;' |
|
|
|
|
|
|
|
: (this.isFirstMessage === true && this.isSingleMessageInGroup === true && this.isLastMessageInGroup === false)
|
|
|
|
|
|
|
|
? 'border-radius: 27px 25px 25px 12px;' |
|
|
|
|
|
|
|
: (this.isSingleMessageInGroup === true && this.isSingleMessageInGroup === true && this.isLastMessageInGroup === true) ?
|
|
|
|
|
|
|
|
'border-radius: 10px 25px 25px 0;'
|
|
|
|
|
|
|
|
: null |
|
|
|
|
|
|
|
}"> |
|
|
|
${repliedToData && html` |
|
|
|
${repliedToData && html` |
|
|
|
<div class="original-message"> |
|
|
|
<div class="original-message"> |
|
|
|
<p class="original-message-sender">${repliedToData.sendName ?? repliedToData.sender}</p> |
|
|
|
<p class="original-message-sender">${repliedToData.sendName ?? repliedToData.sender}</p> |
|
|
|
@ -412,24 +411,10 @@ class MessageTemplate extends LitElement { |
|
|
|
${unsafeHTML(this.emojiPicker.parse(this.escapeHTML(message)))} |
|
|
|
${unsafeHTML(this.emojiPicker.parse(this.escapeHTML(message)))} |
|
|
|
</div> |
|
|
|
</div> |
|
|
|
</div> |
|
|
|
</div> |
|
|
|
<div class="message-reactions"> |
|
|
|
|
|
|
|
${reactions.map((reaction)=> { |
|
|
|
|
|
|
|
return html` |
|
|
|
|
|
|
|
<span
|
|
|
|
|
|
|
|
@click=${() => this.sendMessage({ |
|
|
|
|
|
|
|
type: 'reaction', |
|
|
|
|
|
|
|
editedMessageObj: this.messageObj, |
|
|
|
|
|
|
|
reaction: reaction.type, |
|
|
|
|
|
|
|
})}
|
|
|
|
|
|
|
|
class="reactions-bg"> |
|
|
|
|
|
|
|
${reaction.type} ${reaction.qty} |
|
|
|
|
|
|
|
</span>` |
|
|
|
|
|
|
|
})} |
|
|
|
|
|
|
|
</div> |
|
|
|
|
|
|
|
<chat-menu
|
|
|
|
<chat-menu
|
|
|
|
tabindex="0" |
|
|
|
tabindex="0" |
|
|
|
class="chat-hover" |
|
|
|
class="chat-hover" |
|
|
|
style=${this.showBlockAddressIcon && "display: block"} |
|
|
|
style="${this.showBlockAddressIcon ? 'display: block;' : null} ${this.isFirstMessage && 'top: -50px'}" |
|
|
|
toblockaddress="${this.messageObj.sender}"
|
|
|
|
toblockaddress="${this.messageObj.sender}"
|
|
|
|
.showPrivateMessageModal=${() => this.showPrivateMessageModal()} |
|
|
|
.showPrivateMessageModal=${() => this.showPrivateMessageModal()} |
|
|
|
.showBlockUserModal=${() => this.showBlockUserModal()} |
|
|
|
.showBlockUserModal=${() => this.showBlockUserModal()} |
|
|
|
@ -445,6 +430,24 @@ class MessageTemplate extends LitElement { |
|
|
|
>
|
|
|
|
>
|
|
|
|
</chat-menu> |
|
|
|
</chat-menu> |
|
|
|
</div> |
|
|
|
</div> |
|
|
|
|
|
|
|
<div class="message-reactions" style="${reactions.length > 0 &&
|
|
|
|
|
|
|
|
'margin-top: 10px; margin-bottom: 5px;'}"> |
|
|
|
|
|
|
|
${reactions.map((reaction)=> { |
|
|
|
|
|
|
|
return html` |
|
|
|
|
|
|
|
<span
|
|
|
|
|
|
|
|
@click=${() => this.sendMessage({ |
|
|
|
|
|
|
|
type: 'reaction', |
|
|
|
|
|
|
|
editedMessageObj: this.messageObj, |
|
|
|
|
|
|
|
reaction: reaction.type, |
|
|
|
|
|
|
|
})}
|
|
|
|
|
|
|
|
class="reactions-bg"> |
|
|
|
|
|
|
|
${reaction.type} ${reaction.qty} |
|
|
|
|
|
|
|
</span>` |
|
|
|
|
|
|
|
})} |
|
|
|
|
|
|
|
</div> |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
</div> |
|
|
|
|
|
|
|
</div> |
|
|
|
</div> |
|
|
|
</div> |
|
|
|
</li> |
|
|
|
</li> |
|
|
|
<chat-modals
|
|
|
|
<chat-modals
|
|
|
|
|
Justin Ferrari
2 years ago