thredded 0.6.3 → 0.7.0

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

@@ -1,4 +1,4 @@
-&--topic-header {
+.thredded--topic-header {
   margin-bottom: $thredded-large-spacing;
   margin-top: $thredded-base-spacing;
   @include thredded-media-mobile {
@@ -7,14 +7,14 @@
   }
 }
 
-&--topic-header--title {
+.thredded--topic-header--title {
   @extend %thredded--heading;
   font-size: 1.5rem; // 24px
   line-height: 1.2;
   margin-bottom: $thredded-small-spacing / 2;
 }
 
-&--topic-header--started-by {
+.thredded--topic-header--started-by {
   font-size: $thredded-font-size-small;
   color: $thredded-secondary-text-color;
   font-style: normal;
@@ -23,20 +23,16 @@
   }
 }
 
-&--topic-header--edit-topic {
+.thredded--topic-header--edit-topic {
   @extend %thredded--link;
   font-size: $thredded-font-size-small;
   margin-left: 0.4rem;
 }
-&--topic-follow-info {
+
+.thredded--topic-header--follow-info {
   float: right;
   color: $thredded-secondary-text-color;
-  &.thredded--following {
-    font-size: 0.65rem;
-  }
-  &.thredded--notfollowing {
-    font-size: $thredded-font-size-small;
-  }
+  font-size: $thredded-font-size-small;
   font-style: normal;
   max-width: 60%;
   text-align: right;
@@ -55,3 +51,21 @@
     }
   }
 }
+
+.thredded--topic-following {
+  .thredded--topic-header--follow-info {
+    position: relative;
+  }
+  .thredded--topic-header--follow-icon {
+    @extend %thredded--following-icon;
+  }
+}
+
+.thredded--topic-followers {
+  font-size: $thredded-font-size-small;
+  color: $thredded-secondary-text-color;
+}
+
+.thredded--svg-definitions {
+  display: none;
+}

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

@@ -1,4 +1,4 @@
-&--topics--topic {
+.thredded--topics--topic {
   margin-bottom: $thredded-base-spacing;
   position: relative;
 
@@ -7,7 +7,7 @@
   }
 }
 
-&--topics--title {
+.thredded--topics--title {
   @extend %thredded--heading;
   display: inline;
   font-size: 1.125rem; // 18px
@@ -24,7 +24,7 @@
   }
 }
 
-&--topics--categories {
+.thredded--topics--categories {
   list-style-type: none;
   margin: 0;
   padding: 0;
@@ -45,8 +45,8 @@
   }
 }
 
-&--topics--started-by,
-&--topics--updated-by {
+.thredded--topics--started-by,
+.thredded--topics--updated-by {
   color: $thredded-secondary-text-color;
   font-size: $thredded-font-size-small;
   font-style: normal;
@@ -68,7 +68,7 @@
   }
 }
 
-&--topics--updated-by {
+.thredded--topics--updated-by {
   margin-right: $thredded-small-spacing;
 
   abbr {
@@ -78,7 +78,7 @@
   }
 }
 
-&--topics--started-by {
+.thredded--topics--started-by {
   display: none;
 
   abbr {
@@ -88,13 +88,13 @@
   }
 }
 
-&--topics--moderation-state {
+.thredded--topics--moderation-state {
   padding: 0.3em 0.5em;
   font-size: $thredded-font-size-small;
   font-style: normal;
 }
 
-&--topics--posts-count {
+.thredded--topics--posts-count {
   border-radius: 50%;
   display: inline-block;
   font-weight: 900;
@@ -110,12 +110,34 @@
   transition: background 0.1s linear, color 0.1s linear;
 }
 
-&--topic-unread > &--topics--posts-count {
-  background: $thredded-badge-active-background;
-  color: $thredded-badge-active-color;
+.thredded--topic-read {
+  > .thredded--topics--title a {
+    font-weight: lighter;
+  }
+  > .thredded--topics--posts-count {
+    background: $thredded-badge-inactive-background;
+    color: $thredded-badge-inactive-color;
+  }
+}
+
+.thredded--topic-unread {
+  > .thredded--topics--title a {
+    font-weight: bold;
+  }
+  > .thredded--topics--posts-count {
+    background: $thredded-badge-active-background;
+    color: $thredded-badge-active-color;
+  }
 }
 
-&--topic-read > &--topics--posts-count {
-  background: $thredded-badge-inactive-background;
-  color: $thredded-badge-inactive-color;
+.thredded--topic-following {
+  .thredded--topics--follow-icon {
+    @extend %thredded--following-icon;
+  }
+}
+
+.thredded--topic-notfollowing {
+  .thredded--topics--follow-icon {
+    @extend %thredded--not-following-icon;
+  }
 }

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

@@ -1,4 +1,4 @@
-&--main-container {
+.thredded--main-container {
   @include thredded--clearfix;
   -webkit-font-smoothing: antialiased;
   color: $thredded-text-color;

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

@@ -1,4 +1,4 @@
-&--main-navigation {
+.thredded--main-navigation {
   @extend %thredded--list-unstyled;
   @include thredded--clearfix;
   display: block;
@@ -7,7 +7,7 @@
   }
 }
 
-&--navigation-breadcrumbs {
+.thredded--navigation-breadcrumbs {
   @extend %thredded--list-unstyled;
 
   li {

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

@@ -1,4 +1,4 @@
-&--moderation-navigation {
+.thredded--moderation-navigation {
   position: relative;
   &--items {
     @extend %thredded--nav-tabs;
@@ -8,31 +8,32 @@
   }
 }
 
-.thredded--pending-moderation &--moderation-navigation--pending,
-.thredded--moderation-history &--moderation-navigation--history,
-.thredded--moderation-users &--moderation-navigation--users,
-.thredded--moderation-user &--moderation-navigation--users,
-.thredded--moderation-activity &--moderation-navigation--activity {
+.thredded--pending-moderation .thredded--moderation-navigation--pending,
+.thredded--moderation-history .thredded--moderation-navigation--history,
+.thredded--moderation-users .thredded--moderation-navigation--users,
+.thredded--moderation-user .thredded--moderation-navigation--users,
+.thredded--moderation-activity .thredded--moderation-navigation--activity {
   @extend %thredded--nav-tabs--item-current;
 }
 
-&--post-moderation-actions {
+.thredded--post-moderation-actions {
   @extend %thredded--buttons-list;
 }
 
-&--moderated-notice {
+.thredded--moderated-notice {
   margin-bottom: $thredded-base-spacing;
   padding: $thredded-small-spacing $thredded-base-spacing;
   background: $thredded-light-gray;
 }
 
-&--post-moderation, &--post-moderation-record {
+.thredded--post-moderation,
+.thredded--post-moderation-record {
   .thredded--post--user a {
     color: $thredded-action-color;
   }
 }
 
-&--post-moderation-record {
+.thredded--post-moderation-record {
   .thredded--post {
     margin-bottom: 0;
     margin-left: 1rem;
@@ -60,26 +61,26 @@
   }
 }
 
-&--post-moderation-record + &--post-moderation-record {
+.thredded--post-moderation-record + .thredded--post-moderation-record {
   margin-top: $thredded-large-spacing;
 }
 
-&--moderation--users-table {
+.thredded--moderation--users-table {
   width: 100%;
   a {
     display: block;
   }
 }
 
-&--moderation--user--title {
+.thredded--moderation--user--title {
   margin: 0;
 }
 
-&--moderation--user--info {
+.thredded--moderation--user--info {
   margin-left: 2rem;
 }
 
-&--user--moderation-actions {
+.thredded--user--moderation-actions {
   text-align: left;
   margin-left: 4rem;
   .button_to {

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

@@ -1,4 +1,4 @@
-&--navigation {
+.thredded--navigation {
   margin-bottom: $thredded-small-spacing;
   position: relative;
   .thredded--icon {
@@ -8,23 +8,23 @@
 
 @include thredded-media-tablet-and-down {
   $icon-nav-item-width: 2.625rem;
-  &--navigation {
+  .thredded--navigation {
     display: table;
     position: relative;
     width: 100%;
   }
-  &--main-navigation {
+  .thredded--main-navigation {
     position: relative;
     border: none;
   }
-  &--navigation-breadcrumbs {
+  .thredded--navigation-breadcrumbs {
     font-size: $thredded-font-size-small;
     padding-right: $icon-nav-item-width * 2;
     .thredded--is-moderator & {
       padding-right: $icon-nav-item-width * 3;
     }
   }
-  &--navigation--search-topics {
+  .thredded--navigation--search-topics {
     display: none;
     .thredded--messageboards-index &,
     .thredded--topics-index &,
@@ -32,7 +32,7 @@
       display: block;
     }
   }
-  &--user-navigation {
+  .thredded--user-navigation {
     display: table-footer-group;
     &-standalone {
       display: block;

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

@@ -1,4 +1,4 @@
-&--navigation--search {
+.thredded--navigation--search {
   margin-right: 0;
   padding: 0;
   position: absolute;

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

@@ -1,24 +1,24 @@
-&--user-navigation {
+.thredded--user-navigation {
   @extend %thredded--nav-tabs;
 }
 
-&--user-navigation--item {
+.thredded--user-navigation--item {
   @extend %thredded--nav-tabs--item;
 }
 
-.thredded--preferences &--user-navigation--settings,
-.thredded--new-private-topic &--user-navigation--private-topics,
-.thredded--private-topics-index &--user-navigation--private-topics,
-.thredded--private-topic-show &--user-navigation--private-topics,
-.thredded--pending-moderation &--user-navigation--moderation,
-.thredded--moderation-history &--user-navigation--moderation,
-.thredded--moderation-users &--user-navigation--moderation,
-.thredded--moderation-user &--user-navigation--moderation,
-.thredded--moderation-activity &--user-navigation--moderation {
+.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;
 }
 
-&--user-navigation--private-topics--unread,
-&--user-navigation--moderation--pending-count {
+.thredded--user-navigation--private-topics--unread,
+.thredded--user-navigation--moderation--pending-count {
   @extend %thredded--nav-tabs--item--badge;
 }

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

@@ -1,4 +1,4 @@
-&--user--avatar {
+.thredded--user--avatar {
   border-radius: 50%;
   display: inline-block;
   height: 1.75em;

data/app/assets/stylesheets/thredded/utilities/_is-compact.scss

@@ -1,4 +1,4 @@
-&--is-compact {
+.thredded--is-compact {
 
   input[type="submit"],
   label {

data/app/assets/stylesheets/thredded/utilities/_is-expanded.scss

@@ -1,4 +1,4 @@
-&--is-expanded {
+.thredded--is-expanded {
   label {
     height: auto;
     margin-bottom: $thredded-small-spacing / 2;

data/app/commands/thredded/notify_following_users.rb

@@ -12,7 +12,7 @@ module Thredded
     end
 
     def targeted_users
-      @targeted_users ||= @post.postable.following_users.reject { |u| u == @post.user }
+      @targeted_users ||= @post.postable.followers.reject { |u| u == @post.user }
     end
   end
 end

data/app/controllers/thredded/messageboard_groups_controller.rb

@@ -12,8 +12,10 @@ module Thredded
       authorize @messageboard_group, :create?
 
       if @messageboard_group.save
-        redirect_to root_path, notice: I18n.t('thredded.messageboard_group.created_notice')
+        redirect_to root_path, notice: I18n.t('thredded.messageboard_group.saved', name: @messageboard_group.name)
       else
+        flash.now[:notice] = @messageboard_group.errors.full_messages.to_sentence
+
         render action: :new
       end
     end

data/app/controllers/thredded/messageboards_controller.rb

@@ -7,9 +7,7 @@ module Thredded
     after_action :verify_policy_scoped, except: %i(new create edit update)
 
     def index
-      @groups = policy_scope(Messageboard.all)
-        .preload(:group, last_topic: [:last_user]).group_by(&:group)
-        .map { |(group, messageboards)| MessageboardGroupView.new(group, messageboards) }
+      @groups = MessageboardGroupView.grouped(policy_scope(Messageboard.all))
     end
 
     def new

data/app/controllers/thredded/private_topics_controller.rb

@@ -11,7 +11,7 @@ module Thredded
         PrivateTopic
           .distinct
           .for_user(thredded_current_user)
-          .order_recently_updated_first
+          .order_recently_posted_first
           .includes(:last_user, :user)
           .page(params[:page])
       )

data/app/controllers/thredded/topics_controller.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 require_dependency 'thredded/posts_page_view'
 require_dependency 'thredded/topics_page_view'
+# rubocop:disable Metrics/ClassLength
 module Thredded
   class TopicsController < Thredded::ApplicationController
     before_action :thredded_require_login!,
@@ -16,7 +17,7 @@ module Thredded
       @topics = Thredded::TopicsPageView.new(
         thredded_current_user,
         policy_scope(messageboard.topics)
-          .order_sticky_first.order_recently_updated_first
+          .order_sticky_first.order_recently_posted_first
           .includes(:categories, :last_user, :user)
           .page(current_page)
       )
@@ -52,7 +53,7 @@ module Thredded
         thredded_current_user,
         topics_scope
           .search_query(@query)
-          .order_recently_updated_first
+          .order_recently_posted_first
           .includes(:categories, :last_user, :user)
           .page(current_page)
       )
@@ -70,7 +71,7 @@ module Thredded
         thredded_current_user,
         policy_scope(@category.topics)
           .unstuck
-          .order_recently_updated_first
+          .order_recently_posted_first
           .page(current_page)
       )
       render :index
@@ -110,20 +111,25 @@ module Thredded
     def follow
       authorize topic, :read?
       UserTopicFollow.create_unless_exists(thredded_current_user.id, topic.id)
-      redirect_to messageboard_topic_url(messageboard, topic),
-                  notice: t('thredded.topics.followed_notice')
+      follow_change_response(following: true)
     end
 
     def unfollow
       authorize topic, :read?
-      follow = thredded_current_user.following?(topic)
-      follow.destroy if follow
-      redirect_to messageboard_topic_url(messageboard, topic),
-                  notice: t('thredded.topics.unfollowed_notice')
+      UserTopicFollow.find_by(topic_id: topic.id, user_id: thredded_current_user.id).try(:destroy)
+      follow_change_response(following: false)
     end
 
     private
 
+    def follow_change_response(following:)
+      notice = following ? t('thredded.topics.followed_notice') : t('thredded.topics.unfollowed_notice')
+      respond_to do |format|
+        format.html { redirect_to messageboard_topic_url(messageboard, topic), notice: notice }
+        format.json { render(json: { follow: following }) }
+      end
+    end
+
     def topic
       @topic ||= messageboard.topics.find_by_slug!(params[:id])
     end
@@ -150,3 +156,4 @@ module Thredded
     end
   end
 end
+# rubocop:enable Metrics/ClassLength