diff options
author | Starfall <us@starfall.systems> | 2021-01-07 10:25:39 -0600 |
---|---|---|
committer | Starfall <us@starfall.systems> | 2021-01-07 10:25:39 -0600 |
commit | 29227b32e150894e15098bcf216b1f5c08763200 (patch) | |
tree | afa3ac9c52a63ca672e619876c84cf59f2dbb36f /lib | |
parent | 6ed4e874c5ace36344f77b3f096c4089d9b11e01 (diff) | |
parent | d42e7e01dcd464f80637682d4eee6e5a7f36f26e (diff) |
Merge remote-tracking branch 'glitchsoc/master' into main
Diffstat (limited to 'lib')
-rw-r--r-- | lib/mastodon/accounts_cli.rb | 2 | ||||
-rw-r--r-- | lib/mastodon/emoji_cli.rb | 7 | ||||
-rw-r--r-- | lib/mastodon/version.rb | 2 |
3 files changed, 8 insertions, 3 deletions
diff --git a/lib/mastodon/accounts_cli.rb b/lib/mastodon/accounts_cli.rb index cdd1db995..653bfca30 100644 --- a/lib/mastodon/accounts_cli.rb +++ b/lib/mastodon/accounts_cli.rb @@ -384,7 +384,7 @@ module Mastodon end processed, = parallelize_with_progress(Account.local.without_suspended) do |account| - FollowService.new.call(account, target_account) + FollowService.new.call(account, target_account, bypass_limit: true) end say("OK, followed target from #{processed} accounts", :green) diff --git a/lib/mastodon/emoji_cli.rb b/lib/mastodon/emoji_cli.rb index da8fd6a0d..0a1f538e6 100644 --- a/lib/mastodon/emoji_cli.rb +++ b/lib/mastodon/emoji_cli.rb @@ -43,7 +43,12 @@ module Mastodon tar.each do |entry| next unless entry.file? && entry.full_name.end_with?('.png') - shortcode = [options[:prefix], File.basename(entry.full_name, '.*'), options[:suffix]].compact.join + filename = File.basename(entry.full_name, '.*') + + # Skip macOS shadow files + next if filename.start_with?('._') + + shortcode = [options[:prefix], filename, options[:suffix]].compact.join custom_emoji = CustomEmoji.local.find_by(shortcode: shortcode) if custom_emoji && !options[:overwrite] diff --git a/lib/mastodon/version.rb b/lib/mastodon/version.rb index b51ce9042..970ee4fb2 100644 --- a/lib/mastodon/version.rb +++ b/lib/mastodon/version.rb @@ -17,7 +17,7 @@ module Mastodon end def flags - 'rc3' + '' end def suffix |