Leatherface/mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2025-12-15 00:38:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit 'eb118d85238da8d0583868abab2756bb329742ba' into glitch-soc/merge-upstream

Browse Source 
Conflicts:
- `yarn.lock`:
  Upstream updated dependencies textually adjacent to glitch-soc-only ones.
  Updated them as upstream did.
This commit is contained in:
Claire
2025-09-10 18:11:12 +02:00
parent a317bde6b8 eb118d8523
commit 06f45a2046
219 changed files with 2373 additions and 1267 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/lib/activitypub/tag_manager.rb
View File

@@ -40,6 +40,8 @@ class ActivityPub::TagManager
case target.object_type
when :person
target.instance_actor? ? instance_actor_url : account_url(target)
when :conversation
context_url(target) unless target.parent_account_id.nil? || target.parent_status_id.nil?
when :note, :comment, :activity
return activity_account_status_url(target.account, target) if target.reblog?
@@ -76,6 +78,12 @@ class ActivityPub::TagManager
activity_account_status_url(target.account, target)
end
def context_uri_for(target, page_params = nil)
raise ArgumentError, 'target must be a local activity' unless %i(note comment activity).include?(target.object_type) && target.local?
items_context_url(target.conversation, page_params)
end
def replies_uri_for(target, page_params = nil)
raise ArgumentError, 'target must be a local activity' unless %i(note comment activity).include?(target.object_type) && target.local?