thredded 0.2.2 → 0.3.0

data/app/controllers/thredded/private_topics_controller.rb

@@ -1,27 +1,38 @@
+# frozen_string_literal: true
+require_dependency 'thredded/posts_page_view'
+require_dependency 'thredded/topics_page_view'
 module Thredded
   class PrivateTopicsController < Thredded::ApplicationController
-    helper_method :private_topic
+    before_action :thredded_require_login!
 
     def index
-      @new_private_topic = PrivateTopicForm.new(user: thredded_current_user)
-      @private_topics = PrivateTopic
-                          .uniq
-                          .for_user(thredded_current_user)
-                          .order('updated_at DESC')
-                          .on_page(params[:page])
-                          .load
-      @decorated_private_topics = Thredded::UserPrivateTopicDecorator
-        .decorate_all(thredded_current_user, @private_topics)
+      @private_topics = Thredded::TopicsPageView.new(
+        thredded_current_user,
+        PrivateTopic
+          .distinct
+          .for_user(thredded_current_user)
+          .order_recently_updated_first
+          .includes(:last_user, :user)
+          .page(params[:page]))
+
+      PrivateTopicForm.new(user: thredded_current_user).tap do |form|
+        @new_private_topic = form if policy(form.private_topic).create?
+      end
     end
 
     def show
-      authorize! :read, private_topic
-      UserReadsPrivateTopic.new(private_topic, thredded_current_user).run
+      authorize_reading private_topic
 
-      @posts = private_topic
+      page_scope = private_topic
         .posts
         .includes(:user)
-        .order('id ASC')
+        .order_oldest_first
+        .page(current_page)
+      @posts = Thredded::PostsPageView.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)
+      end
 
       @post = private_topic.posts.build
     end
@@ -34,32 +45,56 @@ module Thredded
     def create
       @private_topic = PrivateTopicForm.new(new_private_topic_params)
       if @private_topic.save
-        NotifyPrivateTopicUsersJob
-          .perform_later(@private_topic.private_topic.id)
-
-        UserResetsPrivateTopicToUnread
-          .new(@private_topic.private_topic, thredded_current_user)
-          .run
-
+        NotifyPrivateTopicUsersJob.perform_later(@private_topic.private_topic.id)
         redirect_to @private_topic.private_topic
       else
         render :new
       end
     end
 
+    def edit
+      authorize private_topic, :update?
+    end
+
+    def update
+      authorize private_topic, :update?
+      if private_topic.update(private_topic_params)
+        redirect_to private_topic_url(private_topic),
+                    notice: t('thredded.private_topics.updated_notice')
+      else
+        render :edit
+      end
+    end
+
     private
 
+    def current_page
+      (params[:page] || 1).to_i
+    end
+
     def private_topic
       @private_topic ||= Thredded::PrivateTopic.find_by_slug(params[:id])
     end
 
+    def private_topic_params
+      params
+        .require(:private_topic)
+        .permit(:title)
+    end
+
     def new_private_topic_params
       params
         .require(:private_topic)
-        .permit(:title, :locked, :sticky, :content, user_ids: [], category_ids: [])
+        .permit(:title, :content, :user_ids, user_ids: [])
         .merge(
           user: thredded_current_user,
-          ip: request.remote_ip)
+          ip:   request.remote_ip
+        ).tap { |p| adapt_user_ids! p }
+    end
+
+    # select2 returns a string of IDs joined with commas.
+    def adapt_user_ids!(p)
+      p[:user_ids] = p[:user_ids].split(',') if p[:user_ids].is_a?(String)
     end
   end
 end

data/app/controllers/thredded/setups_controller.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Thredded
   class SetupsController < Thredded::ApplicationController
     def new

data/app/controllers/thredded/theme_previews_controller.rb

@@ -1,59 +1,30 @@
+# frozen_string_literal: true
 module Thredded
   class ThemePreviewsController < Thredded::ApplicationController
-    before_filter :fail_on_empty_database, if: :no_messageboard?
-
     def show
-      @messageboard = messageboard
-      @messageboards = Messageboard.where(closed: false).decorate
-      @topics = messageboard.topics.on_page(current_page).limit(3)
-      @decorated_topics = UserTopicDecorator.decorate_all(user, @topics)
-      @decorated_private_topics = Thredded::UserPrivateTopicDecorator
-        .decorate_all(thredded_current_user, user.thredded_private_topics)
-      @topic = @topics.find { |t| t.posts.present? } || @topics.first ||
-        @messageboard.topics.build(title: 'Hello', slug: 'hello', user: user)
-      @user_topic = UserTopicDecorator.new(user, @topic)
-      @posts = @topic.posts.first(3)
-      @post = @posts.first || @messageboard.posts.build(id: 1337, postable: @topic, content: 'Hello world', user: user)
-      @new_post = @messageboard.posts.build(postable: @topic)
-      @new_topic = TopicForm.new(messageboard: messageboard, user: Thredded::NullUser.new)
-      @new_private_topic = PrivateTopicForm.new(user: user)
-      @private_topic = PrivateTopic.all.first || PrivateTopic.new(id: 1337, title: 'Hello', user: user, last_user: user,
-                                                                  users: [user])
-      @private_post = PrivatePost.first ||
-        @private_topic.posts.build(id: 1337, postable: @private_topic, content: 'A private hello world', user: user)
-      @preference = preference
-    end
-
-    def messageboard
-      @messageboard ||= Messageboard.first
-    end
-
-    def preference
-      @preference ||= NotificationPreference
-        .where(messageboard_id: messageboard.id, user_id: user.id)
-        .first_or_create!
-    end
-
-    def current_page
-      1
-    end
-
-    private
-
-    def fail_on_empty_database
-      fail Thredded::Errors::DatabaseEmpty
-    end
-
-    def no_messageboard?
-      !Thredded::Messageboard.any?
-    end
-
-    def user
-      @user ||= if thredded_current_user.thredded_anonymous?
-                  Thredded.user_class.first_or_create!(slug: 'joe', name: 'joe', email: 'joe@example.com')
-                else
-                  thredded_current_user
-                end
+      @messageboard = Messageboard.first
+      fail Thredded::Errors::DatabaseEmpty unless @messageboard
+      @user              = if thredded_current_user.thredded_anonymous?
+                             Thredded.user_class.new(id: 1334, name: 'joe', email: 'joe@example.com')
+                           else
+                             thredded_current_user
+                           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))
+      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))
+      @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_post      = private_topic.posts.build(
+        id: 1337, postable: private_topic, content: 'A private hello world', user: @user)
+      @preferences       = UserPreferencesForm.new(user: @user, messageboard: @messageboard)
     end
   end
 end

data/app/controllers/thredded/topics_controller.rb

@@ -1,40 +1,48 @@
+# frozen_string_literal: true
+require_dependency 'thredded/posts_page_view'
+require_dependency 'thredded/topics_page_view'
 module Thredded
   class TopicsController < Thredded::ApplicationController
-    helper_method :current_page, :topic, :user_topic
-    before_filter :update_user_activity
+    before_action :thredded_require_login!,
+                  only: [:edit, :new, :update, :create, :destroy]
+    after_action :update_user_activity
 
     def index
       authorize_reading messageboard
 
-      @topics = topics
-      @decorated_topics = Thredded::UserTopicDecorator
-        .decorate_all(thredded_current_user, @topics)
-      initialize_new_topic.tap do |new_topic|
-        @new_topic = new_topic if current_ability.can?(:create, new_topic.topic)
+      @topics = Thredded::TopicsPageView.new(
+        thredded_current_user,
+        messageboard.topics
+          .order_sticky_first.order_recently_updated_first
+          .includes(:categories, :last_user, :user)
+          .page(current_page))
+      TopicForm.new(messageboard: messageboard, user: thredded_current_user).tap do |form|
+        @new_topic = form if policy(form.topic).create?
       end
     end
 
     def show
-      authorize! :read, topic
-
-      @posts = topic.posts
+      authorize_reading topic
+      page_scope = topic.posts
         .includes(:user, :messageboard, :postable)
-        .order('id ASC')
+        .order_oldest_first
         .page(current_page)
+      @posts = Thredded::PostsPageView.new(thredded_current_user, topic, page_scope)
 
-      @new_post = messageboard.posts.build(
-        postable: topic,
-        filter: messageboard.filter
-      )
+      UserTopicReadState.touch!(thredded_current_user.id, topic.id, page_scope.last, current_page) if signed_in?
 
-      update_read_status
+      @new_post = messageboard.posts.build(postable: topic)
     end
 
     def search
-      @topics = Topic.search(params[:q], messageboard)
-      @decorated_topics = Thredded::UserTopicDecorator
-        .decorate_all(thredded_current_user, @topics)
-      flash.now[:notice] = "Search Results for '#{params[:q]}'"
+      @query = params[:q].to_s
+      @topics = Thredded::TopicsPageView.new(
+        thredded_current_user,
+        (messageboard_or_nil ? messageboard.topics : Topic)
+          .search_query(@query)
+          .order_recently_updated_first
+          .includes(:categories, :last_user, :user)
+          .page(current_page))
     end
 
     def new
@@ -43,16 +51,14 @@ module Thredded
     end
 
     def category
+      authorize_reading messageboard
       @category = messageboard.categories.friendly.find(params[:category_id])
-      @topics = @category
-        .topics
-        .unstuck
-        .order_by_updated_time
-        .on_page(current_page)
-        .load
-      @decorated_topics = Thredded::UserTopicDecorator
-        .decorate_all(thredded_current_user, @topics)
-
+      @topics = Thredded::TopicsPageView.new(
+        thredded_current_user,
+        @category.topics
+          .unstuck
+          .order_recently_updated_first
+          .page(current_page))
       render :index
     end
 
@@ -67,37 +73,30 @@ module Thredded
     end
 
     def edit
-      authorize! :update, topic
+      authorize topic, :update?
     end
 
     def update
-      topic.update_attributes!(topic_params.merge(last_user_id: thredded_current_user.id))
-      redirect_to messageboard_topic_posts_url(messageboard, topic), flash: { notice: 'Topic updated' }
+      authorize topic, :update?
+      if topic.update(topic_params.merge(last_user_id: thredded_current_user.id))
+        redirect_to messageboard_topic_url(messageboard, topic),
+                    notice: t('thredded.topics.updated_notice')
+      else
+        render :edit
+      end
     end
 
     def destroy
-      authorize! :destroy, topic
+      authorize topic, :destroy?
       topic.destroy!
-      redirect_to messageboard_topics_path(messageboard), flash: { notice: 'Topic deleted' }
+      redirect_to messageboard_topics_path(messageboard),
+                  notice: t('thredded.topics.deleted_notice')
     end
 
     private
 
-    def initialize_new_topic
-      TopicForm.new(messageboard: messageboard, user: thredded_current_user)
-    end
-
     def topic
-      @topic ||= messageboard.topics.find_by_slug_with_user_topic_reads!(params[:id])
-    end
-
-    def topics
-      messageboard
-        .topics
-        .includes(:user_topic_reads, :categories, :last_user, :user)
-        .order_by_stuck_and_updated_time
-        .on_page(current_page)
-        .load
+      @topic ||= messageboard.topics.find_by_slug!(params[:id])
     end
 
     def topic_params
@@ -118,36 +117,8 @@ module Thredded
         )
     end
 
-    def topics_by_category(category_id)
-      messageboard.categories.friendly.find(category_id)
-        .topics
-        .unstuck
-        .order_by_updated
-        .on_page(current_page)
-        .load
-    end
-
     def current_page
-      params[:page] || 1
-    end
-
-    def user_topic
-      @user_topic ||= UserTopicDecorator.new(thredded_current_user, topic)
-    end
-
-    def update_read_status
-      return if thredded_current_user.thredded_anonymous?
-
-      read_history = UserTopicRead.where(
-        user_id: thredded_current_user,
-        topic: topic,
-      ).first_or_initialize
-
-      read_history.update_attributes(
-        farthest_post: @posts.last,
-        posts_count: topic.posts_count,
-        page: current_page,
-      )
+      (params[:page] || 1).to_i
     end
   end
 end

data/app/forms/thredded/private_topic_form.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Thredded
   class PrivateTopicForm
     include ActiveModel::Model
@@ -30,14 +31,6 @@ module Thredded
       Thredded::PrivateTopic.model_name
     end
 
-    def users
-      @user.thredded_can_message_users
-    end
-
-    def users_for_select
-      (users - [@user]).map { |user| [user.to_s, user.id] }
-    end
-
     def id
       private_topic.id
     end
@@ -66,19 +59,6 @@ module Thredded
         user: non_null_user)
     end
 
-    def users_selected_options
-      { selected: private_user_ids }
-    end
-
-    def users_select_html_options
-      {
-        multiple: true,
-        required: true,
-        'data-placeholder' => 'select users to participate in this topic',
-        'data-thredded-users-select' => true
-      }
-    end
-
     private
 
     def topic_categories

data/app/forms/thredded/topic_form.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Thredded
   class TopicForm
     include ActiveModel::Model
@@ -26,11 +27,7 @@ module Thredded
     end
 
     def category_options
-      topic.messageboard.decorate.category_options
-    end
-
-    def filter
-      topic.messageboard.filter
+      categories.map { |cat| [cat.name, cat.id] }
     end
 
     def save
@@ -58,8 +55,7 @@ module Thredded
       @post ||= topic.posts.build(
         content: content,
         user: non_null_user,
-        messageboard: messageboard,
-        filter: messageboard.filter
+        messageboard: messageboard
       )
     end