erik/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2024-08-20 21:08:15 -07:00
Code Issues Projects Releases Wiki Activity

Increase remote media count to 16

Browse source 
* Remove remote media count limit

* Show >4 images in a grid

* Fix gallery for <4 media

* Don't use weirdly wide images in media gallery

Also support cols > 4 (size > 16)

* Use 3/2 ratio

* Port to glitch
This commit is contained in:
Jeong Arm 2024-05-27 20:38:04 +09:00
parent fa8e972722
commit 01ebfa0c46
4 changed files with 27 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
app/javascript/mastodon/components/media_gallery.jsx
View file

@ -21,6 +21,14 @@ const messages = defineMessages({
toggle_visible: { id: 'media_gallery.toggle_visible', defaultMessage: '{number, plural, one {Hide image} other {Hide images}}' },
});
const colCount = function(size) {
return Math.max(Math.floor(Math.sqrt(size)), 2);
};
const rowCount = function(size) {
return Math.ceil(size / colCount(size));
};
class Item extends PureComponent {
static propTypes = {
@ -92,14 +100,18 @@ class Item extends PureComponent {
let badges = [], thumbnail;
let width = 50;
let height = 100;
let height = 50;
if (size === 1) {
const cols = colCount(size);
const remaining = (-size % cols + cols) % cols;
const largeCount = Math.floor(remaining / 3); // width=2, height=2
const mediumCount = remaining % 3; // height=2
if (size === 1 || index < largeCount) {
width = 100;
}
if (size === 4 || (size === 3 && index > 0)) {
height = 50;
height = 100;
} else if (size === 2 || index < largeCount + mediumCount) {
height = 100;
}
if (attachment.get('description')?.length > 0) {
@ -302,6 +314,11 @@ class MediaGallery extends PureComponent {
if (this.isFullSizeEligible()) {
style.aspectRatio = `${this.props.media.getIn([0, 'meta', 'small', 'aspect'])}`;
} else {
const cols = colCount(media.size);
const rows = rowCount(media.size);
style.gridTemplateColumns = `repeat(${cols}, 1fr)`;
style.gridTemplateRows = `repeat(${rows}, 1fr)`;
style.aspectRatio = '3 / 2';
}

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(Status::MEDIA_ATTACHMENTS_LIMIT).map(&:id)
attachment_ids = process_attachments.take(Status::REMOTE_MEDIA_ATTACHMENTS_LIMIT).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 >= Status::MEDIA_ATTACHMENTS_LIMIT
next if media_attachment_parser.remote_url.blank? || media_attachments.size >= Status::REMOTE_MEDIA_ATTACHMENTS_LIMIT
begin
media_attachment = MediaAttachment.create(

1
app/models/status.rb
View file

@ -40,6 +40,7 @@ class Status < ApplicationRecord
include Status::ThreadingConcern
MEDIA_ATTACHMENTS_LIMIT = 4
REMOTE_MEDIA_ATTACHMENTS_LIMIT = 16
rate_limit by: :account, family: :statuses

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 > Status::MEDIA_ATTACHMENTS_LIMIT
next if media_attachment_parser.remote_url.blank? || @next_media_attachments.size > Status::REMOTE_MEDIA_ATTACHMENTS_LIMIT
begin
media_attachment = previous_media_attachments.find { |previous_media_attachment| previous_media_attachment.remote_url == media_attachment_parser.remote_url }