diff options
| author | ThibG <thib@sitedethib.com> | 2020-05-14 23:30:05 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-14 23:30:05 +0200 |
| commit | b7e178d2e4102bdaa1ea41dfd8ed50093cf3f60a (patch) | |
| tree | 8ff7cc88e6875952250a9c099842da4909226906 /lib | |
| parent | e1d282023432ff4a88cb795f3a9889704314e448 (diff) | |
| parent | 2b75728a8083d07bc3238b7aef21ceb3b2cc6e7f (diff) | |
Merge pull request #1329 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/mastodon/media_cli.rb | 4 | ||||
| -rw-r--r-- | lib/mastodon/version.rb | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/mastodon/media_cli.rb b/lib/mastodon/media_cli.rb index 506544446..2b1653335 100644 --- a/lib/mastodon/media_cli.rb +++ b/lib/mastodon/media_cli.rb @@ -198,7 +198,7 @@ module Mastodon if options[:status] scope = MediaAttachment.where(status_id: options[:status]) elsif options[:account] - username, domain = username.split('@') + username, domain = options[:account].split('@') account = Account.find_remote(username, domain) if account.nil? @@ -217,7 +217,7 @@ module Mastodon next if media_attachment.remote_url.blank? || (!options[:force] && media_attachment.file_file_name.present?) unless options[:dry_run] - media_attachment.reset_file! + media_attachment.file_remote_url = media_attachment.remote_url media_attachment.save end diff --git a/lib/mastodon/version.rb b/lib/mastodon/version.rb index ba78a3c30..fa85f8e37 100644 --- a/lib/mastodon/version.rb +++ b/lib/mastodon/version.rb @@ -13,7 +13,7 @@ module Mastodon end def patch - 3 + 4 end def flags |