From 1502668ee58a64b78f1d023fb7dfc3f77b148344 Mon Sep 17 00:00:00 2001 From: KMY Date: Fri, 7 Apr 2023 20:26:52 +0900 Subject: [PATCH 1/4] Support 5 or more media_attachments from activitypub --- app/javascript/mastodon/actions/compose.js | 2 +- .../mastodon/actions/importer/normalizer.js | 2 +- .../mastodon/components/media_gallery.jsx | 29 +++++++++++++++++-- .../containers/upload_button_container.js | 2 +- app/lib/activitypub/activity/create.rb | 2 +- app/models/media_attachment.rb | 3 ++ app/serializers/rest/instance_serializer.rb | 2 +- .../rest/v1/instance_serializer.rb | 2 +- .../process_status_update_service.rb | 2 +- app/services/post_status_service.rb | 4 +-- app/services/update_status_service.rb | 4 +-- 11 files changed, 41 insertions(+), 13 deletions(-) diff --git a/app/javascript/mastodon/actions/compose.js b/app/javascript/mastodon/actions/compose.js index 6000970512..4a799a08f1 100644 --- a/app/javascript/mastodon/actions/compose.js +++ b/app/javascript/mastodon/actions/compose.js @@ -278,7 +278,7 @@ export function uploadCompose(files) { dispatch(uploadComposeRequest()); for (const [i, f] of Array.from(files).entries()) { - if (media.size + i > 3) break; + if (media.size + i >= 4) break; resizeImage(f).then(file => { const data = new FormData(); diff --git a/app/javascript/mastodon/actions/importer/normalizer.js b/app/javascript/mastodon/actions/importer/normalizer.js index 6065ed8ac2..6e81d4b49a 100644 --- a/app/javascript/mastodon/actions/importer/normalizer.js +++ b/app/javascript/mastodon/actions/importer/normalizer.js @@ -66,7 +66,7 @@ export function normalizeStatus(status, normalOldStatus) { normalStatus.filtered = status.filtered.map(normalizeFilterResult); } - if (status.emoji_reactions && normalOldStatus) { + if (status.emoji_reactions && normalOldStatus && normalOldStatus.get('emoji_reactions')) { normalStatus.emoji_reactions = normalizeEmojiReactions(normalOldStatus.get('emoji_reactions').toArray()); } diff --git a/app/javascript/mastodon/components/media_gallery.jsx b/app/javascript/mastodon/components/media_gallery.jsx index f869bd62d1..8b6ba9cfdf 100644 --- a/app/javascript/mastodon/components/media_gallery.jsx +++ b/app/javascript/mastodon/components/media_gallery.jsx @@ -96,6 +96,16 @@ class Item extends React.PureComponent { height = 50; } + if (size === 5 || size === 6) { + height = 33; + } + if (size === 7 || size === 8) { + height = 25; + } + if ((size === 5 && index === 4) || (size === 7 && index === 6)) { + width = 100; + } + if (size === 2) { if (index === 0) { right = '2px'; @@ -128,6 +138,21 @@ class Item extends React.PureComponent { } else { top = '2px'; } + } else { + if (index % 2 === 0) { + right = '2px'; + } + + if (index % 2 === 1) { + left = '2px'; + } + + if (index >= 2) { + top = '2px'; + } + if (index < size - 1) { + bottom = '2px'; + } } let thumbnail = ''; @@ -332,13 +357,13 @@ class MediaGallery extends React.PureComponent { style.height = height; } - const size = media.take(4).size; + const size = media.take(8).size; const uncached = media.every(attachment => attachment.get('type') === 'unknown'); if (standalone && this.isFullSizeEligible()) { children = ; } else { - children = media.take(4).map((attachment, i) => ); + children = media.take(8).map((attachment, i) => ); } if (uncached) { diff --git a/app/javascript/mastodon/features/compose/containers/upload_button_container.js b/app/javascript/mastodon/features/compose/containers/upload_button_container.js index 221b98e310..3bd554da88 100644 --- a/app/javascript/mastodon/features/compose/containers/upload_button_container.js +++ b/app/javascript/mastodon/features/compose/containers/upload_button_container.js @@ -3,7 +3,7 @@ import UploadButton from '../components/upload_button'; import { uploadCompose } from '../../../actions/compose'; const mapStateToProps = state => ({ - disabled: state.getIn(['compose', 'is_uploading']) || (state.getIn(['compose', 'media_attachments']).size + state.getIn(['compose', 'pending_media_attachments']) > 3 || state.getIn(['compose', 'media_attachments']).some(m => ['video', 'audio'].includes(m.get('type')))), + disabled: state.getIn(['compose', 'is_uploading']) || (state.getIn(['compose', 'media_attachments']).size + state.getIn(['compose', 'pending_media_attachments']) >= 4 || state.getIn(['compose', 'media_attachments']).some(m => ['video', 'audio'].includes(m.get('type')))), unavailable: state.getIn(['compose', 'poll']) !== null, resetFileKey: state.getIn(['compose', 'resetFileKey']), }); diff --git a/app/lib/activitypub/activity/create.rb b/app/lib/activitypub/activity/create.rb index 9e08064191..03e7cf9eda 100644 --- a/app/lib/activitypub/activity/create.rb +++ b/app/lib/activitypub/activity/create.rb @@ -131,7 +131,7 @@ class ActivityPub::Activity::Create < ActivityPub::Activity searchability: searchability, thread: replied_to_status, conversation: conversation_from_uri(@object['conversation']), - media_attachment_ids: process_attachments.take(4).map(&:id), + media_attachment_ids: process_attachments.take(MediaAttachment::ACTIVITYPUB_STATUS_ATTACHMENT_MAX).map(&:id), poll: process_poll, } end diff --git a/app/models/media_attachment.rb b/app/models/media_attachment.rb index f390d87aaf..6ca9af0430 100644 --- a/app/models/media_attachment.rb +++ b/app/models/media_attachment.rb @@ -35,6 +35,9 @@ class MediaAttachment < ApplicationRecord include Attachmentable include RoutingHelper + LOCAL_STATUS_ATTACHMENT_MAX = 4 + ACTIVITYPUB_STATUS_ATTACHMENT_MAX = 8 + enum type: { :image => 0, :gifv => 1, :video => 2, :unknown => 3, :audio => 4 } enum processing: { :queued => 0, :in_progress => 1, :complete => 2, :failed => 3 }, _prefix: true diff --git a/app/serializers/rest/instance_serializer.rb b/app/serializers/rest/instance_serializer.rb index 15b4cd425b..6fbb463572 100644 --- a/app/serializers/rest/instance_serializer.rb +++ b/app/serializers/rest/instance_serializer.rb @@ -54,7 +54,7 @@ class REST::InstanceSerializer < ActiveModel::Serializer statuses: { max_characters: StatusLengthValidator::MAX_CHARS, - max_media_attachments: 4, + max_media_attachments: MediaAttachment::LOCAL_STATUS_ATTACHMENT_MAX, characters_reserved_per_url: StatusLengthValidator::URL_PLACEHOLDER_CHARS, }, diff --git a/app/serializers/rest/v1/instance_serializer.rb b/app/serializers/rest/v1/instance_serializer.rb index 338c79383e..7db03edf08 100644 --- a/app/serializers/rest/v1/instance_serializer.rb +++ b/app/serializers/rest/v1/instance_serializer.rb @@ -64,7 +64,7 @@ class REST::V1::InstanceSerializer < ActiveModel::Serializer statuses: { max_characters: StatusLengthValidator::MAX_CHARS, - max_media_attachments: 4, + max_media_attachments: MediaAttachment::LOCAL_STATUS_ATTACHMENT_MAX, characters_reserved_per_url: StatusLengthValidator::URL_PLACEHOLDER_CHARS, }, diff --git a/app/services/activitypub/process_status_update_service.rb b/app/services/activitypub/process_status_update_service.rb index ac7372f745..2e27eb5d09 100644 --- a/app/services/activitypub/process_status_update_service.rb +++ b/app/services/activitypub/process_status_update_service.rb @@ -72,7 +72,7 @@ class ActivityPub::ProcessStatusUpdateService < BaseService as_array(@json['attachment']).each do |attachment| media_attachment_parser = ActivityPub::Parser::MediaAttachmentParser.new(attachment) - next if media_attachment_parser.remote_url.blank? || @next_media_attachments.size > 4 + next if media_attachment_parser.remote_url.blank? || @next_media_attachments.size > MediaAttachment::ACTIVITYPUB_STATUS_ATTACHMENT_MAX begin media_attachment = previous_media_attachments.find { |previous_media_attachment| previous_media_attachment.remote_url == media_attachment_parser.remote_url } diff --git a/app/services/post_status_service.rb b/app/services/post_status_service.rb index 1bf094116f..feeb9de205 100644 --- a/app/services/post_status_service.rb +++ b/app/services/post_status_service.rb @@ -150,9 +150,9 @@ class PostStatusService < BaseService return end - raise Mastodon::ValidationError, I18n.t('media_attachments.validations.too_many') if @options[:media_ids].size > 4 || @options[:poll].present? + raise Mastodon::ValidationError, I18n.t('media_attachments.validations.too_many') if @options[:media_ids].size > MediaAttachment::LOCAL_STATUS_ATTACHMENT_MAX || @options[:poll].present? - @media = @account.media_attachments.where(status_id: nil).where(id: @options[:media_ids].take(4).map(&:to_i)) + @media = @account.media_attachments.where(status_id: nil).where(id: @options[:media_ids].take(MediaAttachment::LOCAL_STATUS_ATTACHMENT_MAX).map(&:to_i)) raise Mastodon::ValidationError, I18n.t('media_attachments.validations.images_and_video') if @media.size > 1 && @media.find(&:audio_or_video?) raise Mastodon::ValidationError, I18n.t('media_attachments.validations.not_ready') if @media.any?(&:not_processed?) diff --git a/app/services/update_status_service.rb b/app/services/update_status_service.rb index 9cdef9b326..f29dba816f 100644 --- a/app/services/update_status_service.rb +++ b/app/services/update_status_service.rb @@ -71,9 +71,9 @@ class UpdateStatusService < BaseService def validate_media! return [] if @options[:media_ids].blank? || !@options[:media_ids].is_a?(Enumerable) - raise Mastodon::ValidationError, I18n.t('media_attachments.validations.too_many') if @options[:media_ids].size > 4 || @options[:poll].present? + raise Mastodon::ValidationError, I18n.t('media_attachments.validations.too_many') if @options[:media_ids].size > MediaAttachment::LOCAL_STATUS_ATTACHMENT_MAX || @options[:poll].present? - media_attachments = @status.account.media_attachments.where(status_id: [nil, @status.id]).where(scheduled_status_id: nil).where(id: @options[:media_ids].take(4).map(&:to_i)).to_a + media_attachments = @status.account.media_attachments.where(status_id: [nil, @status.id]).where(scheduled_status_id: nil).where(id: @options[:media_ids].take(MediaAttachment::LOCAL_STATUS_ATTACHMENT_MAX).map(&:to_i)).to_a raise Mastodon::ValidationError, I18n.t('media_attachments.validations.images_and_video') if media_attachments.size > 1 && media_attachments.find(&:audio_or_video?) raise Mastodon::ValidationError, I18n.t('media_attachments.validations.not_ready') if media_attachments.any?(&:not_processed?) From c2cd05d0e1fb333e26073dca2066a608583ae0af Mon Sep 17 00:00:00 2001 From: KMY Date: Fri, 7 Apr 2023 20:27:00 +0900 Subject: [PATCH 2/4] Fix IconButton console error --- .../mastodon/features/status/components/action_bar.jsx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/javascript/mastodon/features/status/components/action_bar.jsx b/app/javascript/mastodon/features/status/components/action_bar.jsx index 5c0f36ea10..7564b22cd0 100644 --- a/app/javascript/mastodon/features/status/components/action_bar.jsx +++ b/app/javascript/mastodon/features/status/components/action_bar.jsx @@ -42,6 +42,7 @@ const messages = defineMessages({ unmute: { id: 'account.unmute', defaultMessage: 'Unmute @{name}' }, unblock: { id: 'account.unblock', defaultMessage: 'Unblock @{name}' }, openOriginalPage: { id: 'account.open_original_page', defaultMessage: 'Open original page' }, + pickEmoji: { id: 'status.emoji_reaction.pick', defaultMessage: 'Pick emoji' }, }); const mapStateToProps = (state, { status }) => ({ @@ -270,7 +271,7 @@ class ActionBar extends React.PureComponent { ); const emojiPickerButton = ( - + ); let replyIcon; From dc4dca177e992a9843e03788e1fe9a65b555e0c2 Mon Sep 17 00:00:00 2001 From: KMY Date: Fri, 7 Apr 2023 20:28:15 +0900 Subject: [PATCH 3/4] Fix: lack of change --- app/lib/activitypub/activity/create.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/lib/activitypub/activity/create.rb b/app/lib/activitypub/activity/create.rb index 03e7cf9eda..7b6b7a7620 100644 --- a/app/lib/activitypub/activity/create.rb +++ b/app/lib/activitypub/activity/create.rb @@ -263,7 +263,7 @@ class ActivityPub::Activity::Create < ActivityPub::Activity as_array(@object['attachment']).each do |attachment| media_attachment_parser = ActivityPub::Parser::MediaAttachmentParser.new(attachment) - next if media_attachment_parser.remote_url.blank? || media_attachments.size >= 4 + next if media_attachment_parser.remote_url.blank? || media_attachments.size >= MediaAttachment::ACTIVITYPUB_STATUS_ATTACHMENT_MAX begin media_attachment = MediaAttachment.create( From 8719715e27823dda620d4b433773a2525d9263bd Mon Sep 17 00:00:00 2001 From: KMY Date: Fri, 7 Apr 2023 21:36:35 +0900 Subject: [PATCH 4/4] Add media_expand setting --- app/controllers/settings/preferences_controller.rb | 1 + app/javascript/mastodon/components/media_gallery.jsx | 9 ++++++--- app/javascript/mastodon/initial_state.js | 2 ++ app/lib/user_settings_decorator.rb | 5 +++++ app/models/user.rb | 2 +- app/serializers/initial_state_serializer.rb | 1 + app/views/settings/preferences/appearance/show.html.haml | 3 +++ config/locales/simple_form.en.yml | 1 + config/locales/simple_form.ja.yml | 2 ++ 9 files changed, 22 insertions(+), 4 deletions(-) diff --git a/app/controllers/settings/preferences_controller.rb b/app/controllers/settings/preferences_controller.rb index a3994d8f85..3b2a79cdd4 100644 --- a/app/controllers/settings/preferences_controller.rb +++ b/app/controllers/settings/preferences_controller.rb @@ -42,6 +42,7 @@ class Settings::PreferencesController < Settings::BaseController :setting_delete_modal, :setting_auto_play_gif, :setting_display_media, + :setting_display_media_expand, :setting_expand_spoilers, :setting_reduce_motion, :setting_disable_swiping, diff --git a/app/javascript/mastodon/components/media_gallery.jsx b/app/javascript/mastodon/components/media_gallery.jsx index 8b6ba9cfdf..85f0f669d9 100644 --- a/app/javascript/mastodon/components/media_gallery.jsx +++ b/app/javascript/mastodon/components/media_gallery.jsx @@ -5,7 +5,7 @@ import { is } from 'immutable'; import IconButton from './icon_button'; import { defineMessages, injectIntl, FormattedMessage } from 'react-intl'; import classNames from 'classnames'; -import { autoPlayGif, cropImages, displayMedia, useBlurhash } from '../initial_state'; +import { autoPlayGif, cropImages, displayMedia, displayMediaExpand, useBlurhash } from '../initial_state'; import { debounce } from 'lodash'; import Blurhash from 'mastodon/components/blurhash'; @@ -357,13 +357,16 @@ class MediaGallery extends React.PureComponent { style.height = height; } - const size = media.take(8).size; + const maxSize = displayMediaExpand ? 8 : 4; + console.log(displayMediaExpand) + + const size = media.take(maxSize).size; const uncached = media.every(attachment => attachment.get('type') === 'unknown'); if (standalone && this.isFullSizeEligible()) { children = ; } else { - children = media.take(8).map((attachment, i) => ); + children = media.take(maxSize).map((attachment, i) => ); } if (uncached) { diff --git a/app/javascript/mastodon/initial_state.js b/app/javascript/mastodon/initial_state.js index 919e0fc282..9ca02dde87 100644 --- a/app/javascript/mastodon/initial_state.js +++ b/app/javascript/mastodon/initial_state.js @@ -56,6 +56,7 @@ * @property {boolean=} disable_swiping * @property {string=} disabled_account_id * @property {boolean} display_media + * @property {boolean} display_media_expand * @property {string} domain * @property {boolean=} expand_spoilers * @property {boolean} limited_federation_mode @@ -108,6 +109,7 @@ export const deleteModal = getMeta('delete_modal'); export const disableSwiping = getMeta('disable_swiping'); export const disabledAccountId = getMeta('disabled_account_id'); export const displayMedia = getMeta('display_media'); +export const displayMediaExpand = getMeta('display_media_expand'); export const domain = getMeta('domain'); export const expandSpoilers = getMeta('expand_spoilers'); export const forceSingleColumn = !getMeta('advanced_layout'); diff --git a/app/lib/user_settings_decorator.rb b/app/lib/user_settings_decorator.rb index 335a66bcc5..81aff0ee42 100644 --- a/app/lib/user_settings_decorator.rb +++ b/app/lib/user_settings_decorator.rb @@ -26,6 +26,7 @@ class UserSettingsDecorator user.settings['delete_modal'] = delete_modal_preference if change?('setting_delete_modal') user.settings['auto_play_gif'] = auto_play_gif_preference if change?('setting_auto_play_gif') user.settings['display_media'] = display_media_preference if change?('setting_display_media') + user.settings['display_media_expand']= display_media_expand_preference if change?('setting_display_media_expand') user.settings['expand_spoilers'] = expand_spoilers_preference if change?('setting_expand_spoilers') user.settings['reduce_motion'] = reduce_motion_preference if change?('setting_reduce_motion') user.settings['disable_swiping'] = disable_swiping_preference if change?('setting_disable_swiping') @@ -86,6 +87,10 @@ class UserSettingsDecorator settings['setting_display_media'] end + def display_media_expand_preference + boolean_cast_setting 'setting_display_media_expand' + end + def expand_spoilers_preference boolean_cast_setting 'setting_expand_spoilers' end diff --git a/app/models/user.rb b/app/models/user.rb index 9323e0d181..df59469d1b 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -134,7 +134,7 @@ class User < ApplicationRecord has_many :session_activations, dependent: :destroy delegate :auto_play_gif, :default_sensitive, :unfollow_modal, :boost_modal, :delete_modal, - :reduce_motion, :system_font_ui, :noindex, :theme, :display_media, + :reduce_motion, :system_font_ui, :noindex, :theme, :display_media, :display_media_expand, :expand_spoilers, :default_language, :aggregate_reblogs, :show_application, :advanced_layout, :use_blurhash, :use_pending_items, :trends, :crop_images, :disable_swiping, :always_send_emails, diff --git a/app/serializers/initial_state_serializer.rb b/app/serializers/initial_state_serializer.rb index 9767d3a5ac..f158df794c 100644 --- a/app/serializers/initial_state_serializer.rb +++ b/app/serializers/initial_state_serializer.rb @@ -41,6 +41,7 @@ class InitialStateSerializer < ActiveModel::Serializer store[:delete_modal] = object.current_account.user.setting_delete_modal store[:auto_play_gif] = object.current_account.user.setting_auto_play_gif store[:display_media] = object.current_account.user.setting_display_media + store[:display_media_expand]=object.current_account.user.setting_display_media_expand store[:expand_spoilers] = object.current_account.user.setting_expand_spoilers store[:reduce_motion] = object.current_account.user.setting_reduce_motion store[:disable_swiping] = object.current_account.user.setting_disable_swiping diff --git a/app/views/settings/preferences/appearance/show.html.haml b/app/views/settings/preferences/appearance/show.html.haml index 9e3964f217..7afb1850b2 100644 --- a/app/views/settings/preferences/appearance/show.html.haml +++ b/app/views/settings/preferences/appearance/show.html.haml @@ -55,6 +55,9 @@ .fields-group = f.input :setting_display_media, collection: ['default', 'show_all', 'hide_all'],label_method: lambda { |item| t("simple_form.hints.defaults.setting_display_media_#{item}") }, hint: false, as: :radio_buttons, collection_wrapper_tag: 'ul', item_wrapper_tag: 'li', wrapper: :with_floating_label + .fields-group + = f.input :setting_display_media_expand, as: :boolean, wrapper: :with_label + .fields-group = f.input :setting_use_blurhash, as: :boolean, wrapper: :with_label diff --git a/config/locales/simple_form.en.yml b/config/locales/simple_form.en.yml index 00aa828ba2..caa5cde767 100644 --- a/config/locales/simple_form.en.yml +++ b/config/locales/simple_form.en.yml @@ -212,6 +212,7 @@ en: setting_disable_swiping: Disable swiping motions setting_display_media: Media display setting_display_media_default: Default + setting_display_media_expand: Show more medias setting_display_media_hide_all: Hide all setting_display_media_show_all: Show all setting_expand_spoilers: Always expand posts marked with content warnings diff --git a/config/locales/simple_form.ja.yml b/config/locales/simple_form.ja.yml index 3ffa286218..8d59d5dcf5 100644 --- a/config/locales/simple_form.ja.yml +++ b/config/locales/simple_form.ja.yml @@ -58,6 +58,7 @@ ja: setting_display_media_hide_all: メディアを常に隠す setting_display_media_show_all: メディアを常に表示する setting_hide_network: フォローとフォロワーの情報がプロフィールページで見られないようにします + setting_display_media_expand: Misskeyなどは4個を超えて投稿可能です。その追加分を最大8個まで表示します。kmyblueからアップロードはできません setting_noindex: 公開プロフィールおよび各投稿ページに影響します setting_show_application: 投稿するのに使用したアプリが投稿の詳細ビューに表示されるようになります setting_use_blurhash: ぼかしはメディアの色を元に生成されますが、細部は見えにくくなっています @@ -212,6 +213,7 @@ ja: setting_disable_swiping: スワイプでの切り替えを無効にする setting_display_media: メディアの表示 setting_display_media_default: 標準 + setting_display_media_expand: 5個目以降のメディアも表示する (最大8) setting_display_media_hide_all: 非表示 setting_display_media_show_all: 表示 setting_expand_spoilers: 閲覧注意としてマークされた投稿を常に展開する