-
- 
+
- ${chat.lastMessage || 'No messages yet'}
- ${hasUnread ? `${chat.unreadCount}` : ''}
-
+
+
- `;
+
+ `;
li.addEventListener('click', () => onChatSelect(chat));
elements.chatList.appendChild(li);
- });
+ }
},
/**
* Render chat message log inside chat view container
*/
- async renderMessages(messages, activeChatName, userID) {
+ async renderMessages(messages, activeChatName, userID, chatId) {
elements.messagesContainer.innerHTML = '';
if (messages.length === 0) {
@@ -129,7 +129,7 @@ export const ui = {
}
for (const msg of messages) {
- this.appendSingleMessage(msg, activeChatName, userID);
+ this.appendSingleMessage(msg, activeChatName, userID, chatId);
}
lucide.createIcons();
@@ -139,7 +139,7 @@ export const ui = {
/**
* Append a single message (used for optimistic updates immediately upon sending)
*/
- appendSingleMessage(msg, activeChatName, userID) {
+ appendSingleMessage(msg, activeChatName, userID, chatId) {
console.log(msg);
const isOutgoing = msg.fromMe || msg.sender === 'me';
@@ -179,12 +179,14 @@ export const ui = {
contentEl.appendChild(textEl);
bubble.appendChild(contentEl);
- if (msg.media?.url) {
+ if (msg.hasMedia) {
const a = document.createElement('a');
- a.innerText = `Request media (${msg.media.filename})`;
+ a.innerText = `[Request media]`;
a.addEventListener('click', async (e) => {
- const url = new URL(msg.media.url);
+ const mediaMsg = await waha.getSingleChatMessage(chatId, msg.id, true);
+
+ const url = new URL(mediaMsg.media.url);
const reqID = url.pathname.split('/').filter(Boolean).pop();
const { blob, filename } = await waha.downloadMedia(reqID);
@@ -199,7 +201,7 @@ export const ui = {
img.src = objectUrl;
a.appendChild(img);
} else {
- e.target.textContent = filename || `Download ${msg.media.filename}`;
+ e.target.textContent = filename || `Download ${mediaMsg.media.filename}`;
}
})
diff --git a/docs/utils.js b/www/utils.js
similarity index 100%
rename from docs/utils.js
rename to www/utils.js
diff --git a/docs/waha.js b/www/waha.js
similarity index 94%
rename from docs/waha.js
rename to www/waha.js
index ff4292d..5d4ae69 100644
--- a/docs/waha.js
+++ b/www/waha.js
@@ -89,7 +89,11 @@ export const waha = {
},
async getChatMessages(chatId) {
- return request(`/api/${config.session}/chats/${chatId}/messages?downloadMedia=true&limit=40`);
+ return request(`/api/${config.session}/chats/${chatId}/messages?downloadMedia=false&limit=40`);
+ },
+
+ async getSingleChatMessage(chatId, messageId, downladMedia) {
+ return request(`/api/${config.session}/chats/${chatId}/messages/${messageId}?downloadMedia=${downladMedia}`);
},
async getChatPicture(chatId) {
diff --git a/docs/websocket.js b/www/websocket.js
similarity index 100%
rename from docs/websocket.js
rename to www/websocket.js
+ ${chat.lastMessage || 'No messages yet'}
+ ${hasUnread ? `${chat.unreadCount}` : ''}
+
+