mirror of https://github.com/tootsuite/mastodon
Use Contact User as Relay, Report, Subscribe. (#9661)
* Use Contact User as Relay, Report, Subscribe. * Use Account.representative to fetch contact user. * Use find_local. * No reason to use Account.representative in subscribe_service. * Don't required representative! * Fallback is included in Account.representative method.pull/9719/head
parent
45899cfa69
commit
fae32634b1
|
@ -12,6 +12,10 @@ module AccountFinderConcern
|
|||
find_remote(username, domain) || raise(ActiveRecord::RecordNotFound)
|
||||
end
|
||||
|
||||
def representative
|
||||
find_local(Setting.site_contact_username.gsub(/\A@/, '')) || Account.local.find_by(suspended: false)
|
||||
end
|
||||
|
||||
def find_local(username)
|
||||
find_remote(username, nil)
|
||||
end
|
||||
|
|
|
@ -68,7 +68,7 @@ class Relay < ApplicationRecord
|
|||
end
|
||||
|
||||
def some_local_account
|
||||
@some_local_account ||= Account.local.find_by(suspended: false)
|
||||
@some_local_account ||= Account.representative
|
||||
end
|
||||
|
||||
def ensure_disabled
|
||||
|
|
|
@ -52,6 +52,6 @@ class ReportService < BaseService
|
|||
end
|
||||
|
||||
def some_local_account
|
||||
@some_local_account ||= Account.local.where(suspended: false).first
|
||||
@some_local_account ||= Account.representative
|
||||
end
|
||||
end
|
||||
|
|
Loading…
Reference in New Issue