Merge remote-tracking branch 'upstream/develop' into feature/frontend_refactor

2020-03-10 16:24:43 -05:00
parent bccb9a6f9c fadc08fbad
commit 316b5c8d0f
19 changed files with 123 additions and 218 deletions
--- a/app/controllers/api/v1/account_by_username_controller.rb
+++ b/app/controllers/api/v1/account_by_username_controller.rb
@@ -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