thredded 0.9.4 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3ff5d29c06fad4e64cf4fa4b1577d77785a29453
-  data.tar.gz: 2a6196cbbcff86edd7e418e9b0bdb6bd2bb7ce23
+  metadata.gz: 0e08209cc4846d358cb9cf977e394ab14e553571
+  data.tar.gz: dc0b3eb3302a5fd5b9a3d7d01abfcb25af8635a9
 SHA512:
-  metadata.gz: 944f979a29481faaf886de134b5d2e1ee7dee38d26597292d630c10406a9910e6b064a9b23ba1a26b31a65548a23a7a4cb3e3ed539e84830d8fdc150492e5e86
-  data.tar.gz: d87c3e1584e457bbd771114d548fdf143c90d8adb12f1c4393c7b41f1cb594b68bf6ed3cb05e48827ce3df04db7d5a9f9463f853e4896f51032576c9f989d702
+  metadata.gz: 7f14c1568bc33b5264b04c97e1ac8500d2215c6dd5f9e0002fd052baff8e722b7f691960db5ac47f85f45a828988762ba8f4eb09b2eb9a82ec8fa5c78a5c7f18
+  data.tar.gz: 1e41c3ff6c705a77a5a9856a5c2cb1216d0ccb291796562fd0ca2be87a5a45877e08c7972f39f6c2d2a56ff4c3ffa05f944119d3bf1a78b086a6e400af2d0383

data/README.md

@@ -56,7 +56,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.9.4'
+gem 'thredded', '~> 0.10.0'
 ```
 
 Add the Thredded [initializer] to your parent app by running the install generator.

data/app/assets/javascripts/thredded/core/mention_autocompletion.es6

@@ -41,7 +41,7 @@ class ThreddedMentionAutocompletion {
       },
       replace  ({name, match}) {
         let prefix = match[1];
-        if (/[. ]/.test(name)) {
+        if (/[., ()]/.test(name)) {
           return `${prefix}"${name}" `
         } else {
           return `${prefix}${name} `
@@ -51,4 +51,4 @@ class ThreddedMentionAutocompletion {
   }
 }
 
-ThreddedMentionAutocompletion.MATCH_RE = /(^@|\s@)"?([\w. ]+)$/;
+ThreddedMentionAutocompletion.MATCH_RE = /(^@|\s@)"?([\w.,\- ()]+)$/;

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

@@ -22,8 +22,8 @@ $thredded-dark-gray: #333 !default;
 $thredded-light-gray: #eee !default;
 
 // Colors of text, background, actions (links), and navigation
-$thredded-text-color: #575d6b !default;
-$thredded-secondary-text-color: lighten($thredded-text-color, 30%) !default;
+$thredded-text-color: rgba(black, 0.87) !default;
+$thredded-secondary-text-color: rgba(opacify($thredded-text-color, 1), 0.54) !default;
 $thredded-background-color: #fff !default;
 $thredded-action-color: $thredded-brand !default;
 $thredded-action-hover-color: darken($thredded-action-color, 15%) !default;
@@ -83,3 +83,9 @@ $thredded-badge-active-color: $thredded-button-color !default;
 $thredded-badge-active-background: $thredded-action-color !default;
 $thredded-badge-inactive-color: $thredded-button-color !default;
 $thredded-badge-inactive-background: rgba($thredded-text-color, 0.3) !default;
+
+// Layout features
+// Whether to display messageboards as a grid on the desktop screen sizes.
+$thredded-messageboards-grid: true !default;
+// Minimum width of a grid item
+$thredded-messageboards-grid-item-flex-basis: map-get($thredded-grid-breakpoint-max-widths, tablet) / 3 !default;

data/app/assets/stylesheets/thredded/components/_currently-online.scss

@@ -5,6 +5,7 @@
   position: fixed;
   right: 0;
   width: 16.25rem; // 260px
+  z-index: 10;
 
   @include thredded-media-mobile {
     display: none;

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

@@ -1,18 +1,25 @@
+.thredded--messageboards-group {
+  margin-bottom: $thredded-base-spacing;
+}
+
 .thredded--messageboard {
   @extend %thredded--link;
-  border: $thredded-base-border;
   display: block;
-  margin-bottom: $thredded-base-spacing;
+  margin-bottom: 1px;
   padding: $thredded-base-spacing;
   position: relative;
 
-  header {
-    margin-bottom: $thredded-small-spacing;
+  &, &:focus, &:hover, &:active {
+    outline: 1px solid $thredded-base-border-color;
   }
 
   &:hover {
     background-color: rgba($thredded-brand, 0.035);
   }
+
+  &:active {
+    box-shadow: $thredded-form-box-shadow;
+  }
 }
 
 .thredded--messageboard--title {
@@ -21,31 +28,42 @@
   float: left;
   font-size: 1.125rem; // 18px
   line-height: 1.2;
-  margin-bottom: 0;
   margin-right: $thredded-small-spacing;
   vertical-align: baseline;
 }
 
+.thredded--messageboard--title,
+.thredded--messageboard--meta,
+.thredded--messageboard--description {
+  margin-bottom: $thredded-small-spacing / 2;
+}
+
+.thredded--messageboard--description,
+.thredded--messageboard--meta,
+.thredded--messageboard--byline {
+  font-size: 0.875em;
+}
+
 .thredded--messageboard--meta {
   @extend %thredded--heading;
   color: $thredded-secondary-text-color;
   display: inline-block;
   font-weight: normal;
-  margin-bottom: 0;
   vertical-align: baseline;
 }
 
 .thredded--messageboard--description {
   @extend %thredded--paragraph;
   clear: both;
-  margin-bottom: $thredded-small-spacing / 2;
   color: $thredded-text-color;
+  &:empty {
+    margin: 0;
+  }
 }
 
 .thredded--messageboard--byline {
   @extend %thredded--paragraph;
   color: $thredded-secondary-text-color;
-  font-size: 0.875em;
   font-weight: normal;
   margin-bottom: 0;
 }
@@ -56,3 +74,62 @@
     display: none;
   }
 }
+
+@supports (flex-wrap: wrap) {
+  .thredded--messageboard {
+    display: flex;
+    flex-direction: column;
+    &--header {
+      display: flex;
+      flex-wrap: wrap;
+      justify-content: space-between;
+    }
+    &--meta {
+      text-align: right;
+    }
+    &--byline,
+    &--description {
+      margin-top: auto;
+    }
+  }
+
+  @if $thredded-messageboards-grid {
+    @include thredded-media-desktop-and-up {
+      $item-border-width: 1px;
+      $item-padding-x: ($thredded-base-spacing * 0.8);
+      $item-padding-y: $thredded-base-spacing;
+
+      %thredded--messageboards-cell-flex {
+        flex-basis: $thredded-messageboards-grid-item-flex-basis;
+        flex-grow: 1;
+      }
+
+      .thredded--messageboards-group {
+        display: flex;
+        flex-direction: row;
+        flex-wrap: wrap;
+        justify-content: space-between;
+        margin-left: $item-border-width;
+
+        // Size incomplete last rows with up to two missing items.
+        &::after, &::before {
+          @extend %thredded--messageboards-cell-flex;
+          content: "";
+          margin-right: $item-border-width;
+          padding: 0 $item-padding-x;
+        }
+
+        &::before {
+          order: 1
+        }
+      }
+
+      .thredded--messageboard {
+        @extend %thredded--messageboards-cell-flex;
+        margin-left: 1px;
+        padding: $item-padding-y $item-padding-x;
+      }
+
+    }
+  }
+}

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

@@ -95,6 +95,9 @@
   blockquote {
     @extend %thredded--blockquote;
   }
+  pre {
+    overflow-x: auto;
+  }
 
   &--spoiler {
     color: $thredded-spoiler-hidden-color;

data/app/commands/thredded/notify_following_users.rb

@@ -1,4 +1,6 @@
 # frozen_string_literal: true
+require 'set'
+
 module Thredded
   class NotifyFollowingUsers
     def initialize(post)
@@ -8,12 +10,26 @@ module Thredded
     def run
       Thredded.notifiers.each do |notifier|
         notifiable_users = targeted_users(notifier)
-        notifier.new_post(@post, notifiable_users) if notifiable_users.present?
+        notifiable_users = notifiable_users.select do |user|
+          # Create a notification for the user.
+          # If a notification was already created (from another thread/process),
+          # this will return false due to the unique constraint on the table
+          # and the user will be excluded.
+          Thredded::UserPostNotification.create_from_post_and_user(@post, user)
+        end
+        next if notifiable_users.empty?
+        notifier.new_post(@post, notifiable_users)
       end
     end
 
     def targeted_users(notifier)
-      possible_targeted_users.select do |user|
+      users_subscribed_via(notifier).reject do |user|
+        already_notified_user_ids.include?(user.id)
+      end
+    end
+
+    def users_subscribed_via(notifier)
+      subscribed_users.select do |user|
         NotificationsForFollowedTopics
           .detect_or_default(user.thredded_notifications_for_followed_topics, notifier).enabled? &&
           MessageboardNotificationsForFollowedTopics
@@ -21,16 +37,22 @@ module Thredded
       end
     end
 
-    def possible_targeted_users
-      @possible_targeted_users ||=
-        @post.postable.followers.includes(:thredded_notifications_for_followed_topics).reject { |u| u == @post.user }
+    def subscribed_users
+      @subscribed_users ||=
+        @post.postable.followers.includes(:thredded_notifications_for_followed_topics).reject do |user|
+          user == @post.user || !Thredded::PostPolicy.new(user, @post).read?
+        end
+    end
+
+    def already_notified_user_ids
+      @notified_user_ids ||= Set.new Thredded::UserPostNotification.notified_user_ids(@post)
     end
 
     private
 
     def messageboard_notifier_prefs_by_user_id
       @messageboard_notifier_prefs_by_user_id ||= MessageboardNotificationsForFollowedTopics
-        .where(user_id: possible_targeted_users.map(&:id))
+        .where(user_id: subscribed_users.map(&:id))
         .for_messageboard(@post.messageboard).group_by(&:user_id)
     end
   end

data/app/controllers/thredded/topics_controller.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 module Thredded
-  class TopicsController < Thredded::ApplicationController
+  class TopicsController < Thredded::ApplicationController # rubocop:disable Metrics/ClassLength
     include Thredded::NewTopicParams
 
     before_action :thredded_require_login!,
@@ -92,12 +92,23 @@ module Thredded
 
     def edit
       authorize topic, :update?
+      @edit_topic = Thredded::EditTopicForm.new(user: thredded_current_user, topic: topic)
     end
 
     def update
+      topic.assign_attributes(topic_params_for_update)
       authorize topic, :update?
-      if topic.update(topic_params.merge(last_user_id: thredded_current_user.id))
-        redirect_to messageboard_topic_url(messageboard, topic),
+      if topic.messageboard_id_changed?
+        # Work around the association not being reset.
+        # TODO: report issue to Rails. Looks like a regression of:
+        # https://rails.lighthouseapp.com/projects/8994/tickets/2989
+        topic.messageboard = Thredded::Messageboard.find(topic.messageboard_id)
+
+        authorize topic.messageboard, :post?
+      end
+      @edit_topic = Thredded::EditTopicForm.new(user: thredded_current_user, topic: topic)
+      if @edit_topic.save
+        redirect_to messageboard_topic_url(topic.messageboard, topic),
                     notice: t('thredded.topics.updated_notice')
       else
         render :edit
@@ -148,6 +159,12 @@ module Thredded
         .permit(:title, :locked, :sticky, category_ids: [])
     end
 
+    def topic_params_for_update
+      params
+        .require(:topic)
+        .permit(:title, :locked, :sticky, :messageboard_id, category_ids: [])
+    end
+
     def current_page
       (params[:page] || 1).to_i
     end

data/app/forms/thredded/edit_topic_form.rb

@@ -0,0 +1,50 @@
+# frozen_string_literal: true
+module Thredded
+  class EditTopicForm
+    include ActiveModel::Model
+
+    delegate :id, :title, :category_ids, :locked, :sticky, :messageboard, :messageboard_id, :valid?,
+             to: :@topic
+
+    # @param user [Thredded.user_class]
+    # @param topic [Thredded::Topic]
+    def initialize(user:, topic:)
+      @user = user
+      @topic = topic
+    end
+
+    def self.model_name
+      Thredded::Topic.model_name
+    end
+
+    def category_options
+      @topic.messageboard.categories.map { |cat| [cat.name, cat.id] }
+    end
+
+    def messageboard_options
+      @user.thredded_can_write_messageboards.map { |messageboard| [messageboard.name, messageboard.id] }
+    end
+
+    def save
+      return false unless valid?
+      @topic.save!
+      true
+    end
+
+    def persisted?
+      true
+    end
+
+    def path
+      Thredded::UrlsHelper.messageboard_topic_path(@topic.messageboard, @topic)
+    end
+
+    def edit_path
+      Thredded::UrlsHelper.edit_messageboard_topic_path(@topic.messageboard, @topic)
+    end
+
+    def messageboard_path
+      Thredded::UrlsHelper.messageboard_topics_path(@topic.messageboard)
+    end
+  end
+end

data/app/forms/thredded/topic_form.rb

@@ -22,12 +22,8 @@ module Thredded
       Thredded::Topic.model_name
     end
 
-    def categories
-      topic.messageboard.categories
-    end
-
     def category_options
-      categories.map { |cat| [cat.name, cat.id] }
+      messageboard.categories.map { |cat| [cat.name, cat.id] }
     end
 
     def save

data/app/helpers/thredded/application_helper.rb

@@ -4,6 +4,7 @@ module Thredded
     include ::Thredded::UrlsHelper
     include ::Thredded::NavHelper
 
+    # @return [AllViewHooks] View hooks configuration.
     def view_hooks
       @view_hooks ||= Thredded.view_hooks
     end

data/app/models/thredded/post.rb

@@ -21,6 +21,9 @@ module Thredded
     has_many :moderation_records,
              class_name: 'Thredded::PostModerationRecord',
              dependent: :nullify
+    has_many :user_notifications,
+             class_name: 'Thredded::UserPostNotification',
+             dependent: :destroy
     has_one :last_moderation_record, -> { order_newest_first },
             class_name: 'Thredded::PostModerationRecord'
 

data/app/models/thredded/topic.rb

@@ -44,6 +44,7 @@ module Thredded
                counter_cache: :topics_count
 
     has_many :posts,
+             autosave: true,
              class_name:  'Thredded::Post',
              foreign_key: :postable_id,
              inverse_of:  :postable,
@@ -76,6 +77,10 @@ module Thredded
     after_commit :update_messageboard_last_topic, on: :update, if: -> { previous_changes.include?('moderation_state') }
     after_update :update_last_user_and_time_from_last_post!, if: -> { previous_changes.include?('moderation_state') }
 
+    after_commit :handle_messageboard_change_after_commit,
+                 on: :update,
+                 if: -> { previous_changes.include?('messageboard_id') }
+
     # Finds the topic by its slug or ID, or raises Thredded::Errors::TopicNotFound.
     # @param slug_or_id [String]
     # @return [Thredded::Topic]
@@ -151,5 +156,17 @@ module Thredded
     def update_messageboard_last_topic
       messageboard.update_last_topic!
     end
+
+    def handle_messageboard_change_after_commit
+      # Update the `posts.messageboard_id` column. The column is just a performance optimization,
+      # so use update_all to avoid validitaing, triggering callbacks, and updating the timestamps:
+      posts.update_all(messageboard_id: messageboard_id)
+
+      # Update the associated messageboard metadata that Rails does not update them automatically.
+      previous_changes['messageboard_id'].each do |messageboard_id|
+        Thredded::Messageboard.reset_counters(messageboard_id, :topics, :posts)
+        Messageboard.find(messageboard_id).update_last_topic!
+      end
+    end
   end
 end

data/app/models/thredded/user_extender.rb

@@ -26,6 +26,7 @@ module Thredded
         opt.has_many :thredded_user_messageboard_preferences, class_name: 'Thredded::UserMessageboardPreference'
         opt.has_many :thredded_notifications_for_followed_topics, class_name: 'Thredded::NotificationsForFollowedTopics'
         opt.has_many :thredded_notifications_for_private_topics, class_name: 'Thredded::NotificationsForPrivateTopics'
+        opt.has_many :thredded_post_notifications, class_name: 'Thredded::UserPostNotification'
         opt.has_many :thredded_private_users, class_name: 'Thredded::PrivateUser'
         opt.has_many :thredded_topic_read_states, class_name: 'Thredded::UserTopicReadState'
         opt.has_many :thredded_private_topic_read_states, class_name: 'Thredded::UserPrivateTopicReadState'

data/app/models/thredded/user_permissions/read/all.rb

@@ -12,7 +12,7 @@ module Thredded
         end
 
         module ClassMethods
-          # Users that can read the given messageboards.
+          # Users that can read some of the given messageboards.
           #
           # @param _messageboards [Array<Thredded::Messageboard>]
           # @return [ActiveRecord::Relation<Thredded.user_class>] users that can read the given messageboards

data/app/models/thredded/user_post_notification.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+module Thredded
+  # Delivery records for Thredded::Post notifications.
+  class UserPostNotification < ActiveRecord::Base
+    belongs_to :user, class_name: Thredded.user_class, inverse_of: :thredded_post_notifications
+    belongs_to :post, class_name: 'Thredded::Post', inverse_of: :user_notifications
+
+    # @param post [Thredded::Post]
+    # @return [Array<Integer>] The IDs of users who were already notified about the given post.
+    def self.notified_user_ids(post)
+      where(post_id: post.id).pluck(:user_id)
+    end
+
+    # Create a user-post notification record for a given post and a user.
+    # @param post [Thredded::Post]
+    # @param user [Thredded.user_class]
+    # @return [Boolean] true if a new record was created, false otherwise (e.g. if a record had already existed).
+    def self.create_from_post_and_user(post, user)
+      create(
+        post_id: post.id,
+        user_id: user.id,
+        notified_at: Time.zone.now
+      )
+    rescue ActiveRecord::RecordNotUnique
+      false
+    end
+  end
+end

data/app/view_hooks/thredded/all_view_hooks.rb

@@ -5,6 +5,8 @@ module Thredded
     attr_reader :posts_common
     # @return [PostForm]
     attr_reader :post_form
+    # @return [MessageboardsIndex]
+    attr_reader :messageboards_index
     # @return [ModerationUserPage]
     attr_reader :moderation_user_page
 
@@ -24,6 +26,7 @@ module Thredded
       @posts_common = PostsCommon.new
       @post_form = PostForm.new
       @moderation_user_page = ModerationUserPage.new
+      @messageboards_index = MessageboardsIndex.new
     end
 
     # View hooks for collections of public or private posts.
@@ -52,6 +55,24 @@ module Thredded
       end
     end
 
+    class MessageboardsIndex
+      # @return [Thredded::AllViewHooks::ViewHook]
+      attr_reader :container
+      # @return [Thredded::AllViewHooks::ViewHook]
+      attr_reader :list
+      # @return [Thredded::AllViewHooks::ViewHook]
+      attr_reader :group
+      # @return [Thredded::AllViewHooks::ViewHook]
+      attr_reader :messageboard
+
+      def initialize
+        @container = ViewHook.new
+        @list = ViewHook.new
+        @group = ViewHook.new
+        @messageboard = ViewHook.new
+      end
+    end
+
     class ModerationUserPage
       # @return [Thredded::AllViewHooks::ViewHook]
       attr_reader :user_title

data/app/view_models/thredded/post_view.rb

@@ -56,13 +56,14 @@ module Thredded
       [
         I18n.locale,
         @post.cache_key,
+        (@post.messageboard_id unless @post.private_topic_post?),
         @post.user ? @post.user.cache_key : 'users/nil',
         moderation_state || '+',
         [
           can_update?,
           can_destroy?
         ].map { |p| p ? '+' : '-' } * ''
-      ].join('/')
+      ].compact.join('/')
     end
     # rubocop:enable Metrics/CyclomaticComplexity
   end

data/app/views/thredded/messageboards/_messageboard.html.erb

@@ -1,22 +1,24 @@
 <% if policy(messageboard).read? %>
-  <%= link_to messageboard_topics_path(messageboard), class: 'thredded--messageboard' do %>
-    <header>
-      <h2 class="thredded--messageboard--title"><%= messageboard.name %></h2>
-      <h3 class="thredded--messageboard--meta">
-        <%= t 'thredded.messageboard.topics_and_posts_counts',
-              topics_count: number_to_human(messageboard.topics_count).downcase,
-              posts_count:  number_to_human(messageboard.posts_count).downcase %>
-      </h3>
-    </header>
+  <%= view_hooks.messageboards_index.messageboard.render self, messageboard: messageboard do %>
+    <%= link_to messageboard_topics_path(messageboard), class: 'thredded--messageboard' do %>
+      <header class="thredded--messageboard--header">
+        <h2 class="thredded--messageboard--title"><%= messageboard.name %></h2>
+        <h3 class="thredded--messageboard--meta">
+          <%= t 'thredded.messageboard.topics_and_posts_counts',
+                topics_count: number_with_delimiter(messageboard.topics_count),
+                posts_count: number_with_delimiter(messageboard.posts_count) %>
+        </h3>
+      </header>
 
-    <p class="thredded--messageboard--description"><%= messageboard.description %></p>
+      <p class="thredded--messageboard--description"><%= messageboard.description %></p>
 
-    <% if messageboard.last_topic %>
-      <p class="thredded--messageboard--byline">
-        <%= t 'thredded.messageboard.last_updated_by_html',
-              time_ago: time_ago(messageboard.last_topic.last_post_at),
-              user:     messageboard.last_user.thredded_display_name %>
-      </p>
+      <% if messageboard.last_topic %>
+        <p class="thredded--messageboard--byline">
+          <%= t 'thredded.messageboard.last_updated_by_html',
+                time_ago: time_ago(messageboard.last_topic.last_post_at),
+                user: messageboard.last_user.thredded_display_name %>
+        </p>
+      <% end %>
     <% end %>
   <% end %>
 <% end %>

data/app/views/thredded/messageboards/index.html.erb

@@ -2,21 +2,33 @@
 <% content_for :thredded_page_id, 'thredded--messageboards-index' %>
 <% content_for :thredded_breadcrumbs, render('thredded/shared/breadcrumbs') %>
 <%= thredded_page do %>
-  <section class="thredded--main-section thredded--messageboards">
-    <% @groups.each do |group| %>
-      <% if group.name.present? %>
-        <h3><%= group.name %></h3>
+  <%= view_hooks.messageboards_index.container.render self, groups: @groups do %>
+    <section class="thredded--main-section thredded--messageboards">
+      <%= view_hooks.messageboards_index.list.render self, groups: @groups do %>
+        <% @groups.each do |group| %>
+          <% if group.name.present? %>
+            <h3 class="thredded--messageboards-group--title"><%= group.name %></h3>
+          <% end %>
+          <div class="thredded--messageboards-group">
+            <%= view_hooks.messageboards_index.group.render self, group: group do %>
+              <%= render group.messageboards %>
+            <% end %>
+          </div>
+        <% end %>
       <% end %>
-      <%= render group.messageboards %>
-    <% end %>
 
-    <div class="thredded--messageboards--actions">
-      <% if policy(Thredded::Messageboard.new).create? %>
-        <a class="thredded--button" href="<%= new_messageboard_path %>"><%= t('thredded.messageboard.create') %></a>
-      <% end %>
-      <% if policy(Thredded::MessageboardGroup.new).create? %>
-        <a class="thredded--button" href="<%= new_messageboard_group_path %>"><%= t('thredded.messageboard_group.create') %></a>
-      <% end %>
-    </div>
-  </section>
+      <div class="thredded--messageboards--actions">
+        <% if policy(Thredded::Messageboard.new).create? %>
+          <a class="thredded--button" href="<%= new_messageboard_path %>">
+            <%= t('thredded.messageboard.create') %>
+          </a>
+        <% end %>
+        <% if policy(Thredded::MessageboardGroup.new).create? %>
+          <a class="thredded--button" href="<%= new_messageboard_group_path %>">
+            <%= t('thredded.messageboard_group.create') %>
+          </a>
+        <% end %>
+      </div>
+    </section>
+  <% end %>
 <% end %>

data/app/views/thredded/topics/_form.html.erb

@@ -11,7 +11,7 @@
       <%= form.text_field :title, placeholder: placeholder, required: true %>
     </li>
 
-    <% if form.object.categories.any? %>
+    <% if form.object.category_options.any? %>
       <li class="category">
         <%= form.select :category_ids,
                         form.object.category_options,

data/app/views/thredded/topics/edit.html.erb

@@ -1,16 +1,17 @@
-<% content_for :thredded_page_title, t('thredded.nav.edit_private_topic') %>
+<% content_for :thredded_page_title, t('thredded.nav.edit_topic') %>
 <% content_for :thredded_page_id, 'thredded--edit-topic' %>
 <% content_for :thredded_breadcrumbs do %>
   <ul class="thredded--navigation-breadcrumbs">
     <li><%= link_to t('thredded.nav.all_messageboards'), messageboards_path %></li>
-    <li><%= link_to messageboard.name, messageboard_topics_path(@topic.messageboard) %></li>
-    <li><%= link_to @topic.title, topic_path(@topic) %></li>
-    <li><%= link_to t('thredded.nav.edit_topic'), edit_messageboard_topic_path(@topic.messageboard, @topic) %></li>
+    <li><%= link_to messageboard.name, @edit_topic.messageboard_path %></li>
+    <li><%= link_to @edit_topic.title, @edit_topic.path %></li>
+    <li><%= link_to t('thredded.nav.edit_topic'), @edit_topic.edit_path %></li>
   </ul>
 <% end %>
 
 <%= thredded_page do %>
-  <%= form_for [@topic.messageboard, @topic],
+  <%= form_for @edit_topic,
+               url: @edit_topic.path,
                html: { class: 'thredded--form thredded--is-expanded', 'data-thredded-topic-form' => true } do |form| %>
     <ul class="thredded--form-list on-top">
 
@@ -22,7 +23,7 @@
                             required:    true %>
       </li>
 
-      <% if form.object.categories.any? %>
+      <% if form.object.category_options.any? %>
         <li class="category">
           <%= form.select :category_ids, form.object.category_options, {},
                           multiple:          true,
@@ -30,6 +31,11 @@
         </li>
       <% end %>
 
+      <li>
+        <%= form.label :messageboard_id, t('thredded.topics.form.messageboard_label') %>
+        <%= form.select :messageboard_id, form.object.messageboard_options %>
+      </li>
+
       <%= render 'thredded/topics/topic_form_admin_options', form: form %>
 
       <li>

data/config/locales/en.yml

@@ -150,6 +150,7 @@ en:
         categories_placeholder: Categories
         content_label: :thredded.posts.form.content_label
         create_btn: Create New Topic
+        messageboard_label: Messageboard
         title_label: Title
         title_placeholder: :thredded.topics.form.title_label
         title_placeholder_start: Start a New Topic

data/config/locales/es.yml

@@ -150,6 +150,7 @@ es:
         categories_placeholder: Categorías
         content_label: :thredded.posts.form.content_label
         create_btn: Crear Nuevo Tema
+        messageboard_label: Foro
         title_label: Título
         title_placeholder: :thredded.topics.form.title_label
         title_placeholder_start: Crear un Nuevo Tema

data/config/locales/pl.yml

@@ -149,6 +149,7 @@ pl:
         categories_placeholder: Kategorie
         content_label: :thredded.posts.form.content_label
         create_btn: Stwórz nowy temat
+        messageboard_label: Tablica
         title_label: Tytuł
         title_placeholder: :thredded.topics.form.title_label
         title_placeholder_start: Rozpocznij nowy temat

data/config/locales/pt-BR.yml

@@ -153,6 +153,7 @@ pt-BR:
         categories_placeholder: Categorias
         content_label: :thredded.posts.form.content_label
         create_btn: Criar Novo Tópico
+        messageboard_label: Fórum
         title_label: Título
         title_placeholder: :thredded.topics.form.title_label
         title_placeholder_start: Iniciar um novo tópico

data/db/migrate/20160329231848_create_thredded.rb

@@ -149,8 +149,8 @@ class CreateThredded < ActiveRecord::Migration
     end
 
     create_table :thredded_messageboard_users do |t|
-      t.references :thredded_user_detail, foreign_key: true, null: false
-      t.references :thredded_messageboard, foreign_key: true, null: false
+      t.references :thredded_user_detail, foreign_key: { on_delete: :cascade }, null: false
+      t.references :thredded_messageboard, foreign_key: { on_delete: :cascade }, null: false
       t.datetime :last_seen_at, null: false
       t.index [:thredded_messageboard_id, :thredded_user_detail_id],
               name: :index_thredded_messageboard_users_primary
@@ -237,6 +237,16 @@ class CreateThredded < ActiveRecord::Migration
       t.index [:user_id, :messageboard_id, :notifier_key],
               name: 'thredded_messageboard_notifications_for_followed_topics_unique', unique: true
     end
+
+    create_table :thredded_user_post_notifications do |t|
+      t.references :user, null: false
+      t.foreign_key Thredded.user_class.table_name, column: :user_id, on_delete: :cascade
+      t.references :post, null: false
+      t.foreign_key :thredded_posts, column: :post_id, on_delete: :cascade
+      t.datetime :notified_at, null: false
+      t.index :post_id, name: :index_thredded_user_post_notifications_on_post_id
+      t.index [:user_id, :post_id], name: :index_thredded_user_post_notifications_on_user_id_and_post_id, unique: true
+    end
   end
 end
 # rubocop:enable Metrics/MethodLength

data/db/upgrade_migrations/20170125033319_upgrade_v0_9_to_v0_10.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+class UpgradeV09ToV010 < ActiveRecord::Migration
+  def up
+    remove_foreign_key :thredded_messageboard_users, :thredded_messageboards
+    add_foreign_key :thredded_messageboard_users, :thredded_messageboards, on_delete: :cascade
+    remove_foreign_key :thredded_messageboard_users, :thredded_user_details
+    add_foreign_key :thredded_messageboard_users, :thredded_user_details, on_delete: :cascade
+
+    create_table :thredded_user_post_notifications do |t|
+      t.references :user, null: false
+      t.foreign_key Thredded.user_class.table_name, column: :user_id, on_delete: :cascade
+      t.references :post, null: false
+      t.foreign_key :thredded_posts, column: :post_id, on_delete: :cascade
+      t.datetime :notified_at, null: false
+      t.index :post_id, name: :index_thredded_user_post_notifications_on_post_id
+      t.index [:user_id, :post_id], name: :index_thredded_user_post_notifications_on_user_id_and_post_id, unique: true
+    end
+  end
+
+  def down
+    drop_table :thredded_user_post_notifications
+
+    remove_foreign_key :thredded_messageboard_users, :thredded_user_details
+    add_foreign_key :thredded_messageboard_users, :thredded_user_details
+    remove_foreign_key :thredded_messageboard_users, :thredded_messageboards
+    add_foreign_key :thredded_messageboard_users, :thredded_messageboards
+  end
+end

data/lib/thredded/database_seeder.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 require 'factory_girl_rails'
+require_relative '../../spec/support/features/fake_content'
 
 # rubocop:disable HandleExceptions
 begin

data/lib/thredded/html_pipeline/at_mention_filter.rb

@@ -34,7 +34,7 @@ module Thredded
 
       private
 
-      MATCH_NAME_RE = /(?:^|[\s>])@(\w+|"[\w. ]+")(?=\W|$)/
+      MATCH_NAME_RE = /(?:^|[\s>])@([\w\-]+|"[\w.,\- ()]+")(?=\W|$)/
 
       def mentioned_names(text_node_html)
         text_node_html.scan(MATCH_NAME_RE).map(&:first).map { |m| m.start_with?('"') ? m[1..-2] : m }
@@ -45,7 +45,7 @@ module Thredded
         return unless names.present?
         @users_provider.call(names).each do |user|
           name = user.thredded_display_name
-          maybe_quoted_name = name =~ /[. ]/ ? %("#{name}") : name
+          maybe_quoted_name = name =~ /[., ()]/ ? %("#{name}") : name
           url = Thredded.user_path(@view_context, user)
           text_node_html.gsub!(
             /(^|[\s>])(@#{Regexp.escape maybe_quoted_name})([^a-z\d]|$)/i,

data/lib/thredded/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Thredded
-  VERSION = '0.9.4'
+  VERSION = '0.10.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: thredded
 version: !ruby/object:Gem::Version
-  version: 0.9.4
+  version: 0.10.0
 platform: ruby
 authors:
 - Joel Oliveira
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-30 00:00:00.000000000 Z
+date: 2017-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pundit
@@ -762,6 +762,7 @@ files:
 - app/controllers/thredded/theme_previews_controller.rb
 - app/controllers/thredded/topic_previews_controller.rb
 - app/controllers/thredded/topics_controller.rb
+- app/forms/thredded/edit_topic_form.rb
 - app/forms/thredded/private_topic_form.rb
 - app/forms/thredded/topic_form.rb
 - app/forms/thredded/user_preferences_form.rb
@@ -815,6 +816,7 @@ files:
 - app/models/thredded/user_permissions/read/all.rb
 - app/models/thredded/user_permissions/write/all.rb
 - app/models/thredded/user_permissions/write/none.rb
+- app/models/thredded/user_post_notification.rb
 - app/models/thredded/user_preference.rb
 - app/models/thredded/user_private_topic_read_state.rb
 - app/models/thredded/user_topic_follow.rb
@@ -952,6 +954,7 @@ files:
 - db/upgrade_migrations/20160723012349_upgrade_v0_6_to_v0_7.rb
 - db/upgrade_migrations/20161019150201_upgrade_v0_7_to_v0_8.rb
 - db/upgrade_migrations/20161113161801_upgrade_v0_8_to_v0_9.rb
+- db/upgrade_migrations/20170125033319_upgrade_v0_9_to_v0_10.rb
 - lib/generators/thredded/install/USAGE
 - lib/generators/thredded/install/install_generator.rb
 - lib/generators/thredded/install/templates/initializer.rb