thredded 0.11.1 → 0.12.0

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)
@@ -43,7 +48,7 @@ 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
@@ -172,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/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_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/posts/_form.html.erb

@@ -1,7 +1,5 @@
 <%= render 'thredded/posts_common/form',
-           topic: topic,
            post: post,
-           preview_url: preview_url,
            content_label: t('thredded.posts.form.content_label'),
            button_text: button_text,
            button_submitting_text: local_assigns.key?(:button_submitting_text) ? button_submitting_text : nil %>

data/app/views/thredded/posts/edit.html.erb

@@ -2,17 +2,14 @@
 <% content_for :thredded_page_id, 'thredded--edit-post' %>
 <% content_for :thredded_breadcrumbs do %>
   <ul class="thredded--navigation-breadcrumbs">
-    <li><%= link_to t('thredded.nav.edit_post'), edit_post_path(@post) %></li>
+    <li><%= link_to t('thredded.nav.edit_post'), edit_post_path(@post_form.post) %></li>
   </ul>
 <% end %>
 
 <%= thredded_page do %>
   <section class="thredded--main-section">
     <%= render 'thredded/posts/form',
-               messageboard: messageboard,
-               topic:        topic,
-               post:         @post,
-               preview_url:  messageboard_topic_post_preview_path(messageboard, @post.postable, @post),
+               post:         @post_form,
                button_text:  t('thredded.posts.form.update_btn'),
                button_submitting_text: t('thredded.posts.form.update_btn_submitting')%>
   </section>

data/app/views/thredded/posts/new.html.erb

@@ -0,0 +1,15 @@
+<% content_for :thredded_page_title, @post_form.topic.title %>
+<% content_for :thredded_page_id, 'thredded--topic--new-post' %>
+<% content_for :thredded_breadcrumbs, render('thredded/shared/breadcrumbs') %>
+
+<%= thredded_page do %>
+  <section class="thredded--main-section">
+    <div class="thredded--post-form--wrapper">
+      <h3 class="thredded--post-form--title"><%= t('thredded.posts.form.title_label') %></h3>
+      <%= render 'thredded/posts/form',
+                 post: @post_form,
+                 button_text: t('thredded.posts.form.create_btn'),
+                 button_submitting_text: t('thredded.posts.form.create_btn_submitting') %>
+    </div>
+  </section>
+<% end %>

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

@@ -1,5 +1,8 @@
 <% actions = capture do %>
   <%= view_hooks.post_common.actions.render self, post: post do %>
+    <% if post.can_reply? %>
+      <%= render 'thredded/posts_common/actions/quote', post: post %>
+    <% end  %>
     <% if post.can_update? %>
       <%= render 'thredded/posts_common/actions/edit', post: post %>
     <% end %>

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

@@ -1,5 +1,7 @@
-<%# locals: messageboard, topic, post, preview_url, content_label, button_text, button_submitting_text. %>
-<%= form_for (post.private_topic_post? ? [topic, post] : [messageboard, topic, post]), as: :post,
+<%# locals: post, content_label, button_text, button_submitting_text. %>
+<%= form_for post,
+             url: post.submit_path,
+             as: :post,
              html: {
                  class: 'thredded--form thredded--post-form',
                  'data-thredded-post-form' => true,
@@ -8,7 +10,7 @@
              } do |form| %>
   <ul class="thredded--form-list">
     <%= render 'thredded/posts_common/form/content',
-               form: form, content_label: content_label, preview_url: preview_url %>
+               form: form, content_label: content_label, preview_url: post.preview_path %>
     <li>
       <% button_submitting_text ||=
              post.persisted? ? t('thredded.form.update_btn_submitting') : t('thredded.form.create_btn_submitting') %>

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

@@ -2,5 +2,7 @@
 <header>
   <%= image_tag post.avatar_url, class: 'thredded--post--avatar' if post.user %>
   <h2 class="thredded--post--user"><%= user_link post.user %></h2>
-  <p class="thredded--post--created-at"><%= time_ago post.created_at %></p>
+  <a href="<%= post.permalink_path %>" rel="nofollow" class="thredded--link thredded--post--created-at">
+    <%= time_ago post.created_at %>
+  </a>
 </header>

data/app/views/thredded/posts_common/actions/_quote.html.erb

@@ -0,0 +1,4 @@
+<%= link_to t('thredded.posts.quote_btn'), url_for(post.quote_url_params),
+            'data-thredded-quote-post' => post.quote_path,
+            class: 'thredded--post--quote thredded--post--dropdown--actions--item',
+            rel: 'nofollow' %>

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

@@ -3,8 +3,6 @@
     class: 'thredded--form thredded--notification-preferences-form',
     'data-thredded-user-preferences-form' => true
 }) do |f| %>
-
-  <h3><%= t 'thredded.preferences.form.global_preferences_label' %></h3>
   <ul class="thredded--form-list">
     <li>
       <%= f.label :auto_follow_topics do %>
@@ -52,9 +50,9 @@
     <% end %>
   </ul>
   <% if preferences.messageboard %>
-    <h3>
-      <%= t 'thredded.preferences.form.messageboard_preferences_label_html', messageboard: messageboard.name %>
-    </h3>
+    <h2 class="thredded--preferences--title">
+      <%= t 'thredded.preferences.messageboard_preferences_title_html', messageboard: messageboard.name %>
+    </h2>
     <ul class="thredded--form-list" data-thredded-user-preferences-form-messageboard-fields>
       <li>
         <%= f.label :messageboard_auto_follow_topics do %>