random-mirrors
/
gab-social
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://code.gab.com/gab/social/gab-social into develop

This commit is contained in:
Rob Colbert 2019-08-07 15:40:07 -04:00
parent 7f3b77f86f b9f9ae2231
commit 263ef3ef9c
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/controllers/api/v1/account_by_username_controller.rb
View File

@ -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

2
config/routes.rb
View File

@ -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]