{if $correspondent->getId() === $thisUser->getId() || $correspondent->getPrivacyPermission('messages.write', $thisUser)}
})
})
{else}
@@ -74,6 +202,12 @@
};
this.loadHistory = _ => {
window.Msg._loadHistory();
+ document.body.querySelectorAll(".bsdn").forEach(el => {
+ if(!el.querySelector(".bdsn-hydrated")) {
+ bsdnInitElement(el);
+ }
+ }
+ );
};
this.onMessagesScroll = (model, e) => {
@@ -238,6 +372,23 @@
msgData.set("content", content);
msgData.set("hash", {$csrfToken});
+ const writeBox = document.querySelector('.messenger-app--input #write');
+ let attachmentElements = writeBox ? writeBox.querySelectorAll("[data-att-id]") : document.querySelectorAll("[data-att-id]");
+ let attachmentIds = [];
+ if(attachmentElements && attachmentElements.length > 0) {
+ attachmentElements.forEach(el => {
+ let type = el.getAttribute("data-att-type");
+ let id = el.getAttribute("data-att-id");
+ if(type && id) {
+ attachmentIds.push(type + id);
+ }
+ });
+ }
+
+ if(attachmentIds.length > 0) {
+ msgData.set("attachments", attachmentIds.join(","));
+ }
+
let that = this;
let xhr = new XMLHttpRequest();
xhr.open("POST", "/im/api/messages" + {$correspondent->getId()} + "/create.json", true);
@@ -266,6 +417,26 @@
console.debug("Message sent, updating view.");
that._patchMessage(tempId, JSON.parse(xhr.responseText));
+
+ document.body.querySelectorAll(".bsdn").forEach(el => {
+ if(!el.querySelector(".bdsn-hydrated")) {
+ bsdnInitElement(el);
+ }
+ }
+ );
+
+ const writeBox = document.querySelector('#write');
+ if(writeBox) {
+ writeBox.querySelector('.post-horizontal').innerHTML = '';
+ writeBox.querySelector('.post-vertical').innerHTML = '';
+ }
+
+ const previewBox = document.querySelector('#messenger-attachment-preview');
+ if(previewBox) {
+ previewBox.querySelector('.post-horizontal').innerHTML = '';
+ previewBox.querySelector('.post-vertical').innerHTML = '';
+ previewBox.style.display = 'none';
+ }
});
xhr.send(msgData);
console.debug("Message sent, awaiting response.");
@@ -273,5 +444,130 @@
}
window.Msg = new Messenger([]);
+
+ document.querySelector(".messenger-app--messages").addEventListener("click", (e) => {
+ if(e.target.closest(".photoMessengerOpen")) {
+ e.preventDefault();
+ e.stopPropagation();
+ const photoLink = e.target.closest(".photoMessengerOpen");
+ const photoId = photoLink.getAttribute("data-photo-id");
+ const photoImg = photoLink.querySelector("img");
+ if(photoImg && photoId) {
+ OpenMiniature(e, photoImg.src, null, photoId, null);
+ }
+ }
+
+ if(e.target.closest(".videoMessengerOpen")) {
+ e.preventDefault();
+ e.stopPropagation();
+ const videoLink = e.target.closest(".videoMessengerOpen");
+ const videoId = videoLink.getAttribute("data-video-id");
+ if(videoId && videoId.indexOf("_") !== -1) {
+ const parts = videoId.split("_");
+ OpenVideo(parts);
+ }
+ }
+ });
+
+ (function() {
+ function syncItemToPreview(item) {
+ if(!item) return;
+
+ const type = item.getAttribute('data-type') || item.getAttribute('data-att-type');
+ const id = item.getAttribute('data-id') || item.getAttribute('data-att-id') || item.getAttribute('data-prettiest-id') || item.getAttribute('data-pretty-id');
+
+ if(type && id) {
+ item.setAttribute('data-att-type', type);
+ item.setAttribute('data-att-id', id);
+
+ const previewBox = document.querySelector('#messenger-attachment-preview');
+ if(previewBox) {
+ const isVertical = type === 'doc' || type === 'note' || type === 'audio';
+ const container = isVertical ?
+ previewBox.querySelector('.post-vertical') :
+ previewBox.querySelector('.post-horizontal');
+ if(container && !container.querySelector(`[data-att-type="${ type }"][data-att-id="${ id }"]`)) {
+ container.appendChild(item.cloneNode(true));
+ previewBox.style.display = 'block';
+ }
+ }
+ }
+ }
+
+ function normalizeUploadItem(el) {
+ if(!el) return;
+ const items = el.querySelectorAll('.upload-item, .vertical-attachment');
+ items.forEach(a => {
+ syncItemToPreview(a);
+ });
+ }
+
+ const write = document.querySelector('#write');
+ if(write) normalizeUploadItem(write);
+ const observer = new MutationObserver(mutations => {
+ mutations.forEach(m => {
+ if(m.addedNodes && m.addedNodes.length) {
+ m.addedNodes.forEach(node => {
+ if(node.nodeType === 1) {
+ if(node.matches && (node.matches('.upload-item') || node.matches('.vertical-attachment'))) {
+ syncItemToPreview(node);
+ } else {
+ normalizeUploadItem(node);
+ }
+ }
+ });
+ }
+
+ if(m.removedNodes && m.removedNodes.length) {
+ const previewBox = document.querySelector('#messenger-attachment-preview');
+ if (!previewBox) return;
+
+ m.removedNodes.forEach(node => {
+ if(node.nodeType === 1 && node.matches && (node.matches('.upload-item') || node.matches('.vertical-attachment'))) {
+ const type = node.getAttribute('data-att-type') || node.getAttribute('data-type');
+ const id = node.getAttribute('data-att-id') || node.getAttribute('data-id');
+
+ if(type && id) {
+ const itemToRemove = previewBox.querySelector(`[data-att-type="${ type }"][data-att-id="${ id }"], [data-type="${ type }"][data-id="${ id }"]`);
+ if(itemToRemove) {
+ itemToRemove.remove();
+ }
+ }
+ }
+ });
+
+ if(previewBox.querySelectorAll('.upload-item, .vertical-attachment').length === 0) {
+ previewBox.style.display = 'none';
+ }
+ }
+ });
+ });
+ if(write) observer.observe(write, { childList: true, subtree: true });
+
+ const previewBox = document.querySelector('#messenger-attachment-preview');
+ if(previewBox) {
+ previewBox.addEventListener('click', function(e) {
+ const target = e.target;
+ const deleteBtn = target.closest('.upload-delete') || target.closest('#small_remove_button') || target.closest('.vertical-attachment-remove');
+
+ if(deleteBtn) {
+ e.preventDefault();
+ e.stopPropagation();
+
+ const item = deleteBtn.closest('.upload-item, .vertical-attachment');
+ if(item) {
+ const type = item.getAttribute('data-att-type') || item.getAttribute('data-type');
+ const id = item.getAttribute('data-att-id') || item.getAttribute('data-id');
+
+ if(type && id && write) {
+ const sourceItem = write.querySelector(`[data-att-type="${ type }"][data-att-id="${ id }"], [data-type="${ type }"][data-id="${ id }"]`);
+ if(sourceItem)
+ sourceItem.remove();
+ }
+ }
+ }
+ });
+ }
+ })();
{/block}
diff --git a/Web/static/css/main.css b/Web/static/css/main.css
index d8d455b05..62b0fbc53 100644
--- a/Web/static/css/main.css
+++ b/Web/static/css/main.css
@@ -1323,6 +1323,11 @@ table.User {
display: block;
}
+.messenger-app--messages---message ._content .audioEmbed .title {
+ display: inline;
+ width: auto;
+}
+
.messenger-app--messages---message ._content span {
width: 100%;
height: fit-content;
@@ -1334,7 +1339,7 @@ table.User {
}
.messenger-app--messages---message ._content .attachments>.msg-attach-j * {
- max-width: 86%;
+ max-width: 100%;
}
.messenger-app--messages---message ._content .attachments:not(:empty) {
diff --git a/Web/static/js/al_wall.js b/Web/static/js/al_wall.js
index 22c0465bb..c2f72b449 100644
--- a/Web/static/js/al_wall.js
+++ b/Web/static/js/al_wall.js
@@ -1224,7 +1224,9 @@ async function __uploadToTextarea(file, textareaNode) {
const rand = random_int(0, 1000)
textareaNode.find('.post-horizontal').append(`
`)
- const res = await fetch(`/photos/upload?upload_context=${textareaNode.nodes[0].dataset.id}`, {
+ const writeEl = textareaNode.nodes[0]
+ const photoUploadContext = writeEl.dataset.context === 'messages' ? 'messages' : writeEl.dataset.id
+ const res = await fetch(`/photos/upload?upload_context=${photoUploadContext}`, {
method: 'POST',
body: form_data
})
@@ -1467,7 +1469,7 @@ u(document).on("click", "#__photoAttachment", async (e) => {
u(".ovk-diag-body #__pickerQuickUpload").on('change', (ev) => {
for(file of ev.target.files) {
try {
- __uploadToTextarea(file, form)
+ __uploadToTextarea(file, form.closest('#write'))
} catch(e) {
makeError(e.message)
return
@@ -1488,13 +1490,15 @@ u(document).on("click", "#__photoAttachment", async (e) => {
u(document).on('click', '#__videoAttachment', async (e) => {
const per_page = 10
- const form = u(e.target).closest('form')
+ const form = u(e.target).closest('form')
+ const isMessageContext = form.nodes[0]?.closest('#write')?.dataset?.context === 'messages'
+ const videoUploadUrl = isMessageContext ? '/videos/upload?upload_context=messages' : '/videos/upload'
const msg = new CMessageBox({
title: tr('selecting_video'),
body: `
@@ -1776,6 +1780,8 @@ u(document).on('click', '#__notesAttachment', async (e) => {
})
function showFastVideoUpload(node) {
+ const isMessageContext = node.nodes[0]?.closest('#write')?.dataset?.context === 'messages'
+ const uploadUrl = isMessageContext ? '/videos/upload?upload_context=messages' : '/videos/upload'
let current_tab = 'file'
const msg = new CMessageBox({
title: tr('upload_video'),
@@ -1829,7 +1835,7 @@ function showFastVideoUpload(node) {
form_data.append("hash", u("meta[name=csrf]").attr("value"))
window.messagebox_stack[1].getNode().find('.ovk-diag-action button').nodes[1].classList.add('lagged')
- const fetcher = await fetch(`/videos/upload`, {
+ const fetcher = await fetch(uploadUrl, {
method: 'POST',
body: form_data
})
@@ -1853,7 +1859,7 @@ function showFastVideoUpload(node) {
form_data.append("hash", u("meta[name=csrf]").attr("value"))
window.messagebox_stack[1].getNode().find('.ovk-diag-action button').nodes[1].classList.add('lagged')
- const fetcher_yt = await fetch(`/videos/upload`, {
+ const fetcher_yt = await fetch(uploadUrl, {
method: 'POST',
body: form_data
})
diff --git a/install/sqls/00061-message-attachments-privacy.sql b/install/sqls/00061-message-attachments-privacy.sql
new file mode 100644
index 000000000..cd7651588
--- /dev/null
+++ b/install/sqls/00061-message-attachments-privacy.sql
@@ -0,0 +1,2 @@
+ALTER TABLE `photos` ADD COLUMN `is_message_photo` TINYINT(1) NOT NULL DEFAULT 0;
+ALTER TABLE `videos` ADD COLUMN `is_message_video` TINYINT(1) NOT NULL DEFAULT 0;