Fix off-by-one in tootctl media commands (mastodon#30306)

fedibird · Sep 9, 2024 · 18e0697 · 18e0697
1 parent 355b1d8
commit 18e0697
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/lib/mastodon/media_cli.rb b/lib/mastodon/media_cli.rb
@@ -104,7 +104,7 @@ def remove_orphans
 
             model_name      = path_segments.first.classify
             attachment_name = path_segments[1].singularize
-            record_id       = path_segments[2..-2].join.to_i
+            record_id       = path_segments[2...-2].join.to_i
             file_name       = path_segments.last
             record          = record_map.dig(model_name, record_id)
             attachment      = record&.public_send(attachment_name)
@@ -147,7 +147,7 @@ def remove_orphans
           end
 
           model_name      = path_segments.first.classify
-          record_id       = path_segments[2..-2].join.to_i
+          record_id       = path_segments[2...-2].join.to_i
           attachment_name = path_segments[1].singularize
           file_name       = path_segments.last
 
@@ -324,7 +324,7 @@ def lookup(url)
       end
 
       model_name = path_segments.first.classify
-      record_id  = path_segments[2..-2].join.to_i
+      record_id  = path_segments[2...-2].join.to_i
 
       unless PRELOAD_MODEL_WHITELIST.include?(model_name)
         say("Cannot find corresponding model: #{model_name}", :red)
@@ -374,7 +374,7 @@ def preload_records_from_mixed_objects(objects)
         next unless [7, 10].include?(segments.size)
 
         model_name = segments.first.classify
-        record_id  = segments[2..-2].join.to_i
+        record_id  = segments[2...-2].join.to_i
 
         next unless PRELOAD_MODEL_WHITELIST.include?(model_name)