Merge remote-tracking branch 'origin/master' into merge-upstream

diff --cc app/lib/feed_manager.rb
Simple merge

diff --cc app/models/account.rb
index 230a5d298b38dded7b8a2fd09f2724ee1d7bf109,9353c40dadbf04646bbad4dc32ecb92de8d281d9..a4b8e1c0ba502518a8c7aa3a707111ec59759445
--- 1/app/models/account.rb
--- 2/app/models/account.rb
+++ b/app/models/account.rb
@@@ -53,9 -53,8 +53,10 @@@ class Account < ApplicationRecor
    include AccountInteractions
    include Attachmentable
    include Remotable
+   include Paginable
  
 +  MAX_NOTE_LENGTH = 500
 +
    enum protocol: [:ostatus, :activitypub]
  
    # Local users

diff --cc app/models/follow.rb
index ea00a377a23d2493779fd413b3b96234af9d001e,795ecf55a0a55da404be48dd1c00af31a723e0a9..b82da722724fc764c4ebda3b855fb028507eecfe
--- 1/app/models/follow.rb
--- 2/app/models/follow.rb
+++ b/app/models/follow.rb
@@@ -3,12 -3,11 +3,13 @@@
  #
  # Table name: follows
  #
+ #  id                :integer          not null, primary key
  #  created_at        :datetime         not null
  #  updated_at        :datetime         not null
 -#  account_id        :integer          not null
 -#  target_account_id :integer          not null
 +#  account_id        :bigint          not null
 +#  id                :bigint          not null, primary key
 +#  target_account_id :bigint          not null
 +#  show_reblogs      :boolean          default(TRUE), not null
  #
  
  class Follow < ApplicationRecord

diff --cc app/models/follow_request.rb
index 962b61411308bca2426cf39bbbbf185f46b4f8db,fac91b51330ecf7100fc963cd2455dce08e6d658..21f01e18b197ca95302ede4c2acf7cd553142f6e
--- 1/app/models/follow_request.rb
--- 2/app/models/follow_request.rb
+++ b/app/models/follow_request.rb
@@@ -3,12 -3,11 +3,13 @@@
  #
  # Table name: follow_requests
  #
+ #  id                :integer          not null, primary key
  #  created_at        :datetime         not null
  #  updated_at        :datetime         not null
 -#  account_id        :integer          not null
 -#  target_account_id :integer          not null
 +#  account_id        :bigint          not null
 +#  id                :bigint          not null, primary key
 +#  target_account_id :bigint          not null
 +#  show_reblogs      :boolean          default(TRUE), not null
  #
  
  class FollowRequest < ApplicationRecord

diff --cc app/models/media_attachment.rb
Simple merge

diff --cc app/models/status.rb
Simple merge

diff --cc app/models/stream_entry.rb
Simple merge

diff --cc app/services/batched_remove_status_service.rb
Simple merge

diff --cc app/services/fan_out_on_write_service.rb
index 2214d73dd6d254d8458896b913560d52b2349319,bbaf3094b117a04fbfe6d197ccafbe5e6758c48f..0f77556dcf29d9838402dc930623307ab92a78c6
--- 1/app/services/fan_out_on_write_service.rb
--- 2/app/services/fan_out_on_write_service.rb
+++ b/app/services/fan_out_on_write_service.rb
@@@ -10,13 -10,11 +10,14 @@@ class FanOutOnWriteService < BaseServic
  
      deliver_to_self(status) if status.account.local?
  
 +    render_anonymous_payload(status)
 +
      if status.direct_visibility?
        deliver_to_mentioned_followers(status)
 +      deliver_to_direct_timelines(status)
      else
        deliver_to_followers(status)
+       deliver_to_lists(status)
      end
  
      return if status.account.silenced? || !status.public_visibility? || status.reblog?

diff --cc app/services/remove_status_service.rb
Simple merge

diff --cc config/routes.rb
Simple merge

diff --cc db/schema.rb
index 0691c4220b614ec06316d967a340bc14ceb3fa9a,345b05850c14dfc46e2d0bced012c42601f99843..c2de168857193966a2be0084b564cc1a1c424562
--- 1/db/schema.rb
--- 2/db/schema.rb
+++ b/db/schema.rb
@@@ -489,8 -496,11 +508,12 @@@ ActiveRecord::Schema.define(version: 20
    add_foreign_key "follow_requests", "accounts", name: "fk_76d644b0e7", on_delete: :cascade
    add_foreign_key "follows", "accounts", column: "target_account_id", name: "fk_745ca29eac", on_delete: :cascade
    add_foreign_key "follows", "accounts", name: "fk_32ed1b5560", on_delete: :cascade
 +  add_foreign_key "glitch_keyword_mutes", "accounts", on_delete: :cascade
    add_foreign_key "imports", "accounts", name: "fk_6db1b6e408", on_delete: :cascade
+   add_foreign_key "list_accounts", "accounts", on_delete: :cascade
+   add_foreign_key "list_accounts", "follows", on_delete: :cascade
+   add_foreign_key "list_accounts", "lists", on_delete: :cascade
+   add_foreign_key "lists", "accounts", on_delete: :cascade
    add_foreign_key "media_attachments", "accounts", name: "fk_96dd81e81b", on_delete: :nullify
    add_foreign_key "media_attachments", "statuses", on_delete: :nullify
    add_foreign_key "mentions", "accounts", name: "fk_970d43f9d1", on_delete: :cascade

diff --cc spec/lib/feed_manager_spec.rb
Simple merge

diff --cc streaming/index.js
Simple merge