diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2020-04-12 16:50:27 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2020-04-12 16:50:27 +0200 |
| commit | fdd0beefa7176f4d0df3adcf37156229889127d7 (patch) | |
| tree | 9a618d6a5c0759b28b89f663ff0fc8eee6c4db6c /lib/mastodon | |
| parent | 51bbf0b68dc504c441cb929e4fbf8d8c6e04df42 (diff) | |
| parent | 490ff09c5a503f1e5f9cad964470fdefa3eabea8 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - `README.md`: We have a different README than upstream, discarded upstream changes and kept ours.
Diffstat (limited to 'lib/mastodon')
| -rw-r--r-- | lib/mastodon/media_cli.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/mastodon/media_cli.rb b/lib/mastodon/media_cli.rb index 08a8f1093..0f211f272 100644 --- a/lib/mastodon/media_cli.rb +++ b/lib/mastodon/media_cli.rb @@ -276,7 +276,7 @@ module Mastodon preload_map = Hash.new { |hash, key| hash[key] = [] } objects.map do |object| - segments = object.key.split('/').first + segments = object.key.split('/') model_name = segments.first.classify record_id = segments[2..-2].join.to_i |