From cf5461d96a1dace917feeacf2343a9f5045ac986 Mon Sep 17 00:00:00 2001 From: Oleg Valter Date: Tue, 3 Feb 2026 17:40:13 +0300 Subject: [PATCH 01/28] fixed comment input label inconsistency between partials --- app/views/comments/_new_thread_modal.html.erb | 2 +- app/views/comments/_reply_to_thread.html.erb | 2 +- config/locales/strings/en.comments.yml | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/app/views/comments/_new_thread_modal.html.erb b/app/views/comments/_new_thread_modal.html.erb index 992933b07..097b43d7d 100644 --- a/app/views/comments/_new_thread_modal.html.erb +++ b/app/views/comments/_new_thread_modal.html.erb @@ -22,7 +22,7 @@ <%= form_tag create_comment_thread_path do %> <%= hidden_field_tag :post_id, post.id %> - <%= label_tag :body, 'Your comment', class: 'form-element' %> + <%= label_tag :body, t('comments.labels.comment_body_input'), class: 'form-element' %>
Start the thread with a comment.
<%= text_area_tag :body, '', class: 'form-element js-comment-field', diff --git a/app/views/comments/_reply_to_thread.html.erb b/app/views/comments/_reply_to_thread.html.erb index 14db862cf..9557bcdbc 100644 --- a/app/views/comments/_reply_to_thread.html.erb +++ b/app/views/comments/_reply_to_thread.html.erb @@ -48,7 +48,7 @@ id: "reply-to-thread-form-#{post.id}-#{thread.id}" do %> <%= hidden_field_tag :post_id, post.id %> <%= hidden_field_tag :inline, inline %> - <%= label_tag :content, 'Your message', class: 'form-element' %> + <%= label_tag :content, t('comments.labels.comment_body_input'), class: 'form-element' %> <%= text_area_tag :content, '', class: 'form-element js-comment-field', minlength: min_chars, diff --git a/config/locales/strings/en.comments.yml b/config/locales/strings/en.comments.yml index e6a331703..4dc769e8a 100644 --- a/config/locales/strings/en.comments.yml +++ b/config/locales/strings/en.comments.yml @@ -38,6 +38,8 @@ en: comment_not_posted: > Failed to create comment. labels: + comment_body_input: > + Your comment create_new_thread: > Start new comment thread reply_to_thread: > From 7db0e8cbdeac23411350c8e3f961c5e591f6cb4b Mon Sep 17 00:00:00 2001 From: Oleg Valter Date: Tue, 3 Feb 2026 18:18:43 +0300 Subject: [PATCH 02/28] fixed search widget's input alignment --- app/assets/stylesheets/search.scss | 23 +++++++++++++++++++++++ app/views/search/_widget.html.erb | 6 +++--- 2 files changed, 26 insertions(+), 3 deletions(-) diff --git a/app/assets/stylesheets/search.scss b/app/assets/stylesheets/search.scss index 8cb54160e..c40b12804 100644 --- a/app/assets/stylesheets/search.scss +++ b/app/assets/stylesheets/search.scss @@ -1,5 +1,28 @@ @import 'variables'; +.search-widget { + gap: 0.5em; + + .search-widget-input { + flex-grow: 1; + margin: 0; + } + + @media screen and (max-width: $screen-md) { + flex-direction: row; + } + + @media screen and (max-width: $screen-sm) { + align-items: start; + flex-direction: column; + gap: 0.15em; + + .search-widget-input { + width: 100%; + } + } +} + .search-filters:not([open]) { border-top: 1px solid $muted-graphic; } diff --git a/app/views/search/_widget.html.erb b/app/views/search/_widget.html.erb index 335dc1adb..0571f6bc1 100644 --- a/app/views/search/_widget.html.erb +++ b/app/views/search/_widget.html.erb @@ -1,9 +1,9 @@ -
-
+
+
<%= label_tag :search, 'Search term', class: "form-element" %> <%= search_field_tag :search, params[:search], class: 'form-element' %>
-
+
<%= submit_tag 'Search', class: 'button is-medium is-outlined', name: nil %>
From e8aa83261b0fe67c0351111cd3e01540a3717b5b Mon Sep 17 00:00:00 2001 From: Oleg Valter Date: Tue, 3 Feb 2026 18:48:04 +0300 Subject: [PATCH 03/28] added priority_order comment thrread scope & aligned expanded/collapsed thread ordering --- app/controllers/comments_controller.rb | 2 +- app/models/comment_thread.rb | 1 + app/views/posts/_expanded.html.erb | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/controllers/comments_controller.rb b/app/controllers/comments_controller.rb index 99e3af8ac..8bddbed17 100644 --- a/app/controllers/comments_controller.rb +++ b/app/controllers/comments_controller.rb @@ -323,7 +323,7 @@ def post @post = Post.find(params[:post_id]) @comment_threads = CommentThread.accessible_to(current_user, @post) .where(post: @post) - .order(deleted: :asc, archived: :asc, reply_count: :desc) + .priority_order respond_to do |format| format.html { render layout: false } format.json { render json: @comment_threads } diff --git a/app/models/comment_thread.rb b/app/models/comment_thread.rb index 68d40af67..ca3a8924e 100644 --- a/app/models/comment_thread.rb +++ b/app/models/comment_thread.rb @@ -7,6 +7,7 @@ class CommentThread < ApplicationRecord has_many :thread_follower belongs_to :archived_by, class_name: 'User', optional: true + scope :priority_order, -> { order(deleted: :asc, archived: :asc, updated_at: :desc, reply_count: :desc) } scope :initially_visible, -> { where(deleted: false, archived: false).where('reply_count > 0') } scope :publicly_available, -> { where(deleted: false).where('reply_count > 0') } scope :archived, -> { where(archived: true) } diff --git a/app/views/posts/_expanded.html.erb b/app/views/posts/_expanded.html.erb index 05843506b..8bee21c4b 100644 --- a/app/views/posts/_expanded.html.erb +++ b/app/views/posts/_expanded.html.erb @@ -247,7 +247,7 @@ <% end %>
- <% comment_threads = post.comment_threads.initially_visible.order(updated_at: :desc) %> + <% comment_threads = post.comment_threads.initially_visible.priority_order %> <% public_count = comment_threads.count %> <% available_count = current_user&.post_privilege?('flag_curate', post) ? post.comment_threads.count : post.comment_threads.publicly_available.count %> From ebbc912728783df4b7bc5045aa73dadd9335b1a4 Mon Sep 17 00:00:00 2001 From: Oleg Valter Date: Tue, 3 Feb 2026 19:09:14 +0300 Subject: [PATCH 04/28] fixed user profile sidebar reputation icon misalignment --- app/views/users/show.html.erb | 109 +++++++++++++++++----------------- 1 file changed, 56 insertions(+), 53 deletions(-) diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb index 64a2b9cf8..74a8ae1b4 100644 --- a/app/views/users/show.html.erb +++ b/app/views/users/show.html.erb @@ -18,35 +18,35 @@
- <% effective_profile = raw(sanitize(@user.profile&.strip || '', scrubber: scrubber)) %> - <% if effective_profile.blank? %> -

A quiet enigma. We don't know anything about <%= rtl_safe_username(@user) %> yet.

- <% elsif !user_signed_in? && !@user.community_user.privilege?('unrestricted') %> - <%= sanitize(effective_profile, attributes: %w()) %> - <% else %> - <%= effective_profile %> - <% end %> + <% effective_profile = raw(sanitize(@user.profile&.strip || '', scrubber: scrubber)) %> + <% if effective_profile.blank? %> +

A quiet enigma. We don't know anything about <%= rtl_safe_username(@user) %> yet.

+ <% elsif !user_signed_in? && !@user.community_user.privilege?('unrestricted') %> + <%= sanitize(effective_profile, attributes: %w()) %> + <% else %> + <%= effective_profile %> + <% end %>
<% unless !user_signed_in? && !@user.community_user.privilege?('unrestricted') %> <% if @user.valid_websites_for.size.positive? %> -
-

Extra fields

- - <% @user.valid_websites_for.each do |w| %> - - -
<%= w.label %> - <% if w.url[0,4] == 'http' %> - <%= link_to w.url, w.url, rel: 'nofollow' %> - <% else %> - <%= w.url %> +
+

Extra fields

+ + <% @user.valid_websites_for.each do |w| %> + + + + <% end %> - - - <% end %> -
<%= w.label %> + <% if w.url[0,4] == 'http' %> + <%= link_to w.url, w.url, rel: 'nofollow' %> + <% else %> + <%= w.url %> + <% end %> +
-
+
+
<% end %> <% end %> @@ -73,11 +73,11 @@ annotations on user privileges warnings and suspensions sent to user - <% if @user.community_user.suspended? %> - (includes lifting the suspension) - <% elsif @user.community_user.mod_warnings&.size.positive? %> - (latest <%= time_ago_in_words(@user.community_user.latest_warning) %> ago) - <% end %> + <% if @user.community_user.suspended? %> + (includes lifting the suspension) + <% elsif @user.community_user.mod_warnings&.size.positive? %> + (latest <%= time_ago_in_words(@user.community_user.latest_warning) %> ago) + <% end %> warn or suspend user
@@ -120,23 +120,23 @@ user avatar
<% if @user.staff? %> -
- Staff -
+
+ Staff +
<% elsif @user.admin? %> -
- Administrator -
+
+ Administrator +
<% elsif @user.at_least_moderator? %> -
- Moderator -
+
+ Moderator +
<% end %>
- + @@ -145,11 +145,11 @@ @@ -160,7 +160,8 @@ is_me ? 'View your received votes' : "View received votes for #{rtl_safe_username(@user)}" do %> Received votes <% end %> -
(up minus down) +
+ (up minus down) @@ -169,7 +170,9 @@ <% if is_me || current_user&.at_least_moderator? %> - + + + <% end %>
Reputation Reputation <%= @user.reputation %>
- - <%= link_to search_path(search: "user:#{@user.id} post_type:2"), + + <%= link_to search_path(search: "user:#{@user.id} post_type:2"), 'aria-label': is_me ? 'View your answers' : "View answers from #{rtl_safe_username(@user)}" do %> - Answers - <% end %> + Answers + <% end %> <%= @user.metric '2' %>
<%= @user.metric 's' %>
<%= @user.metric 'E' %>
Joined <%= @user.community_user.created_at %>
Joined <%= @user.community_user.created_at %>
@@ -178,14 +181,14 @@
<% @abilities.each do |a| %> - <% if @user.privilege?(a.internal_id) %> -
- - - <%= a.name %> - -
- <% end %> + <% if @user.privilege?(a.internal_id) %> +
+ + + <%= a.name %> + +
+ <% end %> <% end %>
<%= link_to is_me ? abilities_path : abilities_path(for: @user.id), From a9a8b14e1faa411452b53957b1fed702ff401590 Mon Sep 17 00:00:00 2001 From: Oleg Valter Date: Tue, 3 Feb 2026 20:09:54 +0300 Subject: [PATCH 05/28] QPixel JS API should not use 'this' in arrow function 'methods' - it actually points to globalThis --- app/assets/javascripts/qpixel_api.js | 20 ++++++++++---------- global.d.ts | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/app/assets/javascripts/qpixel_api.js b/app/assets/javascripts/qpixel_api.js index acbf02447..085ec418f 100644 --- a/app/assets/javascripts/qpixel_api.js +++ b/app/assets/javascripts/qpixel_api.js @@ -99,7 +99,7 @@ window.QPixel = { }, /** - * @type {QPixelFilter[]|null} + * @type {Record|null} */ _filters: null, @@ -203,16 +203,16 @@ window.QPixel = { }, filters: async () => { - if (this._filters == null) { + if (QPixel._filters == null) { // If they're still absent after loading from storage, load from the API. const resp = await QPixel.getJSON('/users/me/filters'); const data = await resp.json(); QPixel.Storage?.set('user_filters', data); - this._filters = data; + QPixel._filters = data; } - return this._filters; + return QPixel._filters; }, defaultFilter: async (categoryId) => { @@ -234,12 +234,12 @@ window.QPixel = { headers: { 'Accept': 'application/json' } }); - /** @type {QPixelResponseJSON<{ filters: QPixelFilter[] }>} */ + /** @type {QPixelResponseJSON<{ filters: Record }>} */ const data = await QPixel.parseJSONResponse(resp, 'Failed to save filter'); QPixel.handleJSONResponse(data, (data) => { - this._filters = data.filters; - QPixel.Storage?.set('user_filters', this._filters); + QPixel._filters = data.filters; + QPixel.Storage?.set('user_filters', QPixel._filters); }); }, @@ -249,12 +249,12 @@ window.QPixel = { method: 'DELETE' }); - /** @type {QPixelResponseJSON<{ filters: QPixelFilter[] }>} */ + /** @type {QPixelResponseJSON<{ filters: Record }>} */ const data = await QPixel.parseJSONResponse(resp, 'Failed to delete filter'); QPixel.handleJSONResponse(data, (data) => { - this._filters = data.filters; - QPixel.Storage?.set('user_filters', this._filters); + QPixel._filters = data.filters; + QPixel.Storage?.set('user_filters', QPixel._filters); }); }, diff --git a/global.d.ts b/global.d.ts index ff0565598..394999414 100644 --- a/global.d.ts +++ b/global.d.ts @@ -383,7 +383,7 @@ interface QPixel { readonly ALLOWED_POST_ATTRS?: readonly string[] // private properties - _filters?: QPixelFilter[] | null; + _filters?: Record | null; _pendingUser?: Promise | null; _popups?: Record; _preferences?: UserPreferences | null; From 9b0487ad9bbee3d93e3c0fd317704c05a1c6602a Mon Sep 17 00:00:00 2001 From: Oleg Valter Date: Thu, 5 Feb 2026 11:42:20 +0300 Subject: [PATCH 06/28] added moment dev dependency for types + enabled proper module resolution --- global.d.ts | 2 ++ package-lock.json | 17 +++++++++++++++++ package.json | 1 + tsconfig.json | 6 ++++-- 4 files changed, 24 insertions(+), 2 deletions(-) diff --git a/global.d.ts b/global.d.ts index 394999414..c7193e4fe 100644 --- a/global.d.ts +++ b/global.d.ts @@ -707,6 +707,8 @@ declare var Chartkick: any; declare var hljs: any; // MathJax lib, TODO: types declare var MathJax: any; +// Moment.js lib +declare var moment: typeof import('moment'); // DOMPurify lib, TODO: types declare var DOMPurify: any; // Sefaria Linker (no known types), see https://developers.sefaria.org/docs/linker-v2 diff --git a/package-lock.json b/package-lock.json index e89fa52b8..5842cf47e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,6 +10,7 @@ "@types/prettier": "2.7.3", "@types/select2": "^4.0.63", "dompurify": "2.5.8", + "moment": "2.13.0", "prettier-plugin-brace-style": "0.8.1", "typescript": "5.6.3" } @@ -54,6 +55,16 @@ "dev": true, "license": "(MPL-2.0 OR Apache-2.0)" }, + "node_modules/moment": { + "version": "2.13.0", + "resolved": "https://registry.npmjs.org/moment/-/moment-2.13.0.tgz", + "integrity": "sha512-/P6wE3TnLp4mlh3WHMj2EJeoTgBojZ8U1zIimPH2Hp995rO2JZ0/gk9vi03Pk/kx0Y7Ho8YvXOJ6TVxhEg+P9g==", + "dev": true, + "license": "MIT", + "engines": { + "node": "*" + } + }, "node_modules/prettier": { "version": "3.6.2", "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.6.2.tgz", @@ -158,6 +169,12 @@ "integrity": "sha512-o1vSNgrmYMQObbSSvF/1brBYEQPHhV1+gsmrusO7/GXtp1T9rCS8cXFqVxK/9crT1jA6Ccv+5MTSjBNqr7Sovw==", "dev": true }, + "moment": { + "version": "2.13.0", + "resolved": "https://registry.npmjs.org/moment/-/moment-2.13.0.tgz", + "integrity": "sha512-/P6wE3TnLp4mlh3WHMj2EJeoTgBojZ8U1zIimPH2Hp995rO2JZ0/gk9vi03Pk/kx0Y7Ho8YvXOJ6TVxhEg+P9g==", + "dev": true + }, "prettier": { "version": "3.6.2", "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.6.2.tgz", diff --git a/package.json b/package.json index 9e091fc6b..504f31d58 100644 --- a/package.json +++ b/package.json @@ -10,6 +10,7 @@ "@types/prettier": "2.7.3", "@types/select2": "^4.0.63", "dompurify": "2.5.8", + "moment": "2.13.0", "prettier-plugin-brace-style": "0.8.1", "typescript": "5.6.3" } diff --git a/tsconfig.json b/tsconfig.json index 9b9686a17..04dd419db 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -3,10 +3,12 @@ "allowJs": true, "checkJs": true, "declaration": false, - "module": "none", + "lib": ["ES2022", "DOM", "DOM.Iterable"], + "module": "es2022", + "moduleResolution": "node", "noEmit": true, "target": "ES2021", - "types": ["./global.d.ts", "@types/jquery", "@types/select2"] + "types": ["./global.d.ts", "@types/jquery", "moment", "@types/select2"] }, "include": ["./app/assets/javascripts", "./public/assets/community"], "exclude": [ From c85e351dd32d4c711867fe98b38afb53d75a902e Mon Sep 17 00:00:00 2001 From: Oleg Valter Date: Thu, 5 Feb 2026 12:02:14 +0300 Subject: [PATCH 07/28] removed livestamp.js & added shared timestamp formatting --- app/assets/javascripts/livestamp.min.js | 4 --- app/assets/javascripts/notifications.js | 46 ++++++++++++++++--------- app/assets/javascripts/qpixel_dom.js | 4 +++ global.d.ts | 5 +++ 4 files changed, 38 insertions(+), 21 deletions(-) delete mode 100644 app/assets/javascripts/livestamp.min.js diff --git a/app/assets/javascripts/livestamp.min.js b/app/assets/javascripts/livestamp.min.js deleted file mode 100644 index 88583a8f3..000000000 --- a/app/assets/javascripts/livestamp.min.js +++ /dev/null @@ -1,4 +0,0 @@ -// Livestamp.js / v1.1.2 / (c) 2012 Matt Bradley / MIT License -(function(d,g){var h=1E3,i=!1,e=d([]),j=function(b,a){var c=b.data("livestampdata");"number"==typeof a&&(a*=1E3);b.removeAttr("data-livestamp").removeData("livestamp");a=g(a);g.isMoment(a)&&!isNaN(+a)&&(c=d.extend({},{original:b.contents()},c),c.moment=g(a),b.data("livestampdata",c).empty(),e.push(b[0]))},k=function(){i||(f.update(),setTimeout(k,h))},f={update:function(){d("[data-livestamp]").each(function(){var a=d(this);j(a,a.data("livestamp"))});var b=[];e.each(function(){var a=d(this),c=a.data("livestampdata"); - if(void 0===c)b.push(this);else if(g.isMoment(c.moment)){var e=a.html(),c=c.moment.fromNow();if(e!=c){var f=d.Event("change.livestamp");a.trigger(f,[e,c]);f.isDefaultPrevented()||a.html(c)}}});e=e.not(b)},pause:function(){i=!0},resume:function(){i=!1;k()},interval:function(b){if(void 0===b)return h;h=b}},l={add:function(b,a){"number"==typeof a&&(a*=1E3);a=g(a);g.isMoment(a)&&!isNaN(+a)&&(b.each(function(){j(d(this),a)}),f.update());return b},destroy:function(b){e=e.not(b);b.each(function(){var a= - d(this),c=a.data("livestampdata");if(void 0===c)return b;a.html(c.original?c.original:"").removeData("livestampdata")});return b},isLivestamp:function(b){return void 0!==b.data("livestampdata")}};d.livestamp=f;d(function(){f.resume()});d.fn.livestamp=function(b,a){l[b]||(a=b,b="add");return l[b](this,a)}})(jQuery,moment); diff --git a/app/assets/javascripts/notifications.js b/app/assets/javascripts/notifications.js index 021635266..73e9667ed 100644 --- a/app/assets/javascripts/notifications.js +++ b/app/assets/javascripts/notifications.js @@ -1,6 +1,6 @@ $(() => { /** - * @param {QPixelNotification} notification + * @param {QPixelNotification} notification */ const makeNotification = (notification) => { const template = `
@@ -8,7 +8,7 @@ $(() => {
${notification.community_name} · ${notification.is_read ? 'read' : `unread`} · - ${notification.created_at} + ${QPixel.DOM.formatTimestamp(notification.created_at)}

${notification.content}

@@ -22,7 +22,7 @@ $(() => { }; /** - * @param {number} change + * @param {number} change */ const changeInboxCount = (change) => { const counter = $('.inbox-count'); @@ -51,20 +51,20 @@ $(() => { $('.inbox-toggle').on('click', async (ev) => { ev.preventDefault(); const $inbox = $('.inbox'); - if($inbox.hasClass("is-active")) { + if ($inbox.hasClass('is-active')) { const data = await QPixel.getNotifications(); - const $inboxContainer = $inbox.find(".inbox--container"); + const $inboxContainer = $inbox.find('.inbox--container'); $inboxContainer.html(''); - + const unread = data.filter((n) => !n.is_read); const read = data.filter((n) => n.is_read); - + unread.forEach((notification) => { const item = $(makeNotification(notification)); $inboxContainer.append(item); }); - + $inboxContainer.append(``); read.forEach((notification) => { const item = $(makeNotification(notification)); @@ -76,9 +76,13 @@ $(() => { $('.js-read-all-notifs').on('click', async (ev) => { ev.preventDefault(); - await QPixel.fetchJSON('/notifications/read_all', {}, { - headers: { 'Accept': 'application/json' } - }); + await QPixel.fetchJSON( + '/notifications/read_all', + {}, + { + headers: { Accept: 'application/json' }, + }, + ); $('.inbox-count').remove(); @@ -91,9 +95,13 @@ $(() => { const $tgt = $(evt.target); const id = $tgt.data('id'); - const resp = await QPixel.fetchJSON(`/notifications/${id}/read`, {}, { - headers: { 'Accept': 'application/json' } - }); + const resp = await QPixel.fetchJSON( + `/notifications/${id}/read`, + {}, + { + headers: { Accept: 'application/json' }, + }, + ); const data = await resp.json(); $tgt.parents('.js-notification')[0].outerHTML = makeNotification(data.notification); @@ -106,9 +114,13 @@ $(() => { const $tgt = $(ev.target).is('a') ? $(ev.target) : $(ev.target).parents('a'); const id = $tgt.attr('data-notif-id'); - const resp = await QPixel.fetchJSON(`/notifications/${id}/read`, {}, { - headers: { 'Accept': 'application/json' } - }); + const resp = await QPixel.fetchJSON( + `/notifications/${id}/read`, + {}, + { + headers: { Accept: 'application/json' }, + }, + ); const data = await resp.json(); if (data.status !== 'success') { diff --git a/app/assets/javascripts/qpixel_dom.js b/app/assets/javascripts/qpixel_dom.js index 46ab661dd..9aa5738aa 100644 --- a/app/assets/javascripts/qpixel_dom.js +++ b/app/assets/javascripts/qpixel_dom.js @@ -56,6 +56,10 @@ window.QPixel ||= {}; }, duration); }, + formatTimestamp: (timestamp) => { + return moment(timestamp).format('YYYY-MM-DD [at] hh:mm:ss UTC'); + }, + getModifierState: (e) => { return !!e.altKey || !!e.ctrlKey || !!e.metaKey || !!e.shiftKey; }, diff --git a/global.d.ts b/global.d.ts index c7193e4fe..dc7bdad4f 100644 --- a/global.d.ts +++ b/global.d.ts @@ -58,6 +58,11 @@ interface QPixelDOM { * @param duration A duration for the effect in milliseconds. */ fadeOut?: (element: HTMLElement, duration: number) => void; + /** + * Formats a given {@link timestamp} with the standard format + * @param timestamp timestamp to format + */ + formatTimestamp?: (timestamp: string | number | Date) => string; /** * Checks common modifier states on a given keyboard event * @param event From c8a1797ce2926bf96e12eb79775d2b16b468e78b Mon Sep 17 00:00:00 2001 From: Oleg Valter Date: Thu, 5 Feb 2026 12:11:29 +0300 Subject: [PATCH 08/28] aligned rendered_timestamp format with the client-side version --- app/models/notification.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/notification.rb b/app/models/notification.rb index 5e1db7ff6..9883be4f6 100644 --- a/app/models/notification.rb +++ b/app/models/notification.rb @@ -18,7 +18,7 @@ def unread? end def rendered_timestamp - formatted = created_at.strftime('%b %-d, %Y at %H:%M') + formatted = created_at.strftime('%Y-%m-%d at %H:%M:%S UTC') CGI.unescape_html(formatted).html_safe end end From 9a72ede0c88f619010ab9c7003e4fe192ad7663c Mon Sep 17 00:00:00 2001 From: Oleg Valter Date: Thu, 5 Feb 2026 12:16:32 +0300 Subject: [PATCH 09/28] added full notification timestamp in ISO8601 format on hover --- app/views/notifications/_notification.html.erb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/views/notifications/_notification.html.erb b/app/views/notifications/_notification.html.erb index ee6ab8a8f..5bf54c562 100644 --- a/app/views/notifications/_notification.html.erb +++ b/app/views/notifications/_notification.html.erb @@ -19,7 +19,9 @@ src="<%= logo_path %>" alt="<% notification.community_name %> logo" /> <% end %> - <%= notification.community_name %> · <%= notification.rendered_timestamp %> + <%= notification.community_name %> · + <%= notification.rendered_timestamp %> +
<%= render_pings_text(notification.content) %>
From 317397680ac20745c049aa24a0a26019fc99e00e Mon Sep 17 00:00:00 2001 From: Oleg Valter Date: Thu, 5 Feb 2026 12:21:01 +0300 Subject: [PATCH 10/28] settled on timestamp format 'YYYY-MM-DD hh:mm:ss UTC' --- app/assets/javascripts/qpixel_dom.js | 2 +- app/models/notification.rb | 5 ----- app/views/notifications/_notification.html.erb | 2 +- 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/app/assets/javascripts/qpixel_dom.js b/app/assets/javascripts/qpixel_dom.js index 9aa5738aa..091bdf30b 100644 --- a/app/assets/javascripts/qpixel_dom.js +++ b/app/assets/javascripts/qpixel_dom.js @@ -57,7 +57,7 @@ window.QPixel ||= {}; }, formatTimestamp: (timestamp) => { - return moment(timestamp).format('YYYY-MM-DD [at] hh:mm:ss UTC'); + return moment(timestamp).format('YYYY-MM-DD hh:mm:ss UTC'); }, getModifierState: (e) => { diff --git a/app/models/notification.rb b/app/models/notification.rb index 9883be4f6..6c3ff4f0f 100644 --- a/app/models/notification.rb +++ b/app/models/notification.rb @@ -16,9 +16,4 @@ def read? def unread? !read? end - - def rendered_timestamp - formatted = created_at.strftime('%Y-%m-%d at %H:%M:%S UTC') - CGI.unescape_html(formatted).html_safe - end end diff --git a/app/views/notifications/_notification.html.erb b/app/views/notifications/_notification.html.erb index 5bf54c562..1a9387519 100644 --- a/app/views/notifications/_notification.html.erb +++ b/app/views/notifications/_notification.html.erb @@ -20,7 +20,7 @@ alt="<% notification.community_name %> logo" /> <% end %> <%= notification.community_name %> · - <%= notification.rendered_timestamp %> + <%= notification.created_at.utc %>
<%= render_pings_text(notification.content) %> From 91f3c4de93ce61276aed88e96ad6e3fca84ae4c8 Mon Sep 17 00:00:00 2001 From: Oleg Valter Date: Thu, 5 Feb 2026 13:42:55 +0300 Subject: [PATCH 11/28] restored relative time functionality --- app/assets/javascripts/relative_time.js | 35 +++++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 app/assets/javascripts/relative_time.js diff --git a/app/assets/javascripts/relative_time.js b/app/assets/javascripts/relative_time.js new file mode 100644 index 000000000..05b7873bc --- /dev/null +++ b/app/assets/javascripts/relative_time.js @@ -0,0 +1,35 @@ +document.addEventListener('DOMContentLoaded', () => { + const updateInterval = 6e4; // updates relative time once a minute + let lastRunAt = -1; + + /** + * @type {FrameRequestCallback} + */ + const updateRelativeTime = (timestamp) => { + const elapsed = timestamp - lastRunAt; + + if (elapsed < updateInterval && lastRunAt !== -1) { + requestAnimationFrame(updateRelativeTime); + return; + } + + document.querySelectorAll('[data-relstamp]').forEach((el) => { + if (!QPixel.DOM?.isHTMLElement(el)) { + return; + } + + const { relstamp } = el.dataset; + + if (!relstamp) { + return; + } + + el.textContent = `${QPixel.DOM.formatTimestamp(relstamp)} (${moment(relstamp).fromNow()})`; + }); + + lastRunAt = timestamp; + requestAnimationFrame(updateRelativeTime); + }; + + requestAnimationFrame(updateRelativeTime); +}); From 5bb449c3737e4e0c349d3f45b816559afa206be2 Mon Sep 17 00:00:00 2001 From: Oleg Valter Date: Thu, 5 Feb 2026 13:47:48 +0300 Subject: [PATCH 12/28] added relative time to full inbox notifications --- app/views/notifications/_notification.html.erb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/views/notifications/_notification.html.erb b/app/views/notifications/_notification.html.erb index 1a9387519..1f0f06b49 100644 --- a/app/views/notifications/_notification.html.erb +++ b/app/views/notifications/_notification.html.erb @@ -19,7 +19,8 @@ src="<%= logo_path %>" alt="<% notification.community_name %> logo" /> <% end %> - <%= notification.community_name %> · + <%= notification.community_name %> · <%= notification.created_at.utc %>
From 26c8333f293940b5e1c3db9321a49cd611355060 Mon Sep 17 00:00:00 2001 From: Oleg Valter Date: Thu, 5 Feb 2026 14:01:03 +0300 Subject: [PATCH 13/28] aded relative time to dropdown inbox notifications --- app/assets/javascripts/notifications.js | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/app/assets/javascripts/notifications.js b/app/assets/javascripts/notifications.js index 73e9667ed..4799e2c54 100644 --- a/app/assets/javascripts/notifications.js +++ b/app/assets/javascripts/notifications.js @@ -7,15 +7,26 @@ $(() => {
${notification.community_name} · - ${notification.is_read ? 'read' : `unread`} · - ${QPixel.DOM.formatTimestamp(notification.created_at)} + + ${QPixel.DOM.formatTimestamp(notification.created_at)} +
-

${notification.content}

-

+

+ + ${notification.content} + +

+

+ mark ${notification.is_read ? 'unread' : 'read'} -

+ +

`; return template; @@ -87,7 +98,6 @@ $(() => { $('.inbox-count').remove(); $('.js-notification').removeClass('is-teal').addClass('read'); - $('.js-notif-state').text('read'); $('.js-notification-toggle').html(` mark unread`); }); From 97939d6b5ea5fdfa140f2e4ac2e909044acc1fb5 Mon Sep 17 00:00:00 2001 From: Oleg Valter Date: Thu, 5 Feb 2026 14:25:17 +0300 Subject: [PATCH 14/28] relative time should also be updated on mutations --- app/assets/javascripts/relative_time.js | 38 ++++++++++++++++--------- 1 file changed, 25 insertions(+), 13 deletions(-) diff --git a/app/assets/javascripts/relative_time.js b/app/assets/javascripts/relative_time.js index 05b7873bc..69d126eec 100644 --- a/app/assets/javascripts/relative_time.js +++ b/app/assets/javascripts/relative_time.js @@ -2,6 +2,23 @@ document.addEventListener('DOMContentLoaded', () => { const updateInterval = 6e4; // updates relative time once a minute let lastRunAt = -1; + /** + * @param {Node} el element to process + */ + const processNode = (el) => { + if (!QPixel.DOM?.isHTMLElement(el)) { + return; + } + + const { relstamp } = el.dataset; + + if (!relstamp) { + return; + } + + el.textContent = `${QPixel.DOM.formatTimestamp(relstamp)} (${moment(relstamp).fromNow()})`; + }; + /** * @type {FrameRequestCallback} */ @@ -13,23 +30,18 @@ document.addEventListener('DOMContentLoaded', () => { return; } - document.querySelectorAll('[data-relstamp]').forEach((el) => { - if (!QPixel.DOM?.isHTMLElement(el)) { - return; - } - - const { relstamp } = el.dataset; - - if (!relstamp) { - return; - } - - el.textContent = `${QPixel.DOM.formatTimestamp(relstamp)} (${moment(relstamp).fromNow()})`; - }); + document.querySelectorAll('[data-relstamp]').forEach(processNode); lastRunAt = timestamp; requestAnimationFrame(updateRelativeTime); }; requestAnimationFrame(updateRelativeTime); + + new MutationObserver(() => { + document.querySelectorAll('[data-relstamp]').forEach(processNode); + }).observe(document, { + attributes: true, + subtree: true, + }); }); From 924e5ddf9b97853c867ef06225107bd9cce1b7fb Mon Sep 17 00:00:00 2001 From: Oleg Valter Date: Thu, 5 Feb 2026 14:45:25 +0300 Subject: [PATCH 15/28] 'less than' sign should be escaped when used in HTML markup --- app/views/layouts/_header.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb index 534a84435..d228bede2 100644 --- a/app/views/layouts/_header.html.erb +++ b/app/views/layouts/_header.html.erb @@ -174,7 +174,7 @@ votes:4 posts with 4+ votes
- created:<1w created < 1 week ago + created:<1w created < 1 week ago
post_type:xxxx type of post From 26338fa7125cbea6920847fef2929f2c26c721e7 Mon Sep 17 00:00:00 2001 From: Oleg Valter Date: Thu, 5 Feb 2026 15:18:00 +0300 Subject: [PATCH 16/28] expose MaxUploadSize site setting to the client as QPixel.MAX_UPLOAD_SIZE --- app/views/layouts/_expose.html.erb | 21 +++++++++++++++++++++ app/views/layouts/_head.html.erb | 16 +--------------- global.d.ts | 4 ++++ 3 files changed, 26 insertions(+), 15 deletions(-) create mode 100644 app/views/layouts/_expose.html.erb diff --git a/app/views/layouts/_expose.html.erb b/app/views/layouts/_expose.html.erb new file mode 100644 index 000000000..2198f99b0 --- /dev/null +++ b/app/views/layouts/_expose.html.erb @@ -0,0 +1,21 @@ + diff --git a/app/views/layouts/_head.html.erb b/app/views/layouts/_head.html.erb index 591fa2b80..700655931 100644 --- a/app/views/layouts/_head.html.erb +++ b/app/views/layouts/_head.html.erb @@ -46,21 +46,7 @@ <%= javascript_include_tag 'application' %> - +<%= render 'layouts/expose' %> <% if SiteSetting['SyntaxHighlightingEnabled'] %> diff --git a/global.d.ts b/global.d.ts index dc7bdad4f..1219f8b00 100644 --- a/global.d.ts +++ b/global.d.ts @@ -386,6 +386,10 @@ interface QPixel { * List of attributes allowed on HTML tags in posts, supplied by the server */ readonly ALLOWED_POST_ATTRS?: readonly string[] + /** + * Maximum file upload size (arbitrary unit) + */ + readonly MAX_UPLOAD_SIZE?: string // private properties _filters?: Record | null; From 062fc574b65abb66851c0926fe22d2e517b1db46 Mon Sep 17 00:00:00 2001 From: Oleg Valter Date: Thu, 5 Feb 2026 15:25:02 +0300 Subject: [PATCH 17/28] post image upload should display correct max file size limit in the error notification --- app/assets/javascripts/posts.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/assets/javascripts/posts.js b/app/assets/javascripts/posts.js index 44aad0f44..0a1251c31 100644 --- a/app/assets/javascripts/posts.js +++ b/app/assets/javascripts/posts.js @@ -50,6 +50,8 @@ $(() => { const files = /** @type {HTMLInputElement} */ ($fileInput[0]).files; const form = /** @type {HTMLFormElement} */ ($tgt[0]); + const maxUploadSize = QPixel.MAX_UPLOAD_SIZE || '2MB'; + // TODO: MaxUploadSize is a site setting and can be changed if (files.length > 0 && files[0].size >= 2000000) { const isUploadModalOpened = $('#markdown-image-upload').hasClass('is-active'); @@ -58,7 +60,7 @@ $(() => { postField.val(postField.val()?.toString().replace(placeholder, '')); if (!isUploadModalOpened) { - QPixel.createNotification('danger', `Can't upload files with size more than 2MB`); + QPixel.createNotification('danger', `Can't upload files with size more than ${maxUploadSize}`); } else { $tgt.find('.js-max-size').addClass('has-color-red-700 error-shake'); From aa35c2205d048f30146607034ade73608478c05e Mon Sep 17 00:00:00 2001 From: Oleg Valter Date: Thu, 5 Feb 2026 16:20:38 +0300 Subject: [PATCH 18/28] trying to submit user avatar with size > MaxUploadSize should prevent form submission --- app/assets/javascripts/profile.js | 31 +++++++++++++++++++++++++++ app/views/users/edit_profile.html.erb | 4 ++-- 2 files changed, 33 insertions(+), 2 deletions(-) create mode 100644 app/assets/javascripts/profile.js diff --git a/app/assets/javascripts/profile.js b/app/assets/javascripts/profile.js new file mode 100644 index 000000000..966977239 --- /dev/null +++ b/app/assets/javascripts/profile.js @@ -0,0 +1,31 @@ +document.addEventListener('DOMContentLoaded', () => { + document.querySelector('.js-submit-profile-edit')?.addEventListener('click', (ev) => { + const { target } = ev; + + if (!QPixel.DOM?.isHTMLElement(target)) { + return; + } + + const profileForm = target.closest('form'); + + profileForm?.querySelectorAll('input[type=file]').forEach((el) => { + const files = /** @type {HTMLInputElement} */ (el).files; + + // TODO: MaxUploadSize is a site setting and can be changed + if (files.length > 0 && files[0].size >= 2000000) { + if (!ev.defaultPrevented) { + ev.preventDefault(); + } + + const maxSizeCaption = profileForm?.querySelector(`.js-max-size[for='${el.id}']`); + + if (!maxSizeCaption) { + return; + } + + maxSizeCaption.classList.add('has-color-red-700', 'error-shake'); + setTimeout(() => maxSizeCaption?.classList.remove('error-shake'), 1000); + } + }); + }); +}); diff --git a/app/views/users/edit_profile.html.erb b/app/views/users/edit_profile.html.erb index 65319b03f..6deac1f15 100644 --- a/app/views/users/edit_profile.html.erb +++ b/app/views/users/edit_profile.html.erb @@ -35,7 +35,7 @@ height="64" width="64" /> <%= f.label :avatar, class: "form-element" %> -
+
An optional profile picture. Max file size <%= SiteSetting['MaxUploadSize'] %>.
<%= f.file_field :avatar, class: "form-element" %> @@ -95,7 +95,7 @@
- <%= f.submit 'Save', class: 'button is-filled' %> + <%= f.submit 'Save', class: 'button is-filled js-submit-profile-edit' %> <%= link_to 'Cancel', users_me_path, class: 'button is-muted is-outlined js-cancel-edit', From d640db375fbd08f4777793fca34708302ed78abd Mon Sep 17 00:00:00 2001 From: Oleg Valter Date: Thu, 5 Feb 2026 16:32:00 +0300 Subject: [PATCH 19/28] made new comment thread captions configurable --- app/views/comments/_new_thread_modal.html.erb | 6 +++--- config/locales/strings/en.comments.yml | 5 +++++ 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/app/views/comments/_new_thread_modal.html.erb b/app/views/comments/_new_thread_modal.html.erb index 097b43d7d..3d0618745 100644 --- a/app/views/comments/_new_thread_modal.html.erb +++ b/app/views/comments/_new_thread_modal.html.erb @@ -13,10 +13,10 @@ Start a new comment thread
- <% if post.comment_threads.size > 0 %> -

You can create a new comment thread. Please check first whether an existing comment thread covers already what you need.

+ <% if post.comment_threads.any? %> +

<%= t('comments.captions.new_thread_on_post') %>

<% else %> -

Be the first to create a new comment thread.

+

<%= t('comments.captions.first_thread_on_post') %>

<% end %> <%= form_tag create_comment_thread_path do %> diff --git a/config/locales/strings/en.comments.yml b/config/locales/strings/en.comments.yml index 4dc769e8a..d9e4c4555 100644 --- a/config/locales/strings/en.comments.yml +++ b/config/locales/strings/en.comments.yml @@ -1,5 +1,10 @@ en: comments: + captions: + first_thread_on_post: > + Be the first to create a new comment thread. + new_thread_on_post: > + Please check if an existing comment thread already covers what you need first. errors: disabled_on_archived_threads: > Archived threads cannot be replied to. From f80c92f7bbfaf6919d96d99f31de1b1b4637b6f9 Mon Sep 17 00:00:00 2001 From: Oleg Valter Date: Sat, 7 Feb 2026 19:16:22 +0300 Subject: [PATCH 20/28] exposed current locale to the QPixel global object --- app/views/layouts/_expose.html.erb | 6 ++++++ global.d.ts | 4 ++++ 2 files changed, 10 insertions(+) diff --git a/app/views/layouts/_expose.html.erb b/app/views/layouts/_expose.html.erb index 2198f99b0..71a91776c 100644 --- a/app/views/layouts/_expose.html.erb +++ b/app/views/layouts/_expose.html.erb @@ -13,6 +13,12 @@ writable: false, }); + Object.defineProperty(QPixel, 'LOCALE', { + configurable: false, + value: "<%= I18n.locale %>", + writable: false, + }); + Object.defineProperty(QPixel, 'MAX_UPLOAD_SIZE', { configurable: false, value: "<%= SiteSetting['MaxUploadSize'] || '2MB' %>", diff --git a/global.d.ts b/global.d.ts index 1219f8b00..2f87d6143 100644 --- a/global.d.ts +++ b/global.d.ts @@ -386,6 +386,10 @@ interface QPixel { * List of attributes allowed on HTML tags in posts, supplied by the server */ readonly ALLOWED_POST_ATTRS?: readonly string[] + /** + * Currently used locale (BCP 47 language tag), supplied by the server + */ + readonly LOCALE?: string /** * Maximum file upload size (arbitrary unit) */ From 5d0968f32c35502a9706b99818dfff7150757a79 Mon Sep 17 00:00:00 2001 From: Oleg Valter Date: Sat, 7 Feb 2026 19:18:20 +0300 Subject: [PATCH 21/28] added QPixel#numberToHumanSize and QPixel#supportedNumberLocales helpers --- app/assets/javascripts/qpixel_api.js | 30 ++++++++++++++++++++++++++++ global.d.ts | 11 ++++++++++ 2 files changed, 41 insertions(+) diff --git a/app/assets/javascripts/qpixel_api.js b/app/assets/javascripts/qpixel_api.js index 085ec418f..b66ffb351 100644 --- a/app/assets/javascripts/qpixel_api.js +++ b/app/assets/javascripts/qpixel_api.js @@ -52,6 +52,36 @@ window.QPixel = { popped_modals_ct += 1; }, + supportedNumberLocales: () => { + try { + return Intl.NumberFormat.supportedLocalesOf( + Intl.getCanonicalLocales(QPixel.LOCALE ?? 'en') + ); + } catch { + return ['en'] + } + }, + + numberToHumanSize: (value) => { + /** @type {[number, string][]} */ + const unitMap = [ + [1024 ** 4, 'terabyte'], + [1024 ** 3, 'gigabyte'], + [1024 ** 2, 'megabyte'], + [1024 ** 1, 'kilobyte'], + [0, 'byte'] + ]; + + const [size, unit] = unitMap.find(([size]) => value >= size) ?? [0, 'byte']; + + return new Intl.NumberFormat(QPixel.supportedNumberLocales(), { + notation: 'compact', + style: 'unit', + unit, + unitDisplay: 'narrow', + }).format(size ? value / size : value).toUpperCase(); + }, + offset: function (el) { const topLeft = $(el).offset(); return { diff --git a/global.d.ts b/global.d.ts index 2f87d6143..09dd2b8bb 100644 --- a/global.d.ts +++ b/global.d.ts @@ -486,6 +486,17 @@ interface QPixel { deleteFilter?: (name: string, system?: boolean) => Promise; filters?: () => Promise>; + /** + * Get a list of supported canonical locales for {@link Intl.NumberFormat} based on {@link QPixel.LOCALE}. + */ + supportedNumberLocales?: () => string[]; + + /** + * Format a given {@link value} into a human-friendly representation. + * @param value value (in bytes) to format + */ + numberToHumanSize?: (value: number) => string; + /** * Get the absolute offset of an element. * @param element the element for which to find the offset. From 03db40fe83b921f93db4662da7e83cdba29686cd Mon Sep 17 00:00:00 2001 From: Oleg Valter Date: Sat, 7 Feb 2026 19:33:46 +0300 Subject: [PATCH 22/28] number_to_human_size in en locale shouldn't add spaces between values & units --- config/locales/en.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/config/locales/en.yml b/config/locales/en.yml index 53568f17a..3a9113093 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -14,3 +14,7 @@ en: blank: 'is required (please answer "Where is this content?")' report_type: blank: 'is required (please answer "What are you reporting?")' + number: + human: + storage_units: + format: '%n%u' From 3a954dcdfd5733445d4349a9378bd5136f691f29 Mon Sep 17 00:00:00 2001 From: Oleg Valter Date: Sat, 7 Feb 2026 19:35:55 +0300 Subject: [PATCH 23/28] added MaxRequestBodySize site setting & ensured it's used instead of the magic number when checking upload sizes --- app/assets/javascripts/posts.js | 10 ++++++---- app/assets/javascripts/profile.js | 5 +++-- app/views/layouts/_expose.html.erb | 2 +- db/seeds/site_settings.yml | 9 +++++++++ global.d.ts | 4 ++-- 5 files changed, 21 insertions(+), 9 deletions(-) diff --git a/app/assets/javascripts/posts.js b/app/assets/javascripts/posts.js index 0a1251c31..e0098d5e7 100644 --- a/app/assets/javascripts/posts.js +++ b/app/assets/javascripts/posts.js @@ -50,17 +50,19 @@ $(() => { const files = /** @type {HTMLInputElement} */ ($fileInput[0]).files; const form = /** @type {HTMLFormElement} */ ($tgt[0]); - const maxUploadSize = QPixel.MAX_UPLOAD_SIZE || '2MB'; + const maxUploadSize = QPixel.MAX_UPLOAD_SIZE ?? 2 * 1024 * 1024; - // TODO: MaxUploadSize is a site setting and can be changed - if (files.length > 0 && files[0].size >= 2000000) { + if (files.length > 0 && files[0].size >= maxUploadSize) { const isUploadModalOpened = $('#markdown-image-upload').hasClass('is-active'); const postField = $('.js-post-field'); postField.val(postField.val()?.toString().replace(placeholder, '')); if (!isUploadModalOpened) { - QPixel.createNotification('danger', `Can't upload files with size more than ${maxUploadSize}`); + QPixel.createNotification( + 'danger', + `Can't upload files with size more than ${QPixel.numberToHumanSize(maxUploadSize)}`, + ); } else { $tgt.find('.js-max-size').addClass('has-color-red-700 error-shake'); diff --git a/app/assets/javascripts/profile.js b/app/assets/javascripts/profile.js index 966977239..96341813d 100644 --- a/app/assets/javascripts/profile.js +++ b/app/assets/javascripts/profile.js @@ -11,8 +11,9 @@ document.addEventListener('DOMContentLoaded', () => { profileForm?.querySelectorAll('input[type=file]').forEach((el) => { const files = /** @type {HTMLInputElement} */ (el).files; - // TODO: MaxUploadSize is a site setting and can be changed - if (files.length > 0 && files[0].size >= 2000000) { + const maxUploadSize = QPixel.MAX_UPLOAD_SIZE ?? 2 * 1024 * 1024; + + if (files.length > 0 && files[0].size >= maxUploadSize) { if (!ev.defaultPrevented) { ev.preventDefault(); } diff --git a/app/views/layouts/_expose.html.erb b/app/views/layouts/_expose.html.erb index 71a91776c..ac5176817 100644 --- a/app/views/layouts/_expose.html.erb +++ b/app/views/layouts/_expose.html.erb @@ -21,7 +21,7 @@ Object.defineProperty(QPixel, 'MAX_UPLOAD_SIZE', { configurable: false, - value: "<%= SiteSetting['MaxUploadSize'] || '2MB' %>", + value: <%= SiteSetting['MaxRequestBodySize'] %> ?? 2 * 1024 * 1024, writable: false, }); diff --git a/db/seeds/site_settings.yml b/db/seeds/site_settings.yml index 1251d230f..c4adc117b 100644 --- a/db/seeds/site_settings.yml +++ b/db/seeds/site_settings.yml @@ -189,6 +189,15 @@ set by your web server configuration. This setting should be set to the same value so that the correct limit can be displayed to users. +- name: MaxRequestBodySize + value: 2097152 + value_type: integer + category: AdvancedSettings + description: > + The maximum allowed size of request body (in bytes). This setting must be kept in sync with your web server or + reverse proxy configuration that governs request body size limits - **do not** change it if you don't know what + that means. + - name: FirstVisitGuidance value: ~ value_type: text diff --git a/global.d.ts b/global.d.ts index 09dd2b8bb..6c3e8b00e 100644 --- a/global.d.ts +++ b/global.d.ts @@ -391,9 +391,9 @@ interface QPixel { */ readonly LOCALE?: string /** - * Maximum file upload size (arbitrary unit) + * Maximum file upload size (in bytes), supplied by the server */ - readonly MAX_UPLOAD_SIZE?: string + readonly MAX_UPLOAD_SIZE?: number // private properties _filters?: Record | null; From 68dc07e347a86cf5d53444f6e1a765263f8ff5e1 Mon Sep 17 00:00:00 2001 From: Oleg Valter Date: Sat, 7 Feb 2026 19:36:47 +0300 Subject: [PATCH 24/28] switched server-side provided max upload size strings to human_max_upload_size (based on MaxRequestBodySize) --- app/helpers/site_settings_helper.rb | 6 +++++ app/views/posts/_image_upload.html.erb | 4 +++- app/views/users/edit_profile.html.erb | 33 +++++++++++++------------- 3 files changed, 25 insertions(+), 18 deletions(-) diff --git a/app/helpers/site_settings_helper.rb b/app/helpers/site_settings_helper.rb index 9a8aec92a..9dd38945f 100644 --- a/app/helpers/site_settings_helper.rb +++ b/app/helpers/site_settings_helper.rb @@ -6,4 +6,10 @@ def rendered_description(setting) raw_description = setting.description || '' sanitize(render_markdown(raw_description)) end + + # Formats max upload size (in bytes) into a human-friendly representation + # @return [String] formatted value + def human_max_upload_size + number_to_human_size(SiteSetting['MaxRequestBodySize']) + end end diff --git a/app/views/posts/_image_upload.html.erb b/app/views/posts/_image_upload.html.erb index 171308373..b9b58e230 100644 --- a/app/views/posts/_image_upload.html.erb +++ b/app/views/posts/_image_upload.html.erb @@ -9,7 +9,9 @@ <%= form_tag upload_path, multipart: true, class: 'form-inline upload-form js-upload-form' do %>
<%= label_tag :file, 'Insert an image', class: 'form-element' %> -
Max file size <%= SiteSetting['MaxUploadSize'] %>.
+
+ Max file size is <%= human_max_upload_size %>. +
<%= file_field_tag :file, class: 'form-element' %>
<% end %> diff --git a/app/views/users/edit_profile.html.erb b/app/views/users/edit_profile.html.erb index 6deac1f15..1ac84040c 100644 --- a/app/views/users/edit_profile.html.erb +++ b/app/views/users/edit_profile.html.erb @@ -36,7 +36,7 @@ width="64" /> <%= f.label :avatar, class: "form-element" %>
- An optional profile picture. Max file size <%= SiteSetting['MaxUploadSize'] %>. + An optional profile picture. Max file size is <%= human_max_upload_size %>.
<%= f.file_field :avatar, class: "form-element" %>
@@ -67,23 +67,23 @@

Extra fields -- your web site, GitHub profile, social-media usernames, whatever you want.
- Only values that begin with "http" are rendered as links.

+ Only values that begin with "http" are rendered as links.

<%= f.fields_for :user_websites do |w| %> -
-
-
<%= w.text_field :label, - class: 'form-element', - autocomplete: 'off', - placeholder: 'label' %>
+
+
+
<%= w.text_field :label, + class: 'form-element', + autocomplete: 'off', + placeholder: 'label' %>
+
+
+
<%= w.text_field :url, + class: 'form-element', + autocomplete: 'off', + placeholder: 'https://...' %>
+
-
-
<%= w.text_field :url, - class: 'form-element', - autocomplete: 'off', - placeholder: 'https://...' %>
-
-
<% end %>
@@ -93,8 +93,7 @@ Your Discord user tag, username or username#1234. <%= f.text_field :discord, class: 'form-element', autocomplete: 'off', placeholder: 'username#1234' %>
- - + <%= f.submit 'Save', class: 'button is-filled js-submit-profile-edit' %> <%= link_to 'Cancel', users_me_path, From b085aeafbc3b55b4bbee18c4a410d0071a3241b9 Mon Sep 17 00:00:00 2001 From: Oleg Valter Date: Sat, 7 Feb 2026 21:03:19 +0300 Subject: [PATCH 25/28] allowed seeds to autoremove site settings that are no longer present --- db/seeds.rb | 41 +++++++++++++++++++++++++++++++++++++++-- 1 file changed, 39 insertions(+), 2 deletions(-) diff --git a/db/seeds.rb b/db/seeds.rb index ff74e48b3..421811728 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -134,6 +134,11 @@ def update_post(user, community, post, seed) stats end +# a map of community_id to an array of SiteSetting seed names - a partial +# solution to making our seeds mutable. For now this map facilitates removal +# of no longer present site settings during cleanup +$site_settings_map = {} + # @return [Stats] operation stats def seed_objects(type, seed) seeds = expand_communities(type, seed) @@ -155,6 +160,14 @@ def seed_objects(type, seed) ensure_system_user_abilities end + if type == SiteSetting + seeds.each do |seed| + community_id = seed[:community]&.id + $site_settings_map[community_id] ||= [] + $site_settings_map[community_id] << seed[:name] + end + end + SeedsHelper::Stats.new(created, 0, 0, skipped) end @@ -199,6 +212,29 @@ def seed_community_assets end end +def cleanup_posts + Post.where(community_id: nil).destroy_all +end + +def cleanup_site_settings + to_remove = [] + + $site_settings_map.each do |community_id, names| + stale_settings = SiteSetting.unscoped + .where(community_id: community_id) + .where.not(name: names) + to_remove.push(*stale_settings) + end + + return unless to_remove.any? + + ActiveRecord::Base.transaction do + to_remove.each(&:destroy!) + end + + puts "#{SiteSetting.model_name}: removed #{to_remove.size}" +end + sorted.each do |f, type| processed = ERB.new(File.read(f)).result(binding) data = YAML.load(processed) @@ -219,6 +255,7 @@ def seed_community_assets puts "Got error #{e}. Continuing..." end -Post.where(community_id: nil).destroy_all - seed_community_assets + +cleanup_posts +cleanup_site_settings From 3a1a937b14100b63c8163a17fe5f142e3af9217b Mon Sep 17 00:00:00 2001 From: Oleg Valter Date: Sat, 7 Feb 2026 21:04:08 +0300 Subject: [PATCH 26/28] MaxUploadSize site setting can be safely dropped now --- db/seeds/site_settings.yml | 9 --------- 1 file changed, 9 deletions(-) diff --git a/db/seeds/site_settings.yml b/db/seeds/site_settings.yml index c4adc117b..6cae41ffd 100644 --- a/db/seeds/site_settings.yml +++ b/db/seeds/site_settings.yml @@ -180,15 +180,6 @@ description: > The maximum number of characters an edit comment may contain. Defaults to 255. -- name: MaxUploadSize - value: 2MB - value_type: string - category: AdvancedSettings - description: > - The maximum size of images that users may upload. Changing this setting DOES NOT change the limit - the limit is - set by your web server configuration. This setting should be set to the same value so that the correct limit - can be displayed to users. - - name: MaxRequestBodySize value: 2097152 value_type: integer From b72d7e35146c94a7df9e1786a5f64b703170c347 Mon Sep 17 00:00:00 2001 From: Oleg Valter Date: Sat, 7 Feb 2026 21:27:41 +0300 Subject: [PATCH 27/28] added a note that MaxRequestBodySize's default value is equal to 2MB --- db/seeds/site_settings.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/db/seeds/site_settings.yml b/db/seeds/site_settings.yml index 6cae41ffd..3c98ad52f 100644 --- a/db/seeds/site_settings.yml +++ b/db/seeds/site_settings.yml @@ -185,7 +185,7 @@ value_type: integer category: AdvancedSettings description: > - The maximum allowed size of request body (in bytes). This setting must be kept in sync with your web server or + The maximum allowed size of request body in bytes (2MB by default). This setting must be kept in sync with your web server or reverse proxy configuration that governs request body size limits - **do not** change it if you don't know what that means. From b72d3a40b7fe7bf81ee8ef4fb3c08a91763d5ed3 Mon Sep 17 00:00:00 2001 From: Oleg Valter Date: Sat, 7 Feb 2026 21:49:59 +0300 Subject: [PATCH 28/28] don't cleanup site settings in tests as there are fixtures --- db/seeds.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/db/seeds.rb b/db/seeds.rb index 421811728..34eca426d 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -217,6 +217,8 @@ def cleanup_posts end def cleanup_site_settings + return if Rails.env.test? + to_remove = [] $site_settings_map.each do |community_id, names|