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

Added caption logic & Fixed edit msg styling bug

Browse Source
This commit is contained in:
Justin Ferrari 2022-11-08 22:30:02 -05:00
parent dc489b35f3
commit 83c851d371
2 changed files with 39 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -129,12 +129,14 @@ class ChatPage extends LitElement {
flex-direction: row;
align-items: center;
gap: 15px;
width: 100%;
}
.repliedTo-message {
display: flex;
flex-direction: column;
gap: 5px;
width: 95%;
}
@ -146,6 +148,10 @@ class ChatPage extends LitElement {
}
.original-message {
color: black;
text-overflow: ellipsis;
overflow: hidden;
white-space: nowrap;
margin: 0;
}
@ -493,7 +499,13 @@ class ChatPage extends LitElement {
src="/img/qchat-send-message-icon.svg"
alt="send-icon"
class="send-icon"
@click=${() => this._sendMessage()} />
@click=${()=> {
this._sendMessage({
type: 'image',
imageFile: this.imageFile,
caption: this.caption,
})
}} />
` :
html`
<paper-spinner-lite active></paper-spinner-lite>
@ -515,7 +527,6 @@ class ChatPage extends LitElement {
dialogAction="cancel"
class="red"
@click=${()=>{
this.imageFile = null
}}
>
@ -525,12 +536,11 @@ class ChatPage extends LitElement {
slot="primaryAction"
dialogAction="cancel"
@click=${()=> {
// this._sendMessage({
// type: 'image',
// imageFile: this.imageFile,
// caption: 'This is a caption'
// })
console.log(this.caption);
this._sendMessage({
type: 'image',
imageFile: this.imageFile,
caption: this.caption,
})
}}
>
${translate("chatpage.cchange9")}
@ -1371,16 +1381,17 @@ class ChatPage extends LitElement {
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 ""
}
@ -1538,23 +1549,24 @@ class ChatPage extends LitElement {
repliedTo: '',
version: 1
}
const stringifyMessageObject = JSON.stringify(messageObject)
const stringifyMessageObject = JSON.stringify(messageObject);
this.sendMessage(stringifyMessageObject, typeMessage);
} else if (outSideMsg && outSideMsg.type === 'reaction') {
typeMessage = 'edit'
let chatReference = outSideMsg.editedMessageObj.reference
typeMessage = 'edit';
let chatReference = outSideMsg.editedMessageObj.reference;
if (outSideMsg.editedMessageObj.chatReference) {
chatReference = outSideMsg.editedMessageObj.chatReference
chatReference = outSideMsg.editedMessageObj.chatReference;
}
let message = ""
let message = "";
try {
const parsedMessageObj = JSON.parse(outSideMsg.editedMessageObj.decodedMessage)
message = parsedMessageObj
const parsedMessageObj = JSON.parse(outSideMsg.editedMessageObj.decodedMessage);
message = parsedMessageObj;
} catch (error) {
message = outSideMsg.editedMessageObj.decodedMessage
message = outSideMsg.editedMessageObj.decodedMessage;
}
let reactions = message.reactions || []

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

@ -371,6 +371,6 @@ export const chatStyles = css`
display: flex;
justify-content: center;
align-items: center;
height: 80vh;
height: 100%;
}
`