thredded 0.10.0 → 0.10.1

data/app/controllers/thredded/preferences_controller.rb

@@ -4,8 +4,7 @@ module Thredded
     before_action :thredded_require_login!,
                   :init_preferences
 
-    def edit
-    end
+    def edit; end
 
     def update
       if @preferences.save

data/app/controllers/thredded/private_posts_controller.rb

@@ -0,0 +1,77 @@
+# frozen_string_literal: true
+module Thredded
+  # A controller for managing {PrivatePost}s.
+  class PrivatePostsController < Thredded::ApplicationController
+    include ActionView::RecordIdentifier
+
+    helper_method :topic
+    after_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, user: thredded_current_user)
+    end
+
+    def edit
+      authorize post, :update?
+    end
+
+    def update
+      authorize post, :update?
+      post.update_attributes(post_params.except(:user, :ip))
+
+      redirect_to post_path(post, user: thredded_current_user)
+    end
+
+    def destroy
+      authorize post, :destroy?
+      post.destroy!
+
+      redirect_back fallback_location: topic_url(topic),
+                    notice: I18n.t('thredded.posts.deleted_notice')
+    end
+
+    def mark_as_unread
+      authorize post, :read?
+      page = post.page
+      post.mark_as_unread(thredded_current_user, page)
+      after_mark_as_unread # customization hook
+    end
+
+    private
+
+    def after_mark_as_unread
+      redirect_to private_topics_path
+    end
+
+    def topic
+      post.postable
+    end
+
+    def post_params
+      params.require(:post)
+        .permit(:content)
+        .merge(user: thredded_current_user, ip: request.remote_ip)
+    end
+
+    def parent_topic
+      PrivateTopic
+        .includes(:private_users)
+        .friendly
+        .find(params[:private_topic_id])
+    end
+
+    def post
+      @post ||= Thredded::PrivatePost.find(params[:id])
+    end
+
+    def current_page
+      params[:page].nil? ? 1 : params[:page].to_i
+    end
+  end
+end

data/app/controllers/thredded/private_topics_controller.rb

@@ -30,7 +30,7 @@ module Thredded
         .page(current_page)
       @posts = Thredded::TopicPostsPageView.new(thredded_current_user, private_topic, page_scope)
 
-      if signed_in?
+      if thredded_signed_in?
         Thredded::UserPrivateTopicReadState.touch!(
           thredded_current_user.id, private_topic.id, page_scope.last, current_page
         )

data/app/controllers/thredded/read_states_controller.rb

@@ -4,7 +4,7 @@ module Thredded
     before_action :thredded_require_login!
 
     def update
-      MarkAllRead.run(thredded_current_user) if signed_in?
+      MarkAllRead.run(thredded_current_user) if thredded_signed_in?
 
       redirect_to request.referer
     end

data/app/controllers/thredded/topics_controller.rb

@@ -32,7 +32,7 @@ module Thredded
         .page(current_page)
       @posts = Thredded::TopicPostsPageView.new(thredded_current_user, topic, page_scope)
 
-      if signed_in?
+      if thredded_signed_in?
         Thredded::UserTopicReadState.touch!(
           thredded_current_user.id, topic.id, page_scope.last, current_page
         )

data/app/forms/thredded/private_topic_form.rb

@@ -64,7 +64,7 @@ module Thredded
 
     def topic_categories
       if category_ids
-        ids = category_ids.reject(&:empty?).map(&:to_i)
+        ids = category_ids.reject(&:empty?)
         Category.where(id: ids)
       else
         []
@@ -82,8 +82,8 @@ module Thredded
     def normalized_user_ids
       user_ids
         .reject(&:empty?)
-        .map(&:to_i)
-        .push(user.id)
+        .map(&:to_s)
+        .push(user.id.to_s)
         .uniq
     end
 

data/app/forms/thredded/topic_form.rb

@@ -65,7 +65,7 @@ module Thredded
 
     def topic_categories
       if category_ids
-        ids = category_ids.reject(&:empty?).map(&:to_i)
+        ids = category_ids.reject(&:empty?)
         Category.where(id: ids)
       else
         []

data/app/helpers/thredded/application_helper.rb

@@ -3,6 +3,7 @@ module Thredded
   module ApplicationHelper
     include ::Thredded::UrlsHelper
     include ::Thredded::NavHelper
+    include ::Thredded::RenderHelper
 
     # @return [AllViewHooks] View hooks configuration.
     def view_hooks
@@ -68,6 +69,16 @@ module Thredded
       end
     end
 
+    # @param posts [Thredded::PostsPageView, Array<Thredded::PostView>]
+    # @param partial [String]
+    # @param content_partial [String]
+    def render_posts(posts, partial: 'thredded/posts/post', content_partial: 'thredded/posts/content')
+      posts_with_contents = render_collection_to_strings_with_cache(
+        partial: content_partial, collection: posts, as: :post, expires_in: 1.week
+      )
+      render partial: partial, collection: posts_with_contents, as: :post_and_content
+    end
+
     def paginate(collection, args = {})
       super(collection, args.reverse_merge(views_prefix: 'thredded'))
     end
@@ -96,7 +107,7 @@ module Thredded
 
     def unread_private_topics_count
       @unread_private_topics_count ||=
-        if signed_in?
+        if thredded_signed_in?
           Thredded::PrivateTopic
             .for_user(thredded_current_user)
             .unread(thredded_current_user)

data/app/helpers/thredded/render_helper.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+module Thredded
+  module RenderHelper
+    # @param collection [Array<T>]
+    # @param partial [String]
+    # @param expires_in [ActiveSupport::Duration]
+    # @return Array<[T, String]>
+    def render_collection_to_strings_with_cache(collection:, partial:, expires_in:, **opts)
+      CollectionToStringsWithCacheRenderer.new(lookup_context).render_collection_to_strings_with_cache(
+        self, collection: collection, partial: partial, expires_in: expires_in, **opts
+      )
+    end
+  end
+end

data/app/helpers/thredded/urls_helper.rb

@@ -103,5 +103,13 @@ module Thredded
         messageboards_search_path
       end
     end
+
+    def mark_unread_path(post, _params = {})
+      if post.private_topic_post?
+        mark_as_unread_private_topic_private_post_path(post.postable, post)
+      else
+        mark_as_unread_messageboard_topic_post_path(post.messageboard, post.postable, post)
+      end
+    end
   end
 end

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

@@ -48,6 +48,26 @@ module Thredded
         .in(user_names)
     end
 
+    # Marks all the posts from the given one as unread for the given user
+    # @param user [Thredded.user_class]
+    # @param page [Integer]
+    def mark_as_unread(user, page)
+      if previous_post.nil?
+        read_state = postable.user_read_states.find_by(user_id: user.id)
+        read_state.destroy if read_state
+      else
+        read_state = postable.user_read_states.create_with(
+          read_at: previous_post.created_at,
+          page: page
+        ).find_or_create_by(user_id: user.id)
+        read_state.update_columns(read_at: previous_post.created_at, page: page)
+      end
+    end
+
+    def previous_post
+      @previous_post ||= postable.posts.order_newest_first.find_by('created_at < ?', created_at)
+    end
+
     private
 
     def ensure_user_detail

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

@@ -12,6 +12,12 @@ module Thredded
       postable.last_post_at <= read_at
     end
 
+    # @param post [Post or PrivatePost]
+    # @return [Boolean]
+    def post_read?(post)
+      post.created_at <= read_at
+    end
+
     module ClassMethods
       # @param user_id [Integer]
       # @param topic_id [Integer]

data/app/models/thredded/null_user_topic_read_state.rb

@@ -8,5 +8,9 @@ module Thredded
     def read?
       false
     end
+
+    def post_read?(_post)
+      false
+    end
   end
 end

data/app/policies/thredded/post_policy.rb

@@ -40,6 +40,10 @@ module Thredded
       !@post.first_post_in_topic? && update?
     end
 
+    def anonymous?
+      @user.thredded_anonymous?
+    end
+
     delegate :moderate?, to: :messageboard_policy
 
     private

data/app/policies/thredded/private_post_policy.rb

@@ -24,6 +24,10 @@ module Thredded
       !@post.first_post_in_topic? && update?
     end
 
+    def anonymous?
+      @user.thredded_anonymous?
+    end
+
     private
 
     def own_post?

data/app/view_hooks/thredded/all_view_hooks.rb

@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 module Thredded
   class AllViewHooks
+    # @return [PostCommon]
+    attr_reader :post_common
     # @return [PostsCommon]
     attr_reader :posts_common
     # @return [PostForm]
@@ -23,6 +25,7 @@ module Thredded
     end
 
     def initialize
+      @post_common = PostCommon.new
       @posts_common = PostsCommon.new
       @post_form = PostForm.new
       @moderation_user_page = ModerationUserPage.new
@@ -42,6 +45,18 @@ module Thredded
       end
     end
 
+    class PostCommon
+      # @return [Thredded::AllViewHooks::ViewHook]
+      attr_reader :actions
+      # @return [Thredded::AllViewHooks::ViewHook]
+      attr_reader :mark_as_unread
+
+      def initialize
+        @actions = ViewHook.new
+        @mark_as_unread = ViewHook.new
+      end
+    end
+
     class PostForm
       # @return [Thredded::AllViewHooks::ViewHook]
       attr_reader :content_text_area

data/app/view_models/thredded/base_topic_view.rb

@@ -11,7 +11,7 @@ module Thredded
              :to_model,
              to: :@topic
 
-    delegate :read?,
+    delegate :read?, :post_read?,
              to: :@read_state
 
     # @param topic [TopicCommon]

data/app/view_models/thredded/post_view.rb

@@ -15,9 +15,11 @@ module Thredded
 
     # @param post [Thredded::PostCommon]
     # @param policy [#update? #destroy?]
-    def initialize(post, policy)
+    # @param policy [Thredded::TopicView]
+    def initialize(post, policy, topic_view: nil)
       @post   = post
       @policy = policy
+      @topic_view = topic_view
     end
 
     def can_update?
@@ -36,6 +38,10 @@ module Thredded
       Thredded::UrlsHelper.edit_post_path(@post)
     end
 
+    def mark_unread_path
+      Thredded::UrlsHelper.mark_unread_path(@post)
+    end
+
     def destroy_path
       Thredded::UrlsHelper.delete_post_path(@post)
     end
@@ -44,27 +50,23 @@ module Thredded
       Thredded::UrlsHelper.post_permalink_path(@post.id)
     end
 
-    # rubocop:disable Metrics/CyclomaticComplexity
+    # This cache key is used only for caching the content.
     def cache_key
-      moderation_state = unless @post.private_topic_post?
-                           if @post.pending_moderation? && !Thredded.content_visible_while_pending_moderation
-                             'p'
-                           elsif @post.blocked?
-                             '-'
-                           end
-                         end
-      [
-        I18n.locale,
-        @post.cache_key,
-        (@post.messageboard_id unless @post.private_topic_post?),
-        @post.user ? @post.user.cache_key : 'users/nil',
-        moderation_state || '+',
-        [
-          can_update?,
-          can_destroy?
-        ].map { |p| p ? '+' : '-' } * ''
-      ].compact.join('/')
+      @post.cache_key
+    end
+
+    POST_IS_READ = :read
+    POST_IS_UNREAD = :unread
+
+    # returns nil if read state is not appropriate to the view (i.e. viewing posts outside a topic)
+    def read_state
+      if @topic_view.nil? || @policy.anonymous?
+        nil
+      elsif @topic_view.post_read?(@post)
+        POST_IS_READ
+      else
+        POST_IS_UNREAD
+      end
     end
-    # rubocop:enable Metrics/CyclomaticComplexity
   end
 end

data/app/view_models/thredded/posts_page_view.rb

@@ -16,9 +16,11 @@ module Thredded
 
     # @param user [Thredded.user_class] the user who is viewing the posts page
     # @param paginated_scope [ActiveRecord::Relation<Thredded::PostCommon>]
-    def initialize(user, paginated_scope)
+    def initialize(user, paginated_scope, topic_view: nil)
       @paginated_scope = paginated_scope
-      @post_views      = paginated_scope.map { |post| Thredded::PostView.new(post, Pundit.policy!(user, post)) }
+      @post_views      = paginated_scope.map do |post|
+        Thredded::PostView.new(post, Pundit.policy!(user, post), topic_view: topic_view)
+      end
     end
   end
 end

data/app/view_models/thredded/topic_posts_page_view.rb

@@ -9,8 +9,8 @@ module Thredded
     # @param topic [Thredded::TopicCommon]
     # @param paginated_scope [ActiveRecord::Relation<Thredded::PostCommon>]
     def initialize(user, topic, paginated_scope)
-      super(user, paginated_scope)
       @topic = "#{paginated_scope.reflect_on_association(:postable).klass}View".constantize.from_user(topic, user)
+      super(user, paginated_scope, topic_view: @topic)
     end
   end
 end

data/app/view_models/thredded/topic_view.rb

@@ -2,7 +2,7 @@
 module Thredded
   # A view model for Topic.
   class TopicView < Thredded::BaseTopicView
-    delegate :categories, :id, :blocked?, :last_moderation_record, :followers,
+    delegate :sticky?, :locked?, :categories, :id, :blocked?, :last_moderation_record, :followers,
              :last_post, :messageboard_id, :messageboard_name,
              to: :@topic
 

data/app/view_models/thredded/topics_page_view.rb

@@ -6,6 +6,7 @@ module Thredded
              :to_ary,
              :blank?,
              :empty?,
+             :[],
              to: :@topic_views
     delegate :total_pages,
              :current_page,