diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/mastodon/emoji_cli.rb | 9 | ||||
| -rw-r--r-- | lib/paperclip/blurhash_transcoder.rb | 2 |
2 files changed, 9 insertions, 2 deletions
diff --git a/lib/mastodon/emoji_cli.rb b/lib/mastodon/emoji_cli.rb index beac1b1fd..dbaf12018 100644 --- a/lib/mastodon/emoji_cli.rb +++ b/lib/mastodon/emoji_cli.rb @@ -72,9 +72,16 @@ module Mastodon say("Imported #{imported}, skipped #{skipped}, failed to import #{failed}", color(imported, skipped, failed)) end + option :remote_only, type: :boolean desc 'purge', 'Remove all custom emoji' + long_desc <<-LONG_DESC + Removes all custom emoji. + + With the --remote-only option, only remote emoji will be deleted. + LONG_DESC def purge - CustomEmoji.in_batches.destroy_all + scope = options[:remote_only] ? CustomEmoji.remote : CustomEmoji + scope.in_batches.destroy_all say('OK', :green) end diff --git a/lib/paperclip/blurhash_transcoder.rb b/lib/paperclip/blurhash_transcoder.rb index 08925a6dd..5c33c98b0 100644 --- a/lib/paperclip/blurhash_transcoder.rb +++ b/lib/paperclip/blurhash_transcoder.rb @@ -8,7 +8,7 @@ module Paperclip pixels = convert(':source RGB:-', source: File.expand_path(@file.path)).unpack('C*') geometry = options.fetch(:file_geometry_parser).from_file(@file) - attachment.instance.blurhash = Blurhash.encode(geometry.width, geometry.height, pixels, options[:blurhash] || {}) + attachment.instance.blurhash = Blurhash.encode(geometry.width, geometry.height, pixels, **(options[:blurhash] || {})) @file end |