]> cat aescling's git repositories - mastodon.git/commitdiff
Explicitly define attached file of DeprecatedPreviewCard (#4786)
authorAkihiko Odaki <akihiko.odaki.4i@stu.hosei.ac.jp>
Sun, 3 Sep 2017 05:58:58 +0000 (14:58 +0900)
committerEugen Rochko <eugen@zeonfederated.com>
Sun, 3 Sep 2017 05:58:58 +0000 (07:58 +0200)
The path template of the attached files must explicitly be defined because
it is contradicting to the name of the class.

lib/tasks/mastodon.rake

index f04201a3cdd0357deb445c4cadb86c4afeef2128..f4f6e4d237c3efa52c152c5849f28ab6fbe6dcd4 100644 (file)
@@ -275,8 +275,15 @@ namespace :mastodon do
     task remove_deprecated_preview_cards: :environment do
       return unless ActiveRecord::Base.connection.table_exists? 'deprecated_preview_cards'
 
-      class DeprecatedPreviewCard < PreviewCard
-        self.table_name = 'deprecated_preview_cards'
+      class DeprecatedPreviewCard < ActiveRecord::Base
+        self.inheritance_column = false
+
+        path = '/preview_cards/:attachment/:id_partition/:style/:filename'
+        if ENV['S3_ENABLED'] != 'true'
+          path = (ENV['PAPERCLIP_ROOT_PATH'] || ':rails_root/public/system') + path
+        end
+
+        has_attached_file :image, styles: { original: '280x120>' }, convert_options: { all: '-quality 80 -strip' }, path: path
       end
 
       puts 'Delete records and associated files from deprecated preview cards? [y/N]: '