diff options
| -rw-r--r-- | app/javascript/mastodon/features/account_timeline/containers/header_container.js | 2 | ||||
| -rw-r--r-- | app/javascript/mastodon/features/status/components/card.js | 2 | ||||
| -rw-r--r-- | app/models/preview_card.rb | 1 | ||||
| -rw-r--r-- | app/models/session_activation.rb | 10 | ||||
| -rw-r--r-- | app/serializers/rest/preview_card_serializer.rb | 2 | ||||
| -rw-r--r-- | app/services/fetch_link_card_service.rb | 9 | ||||
| -rw-r--r-- | db/migrate/20171130000000_add_embed_url_to_preview_cards.rb | 18 | ||||
| -rw-r--r-- | db/schema.rb | 3 | ||||
| -rw-r--r-- | lib/tasks/mastodon.rake | 12 |
9 files changed, 39 insertions, 20 deletions
diff --git a/app/javascript/mastodon/features/account_timeline/containers/header_container.js b/app/javascript/mastodon/features/account_timeline/containers/header_container.js index 775610032..b5e0e9a3f 100644 --- a/app/javascript/mastodon/features/account_timeline/containers/header_container.js +++ b/app/javascript/mastodon/features/account_timeline/containers/header_container.js @@ -68,7 +68,7 @@ const mapDispatchToProps = (dispatch, { intl }) => ({ }, onReblogToggle (account) { - if (account.getIn(['relationship', 'show_reblogs'])) { + if (account.getIn(['relationship', 'showing_reblogs'])) { dispatch(followAccount(account.get('id'), false)); } else { dispatch(followAccount(account.get('id'), true)); diff --git a/app/javascript/mastodon/features/status/components/card.js b/app/javascript/mastodon/features/status/components/card.js index 680bf63ab..d3e322c36 100644 --- a/app/javascript/mastodon/features/status/components/card.js +++ b/app/javascript/mastodon/features/status/components/card.js @@ -101,7 +101,7 @@ export default class Card extends React.PureComponent { onClick={this.handlePhotoClick} role='button' tabIndex='0' - src={card.get('url')} + src={card.get('embed_url')} alt={card.get('title')} width={card.get('width')} height={card.get('height')} diff --git a/app/models/preview_card.rb b/app/models/preview_card.rb index e2bf65d94..5baddba8a 100644 --- a/app/models/preview_card.rb +++ b/app/models/preview_card.rb @@ -21,6 +21,7 @@ # height :integer default(0), not null # created_at :datetime not null # updated_at :datetime not null +# embed_url :string default(""), not null # class PreviewCard < ApplicationRecord diff --git a/app/models/session_activation.rb b/app/models/session_activation.rb index 8b711d0d6..1d4ebca02 100644 --- a/app/models/session_activation.rb +++ b/app/models/session_activation.rb @@ -14,16 +14,6 @@ # web_push_subscription_id :integer # -# id :bigint not null, primary key -# user_id :bigint not null -# session_id :string not null -# created_at :datetime not null -# updated_at :datetime not null -# user_agent :string default(""), not null -# ip :inet -# access_token_id :bigint -# - class SessionActivation < ApplicationRecord belongs_to :user, inverse_of: :session_activations, required: true belongs_to :access_token, class_name: 'Doorkeeper::AccessToken', dependent: :destroy diff --git a/app/serializers/rest/preview_card_serializer.rb b/app/serializers/rest/preview_card_serializer.rb index 9c460332c..2df9d07a7 100644 --- a/app/serializers/rest/preview_card_serializer.rb +++ b/app/serializers/rest/preview_card_serializer.rb @@ -6,7 +6,7 @@ class REST::PreviewCardSerializer < ActiveModel::Serializer attributes :url, :title, :description, :type, :author_name, :author_url, :provider_name, :provider_url, :html, :width, :height, - :image + :image, :embed_url def image object.image? ? full_asset_url(object.image.url(:original)) : nil diff --git a/app/services/fetch_link_card_service.rb b/app/services/fetch_link_card_service.rb index 37cf75379..cec96d927 100644 --- a/app/services/fetch_link_card_service.rb +++ b/app/services/fetch_link_card_service.rb @@ -74,9 +74,6 @@ class FetchLinkCardService < BaseService return false unless response.respond_to?(:type) - # The photo will change the URL. So, to avoid duplication of URLs, PreviewCard needs to be checked again. - @card = PreviewCard.find_by(url: response.url) || @card if response.type == 'photo' - @card.type = response.type @card.title = response.respond_to?(:title) ? response.title : '' @card.author_name = response.respond_to?(:author_name) ? response.author_name : '' @@ -90,9 +87,9 @@ class FetchLinkCardService < BaseService when 'link' @card.image = URI.parse(response.thumbnail_url) if response.respond_to?(:thumbnail_url) when 'photo' - @card.url = response.url - @card.width = response.width.presence || 0 - @card.height = response.height.presence || 0 + @card.embed_url = response.url + @card.width = response.width.presence || 0 + @card.height = response.height.presence || 0 when 'video' @card.width = response.width.presence || 0 @card.height = response.height.presence || 0 diff --git a/db/migrate/20171130000000_add_embed_url_to_preview_cards.rb b/db/migrate/20171130000000_add_embed_url_to_preview_cards.rb new file mode 100644 index 000000000..d19c0091b --- /dev/null +++ b/db/migrate/20171130000000_add_embed_url_to_preview_cards.rb @@ -0,0 +1,18 @@ +require Rails.root.join('lib', 'mastodon', 'migration_helpers') + +class AddEmbedUrlToPreviewCards < ActiveRecord::Migration[5.1] + include Mastodon::MigrationHelpers + + disable_ddl_transaction! + + def up + safety_assured do + add_column_with_default :preview_cards, :embed_url, :string, default: '', allow_null: false + end + end + + def down + execute "UPDATE preview_cards SET url=embed_url WHERE embed_url!=''" + remove_column :preview_cards, :embed_url + end +end diff --git a/db/schema.rb b/db/schema.rb index c87c9b393..4cf886a00 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -10,7 +10,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 20171129172043) do +ActiveRecord::Schema.define(version: 20171130000000) do # These are extensions that must be enabled in order to support this database enable_extension "plpgsql" @@ -334,6 +334,7 @@ ActiveRecord::Schema.define(version: 20171129172043) do t.integer "height", default: 0, null: false t.datetime "created_at", null: false t.datetime "updated_at", null: false + t.string "embed_url", default: "", null: false t.index ["url"], name: "index_preview_cards_on_url", unique: true end 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 |