thredded 0.11.0 → 0.12.0

data/app/controllers/thredded/application_controller.rb

@@ -60,6 +60,12 @@ module Thredded
       end
     end
 
+    # @param given [Hash]
+    # @return [Boolean] whether the given params are a subset of the controller's {#params}.
+    def params_match?(given = {})
+      given.all? { |k, v| v == params[k] }
+    end
+
     private
 
     def thredded_layout

data/app/controllers/thredded/posts_controller.rb

@@ -3,27 +3,39 @@ module Thredded
   # A controller for managing {Post}s.
   class PostsController < Thredded::ApplicationController
     include ActionView::RecordIdentifier
+    include Thredded::NewPostParams
 
     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!
+    def new
+      @post_form = PostForm.new(user: thredded_current_user, topic: parent_topic, post_params: new_post_params)
+      authorize_creating @post_form.post
+    end
 
-      redirect_to post_path(post, user: thredded_current_user)
+    def create
+      @post_form = PostForm.new(user: thredded_current_user, topic: parent_topic, post_params: new_post_params)
+      authorize_creating @post_form.post
+
+      if @post_form.save
+        redirect_to post_path(@post_form.post, user: thredded_current_user)
+      else
+        render :new
+      end
     end
 
     def edit
-      authorize post, :update?
+      @post_form = PostForm.for_persisted(post)
+      authorize @post_form.post, :update?
+      return redirect_to(canonical_topic_params) unless params_match?(canonical_topic_params)
+      render
     end
 
     def update
       authorize post, :update?
-      post.update_attributes(post_params.except(:user, :ip))
+      post.update_attributes(new_post_params)
 
       redirect_to post_path(post, user: thredded_current_user)
     end
@@ -43,8 +55,17 @@ module Thredded
       after_mark_as_unread # customization hook
     end
 
+    def quote
+      authorize_reading post
+      render plain: Thredded::ContentFormatter.quote_content(post.content)
+    end
+
     private
 
+    def canonical_topic_params
+      { messageboard_id: messageboard.slug, topic_id: topic.slug }
+    end
+
     def after_mark_as_unread
       redirect_to messageboard_topics_path(messageboard)
     end
@@ -53,12 +74,6 @@ module Thredded
       post.postable
     end
 
-    def post_params
-      params.require(:post)
-        .permit(:content)
-        .merge(user: thredded_current_user, ip: request.remote_ip, messageboard: messageboard)
-    end
-
     def parent_topic
       Topic
         .where(messageboard: messageboard)

data/app/controllers/thredded/preferences_controller.rb

@@ -21,6 +21,7 @@ module Thredded
       @preferences = UserPreferencesForm.new(
         user:         thredded_current_user,
         messageboard: messageboard_or_nil,
+        messageboards: policy_scope(Messageboard.all),
         params: preferences_params
       )
     end

data/app/controllers/thredded/private_posts_controller.rb

@@ -3,22 +3,37 @@ module Thredded
   # A controller for managing {PrivatePost}s.
   class PrivatePostsController < Thredded::ApplicationController
     include ActionView::RecordIdentifier
+    include NewPrivatePostParams
 
     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!
+    def new
+      @post_form = PrivatePostForm.new(
+        user: thredded_current_user, topic: parent_topic, post_params: new_private_post_params
+      )
+      authorize_creating @post_form.post
+    end
 
-      redirect_to post_path(post, user: thredded_current_user)
+    def create
+      @post_form = PrivatePostForm.new(
+        user: thredded_current_user, topic: parent_topic, post_params: new_private_post_params
+      )
+      authorize_creating @post_form.post
+      if @post_form.save
+        redirect_to post_path(@post_form.post, user: thredded_current_user)
+      else
+        render :new
+      end
     end
 
     def edit
-      authorize post, :update?
+      @post_form = PrivatePostForm.for_persisted(post)
+      authorize @post_form.post, :update?
+      return redirect_to(canonical_topic_params) unless params_match?(canonical_topic_params)
+      render
     end
 
     def update
@@ -43,8 +58,17 @@ module Thredded
       after_mark_as_unread # customization hook
     end
 
+    def quote
+      authorize_reading post
+      render plain: Thredded::ContentFormatter.quote_content(post.content)
+    end
+
     private
 
+    def canonical_topic_params
+      { private_topic_id: topic.slug }
+    end
+
     def after_mark_as_unread
       redirect_to private_topics_path
     end
@@ -53,12 +77,6 @@ module Thredded
       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)

data/app/controllers/thredded/private_topics_controller.rb

@@ -2,6 +2,7 @@
 module Thredded
   class PrivateTopicsController < Thredded::ApplicationController
     include Thredded::NewPrivateTopicParams
+    include Thredded::NewPrivatePostParams
 
     before_action :thredded_require_login!
 
@@ -22,6 +23,7 @@ module Thredded
 
     def show
       authorize private_topic, :read?
+      return redirect_to(canonical_topic_params) unless params_match?(canonical_topic_params)
 
       page_scope = private_topic
         .posts
@@ -36,7 +38,9 @@ module Thredded
         )
       end
 
-      @post = private_topic.posts.build
+      @new_post = Thredded::PrivatePostForm.new(
+        user: thredded_current_user, topic: private_topic, post_params: new_private_post_params
+      )
     end
 
     def new
@@ -55,6 +59,8 @@ module Thredded
 
     def edit
       authorize private_topic, :update?
+      return redirect_to(canonical_topic_params) unless params_match?(canonical_topic_params)
+      render
     end
 
     def update
@@ -69,6 +75,10 @@ module Thredded
 
     private
 
+    def canonical_topic_params
+      { id: private_topic.slug }
+    end
+
     def current_page
       (params[:page] || 1).to_i
     end

data/app/controllers/thredded/theme_previews_controller.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 module Thredded
   class ThemePreviewsController < Thredded::ApplicationController
-    def show
+    def show # rubocop:disable Metrics/MethodLength
       @messageboard = Messageboard.first
       fail Thredded::Errors::DatabaseEmpty unless @messageboard
       @user              = if thredded_current_user.thredded_anonymous?
@@ -16,7 +16,8 @@ module Thredded
       @topic             = TopicView.from_user(topic, @user)
       @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)
+      @post_form         = PostForm.for_persisted(@post)
+      @new_post          = PostForm.new(user: @user, topic: 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])
@@ -25,6 +26,7 @@ module Thredded
       @private_post      = private_topic.posts.build(
         id: 1337, postable: private_topic, content: 'A private hello world', user: @user
       )
+      @private_post_form = PrivatePostForm.for_persisted(@private_post)
       @preferences = UserPreferencesForm.new(user: @user, messageboard: @messageboard)
     end
   end

data/app/controllers/thredded/topics_controller.rb

@@ -2,9 +2,14 @@
 module Thredded
   class TopicsController < Thredded::ApplicationController # rubocop:disable Metrics/ClassLength
     include Thredded::NewTopicParams
+    include Thredded::NewPostParams
 
     before_action :thredded_require_login!,
                   only: %i(edit new update create destroy follow unfollow)
+
+    before_action :use_topic_messageboard,
+                  only: %i(show edit update destroy follow unfollow)
+
     after_action :update_user_activity
 
     after_action :verify_authorized, except: %i(search)
@@ -12,6 +17,10 @@ module Thredded
 
     def index
       authorize_reading messageboard
+      unless params_match?(canonical_messageboard_params)
+        skip_policy_scope
+        return redirect_to(canonical_messageboard_params)
+      end
 
       @topics = Thredded::TopicsPageView.new(
         thredded_current_user,
@@ -26,6 +35,7 @@ module Thredded
 
     def show
       authorize topic, :read?
+      return redirect_to(canonical_topic_params) unless params_match?(canonical_topic_params)
       page_scope = policy_scope(topic.posts)
         .order_oldest_first
         .includes(:user, :messageboard, :postable)
@@ -38,12 +48,18 @@ module Thredded
         )
       end
 
-      @new_post = messageboard.posts.build(postable: topic)
+      @new_post = Thredded::PostForm.new(user: thredded_current_user, topic: topic, post_params: new_post_params)
     end
 
     def search
       in_messageboard = params.key?(:messageboard_id)
-      authorize_reading messageboard if in_messageboard
+      if in_messageboard
+        authorize_reading messageboard
+        unless params_match?(canonical_messageboard_params)
+          skip_policy_scope
+          return redirect_to(canonical_messageboard_params)
+        end
+      end
       @query = params[:q].to_s
       topics_scope = policy_scope(
         if in_messageboard
@@ -65,6 +81,8 @@ module Thredded
     def new
       @new_topic = Thredded::TopicForm.new(new_topic_params)
       authorize_creating @new_topic.topic
+      return redirect_to(canonical_messageboard_params) unless params_match?(canonical_messageboard_params)
+      render
     end
 
     def category
@@ -92,6 +110,7 @@ module Thredded
 
     def edit
       authorize topic, :update?
+      return redirect_to(canonical_topic_params) unless params_match?(canonical_topic_params)
       @edit_topic = Thredded::EditTopicForm.new(user: thredded_current_user, topic: topic)
     end
 
@@ -136,6 +155,14 @@ module Thredded
 
     private
 
+    def canonical_messageboard_params
+      { messageboard_id: messageboard.slug }
+    end
+
+    def canonical_topic_params
+      { messageboard_id: messageboard.slug, id: topic.slug }
+    end
+
     def follow_change_response(following:)
       notice = following ? t('thredded.topics.followed_notice') : t('thredded.topics.unfollowed_notice')
       respond_to do |format|
@@ -150,7 +177,13 @@ module Thredded
     # @return [Thredded::Topic]
     # @raise [Thredded::Errors::TopicNotFound] if the topic with the given slug does not exist.
     def topic
-      @topic ||= messageboard.topics.friendly_find!(params[:id])
+      @topic ||= Thredded::Topic.friendly_find!(params[:id])
+    end
+
+    # Use the topic's messageboard instead of the one specified in the URL,
+    # to account for `params[:messageboard_id]` pointing to the wrong messageboard
+    def use_topic_messageboard
+      @messageboard = topic.messageboard
     end
 
     def topic_params

data/app/forms/thredded/post_form.rb

@@ -0,0 +1,52 @@
+# frozen_string_literal: true
+module Thredded
+  class PostForm
+    attr_reader :post, :topic
+    delegate :id,
+             :persisted?,
+             :content,
+             :content=,
+             to: :@post
+
+    # @param user [Thredded.user_class]
+    # @param topic [Topic]
+    # @param post [PrivatePost]
+    # @param post_params [Hash]
+    def initialize(user:, topic:, post: nil, post_params: {})
+      @messageboard = topic.messageboard
+      @topic = topic
+      @post = post ? post : topic.posts.build
+
+      if post_params.include?(:quote_post)
+        post_params[:content] =
+          Thredded::ContentFormatter.quote_content(post_params.delete(:quote_post).content)
+      end
+      @post.attributes = post_params.merge(
+        user: (user unless user.thredded_anonymous?),
+        messageboard: topic.messageboard
+      )
+    end
+
+    def self.for_persisted(post)
+      new(user: post.user, topic: post.postable, post: post)
+    end
+
+    def submit_path
+      Thredded::UrlsHelper.url_for([@messageboard, @topic, @post, only_path: true])
+    end
+
+    def preview_path
+      if @post.persisted?
+        Thredded::UrlsHelper.messageboard_topic_post_preview_path(@messageboard, @topic, @post)
+      else
+        Thredded::UrlsHelper.preview_new_messageboard_topic_post_path(@messageboard, @topic)
+      end
+    end
+
+    def save
+      return false unless @post.valid?
+      @post.save!
+      true
+    end
+  end
+end

data/app/forms/thredded/private_post_form.rb

@@ -0,0 +1,48 @@
+# frozen_string_literal: true
+module Thredded
+  class PrivatePostForm
+    attr_reader :post, :topic
+    delegate :id,
+             :persisted?,
+             :content,
+             :content=,
+             to: :@post
+
+    # @param user [Thredded.user_class]
+    # @param topic [PrivateTopic]
+    # @param post [Post]
+    # @param post_params [Hash]
+    def initialize(user:, topic:, post: nil, post_params: {})
+      @topic = topic
+      @post = post ? post : topic.posts.build
+
+      if post_params.include?(:quote_post)
+        post_params[:content] =
+          Thredded::ContentFormatter.quote_content(post_params.delete(:quote_post).content)
+      end
+      @post.attributes = post_params.merge(user: (user unless user.thredded_anonymous?))
+    end
+
+    def self.for_persisted(post)
+      new(user: post.user, topic: post.postable, post: post)
+    end
+
+    def submit_path
+      Thredded::UrlsHelper.url_for([@topic, @post, only_path: true])
+    end
+
+    def preview_path
+      if @post.persisted?
+        Thredded::UrlsHelper.private_topic_private_post_preview_path(@topic, @post)
+      else
+        Thredded::UrlsHelper.preview_new_private_topic_private_post_path(@topic)
+      end
+    end
+
+    def save
+      return false unless @post.valid?
+      @post.save!
+      true
+    end
+  end
+end

data/app/forms/thredded/private_topic_form.rb

@@ -60,6 +60,14 @@ module Thredded
       )
     end
 
+    def submit_path
+      Thredded::UrlsHelper.url_for([private_topic, only_path: true])
+    end
+
+    def preview_path
+      Thredded::UrlsHelper.preview_new_private_topic_path
+    end
+
     private
 
     def topic_categories

data/app/forms/thredded/topic_form.rb

@@ -55,6 +55,14 @@ module Thredded
       )
     end
 
+    def submit_path
+      Thredded::UrlsHelper.url_for([messageboard, topic, only_path: true])
+    end
+
+    def preview_path
+      Thredded::UrlsHelper.preview_new_messageboard_topic_path(messageboard)
+    end
+
     private
 
     # @return [Thredded.user_class, nil] return a user or nil if the user is a NullUser

data/app/forms/thredded/user_preferences_form.rb

@@ -22,9 +22,11 @@ module Thredded
 
     # @param user [Thredded.user_class]
     # @param messageboard [Thredded::Messageboard, nil]
-    def initialize(user:, messageboard: nil, params: {})
+    # @param messageboards [ActiveRecord::Relation<Thredded::Messageboard>]
+    def initialize(user:, messageboard: nil, messageboards: nil, params: {})
       @user = user
       @messageboard = messageboard
+      @messageboards = messageboards
       super(params)
     end
 
@@ -46,6 +48,10 @@ module Thredded
       true
     end
 
+    def messageboard_groups
+      @messageboard_groups ||= MessageboardGroupView.grouped(@messageboards)
+    end
+
     def notifications_for_private_topics
       for_every_notifier(user_preference.notifications_for_private_topics)
     end

data/app/helpers/thredded/urls_helper.rb

@@ -104,6 +104,14 @@ module Thredded
       end
     end
 
+    def quote_post_path(post)
+      if post.private_topic_post?
+        quote_private_topic_private_post_path(post.postable, post)
+      else
+        quote_messageboard_topic_post_path(post.messageboard, post.postable, post)
+      end
+    end
+
     def mark_unread_path(post, _params = {})
       if post.private_topic_post?
         mark_as_unread_private_topic_private_post_path(post.postable, post)
@@ -111,5 +119,15 @@ module Thredded
         mark_as_unread_messageboard_topic_post_path(post.messageboard, post.postable, post)
       end
     end
+
+    # @param post [Post, PrivatePost]
+    # @return [String] post permalink path
+    def permalink_path(post)
+      if post.private_topic_post?
+        private_post_permalink_path(post)
+      else
+        post_permalink_path(post)
+      end
+    end
   end
 end

data/app/models/thredded/topic.rb

@@ -22,8 +22,7 @@ module Thredded
 
     extend FriendlyId
     friendly_id :slug_candidates,
-                use:            [:history, :reserved, :scoped],
-                scope:          :messageboard,
+                use: %i(history reserved),
                 # Avoid route conflicts
                 reserved_words: ::Thredded::FriendlyIdReservedWordsAndPagination.new(%w(topics))
 
@@ -153,7 +152,8 @@ module Thredded
     def slug_candidates
       [
         :title,
-        [:title, '-topic'],
+        [:title, '-', messageboard.try(:name)],
+        [:title, '-', messageboard.try(:name), '-topic']
       ]
     end
 

data/app/policies/thredded/post_policy.rb

@@ -53,7 +53,7 @@ module Thredded
     end
 
     def own_post?
-      @user.id == @post.user_id
+      !anonymous? && @user.id == @post.user_id
     end
   end
 end

data/app/policies/thredded/private_topic_policy.rb

@@ -17,7 +17,7 @@ module Thredded
     end
 
     def update?
-      @user.id == @private_topic.user_id
+      !@user.thredded_anonymous? && @user.id == @private_topic.user_id
     end
   end
 end

data/app/view_hooks/thredded/all_view_hooks.rb

@@ -94,11 +94,14 @@ module Thredded
       # @return [Thredded::AllViewHooks::ViewHook]
       attr_reader :user_info
       # @return [Thredded::AllViewHooks::ViewHook]
+      attr_reader :user_info_list_items
+      # @return [Thredded::AllViewHooks::ViewHook]
       attr_reader :user_moderation_actions
 
       def initialize
         @user_title = ViewHook.new
         @user_info = ViewHook.new
+        @user_info_list_items = ViewHook.new
         @user_moderation_actions = ViewHook.new
       end
     end

data/app/view_models/thredded/messageboard_group_view.rb

@@ -5,7 +5,7 @@ module Thredded
     delegate :name, to: :@group, allow_nil: true
     attr_reader :group, :messageboards
 
-    # @param messageboard_scope [ActiveRecord::Relation]
+    # @param messageboard_scope [ActiveRecord::Relation<Thredded::Messageboard>]
     # @return [Array<MessageboardGroupView>]
     def self.grouped(messageboard_scope)
       messageboard_scope.preload(last_topic: [:last_user])

data/app/view_models/thredded/post_view.rb

@@ -14,14 +14,18 @@ module Thredded
              to: :@post
 
     # @param post [Thredded::PostCommon]
-    # @param policy [#update? #destroy?]
-    # @param policy [Thredded::TopicView]
+    # @param policy [#create? #update? #destroy? #moderate?]
+    # @param topic_view [Thredded::TopicView]
     def initialize(post, policy, topic_view: nil)
       @post   = post
       @policy = policy
       @topic_view = topic_view
     end
 
+    def can_reply?
+      @can_reply ||= @policy.create?
+    end
+
     def can_update?
       @can_update ||= @policy.update?
     end
@@ -34,6 +38,18 @@ module Thredded
       @can_moderate ||= @policy.moderate?
     end
 
+    def quote_url_params
+      if @post.private_topic_post?
+        { post: { quote_private_post_id: @post.id } }
+      else
+        { post: { quote_post_id: @post.id } }
+      end.update(anchor: 'post_content')
+    end
+
+    def quote_path
+      Thredded::UrlsHelper.quote_post_path(@post)
+    end
+
     def edit_path
       Thredded::UrlsHelper.edit_post_path(@post)
     end
@@ -47,7 +63,7 @@ module Thredded
     end
 
     def permalink_path
-      Thredded::UrlsHelper.post_permalink_path(@post.id)
+      Thredded::UrlsHelper.permalink_path(@post)
     end
 
     # This cache key is used only for caching the content.

data/app/view_models/thredded/private_topic_view.rb

@@ -15,9 +15,5 @@ module Thredded
                    end
       new(topic, read_state, Pundit.policy!(user, topic))
     end
-
-    def new_post_preview_path
-      Thredded::UrlsHelper.preview_new_private_topic_private_post_path(@topic)
-    end
   end
 end

data/app/view_models/thredded/topic_view.rb

@@ -63,9 +63,5 @@ module Thredded
     def messageboard_path
       Thredded::UrlsHelper.messageboard_topics_path(@topic.messageboard)
     end
-
-    def new_post_preview_path
-      Thredded::UrlsHelper.preview_new_messageboard_topic_post_path(@topic.messageboard, @topic)
-    end
   end
 end

data/app/views/thredded/moderation/_users_search_form.html.erb

@@ -1,6 +1,6 @@
 <%= form_tag users_moderation_path,
              method: 'get',
-             class: 'thredded--form thredded--navigation--search',
+             class: 'thredded--form thredded--navigation--search thredded--navigation--search--right',
              'data-thredded-turboform' => true do %>
   <%= label_tag :q, t('thredded.moderation.search_users.form_label') %>
   <%= text_field_tag :q, @query,