gochan/gochan
1
0
Fork 0
mirror of https://github.com/Eggbertx/gochan.git synced 2025-09-06 11:46:24 -07:00
Code Releases Activity

Update thread when a QR post is submitted

Browse source
This commit is contained in:
Eggbertx 2023-06-22 12:20:57 -07:00
parent 4264b8eeec
commit 51f62b8fc1
2 changed files with 18 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

36
frontend/ts/dom/qr.ts
View file

@ -12,11 +12,11 @@ import { upArrow, downArrow } from "../vars";
import { getCookie } from "../cookies";
import { $topbar, topbarHeight } from "./topbar";
import { getBooleanStorageVal, getJsonStorageVal, setStorageVal } from "../storage";
import { updateThread } from "../postutil";
import { currentBoard, currentThread } from "../postinfo";
import { getReplyCooldown, getThreadCooldown } from "../api/cooldowns";
import { getUploadFilename, updateUploadImage } from "./uploaddata";
import { alertLightbox } from "./lightbox";
import { addPostDropdown } from "./postdropdown";
export let $qr: JQuery<HTMLElement> = null;
let threadCooldown = 0;
@ -115,7 +115,7 @@ export function initQR() {
const $qrbuttons = $("<div/>")
.prop("id", "qrbuttons")
.append(qrButtonHTML);
const $postform = $("<form/>").prop({
const $postform = $<HTMLFormElement>("<form/>").prop({
id: "qrpostform",
name: "qrpostform",
action: webroot + "post",
@ -202,23 +202,18 @@ export function initQR() {
openQR();
updateUploadImage($qrbuttons.find("input#imagefile"), qrUploadChange);
resetSubmitButtonText();
if(currentThread().id < 1) {
$("form#qrpostform").on("submit", function(_e) {
copyCaptchaResponse($(this));
});
return;
}
$postform.on("submit", function(e) {
const $form = $<HTMLFormElement>(this as HTMLFormElement);
const $form = $<HTMLFormElement>(this);
e.preventDefault();
copyCaptchaResponse($form);
const data = new FormData(this as HTMLFormElement);
const data = new FormData(this);
$.ajax({
type: "POST",
url: $form.attr("action"),
enctype: "multipart/form-data",
data: data, // $form.serialize(),
data: data,
processData: false,
contentType: false,
dataType: "json",
@ -227,6 +222,11 @@ export function initQR() {
alertLightbox(data.error, "Error");
return;
}
if(data.thread !== location.pathname) {
// new thread
location.pathname = data.thread;
return;
}
clearQR();
const cooldown = (currentThread().id > 0)?replyCooldown:threadCooldown;
setButtonTimeout("", cooldown);
@ -245,14 +245,12 @@ export function initQR() {
}
function updateThreadSuccess(data: any) {
const $doc = $(data);
const $replyContainers = $("div.reply-container");
$doc.find("div.reply-container").each((_i, el: HTMLElement) => {
const idSelector = `#${el.id}`;
const prevIDselector = `#${el.previousElementSibling.id}`;
if($replyContainers.filter(idSelector).length === 0) {
// new post
$(el).insertAfter($replyContainers.filter(prevIDselector));
const $checkPosts = $(data).find("div.thread").children().filter((_i, el) => !$(el).hasClass("op-post"));
let $replyContainers = $("div.thread").children();
$checkPosts.each((_i, el) => {
if($replyContainers.filter(`#${el.id}`).length < 1) {
addPostDropdown($(el).insertAfter(`#${el.previousElementSibling.id}`));
$replyContainers = $("div.thread").children();
}
});
}

2
templates/post.html
View file

@ -14,7 +14,7 @@
{{- end -}}
{{- if ne .post.Email ""}}</a>{{end}}</span>
{{- if ne .post.Tripcode ""}}<span class="tripcode">!{{.post.Tripcode}}</span>{{end}} {{formatTimestamp .post.Timestamp -}}
</label><a href="{{.post.WebPath}}">No.</a> <a href="javascript:quote({{.post.ID}})" class="backlink-click">{{.post.ID}}</a>
</label> <a href="{{.post.WebPath}}">No.</a> <a href="javascript:quote({{.post.ID}})" class="backlink-click">{{.post.ID}}</a>
<span class="status-icons">
{{- if $.thread.Locked -}}<img src="{{webPath "/static/lock.png"}}" class="locked-icon" alt="Thread locked" title="Thread locked">{{end -}}
{{- if $.thread.Stickied -}}<img src="{{webPath "/static/sticky.png"}}" class="sticky-icon" alt="Sticky" title="Sticky">{{end -}}