Merge pull request #1888 from codidact/ovalt/user-restore

Assorted improvements

Author: Oaphi

CODE-STANDARDS.md

@@ -281,8 +281,8 @@ onto the next line, and every continuation line must be indented _at least_ one
 Wrapped lines may be indented further to align certain elements with one another.
 
 ```js
-codidact.createDangerConfirmationAudit(document.querySelectorAll('.modal.is-danger > .modal--body'),
-                                       'POST', 'https://codidact.org/audits/danger-confirmation');
+QPixel.createDangerConfirmationAudit(document.querySelectorAll('.modal.is-danger > .modal--body'),
+                                       'POST', 'https://example.com/audits/danger-confirmation');
 ```
 
 #### Bracing

Gemfile

@@ -93,6 +93,7 @@ group :test do
   gem 'capybara', '~> 3.38'
   gem 'selenium-webdriver', '~> 4.7'
   gem 'webdrivers', '~> 5.2'
+  gem 'webmock', '~> 3.26'
 end
 
 group :development, :test do

Gemfile.lock

@@ -137,6 +137,9 @@ GEM
     counter_culture (3.11.2)
       activerecord (>= 4.2)
       activesupport (>= 4.2)
+    crack (1.0.1)
+      bigdecimal
+      rexml
     crass (1.0.6)
     css_parser (1.21.1)
       addressable
@@ -166,6 +169,7 @@ GEM
       activesupport (>= 6.1)
     groupdate (6.5.1)
       activesupport (>= 7)
+    hashdiff (1.2.1)
     hashie (5.0.0)
     htmlentities (4.3.4)
     i18n (1.14.7)
@@ -448,6 +452,10 @@ GEM
       nokogiri (~> 1.6)
       rubyzip (>= 1.3.0)
       selenium-webdriver (~> 4.0, < 4.11)
+    webmock (3.26.0)
+      addressable (>= 2.8.0)
+      crack (>= 0.3.2)
+      hashdiff (>= 0.4.0, < 2.0.0)
     webrick (1.9.1)
     websocket (1.2.11)
     websocket-driver (0.8.0)
@@ -530,6 +538,7 @@ DEPENDENCIES
   tzinfo-data (~> 1.2022.3)
   web-console (~> 4.2)
   webdrivers (~> 5.2)
+  webmock (~> 3.26)
   whenever (~> 1.0)
   will_paginate (~> 3.3)
   will_paginate-bootstrap (~> 1.0)

app/assets/javascripts/keyboard_tools.js

@@ -102,7 +102,7 @@ $(() => {
 
       if (isHelp) {
         _CodidactKeyboard.dialog(
-          'Codidact Keyboard Shortcuts\n' +
+          'Keyboard Shortcuts\n' +
           '===========================\n' +
           '?   Open this help\n' +
           'esc Close this help\n' +

app/assets/javascripts/markdown.js

@@ -19,7 +19,7 @@ $(() => {
     const $tgt = $(ev.target);
     const $button = $tgt.is('a') ? $tgt : $tgt.parents('a');
     const action = $button.attr('data-action');
-  
+
     /** @type {JQuery<HTMLTextAreaElement | HTMLInputElement>} */
     const $field = $('.js-post-field');
 
@@ -33,7 +33,7 @@ $(() => {
       heading: ['\n# ', null],
       hr: ['\n\n-----\n\n', null],
       table: ['\n\n| Title1 | Title2 |\n|- | - |\n| row1_1 | row1_2 |\n\n', null],
-      mathjax: ['$', '$']
+      mathjax: ['$', '$'],
     };
 
     if (Object.keys(actions).indexOf(action) !== -1) {
@@ -58,7 +58,7 @@ $(() => {
         case 66:
           $('[data-action="bold"]').click();
           break;
-        
+
         case 73:
           $('[data-action="italic"]').click();
           break;
@@ -123,12 +123,13 @@ $(() => {
   });
 
   QPixel.addPrePostValidation((text) => {
-    // This regex catches Markdown images with no or default alt text.
-    const altRegex = /!\[(?:Image_alt_text)?\](?:\(.+(?!\\\))\)|\[.+(?!\\\])\])/gi;
+    // catch Markdown images with no or default alt text: https://regex101.com/r/ubcVn4/2
+    const altRegex = /!\[(?:Image_alt_text)?\](?:\([^\)]+?\)|\[.+(?!\\\])\])/gi;
     if (text.match(altRegex)) {
-      const message = `It looks like you're posting an image with no alt text. Alt text is important for ` +
-                      `accessibility. Consider adding alt text to the images in your post - ` +
-                      `<a href="/help/alt-text">read this help article</a> for details and help writing alt text.`;
+      const message =
+        `It looks like you're posting an image with no alt text. Alt text is important for ` +
+        `accessibility. Consider adding alt text to the images in your post - ` +
+        `<a href="/help/alt-text">read this help article</a> for details and help writing alt text.`;
       return [false, [{ type: 'warning', message }]];
     }
     else {

app/assets/stylesheets/comment_threads.scss

@@ -1,3 +1,5 @@
+@import 'variables';
+
 .post--comments-thread-wrapper {
   .post--comments-thread {
     .widget--body:not(.widget--deleted-comments):not(.widget--more-comments) {
@@ -19,6 +21,33 @@
 }
 
 .thread {
+  &.widget {
+    .widget--header {
+      display: flex;
+      flex-wrap: wrap;
+      gap: 0.5em;
+      justify-content: space-between;
+    }
+
+    .widget--header-link {
+      font-size: 0.75em;
+      margin: 0;
+      padding: 0;
+      white-space: nowrap;
+    }
+  }
+
+  .thread--actions {
+    display: flex;
+    flex-wrap:wrap;
+    gap: 0.5em;
+    justify-content: end;
+    margin-top: 0.2rem;
+
+    @media screen and (max-width: $screen-sm) {
+      justify-content: start;
+    }
+  }
 
   .widget--full-thread,
   .widget--more-comments,

app/assets/stylesheets/search.scss

@@ -4,6 +4,56 @@
   border-top: 1px solid $muted-graphic;
 }
 
+.search-filters-filter {
+  align-items: end;
+  display: grid;
+  gap: 1.25em;
+  grid-template-columns: auto max-content;
+
+  margin: {
+    top: 0;
+    bottom: 1em;
+  }
+
+  .select2-container {
+    height: 35px;
+    margin: 2px 0;
+
+    .selection {
+      .select2-selection {
+        border-color: $muted-graphic;
+        height: 100%;
+        padding: 4px 0;
+      }
+
+      .select2-selection__arrow {
+        top: 50%;
+        translate: 0 -50%;
+      }
+    }
+  }
+
+  @media screen and (max-width: $screen-md) {
+    gap: 0.5em;
+  }
+
+  @media screen and (min-width: $screen-md) {
+    margin: {
+      left: 0.5em;
+      right: 0.5em;
+    }
+  }
+
+  @media screen and (max-width: $screen-sm) {
+    grid-template-columns: repeat(1, 1fr);
+  }
+}
+
+.search-filters-filter-actions {
+  display: flex;
+  gap: 0.5em;
+}
+
 .search-filters-constraints {
   display: grid;
   column-gap: 0.5em;
@@ -22,6 +72,16 @@
   }
 }
 
+.search-filters-tags {
+  display: grid;
+  column-gap: 0.5em;
+  grid-template-columns: repeat(2, 1fr);
+
+  @media screen and (max-width: $screen-sm) {
+    grid-template-columns: repeat(1, 1fr);
+  }
+}
+
 .search-sorting {
   align-items: center;
   display: flex;

app/controllers/comments_controller.rb

@@ -457,7 +457,7 @@ def check_if_target_post_locked
   # @return [Array<Integer>] list of pinged user ids
   def check_for_pings(thread, content)
     pingable = thread.pingable
-    matches = content.scan(/@#(\d+)/)
+    matches = content.scan(Comment::USER_PING_REG_EXP)
     matches.flatten.select { |m| pingable.include?(m.to_i) }.map(&:to_i)
   end
 

app/controllers/moderator_controller.rb

@@ -83,7 +83,7 @@ def handle_spammy_users
     spam = User.where(id: params[:spam_ids])
     spam.each do |user|
       user.block('Profile spam', length: 10.years, automatic: false)
-      user.do_soft_delete(current_user)
+      user.soft_delete(current_user)
     end
     flash[:success] = "#{spam.size} users blocked and deleted."
     redirect_to mod_spammers_path

app/controllers/users/registrations_controller.rb

@@ -46,7 +46,7 @@ def do_delete
     else
       UserMailer.with(user: @user, host: RequestContext.community.host, community: RequestContext.community)
                 .deletion_confirmation.deliver_later
-      @user.do_soft_delete(@user)
+      @user.soft_delete(@user)
       flash[:info] = 'Sorry to see you go!'
       redirect_to root_path
     end