3 files changed, 18 insertions, 6 deletions
diff --git a/lib/mastodon/migration_helpers.rb b/lib/mastodon/migration_helpers.rb
index 2b5a6cd42..6f6f99f63 100644
--- a/lib/mastodon/migration_helpers.rb
+++ b/lib/mastodon/migration_helpers.rb
@@ -99,7 +99,7 @@ module Mastodon
     # default - The default value for the column.
     # null - When set to `true` the column will allow NULL values.
     #        The default is to not allow NULL values.
-    def add_timestamps_with_timezone(table_name, options = {})
+    def add_timestamps_with_timezone(table_name, **options)
       options[:null] = false if options[:null].nil?
 
       [:created_at, :updated_at].each do |column_name|
@@ -134,7 +134,7 @@ module Mastodon
     #     add_concurrent_index :users, :some_column
     #
     # See Rails' `add_index` for more info on the available arguments.
-    def add_concurrent_index(table_name, column_name, options = {})
+    def add_concurrent_index(table_name, column_name, **options)
       if transaction_open?
         raise 'add_concurrent_index can not be run inside a transaction, ' \
           'you can disable transactions by calling disable_ddl_transaction! ' \
@@ -158,7 +158,7 @@ module Mastodon
     #     remove_concurrent_index :users, :some_column
     #
     # See Rails' `remove_index` for more info on the available arguments.
-    def remove_concurrent_index(table_name, column_name, options = {})
+    def remove_concurrent_index(table_name, column_name, **options)
       if transaction_open?
         raise 'remove_concurrent_index can not be run inside a transaction, ' \
           'you can disable transactions by calling disable_ddl_transaction! ' \
@@ -182,7 +182,7 @@ module Mastodon
     #     remove_concurrent_index :users, "index_X_by_Y"
     #
     # See Rails' `remove_index` for more info on the available arguments.
-    def remove_concurrent_index_by_name(table_name, index_name, options = {})
+    def remove_concurrent_index_by_name(table_name, index_name, **options)
       if transaction_open?
         raise 'remove_concurrent_index_by_name can not be run inside a transaction, ' \
           'you can disable transactions by calling disable_ddl_transaction! ' \
diff --git a/lib/mastodon/version.rb b/lib/mastodon/version.rb
index f10ace13e..ac04913e6 100644
--- a/lib/mastodon/version.rb
+++ b/lib/mastodon/version.rb
@@ -9,7 +9,7 @@ module Mastodon
     end
 
     def minor
-      0
+      1
     end
 
     def patch
@@ -17,7 +17,7 @@ module Mastodon
     end
 
     def pre
-      nil
+      'rc2'
     end
 
     def flags
diff --git a/lib/tasks/mastodon.rake b/lib/tasks/mastodon.rake
index 995cf0d6f..0f2cc536a 100644
--- a/lib/tasks/mastodon.rake
+++ b/lib/tasks/mastodon.rake
@@ -326,5 +326,17 @@ namespace :mastodon do
         end
       end
     end
+
+    desc 'Migrate photo preview cards made before 2.1'
+    task migrate_photo_preview_cards: :environment do
+      status_ids = Status.joins(:preview_cards)
+                         .where(preview_cards: { embed_url: '', type: :photo })
+                         .reorder(nil)
+                         .group(:id)
+                         .pluck(:id)
+
+      PreviewCard.where(embed_url: '', type: :photo).delete_all
+      LinkCrawlWorker.push_bulk status_ids
+    end
   end
 end