Merge branch 'develop' into taeir/fix-validations-apply-to-help-policy

Author: Oaphi

Gemfile

@@ -70,7 +70,7 @@ gem 'net-smtp', '~> 0.3'
 gem 'ruby-progressbar', '~> 1.11'
 
 # Image generation
-gem 'rmagick', '~> 5.0'
+gem 'rmagick', '~> 5.3'
 
 # Payments. Kinda important, y'know.
 gem 'stripe', '~> 5.55'

Gemfile.lock

@@ -221,7 +221,7 @@ GEM
     parallel (1.22.1)
     parser (3.1.2.1)
       ast (~> 2.4.1)
-    pkg-config (1.5.1)
+    pkg-config (1.5.5)
     premailer (1.16.0)
       addressable
       css_parser (>= 1.6.0)
@@ -285,7 +285,7 @@ GEM
     reverse_markdown (2.1.1)
       nokogiri
     rexml (3.2.5)
-    rmagick (5.2.0)
+    rmagick (5.3.0)
       pkg-config (~> 1.4)
     rotp (6.2.0)
     rqrcode (2.1.2)
@@ -428,7 +428,7 @@ DEPENDENCIES
   rails-html-sanitizer (~> 1.4)
   redis (~> 4.8)
   reverse_markdown (~> 2.1)
-  rmagick (~> 5.0)
+  rmagick (~> 5.3)
   rotp (~> 6.2)
   rqrcode (~> 2.1)
   rubocop (~> 1)

app/assets/javascripts/filters.js

@@ -54,7 +54,7 @@ $(() => {
       const filters = await QPixel.filters();
 
       function template(option) {
-        if (option.id == '') { return 'None'; }
+        if (option.id == '') { return 'Default'; }
 
         const filter = filters[option.id];
         const name = `<span>${option.text}</span>`;

app/assets/javascripts/posts.js

@@ -6,6 +6,19 @@ const ALLOWED_ATTR = ['id', 'class', 'href', 'title', 'src', 'height', 'width',
   'start', 'dir'];
 
 $(() => {
+  DOMPurify.addHook("uponSanitizeAttribute", (node, event) => {
+    const rowspan = node.getAttribute("rowspan");
+    const colspan = node.getAttribute("colspan");
+
+    if (rowspan && Number.isNaN(+rowspan)) {
+      event.keepAttr = false;
+    }
+
+    if (colspan && Number.isNaN(+colspan)) {
+      event.keepAttr = false;
+    }
+  });
+
   const $uploadForm = $('.js-upload-form');
 
   const stringInsert = (str, idx, insert) => str.slice(0, idx) + insert + str.slice(idx);
@@ -149,6 +162,27 @@ $(() => {
           ALLOWED_TAGS,
           ALLOWED_ATTR
         });
+
+        const removedElements = [...new Set(DOMPurify.removed
+          .filter(entry => entry.element && !(entry.element instanceof HTMLBodyElement))
+          .map(entry => entry.element.localName))];
+
+        const removedAttributes = [...new Set(DOMPurify.removed
+          .filter(entry => entry.attribute)
+          .map(entry => [
+            entry.attribute.name + (entry.attribute.value ? `='${entry.attribute.value}'` : ''),
+            entry.from.localName
+          ]))]
+
+        $tgt.parents('form')
+          .find('.rejected-elements')
+          .toggleClass('hide', removedElements.length === 0 && removedAttributes.length === 0)
+          .find('ul')
+          .empty()
+          .append(
+            removedElements.map(name => $(`<li><code>&lt;${name}&gt;</code></li>`)),
+            removedAttributes.map(([attr, elName]) => $(`<li><code>${attr}</code> (in <code>&lt;${elName}&gt;</code>)</li>`)));
+
         $tgt.parents('.form-group').siblings('.post-preview').html(html);
         $tgt.parents('form').find('.js-post-html[name="__html"]').val(html + '<!-- g: js, mdit -->');
       }, 0);

app/assets/stylesheets/comments.scss

@@ -65,6 +65,17 @@
   font-style: italic;
 }
 
+.post--comments-header {
+  align-items: center;
+  display: flex;
+  justify-content: space-between;
+  margin-bottom: 0.75rem;
+}
+
+.post--comments-container {
+  margin-bottom: 1rem;
+}
+
 .post--comments-thread.is-inline {
   padding: 0.5rem 0.25rem;
   display: flex;
@@ -139,7 +150,7 @@
 .new-thread-modal {
   box-shadow: 0 3px 5px -2px #eee;
   border: 1px solid #d0d9dd;
-  margin-top: 10px;
+  margin-top: 1rem;
   padding: 0.7em;
   display: none;
 }

app/controllers/categories_controller.rb

@@ -143,7 +143,8 @@ def category_params
     params.require(:category).permit(:name, :short_wiki, :tag_set_id, :is_homepage, :min_trust_level, :button_text,
                                      :color_code, :min_view_trust_level, :license_id, :sequence,
                                      :asking_guidance_override, :answering_guidance_override,
-                                     :use_for_hot_posts, :use_for_advertisement, :min_title_length, :min_body_length,
+                                     :use_for_hot_posts, :use_for_advertisement,
+                                     :min_title_length, :min_body_length, :default_filter_id,
                                      display_post_types: [], post_type_ids: [], required_tag_ids: [],
                                      topic_tag_ids: [], moderator_tag_ids: [])
   end
@@ -165,13 +166,22 @@ def set_list_posts
     filter_qualifiers = helpers.params_to_qualifiers
     @active_filter = helpers.active_filter
 
-    if filter_qualifiers.blank? && user_signed_in?
-      default_filter_id = helpers.default_filter(current_user.id, @category.id)
-      default_filter = Filter.find_by(id: default_filter_id)
+    if filter_qualifiers.blank? && @active_filter[:name].blank?
+      if user_signed_in?
+        default_filter_id = helpers.default_filter(current_user.id, @category.id)
+        default_filter = Filter.find_by(id: default_filter_id)
+        default = :user if default_filter.present?
+      end
+
+      if default_filter.nil?
+        default_filter = @category.default_filter
+        default = :category if default_filter.present?
+      end
+
       unless default_filter.nil?
         filter_qualifiers = helpers.filter_to_qualifiers default_filter
         @active_filter = {
-          default: true,
+          default: default,
           name: default_filter.name,
           min_score: default_filter.min_score,
           max_score: default_filter.max_score,

app/controllers/users_controller.rb

@@ -80,7 +80,7 @@ def filter_json(filter)
   end
 
   def filters_json
-    system_filters = Rails.cache.fetch 'system_filters' do
+    system_filters = Rails.cache.fetch 'default_system_filters', expires_in: 1.day do
       User.find(-1).filters.to_h { |filter| [filter.name, filter_json(filter)] }
     end
 

app/helpers/search_helper.rb

@@ -41,7 +41,7 @@ def filter_to_qualifiers(filter)
 
   def active_filter
     {
-      default: false,
+      default: nil,
       name: params[:predefined_filter],
       min_score: params[:min_score],
       max_score: params[:max_score],

app/models/category.rb

@@ -9,6 +9,7 @@ class Category < ApplicationRecord
   has_many :posts
   belongs_to :tag_set
   belongs_to :license
+  belongs_to :default_filter, class_name: 'Filter', optional: true
 
   serialize :display_post_types, Array
 

app/views/categories/_form.html.erb

@@ -145,6 +145,13 @@
     </span>
       <%= f.number_field :sequence, class: 'form-element' %>
     </div>
+
+    <div class="form-group">
+      <%= f.label :default_filter_id, class: 'form-element' %>
+      <span class="form-caption">The default filter for this category, used for anonymous users.</span>
+      <% system_filters = User.find(-1).filters.to_h { |filter| [filter.name, filter.id] } %>
+      <%= f.select :default_filter_id, options_for_select(system_filters, selected: @category.default_filter_id), { include_blank: "No default" } %>
+    </div>
   </details>
 
   <details>