Merge branch 'develop' into 0valt/1459/draft-discard

Author: Oaphi

Gemfile

@@ -7,6 +7,7 @@ gem 'counter_culture', '~> 3.2'
 gem 'fastimage', '~> 2.2'
 gem 'image_processing', '~> 1.12'
 gem 'jquery-rails', '~> 4.5.0'
+gem 'mime-types', '~> 3.7'
 gem 'mysql2', '~> 0.5.4'
 gem 'puma', '~> 5.6'
 gem 'rails', '~> 7.2'

Gemfile.lock

@@ -493,6 +493,7 @@ DEPENDENCIES
   listen (~> 3.7)
   maintenance_tasks (~> 2.2)
   memory_profiler (~> 1.0)
+  mime-types (~> 3.7)
   minitest (~> 5.16.0)
   minitest-ci (~> 3.4.0)
   msgpack (~> 1.8)

app/assets/javascripts/flags.js

@@ -1,5 +1,5 @@
 $(() => {
-  $(document).on('click', '.flag-link', (ev) => {
+  $(document).on('click', '.flag-link', async (ev) => {
     ev.preventDefault();
     const self = $(ev.target);
     const isCommentFlag = self.hasClass('js-comment-flag');
@@ -21,6 +21,10 @@ $(() => {
     }
 
     const postId = self.data('post-id');
+
+    /**
+     * @type {QPixelFlagData}
+     */
     const data = {
       'flag_type': (reason !== -1) ? reason : null,
       'post_id': postId,
@@ -29,47 +33,26 @@ $(() => {
     };
 
     if (requiresDetails && data['reason'].length < 1) {
-      QPixel.createNotification('danger',
-                                'Details are required for this flag type - please enter a message.');
+      QPixel.createNotification('danger', 'Details are required for this flag type - please enter a message.');
       return;
     }
 
-    const responseType = isCommentFlag ? null : activeRadio.data('response-type');
+    const closeFlagModal = () => {
+      self.parents('.js-flag-box').removeClass('is-active');
+      $(`#flag-comment-${postId}`).removeClass('is-active');
+    };
 
-    $.ajax({
-      'type': 'POST',
-      'url': '/flags/new',
-      'data': data,
-      // TODO: review
-      // 'target': self
-    })
-      .done((response) => {
-        if(response.status !== 'success') {
-          QPixel.createNotification('danger', '<strong>Failed:</strong> ' + response.message);
-        }
-        else {
-          const messages = {
-            comment: `<strong>Thanks!</strong> Your flag has been added as a comment for the author to review.`
-          };
-          const defaultMessage = `<strong>Thanks!</strong> We will review your flag.`;
-          QPixel.createNotification('success', messages[responseType] || defaultMessage);
-          $(`#flag-post-${postId}`).val('');
-        }
-        self.parents('.js-flag-box').removeClass('is-active');
-        $(`#flag-comment-${postId}`).removeClass('is-active');
+    try {
+      const response = await QPixel.flag(data);
 
-      })
-      .fail((jqXHR, _textStatus, _errorThrown) => {
-        let message = jqXHR.status;
-        try {
-          message = JSON.parse(jqXHR.responseText)['message'];
-        }
-        finally {
-          QPixel.createNotification('danger', '<strong>Failed:</strong> ' + message);
-        }
-        self.parents('.js-flag-box').removeClass('is-active');
-        $(`#flag-comment-${postId}`).removeClass('is-active');
-      });
+      QPixel.handleJSONResponse(response, (data) => {
+        QPixel.createNotification('success', data.message);
+        $(`#flag-post-${postId}`).val('');
+      }, closeFlagModal);
+    } catch(e) {
+      console.warn(`[flags/new] API error:`, e);
+      QPixel.createNotification('danger', 'Failed to flag.');
+    }
   });
 
   $('.js-start-escalate').on('click', (ev) => {

app/assets/javascripts/modals.js

@@ -1,7 +1,9 @@
 document.addEventListener('DOMContentLoaded', () => {
-  document.addEventListener('keypress', (ev) => {
-    if (ev.code === 'Escape') {
-      document.querySelectorAll('.modal').forEach((el) => el.classList.remove('is-active'));
+  document.addEventListener('keyup', (ev) => {
+    if (ev.code === 'Escape' && !ev.metaKey && !ev.ctrlKey) {
+      document.querySelectorAll('.modal').forEach((el) => {
+        el.classList.remove('is-active');
+      });
     }
   });
 });

app/assets/javascripts/posts.js

@@ -48,6 +48,23 @@ $(() => {
     $uploadForm.trigger('submit')
   });
 
+  new MutationObserver((records) => {
+    for (const record of records) {
+      if (record.target instanceof HTMLElement &&
+          record.target.id === 'markdown-image-upload' &&
+          record.target.classList.contains('is-active')) {
+        const fileInput = record.target.querySelector('input[type="file"]');
+        
+        if (fileInput instanceof HTMLInputElement) {
+          fileInput.focus();
+        }
+      }
+    }
+  }).observe(document, {
+    attributeFilter: ['class'],
+    subtree: true,
+  });
+
   $uploadForm.on('submit', async (evt) => {
     evt.preventDefault();
 

app/assets/javascripts/qpixel_api.js

@@ -217,10 +217,10 @@ window.QPixel = {
     }
 
     let prefs = await QPixel._getPreferences();
-    let value = community ? prefs.community[name] : prefs.global[name];
+    let value = community ? prefs?.community[name] : prefs?.global[name];
 
     // Note that null is a valid value for a preference, but undefined means we haven't fetched it.
-    if (typeof (value) !== 'undefined') {
+    if (typeof value !== 'undefined') {
       return value;
     }
     // If we haven't fetched a preference, that probably means it's new - run a full re-fetch.
@@ -443,13 +443,25 @@ window.QPixel = {
     return content;
   },
 
-  handleJSONResponse: (data, onSuccess) => {
+  handleJSONResponse: (data, onSuccess, onFinally) => {
     if (data.status === 'success') {
-      onSuccess(data)
+      onSuccess(data);
     }
     else {
       QPixel.createNotification('danger', data.message);
     }
+
+    onFinally?.(data);
+  },
+
+  flag: async (flag) => {
+    const resp = await QPixel.fetchJSON(`/flags/new`, { ...flag }, {
+      headers: { 'Accept': 'application/json' }
+    });
+
+    const data = await resp.json();
+
+    return data;
   },
 
   deleteComment: async (id) => {

app/assets/javascripts/site_settings.js

@@ -1,9 +1,17 @@
 $(() => {
+  /**
+   * @type {Record<string, JQuery<HTMLInputElement | HTMLTextAreaElement | HTMLSelectElement>>}
+   */
   const settingEditFields = {
+    'array': $(`<select class="form-element js-setting-edit" multiple></select>`),
     'string': $(`<input type="text" class="form-element js-setting-edit" />`),
     'integer': $('<input type="number" class="form-element js-setting-edit" />'),
     'float': $('<input type="number" step="0.0001" class="form-element js-setting-edit" />'),
-    'boolean': $(`<select class="form-element js-setting-edit"><option value></option><option value="true">true</option><option value="false">false</option></select>`),
+    'boolean': $(`<select class="form-element js-setting-edit">
+                    <option value></option>
+                    <option value="true">true</option>
+                    <option value="false">false</option>
+                  </select>`),
     'json': $(`<textarea rows="5" cols="100" class="form-element js-setting-edit"></textarea>`),
     'text': $(`<textarea rows="5" cols="100" class="form-element js-setting-edit"></textarea>`)
   };
@@ -26,9 +34,34 @@ $(() => {
     const data = await resp.json();
     const value = data.typed;
 
-    const form = settingEditFields[valueType].clone().val(!!value ? value.toString() : '')
-                                             .attr('data-name', name).attr('data-community-id', communityId);
-    $tgt.addClass('editing').html(form).append(`<button class="button is-primary is-filled js-setting-submit">Update</button>`);
+    const field = settingEditFields[valueType].clone()
+                                              .attr('data-name', name)
+                                              .attr('data-community-id', communityId)
+                                              .get(0);
+
+    if (valueType === 'array' && field instanceof HTMLSelectElement) {
+      for (const opt of data.options ?? []) {
+        const option = document.createElement('option');
+        option.textContent = opt;
+        option.value = opt;
+        option.selected = value.includes(opt);
+        field.add(option);
+      }
+    }
+    else if (valueType === 'boolean') {
+      field.value = value.toString();
+    }
+    else {
+      field.value = !!value ? value.toString() : '';
+    }
+
+    $tgt.addClass('editing')
+        .html(field)
+        .append(`<button class="button is-primary is-filled js-setting-submit has-display-block">Update</button>`);
+
+    if (valueType === 'array') {
+      $(field).select2();
+    }
   });
 
   $(document).on('click', '.js-setting-submit', async (evt) => {
@@ -39,9 +72,14 @@ $(() => {
     const communityId = $input.data('community-id');
     const value = $input.val();
 
-    let body = {site_setting: {value}};
+    const body = {
+      site_setting: {
+        value: Array.isArray(value) ? value.join(' ') : value
+      }
+    };
+
     if (!!communityId) {
-      body = Object.assign(body, {community_id: communityId});
+      body.community_id = communityId;
     }
 
     const resp = await QPixel.fetchJSON(`/admin/settings/${name}`, body);

app/controllers/advertisement_controller.rb

@@ -35,10 +35,10 @@ def specific_question
 
   def specific_category
     @category = Category.unscoped.find(params[:id])
-    @post = Rails.cache.fetch "ca_random_category_post/#{params[:id]}",
-                              expires_in: 5.minutes do
-      select_random_post(@category, days: params[:days]&.to_i, score: params[:score]&.to_f)
-    end
+    @post = Rails.cache.fetch_collection "ca_random_category_post/#{params[:id]}",
+                                         expires_in: 5.minutes do
+      random_post_collection(@category, days: params[:days]&.to_i, score: params[:score]&.to_f)
+    end.sample
 
     if @post.nil?
       not_found!
@@ -53,9 +53,9 @@ def specific_category
   end
 
   def random_question
-    @post = Rails.cache.fetch 'ca_random_hot_post', expires_in: 5.minutes do
-      select_random_post
-    end
+    @post = Rails.cache.fetch_collection 'ca_random_hot_post', expires_in: 5.minutes do
+      random_post_collection
+    end.sample
     if @post.nil?
       return community
     end
@@ -95,7 +95,7 @@ def promoted_post
   # @param score [Float] the minimum post score to consider
   # @param count [Integer] a maximum number of posts to query for; the final post will be randomly selected from this
   # @return [Post]
-  def select_random_post(category = nil, days: nil, score: nil, count: nil)
+  def random_post_collection(category = nil, days: nil, score: nil, count: nil)
     if category.nil?
       category = Category.where(use_for_advertisement: true)
     end
@@ -106,7 +106,7 @@ def select_random_post(category = nil, days: nil, score: nil, count: nil)
         .where(posts: { last_activity: days.days.ago..DateTime.now })
         .where(posts: { category: category })
         .where('posts.score > ?', score.nil? ? SiteSetting['HotPostsScoreThreshold'] : score)
-        .order('posts.score DESC').limit(count.nil? ? SiteSetting['HotQuestionsCount'] : count).all.sample
+        .order('posts.score DESC').limit(count.nil? ? SiteSetting['HotQuestionsCount'] : count).all
   end
 
   def send_resp(data)

app/controllers/application_controller.rb

@@ -205,9 +205,10 @@ def setup_request_context
     RequestContext.clear!
 
     host_name = request.raw_host_with_port # include port to support multiple localhost instances
-    RequestContext.community = @community = Rails.cache.fetch("#{host_name}/community", expires_in: 1.hour) do
-      Community.unscoped.find_by(host: host_name)
-    end
+    @community = Rails.cache.fetch_collection("#{host_name}/community", expires_in: 1.hour) do
+      Community.unscoped.where(host: host_name)
+    end.first
+    RequestContext.community = @community
 
     Rails.logger.info "  Host #{host_name}, community ##{RequestContext.community_id} " \
                       "(#{RequestContext.community&.name})"
@@ -230,7 +231,7 @@ def setup_user
   end
 
   def pull_pinned_links_and_hot_questions
-    @pinned_links = Rails.cache.fetch('pinned_links', expires_in: 2.hours) do
+    @pinned_links = Rails.cache.fetch_collection('pinned_links', expires_in: 2.hours) do
       Rack::MiniProfiler.step 'pinned_links: cache miss' do
         PinnedLink.where(active: true).where('shown_before IS NULL OR shown_before > NOW()').all
       end
@@ -247,7 +248,7 @@ def pull_pinned_links_and_hot_questions
     # I.e., if pinned_post_ids contains null, the selection will never return records
     pinned_post_ids = @pinned_links.map(&:post_id).compact
 
-    @hot_questions = Rails.cache.fetch('hot_questions', expires_in: 4.hours) do
+    @hot_questions = Rails.cache.fetch_collection('hot_questions', expires_in: 4.hours) do
       Rack::MiniProfiler.step 'hot_questions: cache miss' do
         Post.undeleted.not_locked.where(closed: false)
             .where(last_activity: (Rails.env.development? ? 365 : 7).days.ago..DateTime.now)
@@ -261,7 +262,7 @@ def pull_pinned_links_and_hot_questions
   end
 
   def pull_categories
-    @header_categories = Rails.cache.fetch('header_categories') do
+    @header_categories = Rails.cache.fetch_collection('header_categories') do
       Category.all.order(sequence: :asc, id: :asc)
     end
   end

app/controllers/flags_controller.rb

@@ -14,9 +14,7 @@ def new
     max_flags_per_day = SiteSetting[current_user.privilege?('unrestricted') ? 'RL_Flags' : 'RL_NewUserFlags']
 
     if recent_flags >= max_flags_per_day
-      flag_limit_msg = 'Thank you. Flags from people like you help us keep this site clean. ' \
-                       "However, you have reached your daily flag limit of #{max_flags_per_day} " \
-                       'flags. Please come back tomorrow to continue flagging.'
+      flag_limit_msg = I18n.t('flags.errors.rate_limited', count: max_flags_per_day)
 
       AuditLog.rate_limit_log(event_type: 'flag', related: Post.find(params[:post_id]), user: current_user,
                               comment: "limit: #{max_flags_per_day}\n\ntype:#{type}\ncomment:\n#{params[:reason].to_i}")
@@ -27,16 +25,19 @@ def new
 
     if type&.name == "needs author's attention"
       create_as_feedback_comment Post.find(params[:post_id]), current_user, params[:reason]
-      render json: { status: 'success' }, status: :created
+      render json: { status: 'success', message: I18n.t('flags.success.create_author_attention') },
+             status: :created
       return
     end
 
     @flag = Flag.new(post_flag_type: type, reason: params[:reason], post_id: params[:post_id],
                      post_type: params[:post_type], user: current_user)
     if @flag.save
-      render json: { status: 'success' }, status: :created
+      render json: { status: 'success', message: I18n.t('flags.success.create_generic') },
+             status: :created
     else
-      render json: { status: 'failed', message: 'Flag failed to save.' }, status: :internal_server_error
+      render json: { status: 'failed', message: I18n.t('flags.errors.create_generic') },
+             status: :bad_request
     end
   end