Add database support for list show-reply preferences
This commit is contained in:
		
							parent
							
								
									74a281475a
								
							
						
					
					
						commit
						53d0293d25
					
				@ -42,7 +42,8 @@ class FeedManager
 | 
			
		||||
  def push_to_list(list, status)
 | 
			
		||||
    if status.reply? && status.in_reply_to_account_id != status.account_id
 | 
			
		||||
      should_filter = status.in_reply_to_account_id != list.account_id
 | 
			
		||||
      should_filter &&= !ListAccount.where(list_id: list.id, account_id: status.in_reply_to_account_id).exists?
 | 
			
		||||
      should_filter &&= !list.show_all_replies?
 | 
			
		||||
      should_filter &&= !(list.show_list_replies? && ListAccount.where(list_id: list.id, account_id: status.in_reply_to_account_id).exists?)
 | 
			
		||||
      return false if should_filter
 | 
			
		||||
    end
 | 
			
		||||
    return false unless add_to_feed(:list, list.id, status)
 | 
			
		||||
 | 
			
		||||
@ -3,11 +3,12 @@
 | 
			
		||||
#
 | 
			
		||||
# Table name: lists
 | 
			
		||||
#
 | 
			
		||||
#  id         :bigint(8)        not null, primary key
 | 
			
		||||
#  account_id :bigint(8)        not null
 | 
			
		||||
#  title      :string           default(""), not null
 | 
			
		||||
#  created_at :datetime         not null
 | 
			
		||||
#  updated_at :datetime         not null
 | 
			
		||||
#  id             :bigint(8)        not null, primary key
 | 
			
		||||
#  account_id     :bigint(8)        not null
 | 
			
		||||
#  title          :string           default(""), not null
 | 
			
		||||
#  created_at     :datetime         not null
 | 
			
		||||
#  updated_at     :datetime         not null
 | 
			
		||||
#  replies_policy :integer          default("list_replies"), not null
 | 
			
		||||
#
 | 
			
		||||
 | 
			
		||||
class List < ApplicationRecord
 | 
			
		||||
@ -15,6 +16,8 @@ class List < ApplicationRecord
 | 
			
		||||
 | 
			
		||||
  PER_ACCOUNT_LIMIT = 50
 | 
			
		||||
 | 
			
		||||
  enum replies_policy: [:list_replies, :all_replies, :no_replies], _prefix: :show
 | 
			
		||||
 | 
			
		||||
  belongs_to :account, optional: true
 | 
			
		||||
 | 
			
		||||
  has_many :list_accounts, inverse_of: :list, dependent: :destroy
 | 
			
		||||
 | 
			
		||||
							
								
								
									
										23
									
								
								db/migrate/20181127165847_add_show_replies_to_lists.rb
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										23
									
								
								db/migrate/20181127165847_add_show_replies_to_lists.rb
									
									
									
									
									
										Normal file
									
								
							@ -0,0 +1,23 @@
 | 
			
		||||
require Rails.root.join('lib', 'mastodon', 'migration_helpers')
 | 
			
		||||
 | 
			
		||||
class AddShowRepliesToLists < ActiveRecord::Migration[5.2]
 | 
			
		||||
  include Mastodon::MigrationHelpers
 | 
			
		||||
 | 
			
		||||
  disable_ddl_transaction!
 | 
			
		||||
 | 
			
		||||
  def up
 | 
			
		||||
    safety_assured do
 | 
			
		||||
      add_column_with_default(
 | 
			
		||||
        :lists,
 | 
			
		||||
        :replies_policy,
 | 
			
		||||
        :integer,
 | 
			
		||||
        allow_null: false,
 | 
			
		||||
        default: 0
 | 
			
		||||
      )
 | 
			
		||||
    end
 | 
			
		||||
  end
 | 
			
		||||
 | 
			
		||||
  def down
 | 
			
		||||
    remove_column :lists, :replies_policy
 | 
			
		||||
  end
 | 
			
		||||
end
 | 
			
		||||
@ -10,7 +10,7 @@
 | 
			
		||||
#
 | 
			
		||||
# It's strongly recommended that you check this file into your version control system.
 | 
			
		||||
 | 
			
		||||
ActiveRecord::Schema.define(version: 2018_11_27_130500) do
 | 
			
		||||
ActiveRecord::Schema.define(version: 2018_11_27_165847) do
 | 
			
		||||
 | 
			
		||||
  # These are extensions that must be enabled in order to support this database
 | 
			
		||||
  enable_extension "plpgsql"
 | 
			
		||||
@ -293,6 +293,7 @@ ActiveRecord::Schema.define(version: 2018_11_27_130500) do
 | 
			
		||||
    t.string "title", default: "", null: false
 | 
			
		||||
    t.datetime "created_at", null: false
 | 
			
		||||
    t.datetime "updated_at", null: false
 | 
			
		||||
    t.integer "replies_policy", default: 0, null: false
 | 
			
		||||
    t.index ["account_id"], name: "index_lists_on_account_id"
 | 
			
		||||
  end
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user