tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into glitch-soc/merge-upstream

Browse Source
This commit is contained in:
Thibaut Girka
2020-05-20 18:22:42 +02:00
parent b7e178d2e4 50524d1327
commit 27b5143dc4
14 changed files with 124 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/lib/activitypub/activity/create.rb
View File

@@ -201,7 +201,7 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
begin
href = Addressable::URI.parse(attachment['url']).normalize.to_s
media_attachment = MediaAttachment.create(account: @account, remote_url: href, description: attachment['name'].presence, focus: attachment['focalPoint'], blurhash: supported_blurhash?(attachment['blurhash']) ? attachment['blurhash'] : nil)
media_attachment = MediaAttachment.create(account: @account, remote_url: href, description: attachment['summary'].presence || attachment['name'].presence, focus: attachment['focalPoint'], blurhash: supported_blurhash?(attachment['blurhash']) ? attachment['blurhash'] : nil)
media_attachments << media_attachment
next if unsupported_media_type?(attachment['mediaType']) || skip_download?

4
app/lib/webfinger_resource.rb
View File

@@ -3,6 +3,8 @@
class WebfingerResource
attr_reader :resource
class InvalidRequest < StandardError; end
def initialize(resource)
@resource = resource
end
@@ -14,7 +16,7 @@ class WebfingerResource
when /\@/
username_from_acct
else
raise(ActiveRecord::RecordNotFound)
raise InvalidRequest
end
end