From 243e7bbffc8f28e12719bb697e75bd67f9da1901 Mon Sep 17 00:00:00 2001
From: sneedmaster <sneedmaster@cock.li>
Date: Fri, 24 Apr 2026 15:58:03 +0200
Subject: [PATCH] =?UTF-8?q?Captcha=20bfke=C5=A1=C3=A1rna=20opravena?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/web/components/content/catalog_tile.tsx   |  2 +-
 src/web/components/content/post.tsx           |  2 +-
 .../components/forms/post_actions_form.tsx    |  2 +-
 src/web/components/forms/post_form.tsx        |  8 +++---
 src/web/routes/uconfig.tsx                    |  6 ++---
 src/web/templates/error_page.tsx              |  4 +--
 src/web/templates/result.tsx                  |  4 +--
 web/ts/auto_update.ts                         |  2 +-
 web/ts/forms/captcha.ts                       | 27 +++++++++++++++++++
 web/ts/forms/post_actions.ts                  |  2 +-
 web/ts/lib/popup.ts                           |  2 +-
 web/ts/main.ts                                |  2 ++
 12 files changed, 46 insertions(+), 17 deletions(-)
 create mode 100644 web/ts/forms/captcha.ts

diff --git a/src/web/components/content/catalog_tile.tsx b/src/web/components/content/catalog_tile.tsx
index fdac02b..7eaafe5 100644
--- a/src/web/components/content/catalog_tile.tsx
+++ b/src/web/components/content/catalog_tile.tsx
@@ -5,8 +5,8 @@ import type { PropsWithChildren } from "@kitajs/html";
 
 const CatalogTile = ({ post }: PropsWithChildren<{ post: Post }>) => (
   <div
-    class="catalog-tile"
     id={`${post.board}-${post.id}`}
+    class="catalog-tile"
     data-board={post.board}
     data-id={post.id}
   >
diff --git a/src/web/components/content/post.tsx b/src/web/components/content/post.tsx
index 413a0ce..ea558a6 100644
--- a/src/web/components/content/post.tsx
+++ b/src/web/components/content/post.tsx
@@ -28,8 +28,8 @@ const PostComponent = ({
   reply?: boolean;
 }>) => (
   <div
-    class={`post${reply ? " reply" : ""}`}
     id={`${board.id}-${post.id}`}
+    class={`post${reply ? " reply" : ""}`}
     data-board={board.id}
     data-id={post.id}
   >
diff --git a/src/web/components/forms/post_actions_form.tsx b/src/web/components/forms/post_actions_form.tsx
index f8005a8..690b993 100644
--- a/src/web/components/forms/post_actions_form.tsx
+++ b/src/web/components/forms/post_actions_form.tsx
@@ -5,7 +5,7 @@ import { Form, FormButton, FormField, FormHeader } from "./form.js";
 import type { PropsWithChildren } from "@kitajs/html";
 
 const PostActionsForm = ({ ctx }: PropsWithChildren<{ ctx: TemplateCtx }>) => (
-  <div class="form-group" id="post-actions">
+  <div id="post-actions" class="form-group">
     <Form fullWidth headerOnly>
       <FormHeader>
         Akce příspěvku
diff --git a/src/web/components/forms/post_form.tsx b/src/web/components/forms/post_form.tsx
index 2efb74d..25451be 100644
--- a/src/web/components/forms/post_form.tsx
+++ b/src/web/components/forms/post_form.tsx
@@ -16,10 +16,10 @@ const PostForm = ({
   thread?: number;
 }>) => (
   <form
+    id="post-form"
     method="post"
     enctype="multipart/form-data"
     action="/actions/create_post"
-    id="post-form"
   >
     <input name="board" type="hidden" value={board.id} />
     {thread && <input name="thread" type="hidden" value={thread.toString()} />}
@@ -87,10 +87,10 @@ const PostForm = ({
         }
       >
         <textarea
+          id="post-form-content"
           name="content"
           rows="10"
           cols="35"
-          id="post-form-content"
         ></textarea>
       </FormField>
       {
@@ -105,7 +105,7 @@ const PostForm = ({
         ) && (
           <>
             <FormField label="CAPTCHA" wrapper required>
-              <img class="full-width" src="/captcha" />
+              <img id="captcha" class="full-width" src="/captcha" />
               <input name="captcha" type="text" />
             </FormField>
           </>
@@ -138,12 +138,12 @@ const PostForm = ({
             }
           >
             <input
+              id="post-form-file"
               class="file-input"
               name="files"
               type="file"
               multiple={board.config.max_files > 1}
               data-max-files={board.config.max_files}
-              id="post-form-file"
             />
             <label>
               [ Spoiler? <input name="spoiler" type="checkbox" /> ]
diff --git a/src/web/routes/uconfig.tsx b/src/web/routes/uconfig.tsx
index d7ab0f7..8f46765 100644
--- a/src/web/routes/uconfig.tsx
+++ b/src/web/routes/uconfig.tsx
@@ -74,13 +74,13 @@ const Template = (ctx: TemplateCtx) => (
           <FormHeader>Tyto možnosti vyžadují JavaScript</FormHeader>
         </noscript>
         <FormField label="Vlastní CSS">
-          <textarea rows="10" cols="35" id="uconfig-css"></textarea>
+          <textarea id="uconfig-css" rows="10" cols="35"></textarea>
         </FormField>
         <FormField label="Vlastní JS">
-          <textarea rows="10" cols="35" id="uconfig-js"></textarea>
+          <textarea id="uconfig-js" rows="10" cols="35"></textarea>
         </FormField>
         <FormField label="Anonymizovat jména souborů" wrapper>
-          <input type="checkbox" id="uconfig-anon-files" />
+          <input id="uconfig-anon-files" type="checkbox" />
         </FormField>
         <tr>
           <td colspan="2">
diff --git a/src/web/templates/error_page.tsx b/src/web/templates/error_page.tsx
index 7318d9f..537ddf8 100755
--- a/src/web/templates/error_page.tsx
+++ b/src/web/templates/error_page.tsx
@@ -14,11 +14,11 @@ const ErrorPage = (ctx: TemplateCtx, errors: CzchanError[]) => (
     <PageBody ctx={ctx}>
       <div class="container">
         <div class="infobox center">
-          <h2 class="infobox-head" id="error-title">
+          <h2 id="error-title" class="infobox-head">
             Chyba {errors[0].statusCode}
           </h2>
           <div class="infobox-body">
-            <ul class="message-list" id="error-messages">
+            <ul id="error-messages" class="message-list">
               {errors.map((err) => (
                 <li safe>{err.message}</li>
               ))}
diff --git a/src/web/templates/result.tsx b/src/web/templates/result.tsx
index e6abb85..4f9e47f 100644
--- a/src/web/templates/result.tsx
+++ b/src/web/templates/result.tsx
@@ -9,11 +9,11 @@ const ResultPage = (ctx: TemplateCtx, messages: string[]) => (
     <PageBody ctx={ctx}>
       <div class="container">
         <div class="infobox center">
-          <h2 class="infobox-head" id="result-title">
+          <h2 id="result-title" class="infobox-head">
             Výsledek
           </h2>
           <div class="infobox-body">
-            <ul class="message-list" id="result-messages">
+            <ul id="result-messages" class="message-list">
               {messages.map((message) => (
                 <li safe>{message}</li>
               ))}
diff --git a/web/ts/auto_update.ts b/web/ts/auto_update.ts
index 8755d95..99e01a0 100644
--- a/web/ts/auto_update.ts
+++ b/web/ts/auto_update.ts
@@ -20,7 +20,7 @@ const autoUpdate = () => {
   const infoContainer = $("#update-info-container");
 
   infoContainer.append(
-    '<hr><nav class="updater"><span id="update-info"></span> <b><a href="javascript:void(0)" id="update">[Aktualizovat]</a></b> <label>[ Auto? <input type="checkbox" id="do-update" checked=""> ]</label></nav>',
+    '<hr><nav class="updater"><span id="update-info"></span> <b><a id="update" href="javascript:void(0)">[Aktualizovat]</a></b> <label>[ Auto? <input id="do-update" type="checkbox" checked=""> ]</label></nav>',
   );
 
   let seconds = 0;
diff --git a/web/ts/forms/captcha.ts b/web/ts/forms/captcha.ts
new file mode 100644
index 0000000..f7c6c0f
--- /dev/null
+++ b/web/ts/forms/captcha.ts
@@ -0,0 +1,27 @@
+import $ from "jquery";
+
+const captcha = () => {
+  const eventHandler = () => {
+    const captcha = $("#captcha");
+
+    if (captcha.length === 0) {
+      return;
+    }
+
+    const src = captcha.attr("src");
+
+    if (!src) {
+      return;
+    }
+
+    const now = Date.now();
+    const segments = src.split("?");
+
+    captcha.prop("src", `${segments[0]}?${now}`);
+  };
+
+  $(window).on("pageshow", eventHandler);
+  $(window).on("load", eventHandler);
+};
+
+export { captcha };
diff --git a/web/ts/forms/post_actions.ts b/web/ts/forms/post_actions.ts
index 69ea4fe..8bcd1ed 100644
--- a/web/ts/forms/post_actions.ts
+++ b/web/ts/forms/post_actions.ts
@@ -19,7 +19,7 @@ const dragPostActions = () => {
   }
 
   options.html(
-    '<label>[ <img class="icon" src="/public/img/icons/sticky.png"> <input type="checkbox" id="post-actions-sticky" checked=""> ]</label>',
+    '<label>[ <img class="icon" src="/public/img/icons/sticky.png"> <input id="post-actions-sticky" type="checkbox" checked=""> ]</label>',
   );
 
   const stickyCheckbox = $("#post-actions-sticky");
diff --git a/web/ts/lib/popup.ts b/web/ts/lib/popup.ts
index 302f8f0..f2dcfd9 100644
--- a/web/ts/lib/popup.ts
+++ b/web/ts/lib/popup.ts
@@ -2,7 +2,7 @@ import $ from "jquery";
 
 const popup = (title: string, messages: string[]) => {
   const popup = $(
-    `<div class="container"><div class="infobox"><h2 class="infobox-head clearfix"><span id="popup-title"></span><small class="float-r"><a href="javascript:void(0)" id="popup-closer">[X]</a></small></h2><div class="infobox-body"><ul class="message-list" id="popup-messages"></ul></div></div></div>`,
+    `<div class="container"><div class="infobox"><h2 class="infobox-head clearfix"><span id="popup-title"></span><small class="float-r"><a id="popup-closer" href="javascript:void(0)">[X]</a></small></h2><div class="infobox-body"><ul id="popup-messages" class="message-list"></ul></div></div></div>`,
   );
 
   popup.find("#popup-title").text(title);
diff --git a/web/ts/main.ts b/web/ts/main.ts
index 9ba1b61..a10a66e 100644
--- a/web/ts/main.ts
+++ b/web/ts/main.ts
@@ -1,5 +1,6 @@
 import { autoUpdate } from "./auto_update.js";
 import { ajaxify } from "./forms/ajaxify.js";
+import { captcha } from "./forms/captcha.js";
 import { fileSelector } from "./forms/file_selector.js";
 import { dragPostActions } from "./forms/post_actions.js";
 import { dragPostForm } from "./forms/post_form.js";
@@ -17,6 +18,7 @@ $(function () {
   initYous();
   // Forms
   fileSelector($("#post-form"));
+  captcha();
   dragPostForm();
   dragPostActions();
   ajaxify($(".ajax-form"));