thredded 0.14.4 → 0.15.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1b6ed8f98f2eb287346630ed8c6df83ce81edfd0f3ce918dcdb02841efd46590
-  data.tar.gz: 27a77b5767823d6c790cdc344efa10839241edd698714d1483620b5e317ed3ab
+  metadata.gz: a8f7ee3eae771c92edf97664c74ebbcb42e403521cc09b9c05e7379dc98956f1
+  data.tar.gz: 66ac525459c09f1efd65c947a8df0d41dde083166d857664f7163d0ed0b131b0
 SHA512:
-  metadata.gz: 24f2999aabccaa1a87faa5e4b2fefa611b86a8189e199d79e6e086df3d648244194c9c49c083dcd9f55dafff2eae8367bbedf87fc2d54a756170b441c0f1b65d
-  data.tar.gz: cf738f7f1f6354f97bb0fc54b0846b46a99d2047747e306049d03090761047b8cc17ff9a791c897cc5d0361b54ecdcdb45ffdecf0bd810b949d5298d4df861be
+  metadata.gz: 0516e987e201972234778107cff4be78997dd15580ec0b721f21654510049598216d946966dd6a87d11553a47f7d55f7cf78f41e9fc7d07d1e0ecafd57470370
+  data.tar.gz: 70d7f20e62b6187f1017ceced464e4e0cba2ca2988dd4adc9d1f8e5776f9c0b9b5d75d29ed3d12e7125361e203b549ea44fcfe3fb884a1c9ef25496c03223a5b

data/README.md

@@ -4,7 +4,7 @@ _Thredded_ is a Rails 4.2+ forum/messageboard engine. Its goal is to be as simpl
 
 Some of the features currently in Thredded:
 
-* Markdown (default) or BBCode post formatting.
+* Markdown (default) and / or BBCode post formatting, with [onebox] and `<spoiler>` / `[spoiler]` tag support.
 * (Un)read posts tracking.
 * Email notifications, topic subscriptions, @-mentions, per-messageboard notification settings.
 * Private group messaging.
@@ -28,6 +28,7 @@ If you're looking for variations on a theme - see [Discourse]. However, It is a
 application and not an engine like Thredded.
 
 [Discourse]: http://www.discourse.org/
+[onebox]: https://github.com/discourse/onebox
 
 Table of Contents
 =================
@@ -94,7 +95,7 @@ Then, see the rest of this Readme for more information about using and customizi
 Add the gem to your Gemfile:
 
 ```ruby
-gem 'thredded', '~> 0.14.4'
+gem 'thredded', '~> 0.15.1'
 ```
 
 Add the Thredded [initializer] to your parent app by running the install generator.

data/app/assets/javascripts/thredded/components/preview_area.es6

@@ -1,6 +1,8 @@
 //= require thredded/core/serialize_form
+//= require thredded/components/spoilers
 
 (() => {
+  const Thredded = window.Thredded;
   const PREVIEW_AREA_SELECTOR = '[data-thredded-preview-area]';
   const PREVIEW_AREA_POST_SELECTOR = '[data-thredded-preview-area-post]';
 
@@ -49,6 +51,7 @@
     onPreviewResponse(data) {
       this.preview.style.display = 'block';
       this.previewPost.innerHTML = data;
+      Thredded.spoilers.init(this.previewPost);
     }
   }
 

data/app/assets/javascripts/thredded/components/spoilers.es6

@@ -0,0 +1,37 @@
+//= require thredded/core/on_page_load
+
+(() => {
+  const Thredded = window.Thredded;
+  const COMPONENT_SELECTOR = '.thredded--post--content--spoiler';
+  const OPEN_CLASS = 'thredded--post--content--spoiler--is-open';
+
+  Thredded.spoilers = {
+    init(root) {
+      Array.prototype.forEach.call(root.querySelectorAll(COMPONENT_SELECTOR), (node) => {
+        node.addEventListener('mousedown', (evt) => {
+          evt.stopPropagation();
+          this.toggle(evt.currentTarget);
+        });
+        node.addEventListener('keypress', (evt) => {
+          if (event.key === ' ' || event.key === 'Enter') {
+            evt.preventDefault();
+            evt.stopPropagation();
+            this.toggle(evt.currentTarget);
+          }
+        });
+      });
+    },
+
+    toggle(node) {
+      const isOpen = node.classList.contains(OPEN_CLASS);
+      node.classList.toggle(OPEN_CLASS);
+      node.setAttribute('aria-expanded', isOpen ? 'false' : 'true');
+      node.firstElementChild.setAttribute('aria-hidden', isOpen ? 'false' : 'true');
+      node.lastElementChild.setAttribute('aria-hidden', isOpen ? 'true' : 'false');
+    }
+  };
+
+  Thredded.onPageLoad(() => {
+    Thredded.spoilers.init(document);
+  });
+})();

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

@@ -49,3 +49,28 @@
     }
   }
 }
+
+.thredded--post--content--spoiler {
+  background-color: $thredded-spoiler-background-color;
+  padding: 16px;
+
+  &--summary {
+    border-bottom: 1px solid $thredded-dark-gray;
+  }
+
+  &--contents {
+    color: transparent !important;
+
+    * {
+      color: transparent !important;
+    }
+
+    a {
+      text-decoration: underline;
+    }
+
+    > *:last-child {
+      margin-bottom: 0;
+    }
+  }
+}

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

@@ -24,6 +24,7 @@
 @import "components/messageboard";
 @import "components/pagination";
 @import "components/post";
+@import "components/spoiler";
 @import "components/post-form";
 @import "components/preferences";
 @import "components/topic-delete";

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

@@ -44,7 +44,7 @@
   border-left: solid 5px $thredded-blockquote-border-color;
   padding: 1rem;
 
-  p:last-of-type {
+  > *:last-child {
     margin-bottom: 0;
   }
 

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

@@ -22,7 +22,7 @@ $thredded-inline-spacing: 0.4375em !default;
 
 // Named colors
 $thredded-brand: #4a90e2 !default;
-$thredded-dark-gray: #333 !default;
+$thredded-dark-gray: rgba(#424242, 0.25) !default;
 $thredded-light-gray: #eee !default;
 
 // Colors of text, background, actions (links), and navigation
@@ -38,8 +38,7 @@ $thredded-nav-current-color: $thredded-action-color !default;
 $thredded-overlay-background-color: opacify($thredded-background-color, 1) !default;
 $thredded-overlay-box-shadow: 0 2px 2px 0 rgba(0, 0, 0, .14), 0 3px 1px -2px rgba(0, 0, 0, .2), 0 1px 5px 0 rgba(0, 0, 0, .12) !default;
 $thredded-secondary-nav-color: $thredded-secondary-text-color !default;
-$thredded-spoiler-hidden-color: $thredded-light-gray !default;
-$thredded-spoiler-shown-color: black !default;
+$thredded-spoiler-background-color: rgba(0, 0, 0, .06) !default;
 $thredded-code-selected-line-background: #f8eec7 !default;
 
 

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

@@ -124,15 +124,4 @@
   pre {
     overflow-x: auto;
   }
-
-  &--spoiler {
-    color: $thredded-spoiler-hidden-color;
-    background-color: $thredded-spoiler-hidden-color;
-    cursor: pointer;
-
-    &:hover,
-    &:focus {
-      color: $thredded-spoiler-shown-color;
-    }
-  }
 }

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

@@ -0,0 +1,41 @@
+.thredded--post--content--spoiler {
+  background-color: $thredded-spoiler-background-color;
+  cursor: pointer;
+  margin: 0 0 $thredded-small-spacing;
+  padding: $thredded-small-spacing;
+  position: relative;
+
+  &--contents {
+    visibility: hidden;
+
+    > *:last-child {
+      margin-bottom: 0;
+    }
+  }
+
+  &--summary {
+    @extend %thredded--link;
+    position: absolute;
+    visibility: visible;
+  }
+
+  .thredded--post--content--spoiler {
+    visibility: visible;
+  }
+
+  table {
+    td, th {
+      border-color: $thredded-dark-gray;
+    }
+  }
+
+  &.thredded--post--content--spoiler--is-open {
+    > .thredded--post--content--spoiler--contents {
+      visibility: visible;
+    }
+
+    > .thredded--post--content--spoiler--summary {
+      display: none;
+    }
+  }
+}

data/app/commands/thredded/mark_all_read.rb

@@ -8,14 +8,8 @@ module Thredded
 
       unread_topics.each do |topic|
         last_post = topic.posts.order_oldest_first.last
-        total_pages = topic.posts.page(1).total_pages
 
-        Thredded::UserPrivateTopicReadState.touch!(
-          user.id,
-          topic.id,
-          last_post,
-          total_pages
-        )
+        Thredded::UserPrivateTopicReadState.touch!(user.id, topic.id, last_post)
       end
     end
   end

data/app/controllers/concerns/thredded/new_post_params.rb

@@ -8,7 +8,7 @@ module Thredded
     def new_post_params
       params.fetch(:post, {})
         .permit(:content, :quote_post_id)
-        .merge(ip: request.remote_ip).tap do |p|
+        .tap do |p|
         quote_id = p.delete(:quote_post_id)
         if quote_id
           post = Thredded::Post.find(quote_id)

data/app/controllers/concerns/thredded/new_private_post_params.rb

@@ -8,7 +8,7 @@ module Thredded
     def new_private_post_params
       params.fetch(:post, {})
         .permit(:content, :quote_private_post_id)
-        .merge(ip: request.remote_ip).tap do |p|
+        .tap do |p|
         quote_id = p.delete(:quote_private_post_id)
         if quote_id
           post = Thredded::PrivatePost.find(quote_id)

data/app/controllers/concerns/thredded/new_private_topic_params.rb

@@ -7,11 +7,10 @@ module Thredded
 
     def new_private_topic_params
       params
-        .require(:private_topic)
+        .fetch(:private_topic, {})
         .permit(:title, :content, :user_names, user_ids: [])
         .merge(
           user: thredded_current_user,
-          ip: request.remote_ip
         ).tap { |p| adapt_user_ids! p }
     end
 

data/app/controllers/concerns/thredded/new_topic_params.rb

@@ -12,7 +12,6 @@ module Thredded
         .merge(
           messageboard: messageboard,
           user: thredded_current_user,
-          ip: request.remote_ip,
         )
     end
   end

data/app/controllers/thredded/application_controller.rb

@@ -67,6 +67,16 @@ module Thredded
       given.all? { |k, v| v == params[k] }
     end
 
+    # Returns true if the current page is beyond the end of the collection
+    def page_beyond_last?(page_scope)
+      page_scope.to_a.empty? && page_scope.current_page != 1
+    end
+
+    # Returns URL parameters for the last page of the given page scope.
+    def last_page_params(page_scope)
+      { page: page_scope.total_pages }
+    end
+
     private
 
     def thredded_layout

data/app/controllers/thredded/posts_controller.rb

@@ -55,8 +55,7 @@ module Thredded
 
     def mark_as_unread
       authorize post, :read?
-      page = post.page(user: thredded_current_user)
-      post.mark_as_unread(thredded_current_user, page)
+      post.mark_as_unread(thredded_current_user)
       after_mark_as_unread # customization hook
     end
 

data/app/controllers/thredded/private_posts_controller.rb

@@ -54,8 +54,7 @@ module Thredded
 
     def mark_as_unread
       authorize post, :read?
-      page = post.page
-      post.mark_as_unread(thredded_current_user, page)
+      post.mark_as_unread(thredded_current_user)
       after_mark_as_unread # customization hook
     end
 

data/app/controllers/thredded/private_topics_controller.rb

@@ -8,14 +8,13 @@ module Thredded
     before_action :thredded_require_login!
 
     def index
-      @private_topics = Thredded::PrivateTopicsPageView.new(
-        thredded_current_user,
-        Thredded::PrivateTopic
-          .distinct
-          .for_user(thredded_current_user)
-          .order_recently_posted_first
-          .page(params[:page])
-      )
+      page_scope = Thredded::PrivateTopic
+        .distinct
+        .for_user(thredded_current_user)
+        .order_recently_posted_first
+        .page(params[:page])
+      return redirect_to(last_page_params(page_scope)) if page_beyond_last?(page_scope)
+      @private_topics = Thredded::PrivateTopicsPageView.new(thredded_current_user, page_scope)
 
       Thredded::PrivateTopicForm.new(user: thredded_current_user).tap do |form|
         @new_private_topic = form if policy(form.private_topic).create?
@@ -31,12 +30,11 @@ module Thredded
         .includes(:user)
         .order_oldest_first
         .page(current_page)
+      return redirect_to(last_page_params(page_scope)) if page_beyond_last?(page_scope)
       @posts = Thredded::TopicPostsPageView.new(thredded_current_user, private_topic, page_scope)
 
       if thredded_signed_in?
-        Thredded::UserPrivateTopicReadState.touch!(
-          thredded_current_user.id, private_topic.id, page_scope.last, current_page
-        )
+        Thredded::UserPrivateTopicReadState.touch!(thredded_current_user.id, private_topic.id, page_scope.last)
       end
 
       @new_post = Thredded::PrivatePostForm.new(
@@ -45,7 +43,7 @@ module Thredded
     end
 
     def new
-      @private_topic = Thredded::PrivateTopicForm.new(user: thredded_current_user)
+      @private_topic = Thredded::PrivateTopicForm.new(new_private_topic_params)
       authorize_creating @private_topic.private_topic
     end
 

data/app/controllers/thredded/topics_controller.rb

@@ -23,12 +23,11 @@ module Thredded
         return redirect_to(canonical_messageboard_params)
       end
 
-      @topics = Thredded::TopicsPageView.new(
-        thredded_current_user,
-        policy_scope(messageboard.topics)
-          .order_sticky_first.order_recently_posted_first
-          .page(current_page)
-      )
+      page_scope = policy_scope(messageboard.topics)
+        .order_sticky_first.order_recently_posted_first
+        .page(current_page)
+      return redirect_to(last_page_params(page_scope)) if page_beyond_last?(page_scope)
+      @topics = Thredded::TopicsPageView.new(thredded_current_user, page_scope)
       Thredded::TopicForm.new(messageboard: messageboard, user: thredded_current_user).tap do |form|
         @new_topic = form if policy(form.topic).create?
       end
@@ -41,12 +40,11 @@ module Thredded
         .order_oldest_first
         .includes(:user, :messageboard, :postable)
         .page(current_page)
+      return redirect_to(last_page_params(page_scope)) if page_beyond_last?(page_scope)
       @posts = Thredded::TopicPostsPageView.new(thredded_current_user, topic, page_scope)
 
       if thredded_signed_in?
-        Thredded::UserTopicReadState.touch!(
-          thredded_current_user.id, topic.id, page_scope.last, current_page
-        )
+        Thredded::UserTopicReadState.touch!(thredded_current_user.id, topic.id, page_scope.last)
       end
 
       @new_post = Thredded::PostForm.new(user: thredded_current_user, topic: topic, post_params: new_post_params)
@@ -69,14 +67,13 @@ module Thredded
           Thredded::Topic.where(messageboard_id: policy_scope(Thredded::Messageboard.all).pluck(:id))
         end
       )
-      @topics = Thredded::TopicsPageView.new(
-        thredded_current_user,
-        topics_scope
-          .search_query(@query)
-          .order_recently_posted_first
-          .includes(:categories, :last_user, :user)
-          .page(current_page)
-      )
+      page_scope = topics_scope
+        .search_query(@query)
+        .order_recently_posted_first
+        .includes(:categories, :last_user, :user)
+        .page(current_page)
+      return redirect_to(last_page_params(page_scope)) if page_beyond_last?(page_scope)
+      @topics = Thredded::TopicsPageView.new(thredded_current_user, page_scope)
     end
 
     def new

data/app/forms/thredded/edit_topic_form.rb

@@ -4,7 +4,8 @@ module Thredded
   class EditTopicForm
     include ActiveModel::Model
 
-    delegate :id, :title, :category_ids, :locked, :sticky, :messageboard, :messageboard_id, :valid?,
+    delegate :id, :title, :title_was, :category_ids, :locked, :sticky, :messageboard, :messageboard_id, :valid?,
+             :errors,
              to: :@topic
 
     # @param user [Thredded.user_class]

data/app/forms/thredded/post_form.rb

@@ -11,7 +11,7 @@ module Thredded
 
     # @param user [Thredded.user_class]
     # @param topic [Topic]
-    # @param post [PrivatePost]
+    # @param post [Post]
     # @param post_params [Hash]
     def initialize(user:, topic:, post: nil, post_params: {})
       @messageboard = topic.messageboard
@@ -47,7 +47,9 @@ module Thredded
 
     def save
       return false unless @post.valid?
+      was_persisted = @post.persisted?
       @post.save!
+      Thredded::UserTopicReadState.touch!(@post.user.id, @topic.id, @post) unless was_persisted
       true
     end
   end