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

Change tootctl media remove-orphans to work for all classes (#13316)

Browse source 
Change `tootctl media lookup` to not use an interactive prompt
This commit is contained in:
Eugen Rochko 2020-03-26 01:56:41 +01:00 • committed by GitHub
parent e187537dfd
commit 0c8945e5ff
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 98 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/lib/activitypub/tag_manager.rb
View file

@ -15,6 +15,8 @@ class ActivityPub::TagManager
def url_for(target)
return target.url if target.respond_to?(:local?) && !target.local?
return unless target.respond_to?(:object_type)
case target.object_type
when :person
target.instance_actor? ? about_more_url(instance_actor: true) : short_account_url(target)

13
app/models/media_attachment.rb
View file

@ -184,19 +184,6 @@ class MediaAttachment < ApplicationRecord
audio? || video?
end
def variant?(other_file_name)
return true if file_file_name == other_file_name
return false if file_file_name.nil?
formats = file.styles.values.map(&:format).compact
return false if formats.empty?
extension = File.extname(other_file_name)
formats.include?(extension.delete('.')) && File.basename(other_file_name, extension) == File.basename(file_file_name, File.extname(file_file_name))
end
def to_param
shortcode
end