thredded 0.15.3 → 0.15.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3b352700d9047e3e225b310dfc168d67b67ae3159da12baa88893b1185f89b46
-  data.tar.gz: 8301bfe7de537c66eac09594ec89371490b5770b7dbaae223f268c41db2bcb98
+  metadata.gz: 4fb30f1cf973b0e6d8e26feb9006cbf20b1405cddfcaa2deb4e06ccd1d3a6524
+  data.tar.gz: cd3fa99b4797609c4e840ed02a3117ccf7288d1c706ef879ac6ee3d32546404a
 SHA512:
-  metadata.gz: 95cf96447f824d72a3260f9a27ce35aa3827d1d6e64419a184bf8c76e50382a6ed759d46914f72c3680e7553fd25cd6235246b4864bc8dc85ac6e84c3c6bba79
-  data.tar.gz: db8e6876bab1e834633aff07da90cde4b0a6e90b3469615bb21c62f00c8c57ce9b7e47dc148c5e319cf0ce2371c30d33f7e51f95d2e55ba0265f37956ac76c3b
+  metadata.gz: ef7c3bd8c922fc954a55e00625ffe267b0a164be7e4f36eb434de72a70f974571ae72cde41d799643ce893ef3f55aff7b5daebc70119cfe7462027d150ddf897
+  data.tar.gz: e005eb547cbbb181d9f118ff54e9d48427a28c6b3b66dd2e19289e8b5468ceeb059b35e80d9d62b896af964ea416184ac3ea4c4fc8d189675a9b2d5dd9d23616

data/README.md

@@ -95,7 +95,7 @@ Then, see the rest of this Readme for more information about using and customizi
 Add the gem to your Gemfile:
 
 ```ruby
-gem 'thredded', '~> 0.15.3'
+gem 'thredded', '~> 0.15.4'
 ```
 
 Add the Thredded [initializer] to your parent app by running the install generator.

data/app/assets/javascripts/thredded/components/submit_hotkey.es6

@@ -0,0 +1,18 @@
+(function() {
+  const Thredded = window.Thredded;
+  Thredded.isSubmitHotkey = (evt) => {
+    // Ctrl+Enter.
+    return evt.ctrlKey && (evt.keyCode === 13 || evt.keyCode === 10 /* http://crbug.com/79407 */);
+  };
+
+  document.addEventListener('keypress', (evt) => {
+    if (Thredded.isSubmitHotkey(evt)) {
+      const submitButton = document.querySelector('[data-thredded-submit-hotkey] [type="submit"]');
+      if (!submitButton) return;
+      evt.preventDefault();
+      // Focus first for better visual feedback.
+      submitButton.focus();
+      submitButton.click();
+    }
+  });
+})();

data/app/assets/stylesheets/thredded/components/_pagination.scss

@@ -1,6 +1,7 @@
 .thredded--pagination {
   border-top: $thredded-base-border;
   padding-top: $thredded-base-spacing;
+  padding-bottom: $thredded-base-spacing;
   text-align: center;
 
   > span {
@@ -27,7 +28,6 @@
 .thredded--pagination-top > .thredded--pagination {
   border-bottom: $thredded-base-border;
   margin-bottom: $thredded-base-spacing;
-  padding-bottom: $thredded-base-spacing;
 }
 
 .thredded--pagination-bottom > .thredded--pagination {

data/app/assets/stylesheets/thredded/components/_post-form.scss

@@ -5,7 +5,6 @@
 
   &--wrapper {
     border-top: $thredded-base-border;
-    margin-top: $thredded-base-spacing;
     padding-top: $thredded-base-spacing;
   }
 

data/app/assets/stylesheets/thredded/components/_topics.scss

@@ -55,8 +55,8 @@
   }
 }
 
-.thredded--topics--started-by,
-.thredded--topics--updated-by {
+.thredded--topics--updated-by,
+.thredded--topics--messageboard {
   color: $thredded-secondary-text-color;
   font-size: $thredded-font-size-small;
   font-style: normal;
@@ -69,22 +69,6 @@
       color: $thredded-action-color;
     }
   }
-
-  abbr {
-    &::after  {
-      content: ' by ';
-    }
-  }
-}
-
-.thredded--topics--updated-by {
-  margin-right: $thredded-small-spacing;
-
-  abbr {
-    &::before {
-      content: 'updated ';
-    }
-  }
 }
 
 .thredded--topics--participants--participant {
@@ -93,16 +77,6 @@
   }
 }
 
-.thredded--topics--started-by {
-  display: none;
-
-  abbr {
-    &::before {
-      content: 'started ';
-    }
-  }
-}
-
 .thredded--topics--moderation-state {
   padding: 0.3em 0.5em;
   font-size: $thredded-font-size-small;

data/app/controllers/thredded/application_controller.rb

@@ -20,7 +20,9 @@ module Thredded
 
     rescue_from Thredded::Errors::MessageboardNotFound,
                 Thredded::Errors::PrivateTopicNotFound,
+                Thredded::Errors::PrivatePostNotFound,
                 Thredded::Errors::TopicNotFound,
+                Thredded::Errors::PostNotFound,
                 Thredded::Errors::UserNotFound do |exception|
       @error   = exception
       @message = exception.message

data/app/controllers/thredded/post_permalinks_controller.rb

@@ -3,7 +3,7 @@
 module Thredded
   class PostPermalinksController < Thredded::ApplicationController
     def show
-      post = Thredded::Post.find(params[:id])
+      post = Thredded::Post.find!(params[:id])
       authorize post, :read?
       redirect_to post_url(post, user: thredded_current_user), status: :found
     end

data/app/controllers/thredded/post_previews_controller.rb

@@ -13,7 +13,7 @@ module Thredded
 
     # Preview an update to an existing post
     def update
-      @post = Thredded::Post.find(params[:post_id])
+      @post = Thredded::Post.find!(params[:post_id])
       @post.assign_attributes(post_params)
       render_preview
     end

data/app/controllers/thredded/posts_controller.rb

@@ -81,12 +81,11 @@ module Thredded
     def parent_topic
       Thredded::Topic
         .where(messageboard: messageboard)
-        .friendly
-        .find(params[:topic_id])
+        .friendly_find!(params[:topic_id])
     end
 
     def post
-      @post ||= Thredded::Post.find(params[:id])
+      @post ||= Thredded::Post.find!(params[:id])
     end
 
     def current_page

data/app/controllers/thredded/private_post_permalinks_controller.rb

@@ -4,7 +4,7 @@ module Thredded
   class PrivatePostPermalinksController < Thredded::ApplicationController
     before_action :thredded_require_login!
     def show
-      private_post = Thredded::PrivatePost.find(params[:id])
+      private_post = Thredded::PrivatePost.find!(params[:id])
       authorize private_post, :read?
       redirect_to post_url(private_post, user: thredded_current_user), status: :found
     end

data/app/controllers/thredded/private_post_previews_controller.rb

@@ -13,7 +13,7 @@ module Thredded
 
     # Preview an update to an existing post
     def update
-      @private_post = Thredded::PrivatePost.find(params[:private_post_id])
+      @private_post = Thredded::PrivatePost.find!(params[:private_post_id])
       @private_post.assign_attributes(private_post_params)
       render_preview
     end

data/app/controllers/thredded/private_posts_controller.rb

@@ -80,12 +80,11 @@ module Thredded
     def parent_topic
       Thredded::PrivateTopic
         .includes(:private_users)
-        .friendly
-        .find(params[:private_topic_id])
+        .friendly_find!(params[:private_topic_id])
     end
 
     def post
-      @post ||= Thredded::PrivatePost.find(params[:id])
+      @post ||= Thredded::PrivatePost.find!(params[:id])
     end
 
     def current_page

data/app/helpers/thredded/urls_helper.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Thredded
-  module UrlsHelper
+  module UrlsHelper # rubocop:disable Metrics/ModuleLength
     class << self
       include Thredded::Engine.routes.url_helpers
       include Thredded::UrlsHelper
@@ -141,5 +141,32 @@ module Thredded
         post_permalink_path(post)
       end
     end
+
+    # @param [Thredded.user_class] current_user
+    # @param [Thredded.user_class] to
+    # @param [Boolean] use_existing Whether to use the existing thread if any.
+    # @return [String] a path to a new or existing private message thread for the given users.
+    def send_private_message_path(current_user:, to:, use_existing: true)
+      existing_topic = use_existing &&
+                       Thredded::PrivateTopic.has_exact_participants([current_user, to])
+                         .order_recently_posted_first.first
+      if existing_topic
+        page = 1 + (existing_topic.posts_count - 1) / Thredded::PrivatePost.default_per_page
+        Thredded::UrlsHelper.private_topic_path(
+          existing_topic,
+          page: (page if page > 1),
+          autofocus_new_post_content: true,
+          anchor: 'post_content'
+        )
+      else
+        Thredded::UrlsHelper.new_private_topic_path(
+          private_topic: {
+            user_names: to.send(Thredded.user_name_column),
+            title: [current_user, to].map(&Thredded.user_display_name_method).join(' • ')
+          },
+          autofocus_new_post_content: true,
+        )
+      end
+    end
   end
 end

data/app/models/concerns/thredded/content_moderation_state.rb

@@ -13,7 +13,7 @@ module Thredded
 
       scope :moderation_state_visible_to_all, -> { where(visible_to_all_arel_node) }
 
-      scope :moderation_state_visible_to_user, (lambda do |user|
+      scope :moderation_state_visible_to_user, ->(user) {
         visible = visible_to_all_arel_node
         # @type [Arel::Table]
         table = arel_table
@@ -27,7 +27,7 @@ module Thredded
           end
         end
         where(visible)
-      end)
+      }
 
       # @return [Arel::Nodes::Node]
       # @api private

data/app/models/concerns/thredded/post_common.rb

@@ -9,7 +9,7 @@ module Thredded
     extend ActiveSupport::Concern
 
     included do
-      paginates_per 50
+      paginates_per Thredded.posts_per_page
 
       delegate :email, to: :user, prefix: true, allow_nil: true
 

data/app/models/concerns/thredded/topic_common.rb

@@ -4,7 +4,7 @@ module Thredded
   module TopicCommon
     extend ActiveSupport::Concern
     included do
-      paginates_per 50 if respond_to?(:paginates_per)
+      paginates_per Thredded.topics_per_page if respond_to?(:paginates_per)
 
       belongs_to :last_user,
                  class_name: Thredded.user_class_name,

data/app/models/thredded/messageboard.rb

@@ -58,8 +58,6 @@ module Thredded
                **(Thredded.rails_gte_51? ? { optional: true } : {})
 
     has_many :post_moderation_records, inverse_of: :messageboard, dependent: :delete_all
-
-    # rubocop:disable Style/Lambda
     scope :top_level_messageboards, -> { where(group: nil) }
     scope :by_messageboard_group, ->(group) { where(group: group.id) }
     scope :ordered, ->(order = Thredded.messageboards_order) {
@@ -83,7 +81,6 @@ module Thredded
     scope :ordered_by_topics_count_desc, ->() {
       order(topics_count: :desc)
     }
-    # rubocop:enable Style/Lambda
 
     # Finds the messageboard by its slug or ID, or raises Thredded::Errors::MessageboardNotFound.
     # @param slug_or_id [String]

data/app/models/thredded/post.rb

@@ -37,6 +37,14 @@ module Thredded
 
     after_commit :auto_follow_and_notify, on: %i[create update]
 
+    # Finds the post by its ID, or raises {Thredded::Errors::PostNotFound}.
+    # @param id [String, Number]
+    # @return [Thredded::Post]
+    # @raise [Thredded::Errors::PostNotFound] if the post with the given ID does not exist.
+    def self.find!(id)
+      find_by(id: id) || fail(Thredded::Errors::PostNotFound)
+    end
+
     # @param [Integer] per_page
     # @param [Thredded.user_class] user
     def page(per_page: self.class.default_per_page, user:)

data/app/models/thredded/post_moderation_record.rb

@@ -31,6 +31,8 @@ module Thredded
       end
     end
 
+    paginates_per Thredded.posts_per_page
+
     # @param [Thredded.user_class] moderator
     # @param [Thredded::Post] post
     # @param [Symbol, String] previous_moderation_state

data/app/models/thredded/private_post.rb

@@ -21,6 +21,14 @@ module Thredded
     after_commit :update_parent_last_user_and_timestamp, on: %i[create destroy]
     after_commit :notify_users, on: [:create]
 
+    # Finds the post by its ID, or raises {Thredded::Errors::PrivatePostNotFound}.
+    # @param id [String, Number]
+    # @return [Thredded::PrivatePost]
+    # @raise [Thredded::Errors::PrivatePostNotFound] if the post with the given ID does not exist.
+    def self.find!(id)
+      find_by(id: id) || fail(Thredded::Errors::PrivatePostNotFound)
+    end
+
     # @param [Integer] per_page
     def page(per_page: self.class.default_per_page)
       calculate_page(postable.posts, per_page)

data/app/models/thredded/private_topic.rb

@@ -38,6 +38,20 @@ module Thredded
              inverse_of: :postable,
              dependent: :destroy
 
+    # Private topics with that have exactly the given participants.
+    scope :has_exact_participants, ->(users) {
+      private_users = Thredded::PrivateUser.arel_table
+      joins(:private_users)
+        .group(arel_table[:id])
+        .having(
+          Arel::Nodes::And.new(
+            users.map do |user|
+              Arel::Nodes::Count.new([private_users[:user_id].eq(user.id).or(Arel.sql('NULL'))]).eq(1)
+            end
+          ).and(Arel::Nodes::Count.new([private_users[:user_id].not_in(users.map(&:id)).or(Arel.sql('NULL'))]).eq(0))
+        )
+    }
+
     validates_each :users do |model, _attr, users|
       # Must include the creator + at least one other user
       if users.length < 2

data/app/models/thredded/topic.rb

@@ -14,7 +14,7 @@ module Thredded
     scope :search_query, ->(query) { ::Thredded::TopicsSearch.new(query, self).search }
 
     scope :order_sticky_first, -> { order(sticky: :desc) }
-    scope :order_followed_first, lambda { |user|
+    scope :order_followed_first, ->(user) {
       user_follows = UserTopicFollow.arel_table
       joins(arel_table.join(user_follows, Arel::Nodes::OuterJoin)
               .on(user_follows[:topic_id].eq(arel_table[:id])
@@ -22,7 +22,7 @@ module Thredded
         .order(Arel::Nodes::Ascending.new(user_follows[:id].eq(nil)))
     }
 
-    scope :followed_by, lambda { |user|
+    scope :followed_by, ->(user) {
       joins(:user_follows)
         .where(thredded_user_topic_follows: { user_id: user.id })
     }

data/app/models/thredded/user_extender.rb

@@ -46,12 +46,12 @@ module Thredded
         opt.has_many :thredded_post_moderated_records, foreign_key: 'moderator_id', inverse_of: :moderator
       end
 
-      scope :left_join_thredded_user_details, (lambda do
+      scope :left_join_thredded_user_details, -> {
         users = arel_table
         user_details = Thredded::UserDetail.arel_table
         joins(users.join(user_details, Arel::Nodes::OuterJoin)
                 .on(users[:id].eq(user_details[:user_id])).join_sources)
-      end)
+      }
     end
 
     def thredded_user_preference

data/app/views/thredded/posts_common/_form.html.erb

@@ -7,6 +7,7 @@
                  'data-thredded-post-form' => true,
                  'data-autocomplete-url' => autocomplete_users_path,
                  'data-autocomplete-min-length' => Thredded.autocomplete_min_length,
+                 'data-thredded-submit-hotkey' => true,
              } do |form| %>
   <ul class="thredded--form-list">
     <%= render 'thredded/posts_common/form/content',

data/app/views/thredded/posts_common/form/_content_field.html.erb

@@ -2,7 +2,7 @@
   <%= form.label :content, content_label %>
   <%= view_hooks.post_form.content_text_area.render self, form: form, content_label: content_label do %>
       <%= render 'thredded/posts_common/form/before_content', form: form %>
-      <%= form.text_area :content, {rows: 5, required: true} %>
+      <%= form.text_area :content, {rows: 5, required: true, autofocus: !!params[:autofocus_new_post_content]} %>
       <%= render 'thredded/posts_common/form/after_content', form: form %>
   <% end %>
 </li>

data/app/views/thredded/private_topics/_form.html.erb

@@ -6,6 +6,7 @@
                  # TODO: only autocomplete users in this private topic
                  'data-autocomplete-url' => autocomplete_users_path,
                  'data-autocomplete-min-length' => Thredded.autocomplete_min_length,
+                 'data-thredded-submit-hotkey' => true,
              } do |form| %>
 
   <ul class="thredded--form-list on-top">
@@ -17,6 +18,7 @@
     <li>
       <%= form.label :user_names, t('thredded.private_topics.form.users_label') %>
       <%= form.text_area :user_names,
+                         required: true,
                          placeholder: t('thredded.private_topics.form.users_placeholder'),
                          'data-thredded-users-select' => true,
                          'data-autocomplete-url' => autocomplete_users_path,

data/app/views/thredded/private_topics/_private_topic.html.erb

@@ -14,10 +14,5 @@
                  collection: [private_topic.last_user, *(private_topic.users - [private_topic.last_user])] %>
     </span>
   </cite>
-
-  <cite class="thredded--topics--started-by">
-    <%= time_ago private_topic.created_at %>
-    <%= user_link private_topic.user %>
-  </cite>
 <% end %>
 

data/app/views/thredded/topics/_form.html.erb

@@ -5,6 +5,7 @@
                  'data-thredded-topic-form' => true,
                  'data-autocomplete-url' => autocomplete_users_path,
                  'data-autocomplete-min-length' => Thredded.autocomplete_min_length,
+                 'data-thredded-submit-hotkey' => true,
              } do |form| %>
   <ul class="thredded--form-list on-top">
     <li class="title">