thredded 0.5.1 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fc3545dd645f403b5ae3ca2bed2d5a6ab6b3f627
-  data.tar.gz: ca8d375aa187a223f7a250415c36e4749328074c
+  metadata.gz: b89649352c4f5481a4e2ad05a885e21a2bb9a5d0
+  data.tar.gz: 4b7bf4007f49a57fbf4a00b176750cb700a8a801
 SHA512:
-  metadata.gz: 9cf1df595f1f50cea1c495adc89ad1049024a702af881632799a9a0ea8305087a4ce1c51a55c9419465b33fb7f1af4313d979da93da5fab27ee9fcb477ba4e1c
-  data.tar.gz: e52bed5a33b9852a5bebcff13484ffe9ff97c7cbe93f4b0e5f470152beafc99f15c4eb6a4acf483cc5e0375b1aa3216e0a48ed5d7bc547572bb8d8eea5a12029
+  metadata.gz: d2e4a2b77cd7495e279b80e910c20a28f236e1103974410ec3572cb0b99c482ec662f3eb5951f4f7cda7b4e88f5a8f6cdf4c430c363bcd63cc78384a58a5fae1
+  data.tar.gz: d36788984d19723bb7607042e2675d3da6a9103b76d2e550a8797e557e53ac4493fc2f6aee8d6496920e0dc24cbbffcd3b6bd9e96357ec3d07eb0dfb0fdc9fb7

data/CHANGELOG.mkdn

@@ -1,3 +1,24 @@
+# 0.6.0 - 2016-06-12
+
+**NB:** If updating to this version from 0.5.x, you will need to copy and run [this migration](https://github.com/thredded/thredded/blob/66f64068b9501ff4e8686c95894b6795aae6082f/db/upgrade_migrations/20160611094616_upgrade_v0_5_to_v0_6.rb).
+
+## Added
+
+* Adds a Users tab to moderation, where individual users can be moderated.
+* Improves the display of posts in the moderation, showing the topic and
+  whether the post started the topic.
+* Thredded now provides a way to render a user's recent posts in the main_app.
+
+## Changed
+
+* Moderators are now shown all content, including blocked content. A notice is shown on blocked content.
+
+## Fixed
+
+* Fixed a bug that prevented user deletion in main_app if they had posted on the forums.
+
+See the full list of changes here: https://github.com/thredded/thredded/compare/v0.5.1...v0.6.0.
+
 # 0.5.1
 
 This is a minor bugfix release.

data/README.mkdn

@@ -44,7 +44,7 @@ application and not an engine like Thredded.
 Add the gem to your Gemfile:
 
 ```ruby
-gem 'thredded', '~> 0.5.1'
+gem 'thredded', '~> 0.6.0'
 ```
 
 Add the Thredded [initializer] to your parent app by running the install generator.
@@ -148,6 +148,22 @@ Include thredded JavaScripts in your `application.js`:
 Thredded views also provide two `content_tag`s available to yield - `:thredded_page_title` and `:thredded_page_id`.
 The views within Thredded pass those up through to your layout if you would like to use them.
 
+### User profile page
+
+Thredded does not provide a user's profile page, but it provides a helper for rendering the user's recent posts
+in your app's user profile page.
+
+To use it:
+1. Include `Thredded::ApplicationHelper` in the app's helpers module.
+2. Render the partial like this:
+
+```erb
+<%= render 'thredded/users/_posts',
+           posts: Thredded.posts_page_view(
+               scope: user.thredded_posts.order_newest_first.limit(5),
+               current_user: current_user) %>
+```
+
 ### Customizing views
 
 You can also override any views and assets by placing them in the same path in your application as they are in the gem.

data/app/assets/stylesheets/thredded/_thredded.scss

@@ -10,6 +10,7 @@
   @import "layout/user-navigation";
   @import "layout/navigation";
   @import "layout/moderation";
+  @import "layout/user";
 
   @import "components/base";
   @import "components/alerts";

data/app/assets/stylesheets/thredded/base/_grid.scss

@@ -22,6 +22,12 @@
   }
 }
 
+@mixin thredded-media-avatar-breakout {
+  @media (min-width: $thredded-grid-container-max-width + 4rem) {
+    @content;
+  }
+}
+
 @mixin thredded--clearfix {
   &::after {
     clear: both;

data/app/assets/stylesheets/thredded/base/_nav.scss

@@ -19,3 +19,54 @@
 %thredded--nav-link-current {
   color: $thredded-nav-current-color;
 }
+
+
+%thredded--nav-tabs {
+  @extend %thredded--list-unstyled;
+  @include thredded--clearfix;
+  border-bottom: $thredded-base-border;
+  font-size: $thredded-font-size-small;
+  margin-left: 0;
+  margin-bottom: 1rem;
+  text-align: left;
+  list-style-type: none;
+
+  @include thredded-media-tablet-and-up {
+    margin-bottom: 0;
+  }
+}
+
+%thredded--nav-tabs--item {
+  display: inline-block;
+  margin-right: 1rem;
+
+  a {
+    @extend %thredded--nav-link;
+    display: inline-block;
+    color: $thredded-secondary-nav-color;
+    padding: $thredded-small-spacing 0;
+  }
+
+  &:last-child {
+    margin-right: 0;
+  }
+}
+
+%thredded--nav-tabs--item-current {
+  border-bottom: 1px solid $thredded-action-color;
+  margin-bottom: -1px;
+
+  a {
+    @extend %thredded--nav-link-current;
+  }
+}
+
+%thredded--nav-tabs--item--badge {
+  background: $thredded-badge-active-background;
+  border-radius: 10px;
+  color: $thredded-badge-active-color;
+  font-size: 0.75rem; // 12px
+  line-height: 1;
+  margin-left: 0.4rem;
+  padding: 2px 6px;
+}

data/app/assets/stylesheets/thredded/base/_variables.scss

@@ -14,6 +14,7 @@ $thredded-heading-line-height: 1.2 !default;
 $thredded-large-spacing: $thredded-base-line-height * 2rem !default;
 $thredded-base-spacing: $thredded-base-line-height * 1rem !default;
 $thredded-small-spacing: $thredded-base-spacing / 2 !default;
+$thredded-inline-spacing: 0.4375em !default;
 
 // Named colors
 $thredded-brand: #4a90e2 !default;

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

@@ -15,3 +15,7 @@
 &--blockquote {
   @extend %thredded--blockquote;
 }
+
+&--table {
+  @extend %thredded--table;
+}

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

@@ -10,13 +10,13 @@
   border-radius: 50%;
   display: inline-block;
   height: 1.75rem; // 28px
-  margin-right: $thredded-small-spacing;
+  margin-right: $thredded-inline-spacing;
   position: relative;
   top: 6px;
   vertical-align: baseline;
   width: 1.75rem; // 28px
 
-  @media (min-width: $thredded-grid-container-max-width + 4rem) {
+  @include thredded-media-avatar-breakout {
     height: 2.25rem; // 36px
     left: -3rem;
     position: absolute;
@@ -25,16 +25,29 @@
   }
 }
 
-&--post--user {
+&--post--topic {
   @extend %thredded--heading;
-  display: inline-block;
+  font-size: $thredded-base-font-size * 1.25; // 24px
+  line-height: 1.2;
+  margin-bottom: $thredded-small-spacing / 2;
+}
+
+&--post--user,
+&--post--topic,
+&--post--user-and-topic {
+  @extend %thredded--heading;
+  display: inline;
   font-size: 1.125rem; // 18px
   line-height: 1.2;
-  margin-right: $thredded-small-spacing;
-  margin-bottom: 1.25rem; // 20px
+  margin-right: $thredded-inline-spacing;
 
   a {
     @extend %thredded--link;
+  }
+}
+
+&--post--user {
+  a {
     color: $thredded-text-color;
   }
 }

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

@@ -88,6 +88,12 @@
   }
 }
 
+&--topics--moderation-state {
+  padding: 0.3em 0.5em;
+  font-size: $thredded-font-size-small;
+  font-style: normal;
+}
+
 &--topics--posts-count {
   border-radius: 50%;
   display: inline-block;

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

@@ -1,12 +1,22 @@
-&--post-moderation-actions {
-  @extend %thredded--buttons-list;
+&--moderation-navigation {
+  position: relative;
+  &--items {
+    @extend %thredded--nav-tabs;
+  }
+  &--item {
+    @extend %thredded--nav-tabs--item;
+  }
 }
 
-&--moderation--history-link {
-  float: right;
-  margin: 0.4rem 0.6rem $thredded-small-spacing 0;
-  position: relative;
-  z-index: 1;
+.thredded--pending-moderation &--moderation-navigation--pending,
+.thredded--moderation-history &--moderation-navigation--history,
+.thredded--moderation-users &--moderation-navigation--users,
+.thredded--moderation-user &--moderation-navigation--users{
+  @extend %thredded--nav-tabs--item-current;
+}
+
+&--post-moderation-actions {
+  @extend %thredded--buttons-list;
 }
 
 &--moderated-notice {
@@ -15,10 +25,19 @@
   background: $thredded-light-gray;
 }
 
+&--post-moderation, &--post-moderation-record {
+  .thredded--post--user a {
+    color: $thredded-action-color;
+  }
+}
+
 &--post-moderation-record {
   .thredded--post {
     margin-bottom: 0;
-    margin-left: 4rem;
+    margin-left: 1rem;
+    @include thredded-media-avatar-breakout {
+      margin-left: 4rem;
+    }
   }
   &--moderation-state-notice {
     margin-bottom: 1rem;
@@ -43,3 +62,29 @@
 &--post-moderation-record + &--post-moderation-record {
   margin-top: $thredded-large-spacing;
 }
+
+&--moderation--users-table {
+  width: 100%;
+  a {
+    display: block;
+  }
+}
+
+&--moderation--user--title {
+  margin: 0;
+}
+
+&--moderation--user--info {
+  margin-left: 2rem;
+}
+
+&--user--moderation-actions {
+  text-align: left;
+  margin-left: 4rem;
+  .button_to {
+    display: inline-block;
+  }
+  .button_to + .button_to {
+    margin-left: $thredded-small-spacing;
+  }
+}

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

@@ -24,7 +24,7 @@
       padding-right: $icon-nav-item-width * 3;
     }
   }
-  &--navigation--search {
+  &--navigation--search-topics {
     display: none;
     .thredded--messageboards-index &,
     .thredded--topics-index &,

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

@@ -1,40 +1,9 @@
 &--user-navigation {
-  @extend %thredded--list-unstyled;
-  @include thredded--clearfix;
-  border-bottom: $thredded-base-border;
-  margin-bottom: 1rem;
-  text-align: left;
-
-  @include thredded-media-tablet-and-up {
-    font-size: $thredded-font-size-small;
-    margin-bottom: 0;
-  }
-
-  a {
-    @extend %thredded--nav-link;
-    color: $thredded-secondary-nav-color;
-  }
-
-  > ul {
-    @extend %thredded--list-unstyled;
-  }
+  @extend %thredded--nav-tabs;
 }
 
 &--user-navigation--item {
-  display: inline-block;
-  margin-right: 1rem;
-
-  a {
-    padding: $thredded-small-spacing 0;
-  }
-
-  &:last-child {
-    margin-right: 0;
-  }
-
-  @include thredded-media-tablet-and-up {
-    padding: $thredded-small-spacing 0;
-  }
+  @extend %thredded--nav-tabs--item;
 }
 
 .thredded--preferences &--user-navigation--settings,
@@ -42,22 +11,13 @@
 .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 {
-  border-bottom: 1px solid $thredded-action-color;
-  margin-bottom: -1px;
-
-  a {
-    @extend %thredded--nav-link-current;
-  }
+.thredded--moderation-history &--user-navigation--moderation,
+.thredded--moderation-users &--user-navigation--moderation,
+.thredded--moderation-user &--user-navigation--moderation {
+  @extend %thredded--nav-tabs--item-current;
 }
 
 &--user-navigation--private-topics--unread,
 &--user-navigation--moderation--pending-count {
-  background: $thredded-badge-active-background;
-  border-radius: 10px;
-  color: $thredded-badge-active-color;
-  font-size: 0.75rem; // 12px
-  line-height: 1;
-  margin-left: 0.4rem;
-  padding: 2px 6px;
+  @extend %thredded--nav-tabs--item--badge;
 }

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

@@ -0,0 +1,10 @@
+&--user--avatar {
+  border-radius: 50%;
+  display: inline-block;
+  height: 1.75em;
+  width: 1.75em;
+  margin-right: $thredded-inline-spacing;
+  vertical-align: baseline;
+  position: relative;
+  top: 0.5em;
+}

data/app/commands/thredded/moderate_post.rb

@@ -15,7 +15,7 @@ module Thredded
           previous_moderation_state: post.moderation_state,
           moderation_state: moderation_state,
         )
-        if post.user_detail.pending_moderation?
+        if post.user_id && post.user_detail.pending_moderation?
           post.user_detail.update!(moderation_state: moderation_state)
         end
         if post.postable.first_post == post

data/app/controllers/thredded/messageboards_controller.rb

@@ -8,7 +8,7 @@ module Thredded
 
     def index
       @groups = policy_scope(Messageboard.all)
-        .preload(:group).group_by(&:group)
+        .preload(:group, last_topic: [:last_user]).group_by(&:group)
         .map { |(group, messageboards)| MessageboardGroupView.new(group, messageboards) }
     end
 

data/app/controllers/thredded/moderation_controller.rb

@@ -12,17 +12,18 @@ module Thredded
         moderatable_posts
           .pending_moderation
           .order_oldest_first
-          .page(params[:page] || 1)
+          .preload(:user, :postable)
+          .page(current_page)
       )
       if flash[:last_moderated_record_id]
-        @last_moderated_record = accessible_moderation_records.find(flash[:last_moderated_record_id].to_i)
+        @last_moderated_record = accessible_post_moderation_records.find(flash[:last_moderated_record_id].to_i)
       end
     end
 
     def history
-      @post_moderation_records = accessible_moderation_records
+      @post_moderation_records = accessible_post_moderation_records
         .order(created_at: :desc)
-        .page(params[:page] || 1)
+        .page(current_page)
     end
 
     def moderate_post
@@ -35,13 +36,42 @@ module Thredded
       redirect_back fallback_location: pending_moderation_path
     end
 
+    def users
+      @users = Thredded.user_class
+        .left_join_thredded_user_details
+        .merge(Thredded::UserDetail.order(moderation_state_changed_at: :desc))
+      @query = params[:q].to_s
+      if @query.present?
+        @users = DbTextSearch::CaseInsensitive.new(@users, Thredded.user_name_column).prefix(@query)
+      end
+      @users = @users.page(current_page)
+    end
+
+    def user
+      @user = Thredded.user_class.find(params[:id])
+      # Do not apply policy_scope here, as we want to show blocked posts as well.
+      posts_scope = @user.thredded_posts
+        .where(messageboard_id: policy_scope(Messageboard.all).pluck(:id))
+        .order_newest_first
+        .includes(:postable)
+        .page(current_page)
+      @posts = PostsPageView.new(current_user, posts_scope)
+    end
+
+    def moderate_user
+      return head(:bad_request) unless Thredded::UserDetail.moderation_states.include?(params[:moderation_state])
+      user = Thredded.user_class.find(params[:id])
+      user.thredded_user_detail.update!(moderation_state: params[:moderation_state])
+      redirect_back fallback_location: user_moderation_path(user.id)
+    end
+
     private
 
     def moderatable_posts
       Thredded::Post.where(messageboard_id: @moderatable_messageboards)
     end
 
-    def accessible_moderation_records
+    def accessible_post_moderation_records
       Thredded::PostModerationRecord
         .where(messageboard_id: @moderatable_messageboards)
     end
@@ -52,5 +82,9 @@ module Thredded
         fail Pundit::NotAuthorizedError, 'You are not authorized to perform this action.'
       end
     end
+
+    def current_page
+      (params[:page] || 1).to_i
+    end
   end
 end