diff options
author | Thibaut Girka <thib@sitedethib.com> | 2019-11-20 15:36:09 +0100 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2019-11-20 15:36:09 +0100 |
commit | ff67385cfbfd6f5403b2f8b58407dc730dc7e694 (patch) | |
tree | a8a0df2129a863a739dda6399352d64af811110e /app/services/resolve_url_service.rb | |
parent | 707c4918b21d19dd53b64120dbc7263f45fc5ecd (diff) | |
parent | 8dfc45f757ed8995be0d16e88a1f1d6514dae677 (diff) |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - README.md discarded upstream changes - app/controllers/api/v1/bookmarks_controller.rb finally merged upstream, some code style fixes and slightly changed pagination code - app/controllers/application_controller.rb changed upstream to always return HTML error pages slight conflict caused by theming code - app/models/bookmark.rb finally merged upstream, no real conflict - spec/controllers/api/v1/bookmarks_controller_spec.rb finally merged upstream, slightly changed pagination code
Diffstat (limited to 'app/services/resolve_url_service.rb')
-rw-r--r-- | app/services/resolve_url_service.rb | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/app/services/resolve_url_service.rb b/app/services/resolve_url_service.rb index aa883597a..4e971a4b8 100644 --- a/app/services/resolve_url_service.rb +++ b/app/services/resolve_url_service.rb @@ -24,6 +24,12 @@ class ResolveURLService < BaseService status = FetchRemoteStatusService.new.call(resource_url, body, protocol) authorize_with @on_behalf_of, status, :show? unless status.nil? status + elsif fetched_resource.nil? && @on_behalf_of.present? + # It may happen that the resource is a private toot, and thus not fetchable, + # but we can return the toot if we already know about it. + status = Status.find_by(uri: @url) || Status.find_by(url: @url) + authorize_with @on_behalf_of, status, :show? unless status.nil? + status end end |