thredded 0.12.1 → 0.12.2

data/app/models/thredded/user_permissions/admin/if_admin_column_true.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Thredded
   module UserPermissions
     module Admin

data/app/models/thredded/user_permissions/admin/none.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Thredded
   module UserPermissions
     module Admin

data/app/models/thredded/user_permissions/message/readers_of_writeable_boards.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Thredded
   module UserPermissions
     module Message

data/app/models/thredded/user_permissions/moderate/if_moderator_column_true.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Thredded
   module UserPermissions
     module Moderate

data/app/models/thredded/user_permissions/moderate/none.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Thredded
   module UserPermissions
     module Moderate

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Thredded
   module UserPermissions
     module Read

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

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Thredded
   module UserPermissions
     module Write

data/app/models/thredded/user_permissions/write/none.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Thredded
   module UserPermissions
     module Write

data/app/models/thredded/user_post_notification.rb

@@ -1,8 +1,9 @@
 # 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 :user, class_name: Thredded.user_class_name, inverse_of: :thredded_post_notifications
     belongs_to :post, class_name: 'Thredded::Post', inverse_of: :user_notifications
 
     # @param post [Thredded::Post]

data/app/models/thredded/user_preference.rb

@@ -1,7 +1,8 @@
 # frozen_string_literal: true
+
 module Thredded
   class UserPreference < ActiveRecord::Base
-    belongs_to :user, class_name: Thredded.user_class, inverse_of: :thredded_user_preference
+    belongs_to :user, class_name: Thredded.user_class_name, inverse_of: :thredded_user_preference
 
     with_options(inverse_of: :user_preference, primary_key: :user_id, foreign_key: :user_id,
                  dependent: :destroy) do |opt|

data/app/models/thredded/user_private_topic_read_state.rb

@@ -1,9 +1,10 @@
 # frozen_string_literal: true
+
 module Thredded
   class UserPrivateTopicReadState < ActiveRecord::Base
     include Thredded::UserTopicReadStateCommon
     belongs_to :user,
-               class_name: Thredded.user_class,
+               class_name: Thredded.user_class_name,
                inverse_of: :thredded_private_topic_read_states
     belongs_to :postable,
                class_name: 'Thredded::PrivateTopic',

data/app/models/thredded/user_topic_follow.rb

@@ -1,9 +1,10 @@
 # frozen_string_literal: true
+
 module Thredded
   class UserTopicFollow < ActiveRecord::Base
-    enum reason: [:manual, :posted, :mentioned, :auto]
+    enum reason: %i[manual posted mentioned auto]
 
-    belongs_to :user, inverse_of: :thredded_topic_follows, class_name: Thredded.user_class
+    belongs_to :user, inverse_of: :thredded_topic_follows, class_name: Thredded.user_class_name
     belongs_to :topic, inverse_of: :user_follows
 
     validates :user_id, presence: true

data/app/models/thredded/user_topic_read_state.rb

@@ -1,9 +1,10 @@
 # frozen_string_literal: true
+
 module Thredded
   class UserTopicReadState < ActiveRecord::Base
     include Thredded::UserTopicReadStateCommon
     belongs_to :user,
-               class_name: Thredded.user_class,
+               class_name: Thredded.user_class_name,
                inverse_of: :thredded_topic_read_states
     belongs_to :postable,
                class_name: 'Thredded::Topic',

data/app/notifiers/thredded/base_notifier.rb

@@ -6,7 +6,7 @@ module Thredded
       unless notifier.respond_to?(:key) && /^[a-z_]+$/.match(notifier.key)
         fail "Notifier problem: #{notifier.class.name} must respond to #key with a snake_case string"
       end
-      [:human_name, :new_post, :new_private_post].each do |m|
+      %i[human_name new_post new_private_post].each do |m|
         unless notifier.respond_to?(m)
           fail "#{notifier.class.name} must respond to ##{m}"
         end

data/app/notifiers/thredded/email_notifier.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Thredded
   class EmailNotifier
     def human_name

data/app/policies/thredded/messageboard_group_policy.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Thredded
   class MessageboardGroupPolicy
     # @param user [Thredded.user_class]

data/app/policies/thredded/messageboard_policy.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Thredded
   class MessageboardPolicy
     # The scope of readable messageboards

data/app/policies/thredded/post_policy.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Thredded
   class PostPolicy
     # The scope of readable posts.

data/app/policies/thredded/private_post_policy.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Thredded
   class PrivatePostPolicy
     # @param user [Thredded.user_class]

data/app/policies/thredded/private_topic_policy.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Thredded
   class PrivateTopicPolicy
     # @param user [Thredded.user_class]

data/app/policies/thredded/topic_policy.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Thredded
   class TopicPolicy
     # The scope of readable topics.

data/app/view_hooks/thredded/all_view_hooks.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Thredded
   class AllViewHooks
     # @return [PostCommon]

data/app/view_models/thredded/base_topic_view.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Thredded
   # A view model for TopicCommon.
   class BaseTopicView

data/app/view_models/thredded/messageboard_group_view.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Thredded
   # A view model for a page of MessageboardGroupViews.
   class MessageboardGroupView

data/app/view_models/thredded/post_view.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Thredded
   # A view model for PostCommon.
   class PostView

data/app/view_models/thredded/posts_page_view.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Thredded
   # A view model for a page of PostViews.
   class PostsPageView

data/app/view_models/thredded/private_topic_view.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Thredded
   # A view model for PrivateTopic.
   class PrivateTopicView < Thredded::BaseTopicView

data/app/view_models/thredded/private_topics_page_view.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Thredded
   # A view model for a page of BaseTopicViews.
   class PrivateTopicsPageView

data/app/view_models/thredded/topic_email_view.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Thredded
   class TopicEmailView
     # @param [Thredded::TopicCommon] topic

data/app/view_models/thredded/topic_posts_page_view.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Thredded
   # A view model for a page of PostViews of a Topic.
   class TopicPostsPageView < Thredded::PostsPageView

data/app/view_models/thredded/topic_view.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Thredded
   # A view model for Topic.
   class TopicView < Thredded::BaseTopicView

data/app/view_models/thredded/topics_page_view.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Thredded
   # A view model for a page of BaseTopicViews.
   class TopicsPageView

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

@@ -19,12 +19,12 @@
 
       <div class="thredded--messageboards--actions">
         <% if policy(Thredded::Messageboard.new).create? %>
-          <a class="thredded--button" href="<%= new_messageboard_path %>">
+          <a class="thredded--button" href="<%= new_messageboard_path %>" rel="nofollow">
             <%= t('thredded.messageboard.create') %>
           </a>
         <% end %>
         <% if policy(Thredded::MessageboardGroup.new).create? %>
-          <a class="thredded--button" href="<%= new_messageboard_group_path %>">
+          <a class="thredded--button" href="<%= new_messageboard_group_path %>" rel="nofollow">
             <%= t('thredded.messageboard_group.create') %>
           </a>
         <% end %>

data/app/views/thredded/posts_common/actions/_edit.html.erb

@@ -1,2 +1,3 @@
 <%= link_to t('thredded.posts.edit'), post.edit_path,
-            class: 'thredded--post--edit thredded--post--dropdown--actions--item' %>
+            class: 'thredded--post--edit thredded--post--dropdown--actions--item',
+            rel: 'nofollow' %>

data/app/views/thredded/private_topics/_header.html.erb

@@ -11,6 +11,7 @@
   </span>
   <% if topic.can_update? %>
     <%= link_to t('thredded.private_topics.edit'), topic.edit_path,
-                class: 'thredded--topic-header--edit-topic' %>
+                class: 'thredded--topic-header--edit-topic',
+                rel: 'nofollow' %>
   <% end %>
 </header>

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

@@ -7,7 +7,8 @@
   </cite>
   <% if topic.can_update? %>
     <%= link_to t('thredded.topics.edit'), topic.edit_path,
-                class: 'thredded--topic-header--edit-topic' %>
+                class: 'thredded--topic-header--edit-topic',
+                rel: 'nofollow' %>
   <% end %>
   <% if thredded_current_user %>
     <% if topic.followed? %>

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

@@ -22,7 +22,7 @@
 
   <div class="thredded--messageboards--actions">
     <% if policy(messageboard).update? %>
-      <a class="thredded--button" href="<%= edit_messageboard_path(messageboard) %>">
+      <a class="thredded--button" href="<%= edit_messageboard_path(messageboard) %>" rel="nofollow">
         <%= t('thredded.nav.edit_messageboard') %>
       </a>
     <% end %>

data/bin/rails

@@ -1,5 +1,6 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
+
 APP_PATH = File.expand_path('../../spec/dummy/config/application', __FILE__)
 require    File.expand_path('../../spec/dummy/config/boot', __FILE__)
 require    'rails/commands'

data/bin/rubocop

@@ -1,5 +1,6 @@
 #!/usr/bin/env ruby
 # frozen_string_literal: true
+
 #
 # This file was generated by Bundler.
 #

data/config/routes.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
+
 Thredded::Engine.routes.draw do # rubocop:disable Metrics/BlockLength
-  resource :theme_preview, only: [:show], path: 'theme-preview' if %w(development test).include? Rails.env
+  resource :theme_preview, only: [:show], path: 'theme-preview' if %w[development test].include? Rails.env
 
   page_constraint = { page: /[1-9]\d*/ }
 
@@ -9,11 +10,11 @@ Thredded::Engine.routes.draw do # rubocop:disable Metrics/BlockLength
     resource :private_topic, only: [:new], path: '' do
       post :preview, on: :new, controller: 'private_topic_previews'
     end
-    resources :private_topics, except: [:new, :show], path: '' do
+    resources :private_topics, except: %i[new show], path: '' do
       member do
         get '(page-:page)', action: :show, as: '', constraints: page_constraint
       end
-      resources :private_posts, path: '', except: [:index, :show] do
+      resources :private_posts, path: '', except: %i[index show] do
         post :preview, on: :new, controller: 'private_post_previews'
         resource :preview, only: [:update], controller: 'private_post_previews'
         member do
@@ -37,7 +38,7 @@ Thredded::Engine.routes.draw do # rubocop:disable Metrics/BlockLength
   end
 
   scope path: 'admin' do
-    resources :messageboard_groups, only: [:new, :create]
+    resources :messageboard_groups, only: %i[new create]
     scope controller: :moderation, path: 'moderation' do
       scope constraints: page_constraint do
         get '(/page-:page)', action: :pending, as: :pending_moderation
@@ -51,15 +52,15 @@ Thredded::Engine.routes.draw do # rubocop:disable Metrics/BlockLength
     end
   end
 
-  resource :preferences, only: [:edit, :update], as: :global_preferences
+  resource :preferences, only: %i[edit update], as: :global_preferences
   resource :messageboard, path: 'messageboards', only: [:new]
-  resources :messageboards, only: [:edit, :update]
-  resources :messageboards, only: [:index, :create], path: '' do
-    resource :preferences, only: [:edit, :update]
+  resources :messageboards, only: %i[edit update]
+  resources :messageboards, only: %i[index create], path: '' do
+    resource :preferences, only: %i[edit update]
     resource :topic, path: 'topics', only: [:new] do
       post :preview, on: :new, controller: 'topic_previews'
     end
-    resources :topics, path: '', except: [:index, :new, :show] do
+    resources :topics, path: '', except: %i[index new show] do
       collection do
         get '(page-:page)', action: :index, as: '', constraints: page_constraint
         get '/category/:category_id', action: :category, as: :categories
@@ -68,10 +69,10 @@ Thredded::Engine.routes.draw do # rubocop:disable Metrics/BlockLength
         get '(page-:page)', action: :show, as: '', constraints: page_constraint
 
         # match (un)follow via get as well so that redirecting back to it after sign in works.
-        match 'follow', via: [:post, :get]
-        match 'unfollow', via: [:post, :get]
+        match 'follow', via: %i[post get]
+        match 'unfollow', via: %i[post get]
       end
-      resources :posts, except: [:index, :show], path: '' do
+      resources :posts, except: %i[index show], path: '' do
         post :preview, on: :new, controller: 'post_previews'
         resource :preview, only: [:update], controller: 'post_previews'
         member do

data/db/migrate/20160329231848_create_thredded.rb

@@ -1,32 +1,35 @@
 # frozen_string_literal: true
+
+require 'thredded/base_migration'
+
 # rubocop:disable Metrics/ClassLength
 # rubocop:disable Metrics/MethodLength
-class CreateThredded < ActiveRecord::Migration
+class CreateThredded < Thredded::BaseMigration
   def change
     unless table_exists?(:friendly_id_slugs)
       # The user might have installed FriendlyId separately already.
       create_table :friendly_id_slugs do |t|
-        t.string :slug, limit: 191, null: false
+        t.string :slug, null: false
         t.integer :sluggable_id, null: false
         t.string :sluggable_type, limit: 50
-        t.string :scope, limit: 191
-        t.datetime :created_at, null: false
-        t.index [:slug, :sluggable_type, :scope],
-                name: :index_friendly_id_slugs_on_slug_and_sluggable_type_and_scope,
-                unique: true
-        t.index [:slug, :sluggable_type], name: :index_friendly_id_slugs_on_slug_and_sluggable_type
-        t.index [:sluggable_id], name: :index_friendly_id_slugs_on_sluggable_id
-        t.index [:sluggable_type], name: :index_friendly_id_slugs_on_sluggable_type
+        t.string :scope
+        t.datetime :created_at
       end
+      add_index :friendly_id_slugs, :sluggable_id
+      add_index :friendly_id_slugs, %i[slug sluggable_type], length: { slug: 140, sluggable_type: 50 }
+      add_index :friendly_id_slugs, %i[slug sluggable_type scope],
+                length: { slug: 70, sluggable_type: 50, scope: 70 },
+                unique: true
+      add_index :friendly_id_slugs, :sluggable_type
     end
 
     create_table :thredded_categories do |t|
-      t.references :messageboard, null: false
+      t.references :messageboard, null: false, index: false
       t.string :name, limit: 191, null: false
       t.string :description, limit: 255
       t.timestamps null: false
       t.string :slug, limit: 191, null: false
-      t.index [:messageboard_id, :slug], name: :index_thredded_categories_on_messageboard_id_and_slug, unique: true
+      t.index %i[messageboard_id slug], name: :index_thredded_categories_on_messageboard_id_and_slug, unique: true
       t.index [:messageboard_id], name: :index_thredded_categories_on_messageboard_id
     end
     DbTextSearch::CaseInsensitive.add_index connection, :thredded_categories, :name, name: :thredded_categories_name_ci
@@ -38,23 +41,23 @@ class CreateThredded < ActiveRecord::Migration
       t.integer :topics_count, default: 0
       t.integer :posts_count, default: 0
       t.integer :position, null: false
-      t.references :last_topic
-      t.references :messageboard_group
+      t.references :last_topic, index: false
+      t.references :messageboard_group, index: false
       t.timestamps null: false
       t.index [:messageboard_group_id], name: :index_thredded_messageboards_on_messageboard_group_id
       t.index [:slug], name: :index_thredded_messageboards_on_slug
     end
 
     create_table :thredded_posts do |t|
-      t.integer :user_id, limit: 4
+      t.references :user, type: user_id_type, index: false
       t.text :content, limit: 65_535
       t.string :ip, limit: 255
       t.string :source, limit: 255, default: 'web'
-      t.references :postable, null: false
-      t.references :messageboard, null: false
+      t.references :postable, null: false, index: false
+      t.references :messageboard, null: false, index: false
       t.integer :moderation_state, null: false
       t.timestamps null: false
-      t.index [:moderation_state, :updated_at],
+      t.index %i[moderation_state updated_at],
               order: { updated_at: :asc },
               name:  :index_thredded_posts_for_display
       t.index [:messageboard_id], name: :index_thredded_posts_on_messageboard_id
@@ -65,16 +68,16 @@ class CreateThredded < ActiveRecord::Migration
     DbTextSearch::FullText.add_index connection, :thredded_posts, :content, name: :thredded_posts_content_fts
 
     create_table :thredded_private_posts do |t|
-      t.references :user
+      t.references :user, type: user_id_type, index: false
       t.text :content, limit: 65_535
-      t.references :postable, null: false
+      t.references :postable, null: false, index: false
       t.string :ip, limit: 255
       t.timestamps null: false
     end
 
     create_table :thredded_private_topics do |t|
-      t.references :user
-      t.references :last_user
+      t.references :user, type: user_id_type, index: false
+      t.references :last_user, index: false
       t.string :title, limit: 255, null: false
       t.string :slug, limit: 191, null: false
       t.integer :posts_count, default: 0
@@ -86,26 +89,26 @@ class CreateThredded < ActiveRecord::Migration
     end
 
     create_table :thredded_private_users do |t|
-      t.references :private_topic, limit: 4
-      t.references :user, limit: 4
+      t.references :private_topic, index: false
+      t.references :user, type: user_id_type, index: false
       t.timestamps null: false
       t.index [:private_topic_id], name: :index_thredded_private_users_on_private_topic_id
       t.index [:user_id], name: :index_thredded_private_users_on_user_id
     end
 
     create_table :thredded_topic_categories do |t|
-      t.references :topic, null: false
-      t.references :category, null: false
+      t.references :topic, null: false, index: false
+      t.references :category, null: false, index: false
       t.index [:category_id], name: :index_thredded_topic_categories_on_category_id
       t.index [:topic_id], name: :index_thredded_topic_categories_on_topic_id
     end
 
     create_table :thredded_topics do |t|
-      t.references :user
-      t.references :last_user
+      t.references :user, type: user_id_type, index: false
+      t.references :last_user, index: false
       t.string :title, limit: 255, null: false
       t.string :slug, limit: 191, null: false
-      t.references :messageboard, null: false
+      t.references :messageboard, null: false, index: false
       t.integer :posts_count, default: 0, null: false
       t.boolean :sticky, default: false, null: false
       t.boolean :locked, default: false, null: false
@@ -114,7 +117,7 @@ class CreateThredded < ActiveRecord::Migration
       t.integer :moderation_state, null: false
       t.datetime :last_post_at
       t.timestamps null: false
-      t.index %i(moderation_state sticky updated_at),
+      t.index %i[moderation_state sticky updated_at],
               order: { sticky: :desc, updated_at: :desc },
               name:  :index_thredded_topics_for_display
       t.index [:hash_id], name: :index_thredded_topics_on_hash_id
@@ -125,7 +128,7 @@ class CreateThredded < ActiveRecord::Migration
     DbTextSearch::FullText.add_index connection, :thredded_topics, :title, name: :thredded_topics_title_fts
 
     create_table :thredded_user_details do |t|
-      t.references :user, null: false
+      t.references :user, type: user_id_type, null: false, index: false
       t.datetime :latest_activity_at
       t.integer :posts_count, default: 0
       t.integer :topics_count, default: 0
@@ -133,25 +136,29 @@ class CreateThredded < ActiveRecord::Migration
       t.integer :moderation_state, null: false, default: 0 # pending_moderation
       t.timestamp :moderation_state_changed_at
       t.timestamps null: false
-      t.index %i(moderation_state moderation_state_changed_at),
+      t.index %i[moderation_state moderation_state_changed_at],
               order: { moderation_state_changed_at: :desc },
               name: :index_thredded_user_details_for_moderations
-      t.index %i(latest_activity_at), name: :index_thredded_user_details_on_latest_activity_at
-      t.index %i(user_id), name: :index_thredded_user_details_on_user_id
+      t.index %i[latest_activity_at], name: :index_thredded_user_details_on_latest_activity_at
+      t.index %i[user_id], name: :index_thredded_user_details_on_user_id
     end
 
     create_table :thredded_messageboard_users do |t|
-      t.references :thredded_user_detail, foreign_key: { on_delete: :cascade }, null: false
-      t.references :thredded_messageboard, foreign_key: { on_delete: :cascade }, null: false
+      t.references :thredded_user_detail, null: false, index: false
+      t.references :thredded_messageboard, null: false, index: false
       t.datetime :last_seen_at, null: false
-      t.index [:thredded_messageboard_id, :thredded_user_detail_id],
+      t.index %i[thredded_messageboard_id thredded_user_detail_id],
               name: :index_thredded_messageboard_users_primary
-      t.index [:thredded_messageboard_id, :last_seen_at],
+      t.index %i[thredded_messageboard_id last_seen_at],
               name: :index_thredded_messageboard_users_for_recently_active
     end
+    add_foreign_key :thredded_messageboard_users, :thredded_user_details,
+                    column: :thredded_user_detail_id, on_delete: :cascade
+    add_foreign_key :thredded_messageboard_users, :thredded_messageboards,
+                    column: :thredded_messageboard_id, on_delete: :cascade
 
     create_table :thredded_user_preferences do |t|
-      t.references :user, null: false
+      t.references :user, type: user_id_type, null: false, index: false
       t.boolean :follow_topics_on_mention, default: true, null: false
       t.boolean :auto_follow_topics, default: false, null: false
       t.timestamps null: false
@@ -159,24 +166,24 @@ class CreateThredded < ActiveRecord::Migration
     end
 
     create_table :thredded_user_messageboard_preferences do |t|
-      t.references :user, null: false
-      t.references :messageboard, null: false
+      t.references :user, type: user_id_type, null: false, index: false
+      t.references :messageboard, null: false, index: false
       t.boolean :follow_topics_on_mention, default: true, null: false
       t.boolean :auto_follow_topics, default: false, null: false
       t.timestamps null: false
-      t.index [:user_id, :messageboard_id],
+      t.index %i[user_id messageboard_id],
               name: :thredded_user_messageboard_preferences_user_id_messageboard_id,
               unique: true
     end
 
-    %i(topic private_topic).each do |topics_table|
+    %i[topic private_topic].each do |topics_table|
       table_name = :"thredded_user_#{topics_table}_read_states"
       create_table table_name do |t|
-        t.references :user, null: false
-        t.integer :postable_id, null: false
+        t.references :user, type: user_id_type, null: false, index: false
+        t.references :postable, null: false, index: false
         t.integer :page, default: 1, null: false
         t.timestamp :read_at, null: false
-        t.index [:user_id, :postable_id], name: :"#{table_name}_user_postable", unique: true
+        t.index %i[user_id postable_id], name: :"#{table_name}_user_postable", unique: true
       end
     end
 
@@ -187,60 +194,62 @@ class CreateThredded < ActiveRecord::Migration
     end
 
     create_table :thredded_user_topic_follows do |t|
-      t.references :user, null: false
-      t.integer :topic_id, null: false
+      t.references :user, type: user_id_type, null: false, index: false
+      t.references :topic, null: false, index: false
       t.datetime :created_at, null: false
       t.integer :reason, limit: 1
-      t.index [:user_id, :topic_id], name: :thredded_user_topic_follows_user_topic, unique: true
+      t.index %i[user_id topic_id], name: :thredded_user_topic_follows_user_topic, unique: true
     end
 
     create_table :thredded_post_moderation_records do |t|
-      t.references :post
-      t.references :messageboard
+      t.references :post, index: false
+      t.references :messageboard, index: false
       t.text :post_content, limit: 65_535
-      t.references :post_user
+      t.references :post_user, index: false
       t.text :post_user_name
-      t.references :moderator
+      t.references :moderator, index: false
       t.integer :moderation_state, null: false
       t.integer :previous_moderation_state, null: false
       t.timestamp :created_at, null: false
-      t.index [:messageboard_id, :created_at],
+      t.index %i[messageboard_id created_at],
               order: { created_at: :desc },
               name:  :index_thredded_moderation_records_for_display
     end
 
     create_table :thredded_notifications_for_private_topics do |t|
-      t.integer :user_id, null: false
+      t.references :user, null: false, index: false, type: user_id_type
       t.string :notifier_key, null: false, limit: 90
       t.boolean :enabled, default: true, null: false
-      t.index [:user_id, :notifier_key],
+      t.index %i[user_id notifier_key],
               name: 'thredded_notifications_for_private_topics_unique', unique: true
     end
     create_table :thredded_notifications_for_followed_topics do |t|
-      t.integer :user_id, null: false
+      t.references :user, null: false, index: false, type: user_id_type
       t.string :notifier_key, null: false, limit: 90
       t.boolean :enabled, default: true, null: false
-      t.index [:user_id, :notifier_key],
+      t.index %i[user_id notifier_key],
               name: 'thredded_notifications_for_followed_topics_unique', unique: true
     end
     create_table :thredded_messageboard_notifications_for_followed_topics do |t|
-      t.integer :user_id, null: false
-      t.integer :messageboard_id, null: false
+      t.references :user, null: false, index: false, type: user_id_type
+      t.references :messageboard, null: false, index: false
       t.string :notifier_key, null: false, limit: 90
       t.boolean :enabled, default: true, null: false
-      t.index [:user_id, :messageboard_id, :notifier_key],
+      t.index %i[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.references :user, null: false, index: false, type: user_id_type
+      t.references :post, null: false, index: false
       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
+      t.index %i[user_id post_id], name: :index_thredded_user_post_notifications_on_user_id_and_post_id, unique: true
     end
+    add_foreign_key :thredded_user_post_notifications,
+                    Thredded.user_class.table_name, column: :user_id, on_delete: :cascade
+    add_foreign_key :thredded_user_post_notifications,
+                    :thredded_posts, column: :post_id, on_delete: :cascade
   end
 end
 # rubocop:enable Metrics/MethodLength