mirrors
/
mastodon-glitch
mirror of https://github.com/glitch-soc/mastodon
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge 51d34debbb into 113c931cda

Jaehong Kang 2024-04-24 15:15:43 +00:00 committed by GitHub
parent 113c931cda 51d34debbb
commit 0e72538e20
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
8 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/lib/activitypub/activity/create.rb
View File

@ -110,7 +110,7 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
def process_status_params
@status_parser = ActivityPub::Parser::StatusParser.new(@json, followers_collection: @account.followers_url, object: @object)
attachment_ids = process_attachments.take(4).map(&:id)
attachment_ids = process_attachments.take(Rails.configuration.x.glitch.statuses[:max_media_attachments][:remote]).map(&:id)
@params = {
uri: @status_parser.uri,
@ -260,7 +260,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 >= Rails.configuration.x.glitch.statuses[:max_media_attachments][:remote]
begin
media_attachment = MediaAttachment.create(

2
app/serializers/rest/instance_serializer.rb
View File

@ -58,7 +58,7 @@ class REST::InstanceSerializer < ActiveModel::Serializer
statuses: {
max_characters: StatusLengthValidator::MAX_CHARS,
max_media_attachments: 4,
max_media_attachments: Rails.configuration.x.glitch.statuses[:max_media_attachments][:local],
characters_reserved_per_url: StatusLengthValidator::URL_PLACEHOLDER_CHARS,
supported_mime_types: HtmlAwareFormatter::STATUS_MIME_TYPES,
},

2
app/serializers/rest/v1/instance_serializer.rb
View File

@ -77,7 +77,7 @@ class REST::V1::InstanceSerializer < ActiveModel::Serializer
statuses: {
max_characters: StatusLengthValidator::MAX_CHARS,
max_media_attachments: 4,
max_media_attachments: Rails.configuration.x.glitch.statuses[:max_media_attachments][:local],
characters_reserved_per_url: StatusLengthValidator::URL_PLACEHOLDER_CHARS,
supported_mime_types: HtmlAwareFormatter::STATUS_MIME_TYPES,
},

2
app/services/activitypub/process_status_update_service.rb
View File

@ -73,7 +73,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 > Rails.configuration.x.glitch.statuses[:max_media_attachments][:remote]
begin
media_attachment = previous_media_attachments.find { |previous_media_attachment| previous_media_attachment.remote_url == media_attachment_parser.remote_url }

4
app/services/post_status_service.rb
View File

@ -146,9 +146,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 > Rails.configuration.x.glitch.statuses[:max_media_attachments][:local] || @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(Rails.configuration.x.glitch.statuses[:max_media_attachments][:local]).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?)

4
app/services/update_status_service.rb
View File

@ -70,9 +70,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 > Rails.configuration.x.glitch.statuses[:max_media_attachments][:local] || @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(Rails.configuration.x.glitch.statuses[:max_media_attachments][:local]).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?)

5
config/glitch.yml Normal file
View File

@ -0,0 +1,5 @@
shared:
statuses:
max_media_attachments:
local: <%= ENV['GLITCH_MAX_LOCAL_MEDIA_ATTACHMENTS'] || 4 %>
remote: <%= ENV['GLITCH_MAX_REMOTE_MEDIA_ATTACHMENTS'] || 16 %>

7
config/initializers/glitch.rb Normal file
View File

@ -0,0 +1,7 @@
# frozen_string_literal: true
module Glitch
class Application < Rails::Application
config.x.glitch = config_for(:glitch)
end
end