post/nas
1
0
Fork 0
forked from gitea/nas
Code Pull requests Activity

Merge remote-tracking branch 'parent/main' into upstream-20240716

Browse source
This commit is contained in:
KMY 2024-07-16 09:01:12 +09:00
commit adee1645a3
203 changed files with 1707 additions and 1067 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/models/status.rb
View file

@ -364,7 +364,7 @@ class Status < ApplicationRecord
else
map = media_attachments.index_by(&:id)
ordered_media_attachment_ids.filter_map { |media_attachment_id| map[media_attachment_id] }
end
end.take(media_attachments_max)
end
def replies_count
@ -610,6 +610,10 @@ class Status < ApplicationRecord
private
def media_attachments_max
local? ? MEDIA_ATTACHMENTS_LIMIT : MEDIA_ATTACHMENTS_LIMIT_FROM_REMOTE
end
def update_status_stat!(attrs)
return if marked_for_destruction? || destroyed?