From: ThibG <thib@sitedethib.com>
Date: Sun, 9 Aug 2020 23:51:06 +0000 (+0200)
Subject: Fix `tootctl media` commands not handling snowflake ids for media_attachments (#14536)
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=decc5b9a78047539b328224f3349a47bfc9834b7;p=mastodon.git

Fix `tootctl media` commands not handling snowflake ids for media_attachments (#14536)
---

diff --git a/lib/mastodon/media_cli.rb b/lib/mastodon/media_cli.rb
index 2a4e3e379..7b82c3d22 100644
--- a/lib/mastodon/media_cli.rb
+++ b/lib/mastodon/media_cli.rb
@@ -89,7 +89,7 @@ module Mastodon
             path_segments = object.key.split('/')
             path_segments.delete('cache')
 
-            if path_segments.size != 7
+            unless [7, 10].include?(path_segments.size)
               progress.log(pastel.yellow("Unrecognized file found: #{object.key}"))
               next
             end
@@ -133,7 +133,7 @@ module Mastodon
           path_segments = key.split(File::SEPARATOR)
           path_segments.delete('cache')
 
-          if path_segments.size != 7
+          unless [7, 10].include?(path_segments.size)
             progress.log(pastel.yellow("Unrecognized file found: #{key}"))
             next
           end
@@ -258,7 +258,7 @@ module Mastodon
       path_segments = path.split('/')[2..-1]
       path_segments.delete('cache')
 
-      if path_segments.size != 7
+      unless [7, 10].include?(path_segments.size)
         say('Not a media URL', :red)
         exit(1)
       end
@@ -311,7 +311,7 @@ module Mastodon
         segments = object.key.split('/')
         segments.delete('cache')
 
-        next if segments.size != 7
+        next unless [7, 10].include?(segments.size)
 
         model_name = segments.first.classify
         record_id  = segments[2..-2].join.to_i