thredded 0.7.0 → 0.8.2

data/app/assets/stylesheets/thredded/layout/_moderation.scss

@@ -1,7 +1,12 @@
 .thredded--moderation-navigation {
   position: relative;
+  @include thredded-media-desktop-and-up {
+    margin-bottom: $thredded-base-spacing;
+  }
+
   &--items {
     @extend %thredded--nav-tabs;
+    margin-bottom: $thredded-small-spacing;
   }
   &--item {
     @extend %thredded--nav-tabs--item;

data/app/assets/stylesheets/thredded/layout/_navigation.scss

@@ -1,5 +1,4 @@
 .thredded--navigation {
-  margin-bottom: $thredded-small-spacing;
   position: relative;
   .thredded--icon {
     display: none;
@@ -9,7 +8,6 @@
 @include thredded-media-tablet-and-down {
   $icon-nav-item-width: 2.625rem;
   .thredded--navigation {
-    display: table;
     position: relative;
     width: 100%;
   }
@@ -33,20 +31,25 @@
     }
   }
   .thredded--user-navigation {
-    display: table-footer-group;
+    border-bottom: none;
+    position: absolute;
+    top: 0;
+    right: 0;
+    z-index: 2;
     &-standalone {
       display: block;
       margin-bottom: 0;
     }
     %icon-nav-item {
-      margin-right: 0;
+      box-sizing: border-box;
+      display: inline-block;
+      margin: 0 0 0 ($thredded-small-spacing/2);
       padding: 0;
-      position: absolute;
-      top: (0.8rem - $thredded-small-spacing);
-      z-index: 2;
+      vertical-align: top;
       a {
+        position: relative;
         display: block;
-        padding: ($thredded-small-spacing / 2) 0 ($thredded-small-spacing / 2) 0;
+        padding: 0.4375rem 0 0.375rem 0;
       }
       .thredded--icon {
         display: block;
@@ -55,31 +58,25 @@
       }
     }
     %icon-counter {
-      bottom: 0.3rem;
+      bottom: 0.3125rem;
       position: absolute;
-      right: -0.2rem;
+      right: -0.1875rem;
     }
     .thredded--nav-text {
       display: none;
     }
     &--settings {
       @extend %icon-nav-item;
-      right: $icon-nav-item-width;
     }
     &--private-topics {
       @extend %icon-nav-item;
-      right: 0;
-      top: 1px;
-      a {
-        position: relative;
-      }
+      margin-top: 1px;
       &--unread {
         @extend %icon-counter;
       }
     }
     &--moderation {
       @extend %icon-nav-item;
-      right: $icon-nav-item-width * 2;
       &--pending-count {
         @extend %icon-counter
       }

data/app/assets/stylesheets/thredded/layout/_search-navigation.scss

@@ -7,6 +7,7 @@
 
   @include thredded-media-tablet-and-down {
     position: initial;
+    margin-bottom: $thredded-small-spacing;
   }
 
   label {
@@ -18,16 +19,17 @@
     width: 100%;
 
     @include thredded-media-desktop-and-up {
+      $line-height: 1rem;
       $padding-x: 0.75rem;
       background: transparent;
       border-color: transparent;
       font-size: $thredded-font-size-small;
-      line-height: 1rem;
+      line-height: $line-height;
       min-width: 13rem;
       text-align: right;
       width: auto;
-      padding: 0.90625rem $padding-x 0.8125rem $padding-x;
-      margin-right: -($padding-x);
+      padding: 0.9375rem 0.75rem 0.875rem 0.75rem;
+      margin: -1px (-$padding-x) 0 0;
       // Webkit adds an extra padding that we need to remove.
       -webkit-margin-end: -($padding-x + 0.75rem);
 
@@ -49,9 +51,19 @@
         box-shadow: none;
       }
 
+      &::-webkit-search-decoration,
+      &::-webkit-search-cancel-button,
+      &::-webkit-search-results-button,
+      &::-webkit-search-results-decoration {
+        // Remove excessive padding on Safari.
+        max-height: $line-height;
+      }
+
       &::placeholder {
         color: $thredded-secondary-nav-color;
         transition: $thredded-action-transition;
+        height: inherit;
+        line-height: inherit;
         // Firefox applies default opacity of 0.54, while all the other browsers use 1.
         // See https://bugzilla.mozilla.org/show_bug.cgi?id=556145
         opacity: 1;

data/app/assets/stylesheets/thredded/layout/_user-navigation.scss

@@ -4,18 +4,10 @@
 
 .thredded--user-navigation--item {
   @extend %thredded--nav-tabs--item;
-}
 
-.thredded--preferences .thredded--user-navigation--settings,
-.thredded--new-private-topic .thredded--user-navigation--private-topics,
-.thredded--private-topics-index .thredded--user-navigation--private-topics,
-.thredded--private-topic-show .thredded--user-navigation--private-topics,
-.thredded--pending-moderation .thredded--user-navigation--moderation,
-.thredded--moderation-history .thredded--user-navigation--moderation,
-.thredded--moderation-users .thredded--user-navigation--moderation,
-.thredded--moderation-user .thredded--user-navigation--moderation,
-.thredded--moderation-activity .thredded--user-navigation--moderation {
-  @extend %thredded--nav-tabs--item-current;
+  &.thredded--is-current {
+    @extend %thredded--nav-tabs--item-current;
+  }
 }
 
 .thredded--user-navigation--private-topics--unread,

data/app/commands/thredded/at_notification_extractor.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-require_dependency 'html/pipeline/at_mention_filter'
+require 'thredded/html_pipeline/at_mention_filter'
 module Thredded
   class AtNotificationExtractor
     def initialize(post)
@@ -13,7 +13,7 @@ module Thredded
       # * When parsing, @-mentions within <a> tags will not be considered.
       # * We can't always generate the user URL here because request.host is not available.
       html = @post.filtered_content(view_context, users_provider: nil)
-      HTML::Pipeline::AtMentionFilter.new(
+      Thredded::HtmlPipeline::AtMentionFilter.new(
         html,
         view_context: view_context,
         users_provider: -> (user_names) { @post.readers_from_user_names(user_names).to_a }

data/app/commands/thredded/autofollow_mentioned_users.rb

@@ -24,8 +24,8 @@ module Thredded
 
     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?
+        member.thredded_user_preference.follow_topics_on_mention? &&
+          member.thredded_user_messageboard_preferences.in(post.messageboard).follow_topics_on_mention?
       end
     end
   end

data/app/commands/thredded/create_messageboard.rb

@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+module Thredded
+  # Creates a new messageboard and seeds it with a topic.
+  class CreateMessageboard
+    # @param messageboard [Thredded::Messageboard]
+    # @param user [Thredded.user_class]
+    def initialize(messageboard, user)
+      @messageboard = messageboard
+      @user = user
+    end
+
+    # @return [boolean] true if the messageboard was created and seeded with a topic successfully.
+    def run
+      Messageboard.transaction do
+        fail ActiveRecord::Rollback unless @messageboard.save
+        topic = Topic.create!(
+          messageboard: @messageboard,
+          user: @user,
+          title: first_topic_title
+        )
+        Post.create!(
+          messageboard: @messageboard,
+          user: @user,
+          postable: topic,
+          content: first_post_content
+        )
+        true
+      end
+    end
+
+    def first_topic_title
+      "Welcome to your messageboard's very first thread"
+    end
+
+    def first_post_content
+      <<-MARKDOWN
+There's not a whole lot here for now.
+
+These forums are powered by [Thredded](https://github.com/thredded/thredded) v#{Thredded::VERSION}.
+You can contact the Thredded team via the [Thredded chat room](https://gitter.im/thredded/thredded).
+Please let us know that you are using Thredded by tweeting [@thredded](https://twitter.com/thredded)!
+      MARKDOWN
+    end
+  end
+end

data/app/commands/thredded/notify_following_users.rb

@@ -13,6 +13,16 @@ module Thredded
 
     def targeted_users
       @targeted_users ||= @post.postable.followers.reject { |u| u == @post.user }
+      exclude_those_opting_out_of_followed_activity_notifications @targeted_users
+    end
+
+    private
+
+    def exclude_those_opting_out_of_followed_activity_notifications(members)
+      members.select do |member|
+        member.thredded_user_preference.followed_topic_emails &&
+          member.thredded_user_messageboard_preferences.in(@post.messageboard).followed_topic_emails
+      end
     end
   end
 end

data/app/controllers/thredded/autocomplete_users_controller.rb

@@ -1,8 +1,7 @@
 # frozen_string_literal: true
 module Thredded
   class AutocompleteUsersController < Thredded::ApplicationController
-    MIN_QUERY_LENGTH = 2
-    MAX_RESULTS      = 20
+    MAX_RESULTS = 20
 
     def index
       authorize_creating PrivateTopicForm.new(user: thredded_current_user).private_topic
@@ -20,7 +19,7 @@ module Thredded
 
     def users_by_prefix
       query = params[:q].to_s.strip
-      if query.length >= MIN_QUERY_LENGTH
+      if query.length >= Thredded.autocomplete_min_length
         DbTextSearch::CaseInsensitive.new(users_scope, Thredded.user_name_column).prefix(query)
           .where.not(id: thredded_current_user.id)
           .limit(MAX_RESULTS)

data/app/controllers/thredded/messageboards_controller.rb

@@ -19,11 +19,7 @@ module Thredded
     def create
       @messageboard = Messageboard.new(messageboard_params)
       authorize_creating @messageboard
-      if @messageboard.save
-        Topic.transaction do
-          @topic = Topic.create!(topic_params)
-          @post = Post.create!(post_params)
-        end
+      if Thredded::CreateMessageboard.new(@messageboard, thredded_current_user).run
         redirect_to root_path
       else
         render :new
@@ -52,24 +48,5 @@ module Thredded
         .require(:messageboard)
         .permit(:name, :description, :messageboard_group_id)
     end
-
-    def topic_params
-      {
-        messageboard: @messageboard,
-        user: thredded_current_user,
-        last_user: thredded_current_user,
-        title: "Welcome to your messageboard's very first thread",
-      }
-    end
-
-    def post_params
-      {
-        messageboard: @messageboard,
-        postable: @topic,
-        content: "There's not a whole lot here for now.",
-        ip: request.ip,
-        user: thredded_current_user,
-      }
-    end
   end
 end

data/app/controllers/thredded/moderation_controller.rb

@@ -2,7 +2,7 @@
 require_dependency 'thredded/moderate_post'
 require_dependency 'thredded/posts_page_view'
 module Thredded
-  class ModerationController < ApplicationController
+  class ModerationController < Thredded::ApplicationController
     before_action :thredded_require_login!
     before_action :load_moderatable_messageboards
 

data/app/controllers/thredded/post_permalinks_controller.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 module Thredded
-  class PostPermalinksController < ApplicationController
+  class PostPermalinksController < Thredded::ApplicationController
     def show
       post = Post.find(params[:id])
       authorize post, :read?

data/app/controllers/thredded/preferences_controller.rb

@@ -23,9 +23,11 @@ module Thredded
         user:         thredded_current_user,
         messageboard: messageboard_or_nil,
         params:       params.fetch(:user_preferences_form, {}).permit(
-          :notify_on_mention,
+          :followed_topic_emails,
+          :follow_topics_on_mention,
           :notify_on_message,
-          :messageboard_notify_on_mention,
+          :messageboard_followed_topic_emails,
+          :messageboard_follow_topics_on_mention
         )
       )
     end

data/app/controllers/thredded/private_post_permalinks_controller.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 module Thredded
-  class PrivatePostPermalinksController < ApplicationController
+  class PrivatePostPermalinksController < Thredded::ApplicationController
     before_action :thredded_require_login!
     def show
       private_post = PrivatePost.find(params[:id])

data/app/controllers/thredded/theme_previews_controller.rb

@@ -9,7 +9,7 @@ module Thredded
                            else
                              thredded_current_user
                            end
-      @messageboards     = Messageboard.where(closed: false)
+      @messageboards     = Messageboard.all
       @topics            = TopicsPageView.new(@user, @messageboard.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)

data/app/controllers/thredded/topics_controller.rb

@@ -18,7 +18,6 @@ module Thredded
         thredded_current_user,
         policy_scope(messageboard.topics)
           .order_sticky_first.order_recently_posted_first
-          .includes(:categories, :last_user, :user)
           .page(current_page)
       )
       TopicForm.new(messageboard: messageboard, user: thredded_current_user).tap do |form|

data/app/forms/thredded/user_preferences_form.rb

@@ -8,11 +8,13 @@ module Thredded
 
     validate :validate_children
 
-    delegate :notify_on_mention, :notify_on_mention=,
+    delegate :follow_topics_on_mention, :follow_topics_on_mention=,
              :notify_on_message, :notify_on_message=,
+             :followed_topic_emails, :followed_topic_emails=,
              to: :user_preference
 
-    delegate :notify_on_mention, :notify_on_mention=,
+    delegate :follow_topics_on_mention, :follow_topics_on_mention=,
+             :followed_topic_emails, :followed_topic_emails=,
              to: :user_messageboard_preference,
              prefix: :messageboard
 

data/app/helpers/thredded/application_helper.rb

@@ -2,6 +2,11 @@
 module Thredded
   module ApplicationHelper
     include ::Thredded::UrlsHelper
+    include ::Thredded::NavHelper
+
+    def view_hooks
+      @view_hooks ||= Thredded.view_hooks
+    end
 
     def thredded_container_data
       {

data/app/helpers/thredded/nav_helper.rb

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+require 'set'
+module Thredded
+  module NavHelper
+    USER_NAV_MODERATION_PAGES = Set.new(
+      %w(
+        thredded--pending-moderation
+        thredded--moderation-activity
+        thredded--moderation-history
+        thredded--moderation-users
+        thredded--moderation-user
+      )
+    )
+
+    USER_NAV_PREFERENCES_PAGES = Set.new(
+      %w(
+        thredded--preferences
+      )
+    )
+
+    USER_NAV_PRIVATE_TOPICS_PAGES = Set.new(
+      %w(
+        thredded--new-private-topic
+        thredded--private-topics-index
+        thredded--private-topic-show
+      )
+    )
+
+    def current_page_preferences?
+      USER_NAV_PREFERENCES_PAGES.include?(content_for(:thredded_page_id))
+    end
+
+    def current_page_moderation?
+      USER_NAV_MODERATION_PAGES.include?(content_for(:thredded_page_id))
+    end
+
+    def current_page_private_topics?
+      USER_NAV_PRIVATE_TOPICS_PAGES.include?(content_for(:thredded_page_id))
+    end
+  end
+end