Skip to content
Snippets Groups Projects
Commit fae32634 authored by Naoki Kosaka's avatar Naoki Kosaka Committed by Eugen Rochko
Browse files

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.
parent 45899cfa
No related branches found
No related tags found
No related merge requests found
......@@ -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
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment