thredded 0.4.0 → 0.5.0

data/app/commands/thredded/autofollow_mentioned_users.rb

@@ -0,0 +1,32 @@
+# frozen_string_literal: true
+module Thredded
+  class AutofollowMentionedUsers
+    def initialize(post)
+      @post = post
+    end
+
+    def run
+      autofollowers.each do |user|
+        Thredded::UserTopicFollow.create_unless_exists(user.id, post.postable_id, :mentioned)
+      end
+    end
+
+    def autofollowers
+      user_names = Thredded::AtNotificationExtractor.new(post.content).run
+      autofollowers = post.readers_from_user_names(user_names).to_a
+      autofollowers.delete post.user
+      exclude_those_opting_out_of_at_notifications(autofollowers)
+    end
+
+    private
+
+    attr_reader :post
+
+    def exclude_those_opting_out_of_at_notifications(members)
+      members.select do |member|
+        member.thredded_user_preference.notify_on_mention? &&
+          member.thredded_user_messageboard_preferences.in(post.messageboard).notify_on_mention?
+      end
+    end
+  end
+end

data/app/commands/thredded/moderate_post.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+module Thredded
+  module ModeratePost
+    module_function
+
+    # @param [Post] post
+    # @param [Symbol] moderation_state
+    # @param [Thredded.user_class] moderator
+    # @return [Thredded::PostModerationRecord]
+    def run!(post:, moderation_state:, moderator:)
+      Thredded::Post.transaction do
+        post_moderation_record = Thredded::PostModerationRecord.record!(
+          moderator: moderator,
+          post: post,
+          previous_moderation_state: post.moderation_state,
+          moderation_state: moderation_state,
+        )
+        if post.user_detail.pending_moderation?
+          post.user_detail.update!(moderation_state: moderation_state)
+        end
+        if post.postable.first_post == post
+          post.postable.update!(moderation_state: moderation_state)
+          if moderation_state == :blocked
+            # When blocking the first post of a topic, also block all the other posts in the topic by this user.
+            post.postable.posts.where(user_id: post.user.id).where.not(id: post.id).each do |a_post|
+              a_post.update!(moderation_state: moderation_state)
+            end
+          end
+        end
+        post.update!(moderation_state: moderation_state)
+        post_moderation_record
+      end
+    end
+  end
+end

data/app/commands/thredded/notify_following_users.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+module Thredded
+  class NotifyFollowingUsers
+    def initialize(post)
+      @post = post
+    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
+    end
+
+    def targeted_users
+      @targeted_users ||= @post.postable.following_users.reject { |u| u == @post.user }
+    end
+  end
+end

data/app/commands/thredded/notify_private_topic_users.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 module Thredded
   class NotifyPrivateTopicUsers
-    def initialize(private_topic)
-      @post = private_topic.posts.order_oldest_first.first
-      @private_topic = private_topic
+    def initialize(private_post)
+      @post = private_post
+      @private_topic = private_post.postable
     end
 
     def run
@@ -18,7 +18,7 @@ module Thredded
     end
 
     def private_topic_recipients
-      members = private_topic.users - [private_topic.user]
+      members = private_topic.users - [post.user]
       members = exclude_those_opting_out_of_message_notifications(members)
       members = exclude_previously_notified(members)
       members

data/app/controllers/thredded/application_controller.rb

@@ -12,7 +12,6 @@ module Thredded
       :messageboard,
       :messageboard_or_nil,
       :preferences,
-      :unread_private_topics_count,
       :signed_in?
 
     rescue_from Thredded::Errors::MessageboardNotFound,
@@ -64,34 +63,16 @@ module Thredded
       Thredded.layout
     end
 
-    def unread_private_topics_count
-      @unread_private_topics_count ||=
-        if signed_in?
-          Thredded::PrivateTopic
-            .for_user(thredded_current_user)
-            .unread(thredded_current_user)
-            .count
-        else
-          0
-        end
-    end
-
     def authorize_reading(obj)
-      return if policy(obj).read?
-
-      class_name = obj.class.to_s
-      error      = class_name.gsub(/Thredded::/, 'Thredded::Errors::') + 'ReadDenied'
-
-      fail error.constantize
+      authorize obj, :read?
+    rescue Pundit::NotAuthorizedError
+      raise "#{obj.class.to_s.sub(/Thredded::/, 'Thredded::Errors::')}ReadDenied".constantize
     end
 
     def authorize_creating(obj)
-      return if policy(obj).create?
-
-      class_name = obj.class.to_s
-      error      = class_name.gsub(/Thredded::/, 'Thredded::Errors::') + 'CreateDenied'
-
-      fail error.constantize
+      authorize obj, :create?
+    rescue Pundit::NotAuthorizedError
+      raise "#{obj.class.to_s.sub(/Thredded::/, 'Thredded::Errors::')}CreateDenied".constantize
     end
 
     def update_user_activity

data/app/controllers/thredded/messageboards_controller.rb

@@ -3,9 +3,11 @@ module Thredded
   class MessageboardsController < Thredded::ApplicationController
     before_action :thredded_require_login!, only: [:new, :create, :edit, :update]
 
+    after_action :verify_authorized, except: %i(index)
+    after_action :verify_policy_scoped, except: %i(new create edit update)
+
     def index
-      @groups = thredded_current_user
-        .thredded_can_read_messageboards
+      @groups = policy_scope(Messageboard.all)
         .preload(:group).group_by(&:group)
         .map { |(group, messageboards)| MessageboardGroupView.new(group, messageboards) }
     end
@@ -41,7 +43,7 @@ module Thredded
       if @messageboard.update(messageboard_params)
         redirect_to messageboard_topics_path(@messageboard), notice: I18n.t('thredded.messageboard.updated_notice')
       else
-        render :new
+        render :edit
       end
     end
 

data/app/controllers/thredded/moderation_controller.rb

@@ -0,0 +1,56 @@
+# frozen_string_literal: true
+require_dependency 'thredded/moderate_post'
+require_dependency 'thredded/posts_page_view'
+module Thredded
+  class ModerationController < ApplicationController
+    before_action :thredded_require_login!
+    before_action :load_moderatable_messageboards
+
+    def pending
+      @posts = PostsPageView.new(
+        thredded_current_user,
+        moderatable_posts
+          .pending_moderation
+          .order_oldest_first
+          .page(params[:page] || 1)
+      )
+      if flash[:last_moderated_record_id]
+        @last_moderated_record = accessible_moderation_records.find(flash[:last_moderated_record_id].to_i)
+      end
+    end
+
+    def history
+      @post_moderation_records = accessible_moderation_records
+        .order(created_at: :desc)
+        .page(params[:page] || 1)
+    end
+
+    def moderate_post
+      return head(:bad_request) unless Thredded::Post.moderation_states.include?(params[:moderation_state])
+      flash[:last_moderated_record_id] = ModeratePost.run!(
+        post: moderatable_posts.find(params[:id]),
+        moderation_state: params[:moderation_state],
+        moderator: thredded_current_user,
+      ).id
+      redirect_back fallback_location: pending_moderation_path
+    end
+
+    private
+
+    def moderatable_posts
+      Thredded::Post.where(messageboard_id: @moderatable_messageboards)
+    end
+
+    def accessible_moderation_records
+      Thredded::PostModerationRecord
+        .where(messageboard_id: @moderatable_messageboards)
+    end
+
+    def load_moderatable_messageboards
+      @moderatable_messageboards = thredded_current_user.thredded_can_moderate_messageboards.to_a
+      if @moderatable_messageboards.empty?
+        fail Pundit::NotAuthorizedError, 'You are not authorized to perform this action.'
+      end
+    end
+  end
+end

data/app/controllers/thredded/post_permalinks_controller.rb

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

data/app/controllers/thredded/posts_controller.rb

@@ -6,12 +6,14 @@ module Thredded
     helper_method :topic
     before_action :update_user_activity
 
+    after_action :verify_authorized
+
     def create
       post = parent_topic.posts.build(post_params)
       authorize_creating post
       post.save!
 
-      redirect_to post_path(post)
+      redirect_to post_path(post, user: thredded_current_user)
     end
 
     def edit
@@ -22,7 +24,7 @@ module Thredded
       authorize post, :update?
       post.update_attributes(post_params.except(:user, :ip))
 
-      redirect_to post_path(post)
+      redirect_to post_path(post, user: thredded_current_user)
     end
 
     def destroy

data/app/controllers/thredded/private_post_permalinks_controller.rb

@@ -5,7 +5,7 @@ module Thredded
     def show
       private_post = PrivatePost.find(params[:id])
       authorize private_post, :read?
-      redirect_to post_url(private_post), status: :found
+      redirect_to post_url(private_post, user: thredded_current_user), status: :found
     end
   end
 end

data/app/controllers/thredded/private_topics_controller.rb

@@ -6,7 +6,7 @@ module Thredded
     before_action :thredded_require_login!
 
     def index
-      @private_topics = Thredded::TopicsPageView.new(
+      @private_topics = Thredded::PrivateTopicsPageView.new(
         thredded_current_user,
         PrivateTopic
           .distinct
@@ -29,7 +29,7 @@ module Thredded
         .includes(:user)
         .order_oldest_first
         .page(current_page)
-      @posts = Thredded::PostsPageView.new(thredded_current_user, private_topic, page_scope)
+      @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)
@@ -46,7 +46,6 @@ module Thredded
     def create
       @private_topic = PrivateTopicForm.new(new_private_topic_params)
       if @private_topic.save
-        NotifyPrivateTopicUsersJob.perform_later(@private_topic.private_topic.id)
         redirect_to @private_topic.private_topic
       else
         render :new

data/app/controllers/thredded/theme_previews_controller.rb

@@ -11,17 +11,17 @@ module Thredded
                            end
       @messageboards     = Messageboard.where(closed: false)
       @topics            = TopicsPageView.new(@user, @messageboard.topics.page(1).limit(3))
-      @private_topics    = TopicsPageView.new(@user, @user.thredded_private_topics.page(1).limit(3))
+      @private_topics    = PrivateTopicsPageView.new(@user, @user.thredded_private_topics.page(1).limit(3))
       topic              = Topic.new(messageboard: @messageboard, title: 'Hello', slug: 'hello', user: @user)
       @topic             = TopicView.from_user(topic, @user)
-      @posts             = PostsPageView.new(@user, topic, topic.posts.page(1).limit(3))
+      @posts             = TopicPostsPageView.new(@user, topic, topic.posts.page(1).limit(3))
       @post              = topic.posts.build(id: 1337, postable: topic, content: 'Hello world', user: @user)
       @new_post          = @messageboard.posts.build(postable: topic)
       @new_topic         = TopicForm.new(user: @user, messageboard: @messageboard)
       @new_private_topic = PrivateTopicForm.new(user: @user)
       private_topic      = PrivateTopic.new(id: 1337, title: 'Hello', user: @user, last_user: @user, users: [@user])
       @private_topic     = PrivateTopicView.from_user(private_topic, @user)
-      @private_posts     = PostsPageView.new(@user, private_topic, private_topic.posts.page(1).limit(3))
+      @private_posts     = TopicPostsPageView.new(@user, private_topic, private_topic.posts.page(1).limit(3))
       @private_post      = private_topic.posts.build(
         id: 1337, postable: private_topic, content: 'A private hello world', user: @user
       )

data/app/controllers/thredded/topics_controller.rb

@@ -4,15 +4,18 @@ require_dependency 'thredded/topics_page_view'
 module Thredded
   class TopicsController < Thredded::ApplicationController
     before_action :thredded_require_login!,
-                  only: [:edit, :new, :update, :create, :destroy]
+                  only: %i(edit new update create destroy follow unfollow)
     after_action :update_user_activity
 
+    after_action :verify_authorized, except: %i(search)
+    after_action :verify_policy_scoped, except: %i(show new create edit update destroy follow unfollow)
+
     def index
       authorize_reading messageboard
 
       @topics = Thredded::TopicsPageView.new(
         thredded_current_user,
-        messageboard.topics
+        policy_scope(messageboard.topics)
           .order_sticky_first.order_recently_updated_first
           .includes(:categories, :last_user, :user)
           .page(current_page)
@@ -24,11 +27,11 @@ module Thredded
 
     def show
       authorize topic, :read?
-      page_scope = topic.posts
-        .includes(:user, :messageboard, :postable)
+      page_scope = policy_scope(topic.posts)
         .order_oldest_first
+        .includes(:user, :messageboard, :postable)
         .page(current_page)
-      @posts = Thredded::PostsPageView.new(thredded_current_user, topic, page_scope)
+      @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?
 
@@ -36,12 +39,15 @@ module Thredded
     end
 
     def search
+      authorize_reading messageboard if messageboard_or_nil
       @query = params[:q].to_s
-      topics_scope = if messageboard_or_nil
-                       messageboard.topics
-                     else
-                       Topic.where(messageboard_id: thredded_current_user.thredded_can_read_messageboards.pluck(:id))
-                     end
+      topics_scope = policy_scope(
+        if messageboard_or_nil
+          messageboard.topics
+        else
+          Topic.where(messageboard_id: policy_scope(Messageboard.all).pluck(:id))
+        end
+      )
       @topics = Thredded::TopicsPageView.new(
         thredded_current_user,
         topics_scope
@@ -62,7 +68,7 @@ module Thredded
       @category = messageboard.categories.friendly.find(params[:category_id])
       @topics = Thredded::TopicsPageView.new(
         thredded_current_user,
-        @category.topics
+        policy_scope(@category.topics)
           .unstuck
           .order_recently_updated_first
           .page(current_page)
@@ -101,6 +107,21 @@ module Thredded
                   notice: t('thredded.topics.deleted_notice')
     end
 
+    def follow
+      authorize topic, :read?
+      UserTopicFollow.create_unless_exists(thredded_current_user.id, topic.id)
+      redirect_to messageboard_topic_url(messageboard, topic),
+                  notice: t('thredded.topics.followed_notice')
+    end
+
+    def unfollow
+      authorize topic, :read?
+      follow = thredded_current_user.following?(topic)
+      follow.destroy if follow
+      redirect_to messageboard_topic_url(messageboard, topic),
+                  notice: t('thredded.topics.unfollowed_notice')
+    end
+
     private
 
     def topic

data/app/forms/thredded/topic_form.rb

@@ -36,6 +36,7 @@ module Thredded
       ActiveRecord::Base.transaction do
         topic.save!
         post.save!
+        UserTopicReadState.read_on_first_post!(user, topic) if topic.previous_changes.include?(:id)
       end
       true
     end

data/app/helpers/thredded/application_helper.rb

@@ -20,7 +20,10 @@ module Thredded
     # @param datetime [DateTime]
     # @return [String] html_safe datetime presentation
     def time_ago(datetime)
-      timeago_tag datetime, lang: I18n.locale.to_s.downcase, format: :short, nojs: true
+      timeago_tag datetime,
+                  lang: I18n.locale.to_s.downcase,
+                  format: -> (t, _opts) { t.year == Time.current.year ? :short : :long },
+                  nojs: true
     end
 
     def paginate(collection, args = {})
@@ -36,5 +39,27 @@ module Thredded
         *('thredded--private-topic' if topic.is_a?(Thredded::PrivateTopicView))
       ]
     end
+
+    def unread_private_topics_count
+      @unread_private_topics_count ||=
+        if signed_in?
+          Thredded::PrivateTopic
+            .for_user(thredded_current_user)
+            .unread(thredded_current_user)
+            .count
+        else
+          0
+        end
+    end
+
+    def moderatable_messageboards_ids
+      @moderatable_messageboards_ids ||=
+        thredded_current_user.thredded_can_moderate_messageboards.pluck(:id)
+    end
+
+    def posts_pending_moderation_count
+      @posts_pending_moderation_count ||=
+        Thredded::Post.where(messageboard_id: moderatable_messageboards_ids).pending_moderation.count
+    end
   end
 end