@@ -276,7 +313,9 @@ function OpenMiniature(e, photo, post, photo_id) {
__slidePhoto(1);
});
- ky.post("/iapi/getPhotosFromPost/" + post, {
+ let data = new FormData()
+ data.append('parentType', type);
+ ky.post("/iapi/getPhotosFromPost/" + (type == "post" ? post : "1_"+post), {
hooks: {
afterResponse: [
async (_request, _options, response) => {
@@ -298,7 +337,8 @@ function OpenMiniature(e, photo, post, photo_id) {
__reloadTitleBar();
__loadDetails(json.body[imagesIndex - 1].id, imagesIndex); }
]
- }
+ },
+ body: data
});
return u(".ovk-photo-view-dimmer");
@@ -396,6 +436,7 @@ function addNote(textareaId, nid)
u("body").removeClass("dimmed");
u(".ovk-diag-cont").remove();
+ document.querySelector("html").style.overflowY = "scroll"
}
async function attachNote(id)
@@ -711,3 +752,210 @@ $(document).on("click", "#editPost", (e) => {
text.style.display = "block"
}
})
+
+// copypaste from videos picker
+$(document).on("click", "#photosAttachments", async (e) => {
+ let body = `
+
+
+
+
${tr("is_x_photos", 0)}
+
+
+ `
+
+ let form = e.currentTarget.closest("form")
+
+ MessageBox(tr("select_photo"), body, [tr("close")], [Function.noop]);
+
+ document.querySelector(".ovk-diag-body").style.padding = "0"
+ document.querySelector(".ovk-diag-cont").style.width = "630px"
+ document.querySelector(".ovk-diag-body").style.height = "335px"
+
+ async function insertPhotos(page, album = 0) {
+ u("#loader").remove()
+
+ let insertPlace = document.querySelector(".photosInsert .photosList")
+ document.querySelector(".photosInsert").insertAdjacentHTML("beforeend", `
`)
+
+ let photos;
+
+ try {
+ photos = await API.Photos.getPhotos(page, Number(album))
+ } catch(e) {
+ document.querySelector(".photosInsert h4").innerHTML = tr("is_x_photos", -1)
+ insertPlace.innerHTML = "Invalid album"
+ console.error(e)
+ u("#loader").remove()
+ return;
+ }
+
+ document.querySelector(".photosInsert h4").innerHTML = tr("is_x_photos", photos.count)
+
+ let pagesCount = Math.ceil(Number(photos.count) / 24)
+ u("#loader").remove()
+
+ for(const photo of photos.items) {
+ let isAttached = (form.querySelector("input[name='photos']").value.includes(`${photo.owner_id}_${photo.id},`))
+
+ insertPlace.insertAdjacentHTML("beforeend", `
+
+ `)
+ }
+
+ if(page < pagesCount) {
+ insertPlace.insertAdjacentHTML("beforeend", `
+
+ more...
+
`)
+ }
+ }
+
+ insertPhotos(1)
+
+ let albums = await API.Photos.getAlbums(Number(e.currentTarget.dataset.club ?? 0))
+
+ for(const alb of albums.items) {
+ let sel = document.querySelector(".ovk-diag-body #albumSelect")
+
+ sel.insertAdjacentHTML("beforeend", `
`)
+ }
+
+ $(".photosInsert").on("click", "#showMorePhotos", (e) => {
+ u(e.currentTarget).remove()
+ insertPhotos(Number(e.currentTarget.dataset.page), document.querySelector(".topGrayBlock #albumSelect").value)
+ })
+
+ $(".topGrayBlock #albumSelect").on("change", (evv) => {
+ document.querySelector(".photosInsert .photosList").innerHTML = ""
+
+ insertPhotos(1, evv.currentTarget.value)
+ })
+
+ function insertAttachment(id) {
+ let photos = form.querySelector("input[name='photos']")
+
+ if(!photos.value.includes(id + ",")) {
+ if(photos.value.split(",").length > 10) {
+ NewNotification(tr("error"), tr("max_attached_photos"))
+ return false
+ }
+
+ form.querySelector("input[name='photos']").value += (id + ",")
+
+ console.info(id + " attached")
+ return true
+ } else {
+ form.querySelector("input[name='photos']").value = form.querySelector("input[name='photos']").value.replace(id + ",", "")
+
+ console.info(id + " detached")
+ return false
+ }
+ }
+
+ $(".photosList").on("click", ".album-photo", (ev) => {
+ ev.preventDefault()
+
+ if(!insertAttachment(ev.currentTarget.dataset.attachmentdata)) {
+ u(form.querySelector(`.upload #aP[data-id='${ev.currentTarget.dataset.attachmentdata}']`)).remove()
+ ev.currentTarget.querySelector("img").style.backgroundColor = "white"
+ } else {
+ ev.currentTarget.querySelector("img").style.backgroundColor = "#646464"
+ let id = ev.currentTarget.dataset.attachmentdata
+
+ u(form.querySelector(`.upload`)).append(u(`
+
+
×
+
+
+ `));
+
+ u(`.upload #aP[data-id='${ev.currentTarget.dataset.attachmentdata}'] .upload-delete`).on("click", () => {
+ form.querySelector("input[name='photos']").value = form.querySelector("input[name='photos']").value.replace(id + ",", "")
+ u(form.querySelector(`.upload #aP[data-id='${ev.currentTarget.dataset.attachmentdata}']`)).remove()
+ })
+ }
+ })
+
+ u("#fastFotosUplod").on("change", (evn) => {
+ let xhr = new XMLHttpRequest()
+ xhr.open("POST", "/photos/upload")
+
+ let formdata = new FormData()
+ let iterator = 0
+
+ for(const fille of evn.currentTarget.files) {
+ if(!fille.type.startsWith('image/')) {
+ continue;
+ }
+
+ if(fille.size > 5 * 1024 * 1024) {
+ continue;
+ }
+
+ if(evn.currentTarget.files.length >= 10) {
+ NewNotification(tr("error"), tr("max_attached_photos"))
+ return;
+ }
+
+ formdata.append("photo_"+iterator, fille)
+ iterator += 1
+ }
+
+ xhr.onloadstart = () => {
+ evn.currentTarget.parentNode.insertAdjacentHTML("beforeend", `
`)
+ }
+
+ xhr.onload = () => {
+ let result = JSON.parse(xhr.responseText)
+
+ u("#loader").remove()
+ if(result.success) {
+ for(const pht of result.photos) {
+ let id = pht.owner + "_" + pht.vid
+
+ if(!insertAttachment(id)) {
+ return
+ }
+
+ u(form.querySelector(`.upload`)).append(u(`
+
+
×
+
+
+ `));
+
+ u(`.upload #aP[data-id='${pht.owner + "_" + pht.vid}'] .upload-delete`).on("click", () => {
+ form.querySelector("input[name='photos']").value = form.querySelector("input[name='photos']").value.replace(id + ",", "")
+ u(form.querySelector(`.upload #aP[data-id='${id}']`)).remove()
+ })
+ }
+
+ u("body").removeClass("dimmed");
+ u(".ovk-diag-cont").remove();
+ document.querySelector("html").style.overflowY = "scroll"
+ } else {
+ // todo: https://vk.com/wall-32295218_78593
+ alert(result.flash.message)
+ }
+ }
+
+ formdata.append("hash", u("meta[name=csrf]").attr("value"))
+ formdata.append("count", iterator)
+
+ xhr.send(formdata)
+ })
+})
diff --git a/locales/en.strings b/locales/en.strings
index 22cee453..89de34c8 100644
--- a/locales/en.strings
+++ b/locales/en.strings
@@ -412,6 +412,18 @@
"tip" = "Tip";
"tip_ctrl" = "to select multiple photos at once, hold down the Ctrl key when selecting files in Windows or the CMD key in Mac OS.";
"album_poster" = "Album poster";
+"select_photo" = "Select photos";
+"upload_new_photo" = "Upload new photo";
+
+"is_x_photos_zero" = "Just zero photos.";
+"is_x_photos_one" = "Just one photo.";
+"is_x_photos_few" = "Just $1 photos.";
+"is_x_photos_many" = "Just $1 photos.";
+"is_x_photos_other" = "Just $1 photos.";
+
+"all_photos" = "All photos";
+"error_uploading_photo" = "Error when uploading photo. Error text: ";
+"too_many_photos" = "Too many photos.";
/* Notes */
@@ -697,6 +709,7 @@
"selecting_video" = "Selecting videos";
"upload_new_video" = "Upload new video";
"max_attached_videos" = "Max is 10 videos";
+"max_attached_photos" = "Max is 10 photos";
"no_videos" = "You don't have uploaded videos.";
"no_videos_results" = "No results.";
diff --git a/locales/ru.strings b/locales/ru.strings
index 2dfadb8f..9a69c804 100644
--- a/locales/ru.strings
+++ b/locales/ru.strings
@@ -394,6 +394,18 @@
"tip" = "Подсказка";
"tip_ctrl" = "для того, чтобы выбрать сразу несколько фотографий, удерживайте клавишу Ctrl при выборе файлов в ОС Windows или клавишу CMD в Mac OS.";
"album_poster" = "Обложка альбома";
+"select_photo" = "Выберите фотографию";
+"upload_new_photo" = "Загрузить новую фотографию";
+
+"is_x_photos_zero" = "Всего ноль фотографий.";
+"is_x_photos_one" = "Всего одна фотография.";
+"is_x_photos_few" = "Всего $1 фотографии.";
+"is_x_photos_many" = "Всего $1 фотографий.";
+"is_x_photos_other" = "Всего $1 фотографий.";
+
+"all_photos" = "Все фотографии";
+"error_uploading_photo" = "Не удалось загрузить фотографию. Текст ошибки: ";
+"too_many_photos" = "Слишком много фотографий.";
/* Notes */
@@ -656,6 +668,7 @@
"selecting_video" = "Выбор видеозаписей";
"upload_new_video" = "Загрузить новое видео";
"max_attached_videos" = "Максимум 10 видеозаписей";
+"max_attached_photos" = "Максимум 10 фотографий";
"no_videos" = "У вас нет видео.";
"no_videos_results" = "Нет результатов.";
{_photo}
@@ -109,6 +109,7 @@
});
u("#post-buttons{$textAreaId} input[name='videos']")["nodes"].at(0).value = ""
+ u("#post-buttons{$textAreaId} input[name='photos']")["nodes"].at(0).value = ""
{if $graffiti}
diff --git a/Web/routes.yml b/Web/routes.yml
index d61fbd16..dea8ddd5 100644
--- a/Web/routes.yml
+++ b/Web/routes.yml
@@ -371,7 +371,7 @@ routes:
handler: "About->humansTxt"
- url: "/dev"
handler: "About->dev"
- - url: "/iapi/getPhotosFromPost/{text}"
+ - url: "/iapi/getPhotosFromPost/{num}_{num}"
handler: "InternalAPI->getPhotosFromPost"
- url: "/tour"
handler: "About->tour"
diff --git a/Web/static/js/al_wall.js b/Web/static/js/al_wall.js
index 8ea202a4..da4b6b33 100644
--- a/Web/static/js/al_wall.js
+++ b/Web/static/js/al_wall.js
@@ -22,7 +22,7 @@ function trim(string) {
return newStr;
}
-function handleVideoTAreaUpdate(event, id) {
+/*function handleVideoTAreaUpdate(event, id) {
console.log(event, id);
let indicator = u("#post-buttons" + id + " .post-upload");
let file = event.target.files[0];
@@ -34,7 +34,7 @@ function handleVideoTAreaUpdate(event, id) {
}
document.querySelector("#post-buttons" + id + " #wallAttachmentMenu").classList.add("hidden");
-}
+}*/
function initGraffiti(id) {
let canvas = null;
@@ -42,14 +42,8 @@ function initGraffiti(id) {
canvas.getImage({includeWatermark: false}).toBlob(blob => {
let fName = "Graffiti-" + Math.ceil(performance.now()).toString() + ".jpeg";
let image = new File([blob], fName, {type: "image/jpeg", lastModified: new Date().getTime()});
- let trans = new DataTransfer();
- trans.items.add(image);
- let fileSelect = document.querySelector("#post-buttons" + id + " input[name='_pic_attachment']");
- fileSelect.files = trans.files;
-
- u(fileSelect).trigger("change");
- u("#post-buttons" + id + " #write textarea").trigger("focusin");
+ fastUploadImage(id, image)
}, "image/jpeg", 0.92);
canvas.teardown();
@@ -72,6 +66,79 @@ function initGraffiti(id) {
});
}
+function fastUploadImage(textareaId, file) {
+ // uploading images
+
+ if(!file.type.startsWith('image/')) {
+ MessageBox(tr("error"), tr("only_images_accepted", escapeHtml(file.name)), [tr("ok")], [() => {Function.noop}])
+ return;
+ }
+
+ // 🤓🤓🤓
+ if(file.size > 5 * 1024 * 1024) {
+ MessageBox(tr("error"), tr("max_filesize", 5), [tr("ok")], [() => {Function.noop}])
+ return;
+ }
+
+ let imagesCount = document.querySelector("#post-buttons" + textareaId + " input[name='photos']").value.split(",").length
+
+ if(imagesCount > 10) {
+ MessageBox(tr("error"), tr("too_many_photos"), [tr("ok")], [() => {Function.noop}])
+ return
+ }
+
+ let xhr = new XMLHttpRequest
+ let data = new FormData
+
+ data.append("photo_0", file)
+ data.append("count", 1)
+ data.append("hash", u("meta[name=csrf]").attr("value"))
+
+ xhr.open("POST", "/photos/upload")
+
+ xhr.onloadstart = () => {
+ document.querySelector("#post-buttons"+textareaId+" .upload").insertAdjacentHTML("beforeend", `