gitea/nas
1
0
Fork 2
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Fix duplicated post url reference

Browse source
This commit is contained in:
KMY 2023-07-07 17:10:38 +09:00
parent a66207e1ca
commit 30e4bb8d87
1 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

9
app/services/resolve_url_service.rb
View file

@ -5,6 +5,7 @@ class ResolveURLService < BaseService
include Authorization include Authorization
USERNAME_STATUS_RE = %r{/@(?<username>#{Account::USERNAME_RE})/(?<status_id>[0-9]+)\Z} USERNAME_STATUS_RE = %r{/@(?<username>#{Account::USERNAME_RE})/(?<status_id>[0-9]+)\Z}
REMOTE_USERNAME_STATUS_RE = %r{/@(?<username>#{Account::USERNAME_RE}@#{Account::USERNAME_RE})/(?<status_id>[0-9]+)\Z}
def call(url, on_behalf_of: nil) def call(url, on_behalf_of: nil)
@url = url @url = url
@ -89,13 +90,17 @@ class ResolveURLService < BaseService
def process_local_url def process_local_url
recognized_params = Rails.application.routes.recognize_path(@url) recognized_params = Rails.application.routes.recognize_path(@url)
return unless recognized_params[:action] == 'show'
if recognized_params[:controller] == 'statuses' if recognized_params[:controller] == 'statuses'
status = Status.find_by(id: recognized_params[:id]) status = Status.find_by(id: recognized_params[:id])
check_local_status(status) check_local_status(status)
elsif recognized_params[:controller] == 'accounts' elsif recognized_params[:controller] == 'accounts'
Account.find_local(recognized_params[:username]) Account.find_local(recognized_params[:username])
elsif recognized_params[:controller] == 'home' && recognized_params[:action] == 'index'
parsed_url = Addressable::URI.parse(@url)
parsed_url.path.match(REMOTE_USERNAME_STATUS_RE) do |matched|
status = Status.find_by(id: matched[:status_id])
check_local_status(status)
end
end end
end end