thredded 0.10.1 → 0.11.0

data/app/assets/stylesheets/thredded/components/_post.scss

@@ -1,13 +1,14 @@
 .thredded--post {
   position: relative;
-  margin-bottom: $thredded-large-spacing;
-  @include thredded-media-mobile {
-    margin-bottom: $thredded-base-spacing;
+  margin-bottom: $thredded-base-spacing;
+  @include thredded-media-desktop-and-up {
+    margin-bottom: $thredded-large-spacing;
   }
 }
 
 .thredded--post--dropdown--toggle {
   fill: currentColor;
+  box-sizing: content-box;
   color: $thredded-action-color;
   display: inline-block;
   width: 1rem;
@@ -15,6 +16,9 @@
   padding: 0.875rem 0.875rem 0.875rem 1.5rem;
   margin-right: -0.875rem;
   -webkit-tap-highlight-color: transparent;
+  @include thredded-media-content-breakout {
+    margin-top: -0.75rem;
+  }
 }
 
 .thredded--post--dropdown {
@@ -69,8 +73,8 @@ form.button_to > .thredded--post--dropdown--actions--item {
   &:active,
   &:focus,
   &:hover {
-    background-color: $thredded-action-color;
-    color: $thredded-background-color;
+    background-color: $thredded-button-background;
+    color: $thredded-button-color;
     text-decoration: none;
     cursor: pointer;
   }
@@ -100,7 +104,7 @@ form.button_to > .thredded--post--dropdown--actions--item {
   vertical-align: baseline;
   width: 1.75rem; // 28px
 
-  @include thredded-media-avatar-breakout {
+  @include thredded-media-content-breakout {
     height: 2.25rem; // 36px
     left: -3rem;
     position: absolute;

data/app/assets/stylesheets/thredded/components/_topic-header.scss

@@ -2,7 +2,7 @@
   margin-bottom: $thredded-small-spacing;
   margin-top: 0;
   @include thredded-media-desktop-and-up {
-    margin-bottom: $thredded-large-spacing;
+    margin-bottom: $thredded-base-spacing + $thredded-small-spacing;
     margin-top: $thredded-small-spacing;
     @include thredded--clearfix;
   }

data/app/assets/stylesheets/thredded/components/_topics.scss

@@ -2,11 +2,11 @@
   margin-bottom: $thredded-topics-list-gutter-y;
   position: relative;
 
-  @media (max-width: $thredded-grid-container-max-width) {
-    margin-left: 3rem;
+  @include thredded-media-content-no-breakout {
+    margin-left: $thredded-topics-topic-posts-counter-width;
   }
   @include thredded-media-mobile {
-    margin-right: 2rem;
+    margin-right: $thredded-topics-topic-follow-icon-width;
   }
 }
 
@@ -115,7 +115,7 @@
   font-weight: 900;
   font-size: 0.8rem;
   height: 2rem;
-  left: -3rem;
+  left: -$thredded-topics-topic-posts-counter-width;
   line-height: 2rem;
   margin-right: $thredded-base-spacing;
   position: absolute;
@@ -150,7 +150,7 @@
   right: -1.6rem;
   top: 0;
   @include thredded-media-mobile {
-    right: -2rem;
+    right: -$thredded-topics-topic-posts-counter-width;
   }
 }
 

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

@@ -68,12 +68,6 @@
         display: none;
       }
     }
-
-    @include thredded-media-desktop-and-up {
-      a, &.thredded--navigation-breadcrumbs--item-no-link {
-        padding: $thredded-base-spacing 0;
-      }
-    }
   }
 
   a {

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

@@ -42,7 +42,7 @@
   .thredded--post {
     margin-bottom: 0;
     margin-left: 1rem;
-    @include thredded-media-avatar-breakout {
+    @include thredded-media-content-breakout {
       margin-left: 4rem;
     }
   }

data/app/commands/thredded/autofollow_users.rb

@@ -0,0 +1,56 @@
+# frozen_string_literal: true
+module Thredded
+  class AutofollowUsers
+    def initialize(post)
+      @post = post
+    end
+
+    def run
+      new_followers.each do |user, reason|
+        Thredded::UserTopicFollow.create_unless_exists(user.id, post.postable_id, reason)
+      end
+    end
+
+    # @return [Array<Thredded.user_class>]
+    def mentioned_users
+      @mentioned_users ||= Thredded::AtNotificationExtractor.new(post).run
+    end
+
+    # @return [Hash<Thredded.user_class, Symbol]>] a map of users that should get subscribed to their the follow reason.
+    def new_followers
+      result = {}
+      auto_followers.each { |user| result[user] = :auto }
+      exclude_follow_on_mention_opt_outs(mentioned_users).each { |user| result[user] = :mentioned }
+      result.delete(post.user)
+      result
+    end
+
+    private
+
+    attr_reader :post
+
+    # Returns the users that have:
+    #   UserMessageboardPreference#auto_follow_topics? && UserPreference#auto_follow_topics?
+    # If the `user_preference` for a given does not exist, its default value is used.
+    # @return [Enumerable<Thredded.user_class>]
+    def auto_followers
+      user_board_prefs = post.messageboard.user_messageboard_preferences.each_with_object({}) do |ump, h|
+        h[ump.user] = ump
+      end
+      Thredded.user_class.includes(:thredded_user_preference)
+        .select(Thredded.user_class.primary_key)
+        .find_each(batch_size: 50_000).select do |user|
+        (user_board_prefs[user] ||
+            Thredded::UserMessageboardPreference.new(messageboard: post.messageboard, user: user)).auto_follow_topics?
+      end
+    end
+
+    # @return [Enumerable<Thredded.user_class>]
+    def exclude_follow_on_mention_opt_outs(users)
+      users.select do |user|
+        user.thredded_user_preference.follow_topics_on_mention? &&
+          user.thredded_user_messageboard_preferences.in(post.messageboard).follow_topics_on_mention?
+      end
+    end
+  end
+end

data/app/controllers/thredded/preferences_controller.rb

@@ -27,6 +27,8 @@ module Thredded
 
     def preferences_params
       params.fetch(:user_preferences_form, {}).permit(
+        :auto_follow_topics,
+        :messageboard_auto_follow_topics,
         :follow_topics_on_mention,
         :messageboard_follow_topics_on_mention,
         messageboard_notifications_for_followed_topics_attributes: %i(notifier_key id messageboard_id enabled),

data/app/forms/thredded/user_preferences_form.rb

@@ -9,12 +9,14 @@ module Thredded
     validate :validate_children
 
     delegate :follow_topics_on_mention, :follow_topics_on_mention=,
+             :auto_follow_topics, :auto_follow_topics=,
              :messageboard_notifications_for_followed_topics_attributes=,
              :notifications_for_followed_topics_attributes=,
              :notifications_for_private_topics_attributes=,
              to: :user_preference
 
     delegate :follow_topics_on_mention, :follow_topics_on_mention=,
+             :auto_follow_topics, :auto_follow_topics=,
              to: :user_messageboard_preference,
              prefix: :messageboard
 
@@ -31,6 +33,14 @@ module Thredded
       return false unless valid?
       Thredded::UserPreference.transaction do
         user_preference.save!
+
+        # Update all of the messageboards' auto_follow_topics if the global preference has changed.
+        if user_preference.previous_changes.include?('auto_follow_topics')
+          UserMessageboardPreference.where(user: @user)
+            .update_all(auto_follow_topics: user_preference.auto_follow_topics)
+          user_messageboard_preference.auto_follow_topics_will_change! if messageboard
+        end
+
         user_messageboard_preference.save! if messageboard
       end
       true
@@ -55,6 +65,14 @@ module Thredded
       end
     end
 
+    def update_path
+      if @messageboard
+        Thredded::UrlsHelper.messageboard_preferences_path(@messageboard)
+      else
+        Thredded::UrlsHelper.global_preferences_path
+      end
+    end
+
     private
 
     # @return [Thredded::UserPreference]

data/app/helpers/thredded/application_helper.rb

@@ -19,7 +19,7 @@ module Thredded
 
     def thredded_container_classes
       ['thredded--main-container', content_for(:thredded_page_id)].tap do |classes|
-        classes << 'thredded--is-moderator' if moderatable_messageboards_ids
+        classes << 'thredded--is-moderator' unless moderatable_messageboards_ids.empty?
       end
     end
 
@@ -93,11 +93,11 @@ module Thredded
       ]
     end
 
-    # @param follow_reason ['manual', 'posted', 'mentioned', nil]
+    # @param follow_reason ['manual', 'posted', 'mentioned', 'auto', nil]
     def topic_follow_reason_text(follow_reason)
       if follow_reason
         # rubocop:disable Metrics/LineLength
-        # i18n-tasks-use t('thredded.topics.following.manual') t('thredded.topics.following.posted') t('thredded.topics.following.mentioned')
+        # i18n-tasks-use t('thredded.topics.following.manual') t('thredded.topics.following.posted') t('thredded.topics.following.mentioned') t('thredded.topics.following.auto')
         # rubocop:enable Metrics/LineLength
         t("thredded.topics.following.#{follow_reason}")
       else

data/app/jobs/thredded/auto_follow_and_notify_job.rb

@@ -6,7 +6,7 @@ module Thredded
     def perform(post_id)
       post = Post.find(post_id)
 
-      AutofollowMentionedUsers.new(post).run
+      AutofollowUsers.new(post).run
       NotifyFollowingUsers.new(post).run
     end
   end

data/app/mailer_previews/thredded/base_mailer_preview.rb

@@ -11,18 +11,22 @@ module Thredded
 
     def mock_content(mention_users: [])
       <<-MARKDOWN
-#{mention_users.map { |u| "@#{u}" } * ', '}, if we synthesize the driver, we can get to the HDD panel through the `1080p EXE` bus!
-I'll program the **redundant** SMTP array, that should monitor the SMS microchip!
-MARKDOWN
+Hey #{mention_users.map { |u| "@#{u}" } * ', '}!
+All of the basic [Markdown](https://kramdown.gettalong.org/quickref.html) formatting is supported (powered by [Kramdown](https://kramdown.gettalong.org)).
+
+Additionally, Markdown is extended to support the following:
+
+#{Thredded::FormattingDemoContent.parts.join("\n")}
+      MARKDOWN
     end
 
     def mock_topic(attr = {})
+      fail 'Do not assign ID here or a has_many association might get updated' if attr.key?(:id)
       Topic.new(
         attr.reverse_merge(
           title:        'A test topic',
           slug:         'a-test-topic',
           created_at:   3.days.ago,
-          id:           1 + rand(1334),
           last_user:    mock_user,
           locked:       [false, true].sample,
           messageboard: mock_messageboard,
@@ -46,16 +50,16 @@ MARKDOWN
           updated_at:   Time.zone.now,
           user:         topic.last_user,
         )
-      )
+      ).tap { |m| mock_post_cache_key! m }
     end
 
     def mock_private_topic(attr = {})
+      fail 'Do not assign ID here or a has_many association might get updated' if attr.key?(:id)
       PrivateTopic.new(
         attr.reverse_merge(
           title:       'A test private topic',
           slug:        'a-test-private-topic',
           created_at:  3.days.ago,
-          id:          1 + rand(1334),
           last_user:   mock_user,
           posts_count: 1 + rand(42),
           updated_at:  Time.zone.now,
@@ -75,17 +79,17 @@ MARKDOWN
           updated_at: Time.zone.now,
           user:       private_topic.last_user,
         )
-      )
+      ).tap { |m| mock_post_cache_key! m }
     end
 
     def mock_messageboard(attr = {})
+      fail 'Do not assign ID here or a has_many association might get updated' if attr.key?(:id)
       Messageboard.new(
         attr.reverse_merge(
           name:         'A test messageboard',
           slug:         'a-test-messageboard',
           description:  'Test messageboard description',
           created_at:   1.month.ago,
-          id:           1 + rand(1334),
           posts_count:  rand(1337),
           topics_count: rand(42),
           updated_at:   Time.zone.now,
@@ -102,5 +106,12 @@ MARKDOWN
         )
       )
     end
+
+    def mock_post_cache_key!(post)
+      orig_key = post.cache_key
+      post.define_singleton_method :cache_key do
+        orig_key.sub(/new$/, "preview-#{Digest.hexencode(Digest::SHA2.new.digest(content))}")
+      end
+    end
   end
 end

data/app/mailers/thredded/base_mailer.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 module Thredded
-  class BaseMailer < ActionMailer::Base
+  class BaseMailer < Thredded.parent_mailer.constantize
     helper ::Thredded::UrlsHelper
 
     protected

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

@@ -12,8 +12,6 @@ module Thredded
 
       delegate :email, to: :user, prefix: true, allow_nil: true
 
-      has_many :post_notifications, as: :post, dependent: :destroy
-
       validates :content, presence: true
 
       scope :order_oldest_first, -> { order(created_at: :asc, id: :asc) }
@@ -32,8 +30,8 @@ module Thredded
 
     # @param view_context [Object] the context of the rendering view.
     # @return [String] formatted and sanitized html-safe post content.
-    def filtered_content(view_context, users_provider: ->(names) { readers_from_user_names(names) })
-      Thredded::ContentFormatter.new(view_context, users_provider: users_provider).format_content(content)
+    def filtered_content(view_context, users_provider: ->(names) { readers_from_user_names(names) }, **options)
+      Thredded::ContentFormatter.new(view_context, users_provider: users_provider, **options).format_content(content)
     end
 
     def first_post_in_topic?

data/app/models/thredded/category.rb

@@ -9,5 +9,9 @@ module Thredded
 
     validates :name, presence: true
     validates :messageboard_id, presence: true
+
+    def normalize_friendly_id(input)
+      Thredded.slugifier.call(input.to_s)
+    end
   end
 end

data/app/models/thredded/messageboard.rb

@@ -96,17 +96,23 @@ module Thredded
       last_topic.try(:last_user)
     end
 
+    def update_last_topic!
+      return if destroyed?
+      self.last_topic = topics.order_recently_posted_first.moderation_state_visible_to_all.first
+      save! if last_topic_id_changed?
+    end
+
+    def normalize_friendly_id(input)
+      Thredded.slugifier.call(input.to_s)
+    end
+
+    private
+
     def slug_candidates
       [
         :name,
         [:name, '-board']
       ]
     end
-
-    def update_last_topic!
-      return if destroyed?
-      self.last_topic = topics.order_recently_posted_first.moderation_state_visible_to_all.first
-      save! if last_topic_id_changed?
-    end
   end
 end

data/app/models/thredded/private_topic.rb

@@ -66,6 +66,10 @@ module Thredded
       title_changed?
     end
 
+    def normalize_friendly_id(input)
+      Thredded.slugifier.call(input.to_s)
+    end
+
     private
 
     def slug_candidates

data/app/models/thredded/topic.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 module Thredded
-  class Topic < ActiveRecord::Base
+  class Topic < ActiveRecord::Base # rubocop:disable Metrics/ClassLength
     include Thredded::TopicCommon
     include Thredded::ContentModerationState
 
@@ -121,10 +121,6 @@ module Thredded
       true
     end
 
-    def should_generate_new_friendly_id?
-      title_changed?
-    end
-
     # @return [Thredded::PostModerationRecord, nil]
     def last_moderation_record
       first_post.try(:last_moderation_record)
@@ -144,6 +140,14 @@ module Thredded
       end
     end
 
+    def should_generate_new_friendly_id?
+      title_changed?
+    end
+
+    def normalize_friendly_id(input)
+      Thredded.slugifier.call(input.to_s)
+    end
+
     private
 
     def slug_candidates