thredded 0.8.4 → 0.9.1

data/app/assets/stylesheets/thredded/layout/_main-navigation.scss

@@ -1,5 +1,5 @@
 @mixin thredded-breadcrumbs-chevron() {
-  background: image-url("thredded/breadcrumb-chevron.svg") no-repeat center center;
+  background: asset-data-url("thredded/breadcrumb-chevron.svg") no-repeat center center;
   content: "";
   display: inline-block;
   height: 10px;

data/app/assets/stylesheets/thredded/layout/_navigation.scss

@@ -27,7 +27,9 @@
     .thredded--messageboards-index &,
     .thredded--topics-index &,
     .thredded--topic-search-results & {
-      display: block;
+      @media screen {
+        display: block;
+      }
     }
   }
   .thredded--user-navigation {

data/app/assets/stylesheets/thredded/layout/_search-navigation.scss

@@ -85,4 +85,8 @@
   [type="submit"] {
     display: none;
   }
+
+  @media print {
+    display: none;
+  }
 }

data/app/assets/stylesheets/thredded/layout/_user-navigation.scss

@@ -1,5 +1,8 @@
 .thredded--user-navigation {
   @extend %thredded--nav-tabs;
+  @media print {
+    display: none;
+  }
 }
 
 .thredded--user-navigation--item {

data/app/commands/thredded/at_notification_extractor.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-require 'thredded/html_pipeline/at_mention_filter'
 module Thredded
   class AtNotificationExtractor
     def initialize(post)
@@ -16,7 +15,7 @@ module Thredded
       Thredded::HtmlPipeline::AtMentionFilter.new(
         html,
         view_context: view_context,
-        users_provider: -> (user_names) { @post.readers_from_user_names(user_names).to_a }
+        users_provider: ->(user_names) { @post.readers_from_user_names(user_names).to_a }
       ).mentioned_users
     end
   end

data/app/commands/thredded/autofollow_mentioned_users.rb

@@ -1,5 +1,4 @@
 # frozen_string_literal: true
-require_dependency 'thredded/at_notification_extractor'
 module Thredded
   class AutofollowMentionedUsers
     def initialize(post)

data/app/commands/thredded/notify_following_users.rb

@@ -6,23 +6,32 @@ module Thredded
     end
 
     def run
-      return if targeted_users.empty?
-      PostMailer.post_notification(@post.id, targeted_users.map(&:email)).deliver_now
-      MembersMarkedNotified.new(@post, targeted_users).run
+      Thredded.notifiers.each do |notifier|
+        notifiable_users = targeted_users(notifier)
+        notifier.new_post(@post, notifiable_users) if notifiable_users.present?
+      end
     end
 
-    def targeted_users
-      @targeted_users ||= @post.postable.followers.reject { |u| u == @post.user }
-      exclude_those_opting_out_of_followed_activity_notifications @targeted_users
+    def targeted_users(notifier)
+      possible_targeted_users.select do |user|
+        NotificationsForFollowedTopics
+          .detect_or_default(user.thredded_notifications_for_followed_topics, notifier).enabled? &&
+          MessageboardNotificationsForFollowedTopics
+            .detect_or_default(messageboard_notifier_prefs_by_user_id[user.id], notifier).enabled?
+      end
+    end
+
+    def possible_targeted_users
+      @possible_targeted_users ||=
+        @post.postable.followers.includes(:thredded_notifications_for_followed_topics).reject { |u| u == @post.user }
     end
 
     private
 
-    def exclude_those_opting_out_of_followed_activity_notifications(members)
-      members.select do |member|
-        member.thredded_user_preference.followed_topic_emails &&
-          member.thredded_user_messageboard_preferences.in(@post.messageboard).followed_topic_emails
-      end
+    def messageboard_notifier_prefs_by_user_id
+      @messageboard_notifier_prefs_by_user_id ||= MessageboardNotificationsForFollowedTopics
+        .where(user_id: possible_targeted_users.map(&:id))
+        .for_messageboard(@post.messageboard).group_by(&:user_id)
     end
   end
 end

data/app/commands/thredded/notify_private_topic_users.rb

@@ -7,42 +7,26 @@ module Thredded
     end
 
     def run
-      members = private_topic_recipients
-
-      return unless members.present?
-      user_emails = members.map(&:email)
-      PrivateTopicMailer
-        .message_notification(private_topic.id, user_emails)
-        .deliver_later
-      mark_notified(members)
+      Thredded.notifiers.each do |notifier|
+        notifiable_users = targeted_users(notifier)
+        notifier.new_private_post(@post, notifiable_users) if notifiable_users.present?
+      end
     end
 
-    def private_topic_recipients
-      members = private_topic.users - [post.user]
-      members = exclude_those_opting_out_of_message_notifications(members)
-      members = exclude_previously_notified(members)
-      members
+    def targeted_users(notifier)
+      users = private_topic.users.includes(:thredded_notifications_for_private_topics) - [post.user]
+      users = only_those_with_this_notifier_enabled(users, notifier)
+      users
     end
 
     private
 
     attr_reader :post, :private_topic
 
-    def mark_notified(members)
-      members.each do |member|
-        post.post_notifications.create(email: member.email)
-      end
-    end
-
-    def exclude_those_opting_out_of_message_notifications(members)
-      members.select { |member| member.thredded_user_preference.notify_on_message? }
-    end
-
-    def exclude_previously_notified(members)
-      emails_notified = post.post_notifications.map(&:email)
-
-      members.reject do |member|
-        emails_notified.include? member.email
+    def only_those_with_this_notifier_enabled(users, notifier)
+      users.select do |user|
+        NotificationsForPrivateTopics
+          .detect_or_default(user.thredded_notifications_for_private_topics, notifier).enabled?
       end
     end
   end

data/app/controllers/thredded/application_controller.rb

@@ -76,7 +76,7 @@ module Thredded
     end
 
     def update_user_activity
-      return if messageboard.nil? || !signed_in?
+      return if !messageboard_or_nil || !signed_in?
 
       Thredded::ActivityUpdaterJob.perform_later(
         thredded_current_user.id,
@@ -88,10 +88,14 @@ module Thredded
       thredded_current_user
     end
 
+    # Returns the `@messageboard` instance variable.
+    # If `@messageboard` is not set, it first sets it to the messageboard with the slug or ID given by
+    # `params[:messageboard_id]`.
+    #
+    # @return [Thredded::Messageboard]
+    # @raise [Thredded::Errors::MessageboardNotFound] if the messageboard with the given slug does not exist.
     def messageboard
-      @messageboard ||= params[:messageboard_id].presence && Messageboard.friendly.find(params[:messageboard_id])
-    rescue ActiveRecord::RecordNotFound
-      raise Thredded::Errors::MessageboardNotFound
+      @messageboard ||= Messageboard.friendly_find!(params[:messageboard_id])
     end
 
     def messageboard_or_nil

data/app/controllers/thredded/messageboards_controller.rb

@@ -27,12 +27,12 @@ module Thredded
     end
 
     def edit
-      @messageboard = Messageboard.friendly.find(params[:id])
+      @messageboard = Messageboard.friendly_find!(params[:id])
       authorize @messageboard, :update?
     end
 
     def update
-      @messageboard = Messageboard.friendly.find(params[:id])
+      @messageboard = Messageboard.friendly_find!(params[:id])
       authorize @messageboard, :update?
       if @messageboard.update(messageboard_params)
         redirect_to messageboard_topics_path(@messageboard), notice: I18n.t('thredded.messageboard.updated_notice')

data/app/controllers/thredded/moderation_controller.rb

@@ -1,13 +1,11 @@
 # frozen_string_literal: true
-require_dependency 'thredded/moderate_post'
-require_dependency 'thredded/posts_page_view'
 module Thredded
   class ModerationController < Thredded::ApplicationController
     before_action :thredded_require_login!
     before_action :load_moderatable_messageboards
 
     def pending
-      @posts = PostsPageView.new(
+      @posts = Thredded::PostsPageView.new(
         thredded_current_user,
         moderatable_posts
           .pending_moderation
@@ -15,9 +13,7 @@ module Thredded
           .preload(:user, :postable)
           .page(current_page)
       )
-      if flash[:last_moderated_record_id]
-        @last_moderated_record = accessible_post_moderation_records.find(flash[:last_moderated_record_id].to_i)
-      end
+      maybe_set_last_moderated_record_flash
     end
 
     def history
@@ -27,21 +23,19 @@ module Thredded
     end
 
     def activity
-      @posts = PostsPageView.new(
+      @posts = Thredded::PostsPageView.new(
         thredded_current_user,
         moderatable_posts
           .order_newest_first
           .preload(:user, :postable)
           .page(current_page)
       )
-      if flash[:last_moderated_record_id]
-        @last_moderated_record = accessible_post_moderation_records.find(flash[:last_moderated_record_id].to_i)
-      end
+      maybe_set_last_moderated_record_flash
     end
 
     def moderate_post
       return head(:bad_request) unless Thredded::Post.moderation_states.include?(params[:moderation_state])
-      flash[:last_moderated_record_id] = ModeratePost.run!(
+      flash[:last_moderated_record_id] = Thredded::ModeratePost.run!(
         post: moderatable_posts.find(params[:id]),
         moderation_state: params[:moderation_state],
         moderator: thredded_current_user,
@@ -68,7 +62,7 @@ module Thredded
         .order_newest_first
         .includes(:postable)
         .page(current_page)
-      @posts = PostsPageView.new(thredded_current_user, posts_scope)
+      @posts = Thredded::PostsPageView.new(thredded_current_user, posts_scope)
     end
 
     def moderate_user
@@ -80,6 +74,11 @@ module Thredded
 
     private
 
+    def maybe_set_last_moderated_record_flash
+      return unless flash[:last_moderated_record_id]
+      @last_moderated_record = accessible_post_moderation_records.find(flash[:last_moderated_record_id].to_i)
+    end
+
     def moderatable_posts
       Thredded::Post.where(messageboard_id: @moderatable_messageboards)
     end
@@ -91,7 +90,7 @@ module Thredded
 
     def load_moderatable_messageboards
       @moderatable_messageboards = thredded_current_user.thredded_can_moderate_messageboards.to_a
-      if @moderatable_messageboards.empty?
+      if @moderatable_messageboards.empty? # rubocop:disable Style/GuardClause
         fail Pundit::NotAuthorizedError, 'You are not authorized to perform this action.'
       end
     end

data/app/controllers/thredded/posts_controller.rb

@@ -4,7 +4,7 @@ module Thredded
     include ActionView::RecordIdentifier
 
     helper_method :topic
-    before_action :update_user_activity
+    after_action :update_user_activity
 
     after_action :verify_authorized
 

data/app/controllers/thredded/preferences_controller.rb

@@ -22,13 +22,17 @@ module Thredded
       @preferences = UserPreferencesForm.new(
         user:         thredded_current_user,
         messageboard: messageboard_or_nil,
-        params:       params.fetch(:user_preferences_form, {}).permit(
-          :followed_topic_emails,
-          :follow_topics_on_mention,
-          :notify_on_message,
-          :messageboard_followed_topic_emails,
-          :messageboard_follow_topics_on_mention
-        )
+        params: preferences_params
+      )
+    end
+
+    def preferences_params
+      params.fetch(:user_preferences_form, {}).permit(
+        :follow_topics_on_mention,
+        :messageboard_follow_topics_on_mention,
+        messageboard_notifications_for_followed_topics_attributes: %i(notifier_key id messageboard_id enabled),
+        notifications_for_followed_topics_attributes: %i(notifier_key id enabled),
+        notifications_for_private_topics_attributes: %i(notifier_key id enabled)
       )
     end
   end

data/app/controllers/thredded/private_topics_controller.rb

@@ -1,6 +1,4 @@
 # frozen_string_literal: true
-require_dependency 'thredded/posts_page_view'
-require_dependency 'thredded/topics_page_view'
 module Thredded
   class PrivateTopicsController < Thredded::ApplicationController
     before_action :thredded_require_login!
@@ -8,15 +6,14 @@ module Thredded
     def index
       @private_topics = Thredded::PrivateTopicsPageView.new(
         thredded_current_user,
-        PrivateTopic
+        Thredded::PrivateTopic
           .distinct
           .for_user(thredded_current_user)
           .order_recently_posted_first
-          .includes(:last_user, :user)
           .page(params[:page])
       )
 
-      PrivateTopicForm.new(user: thredded_current_user).tap do |form|
+      Thredded::PrivateTopicForm.new(user: thredded_current_user).tap do |form|
         @new_private_topic = form if policy(form.private_topic).create?
       end
     end
@@ -32,19 +29,21 @@ module Thredded
       @posts = Thredded::TopicPostsPageView.new(thredded_current_user, private_topic, page_scope)
 
       if signed_in?
-        UserPrivateTopicReadState.touch!(thredded_current_user.id, private_topic.id, page_scope.last, current_page)
+        Thredded::UserPrivateTopicReadState.touch!(
+          thredded_current_user.id, private_topic.id, page_scope.last, current_page
+        )
       end
 
       @post = private_topic.posts.build
     end
 
     def new
-      @private_topic = PrivateTopicForm.new(user: thredded_current_user)
+      @private_topic = Thredded::PrivateTopicForm.new(user: thredded_current_user)
       authorize_creating @private_topic.private_topic
     end
 
     def create
-      @private_topic = PrivateTopicForm.new(new_private_topic_params)
+      @private_topic = Thredded::PrivateTopicForm.new(new_private_topic_params)
       if @private_topic.save
         redirect_to @private_topic.private_topic
       else
@@ -72,8 +71,13 @@ module Thredded
       (params[:page] || 1).to_i
     end
 
+    # Returns the `@private_topic` instance variable.
+    # If `@private_topic` is not set, it first sets it to the topic with the slug or ID given by `params[:id]`.
+    #
+    # @return [Thredded::PrivateTopic]
+    # @raise [Thredded::Errors::PrivateTopicNotFound] if the topic with the given slug does not exist.
     def private_topic
-      @private_topic ||= Thredded::PrivateTopic.find_by_slug(params[:id])
+      @private_topic ||= Thredded::PrivateTopic.friendly_find!(params[:id])
     end
 
     def private_topic_params

data/app/controllers/thredded/topics_controller.rb

@@ -1,6 +1,4 @@
 # frozen_string_literal: true
-require_dependency 'thredded/posts_page_view'
-require_dependency 'thredded/topics_page_view'
 # rubocop:disable Metrics/ClassLength
 module Thredded
   class TopicsController < Thredded::ApplicationController
@@ -20,7 +18,7 @@ module Thredded
           .order_sticky_first.order_recently_posted_first
           .page(current_page)
       )
-      TopicForm.new(messageboard: messageboard, user: thredded_current_user).tap do |form|
+      Thredded::TopicForm.new(messageboard: messageboard, user: thredded_current_user).tap do |form|
         @new_topic = form if policy(form.topic).create?
       end
     end
@@ -33,19 +31,24 @@ module Thredded
         .page(current_page)
       @posts = Thredded::TopicPostsPageView.new(thredded_current_user, topic, page_scope)
 
-      UserTopicReadState.touch!(thredded_current_user.id, topic.id, page_scope.last, current_page) if signed_in?
+      if signed_in?
+        Thredded::UserTopicReadState.touch!(
+          thredded_current_user.id, topic.id, page_scope.last, current_page
+        )
+      end
 
       @new_post = messageboard.posts.build(postable: topic)
     end
 
     def search
-      authorize_reading messageboard if messageboard_or_nil
+      in_messageboard = params.key?(:messageboard_id)
+      authorize_reading messageboard if in_messageboard
       @query = params[:q].to_s
       topics_scope = policy_scope(
-        if messageboard_or_nil
+        if in_messageboard
           messageboard.topics
         else
-          Topic.where(messageboard_id: policy_scope(Messageboard.all).pluck(:id))
+          Thredded::Topic.where(messageboard_id: policy_scope(Thredded::Messageboard.all).pluck(:id))
         end
       )
       @topics = Thredded::TopicsPageView.new(
@@ -59,7 +62,7 @@ module Thredded
     end
 
     def new
-      @new_topic = TopicForm.new(new_topic_params)
+      @new_topic = Thredded::TopicForm.new(new_topic_params)
       authorize_creating @new_topic.topic
     end
 
@@ -77,7 +80,7 @@ module Thredded
     end
 
     def create
-      @new_topic = TopicForm.new(new_topic_params)
+      @new_topic = Thredded::TopicForm.new(new_topic_params)
       authorize_creating @new_topic.topic
       if @new_topic.save
         redirect_to messageboard_topics_path(messageboard)
@@ -109,13 +112,13 @@ module Thredded
 
     def follow
       authorize topic, :read?
-      UserTopicFollow.create_unless_exists(thredded_current_user.id, topic.id)
+      Thredded::UserTopicFollow.create_unless_exists(thredded_current_user.id, topic.id)
       follow_change_response(following: true)
     end
 
     def unfollow
       authorize topic, :read?
-      UserTopicFollow.find_by(topic_id: topic.id, user_id: thredded_current_user.id).try(:destroy)
+      Thredded::UserTopicFollow.find_by(topic_id: topic.id, user_id: thredded_current_user.id).try(:destroy)
       follow_change_response(following: false)
     end
 
@@ -129,8 +132,13 @@ module Thredded
       end
     end
 
+    # Returns the `@topic` instance variable.
+    # If `@topic` is not set, it first sets it to the topic with the slug or ID given by `params[:id]`.
+    #
+    # @return [Thredded::Topic]
+    # @raise [Thredded::Errors::TopicNotFound] if the topic with the given slug does not exist.
     def topic
-      @topic ||= messageboard.topics.find_by_slug!(params[:id])
+      @topic ||= messageboard.topics.friendly_find!(params[:id])
     end
 
     def topic_params