From c3f36e91424a90275aec780884d38afe73d71872 Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Thu, 1 Aug 2019 19:19:31 -0400 Subject: [PATCH] Actually fix remote profile loading --- app/controllers/api/v1/account_by_username_controller.rb | 9 ++++----- config/routes.rb | 2 +- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/app/controllers/api/v1/account_by_username_controller.rb b/app/controllers/api/v1/account_by_username_controller.rb index 6c8d3734..7fb82d23 100644 --- 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 diff --git a/config/routes.rb b/config/routes.rb index 30707326..d360feb2 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -330,7 +330,7 @@ Rails.application.routes.draw do get '/search', to: 'search#index', as: :search - get '/account_by_username/:username', to: 'account_by_username#show' + get '/account_by_username/:username', to: 'account_by_username#show', username: /(.*)/ resources :follows, only: [:create] resources :media, only: [:create, :update]