Commit a7955ad4 authored by Alex Gleason's avatar Alex Gleason

Account.find_acct! function

parent 0aed68a7
......@@ -11,12 +11,7 @@ class Api::V1::AccountByUsernameController < Api::BaseController
end
def set_account
username, domain = params[:username].split("@")
if domain
@account = Account.find_remote!(username, domain)
else
@account = Account.find_local!(username)
end
@account = Account.find_acct!(params[:username])
end
def check_account_suspension
......
......@@ -12,6 +12,10 @@ module AccountFinderConcern
find_remote(username, domain) || raise(ActiveRecord::RecordNotFound)
end
def find_acct!(acct)
find_acct(acct) || raise(ActiveRecord::RecordNotFound)
end
def representative
find_local(Setting.site_contact_username.strip.gsub(/\A@/, '')) || Account.local.without_suspended.first
end
......@@ -23,6 +27,11 @@ module AccountFinderConcern
def find_remote(username, domain)
AccountFinder.new(username, domain).account
end
def find_acct(acct)
username, domain = acct.split("@")
find_remote(username, domain)
end
end
class AccountFinder
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment