Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `app/views/admin/tags/index.html.haml`: Removed upstream while it had changes in glitch-soc to accomodate for the theming system. Additional changes to accomodate for the theming system: - `app/views/admin/trends/links/preview_card_providers/index.html.haml` - `app/views/admin/trends/links/index.html.haml` - `app/views/admin/trends/tags/index.html.haml` - `app/views/admin/tags/show.html.haml`
This commit is contained in:
@@ -164,9 +164,14 @@ class ActivityPub::Activity::Create < ActivityPub::Activity
|
||||
def attach_tags(status)
|
||||
@tags.each do |tag|
|
||||
status.tags << tag
|
||||
tag.use!(@account, status: status, at_time: status.created_at) if status.public_visibility?
|
||||
tag.update(last_status_at: status.created_at) if tag.last_status_at.nil? || (tag.last_status_at < status.created_at && tag.last_status_at < 12.hours.ago)
|
||||
end
|
||||
|
||||
# If we're processing an old status, this may register tags as being used now
|
||||
# as opposed to when the status was really published, but this is probably
|
||||
# not a big deal
|
||||
Trends.tags.register(status)
|
||||
|
||||
@mentions.each do |mention|
|
||||
mention.status = status
|
||||
mention.save
|
||||
|
Reference in New Issue
Block a user