Merge branch 'remote-profile-fix' into 'develop'

Actually fix remote profile loading See merge request gab/social/gab-social!30
2019-08-05 04:51:57 +00:00
parent aed10a5a3b c3f36e9142
commit b9f9ae2231
2 changed files with 5 additions and 6 deletions
--- a/app/controllers/api/v1/account_by_username_controller.rb
+++ b/app/controllers/api/v1/account_by_username_controller.rb
@@ -11,12 +11,11 @@ class Api::V1::AccountByUsernameController < Api::BaseController
  end

  def set_account
-    user = params[:username].split("@")
-    if user[1]
-      user[1] = "#{user[1]}.#{params[:format]}"
-      @account = Account.find_remote!(user[0], user[1])
+    username, domain = params[:username].split("@")
+    if domain
+      @account = Account.find_remote!(username, domain)
    else
-      @account = Account.find_local!(user[0])
+      @account = Account.find_local!(username)
    end
  end