miraikumiko/nulla
miraikumiko/nulla
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix following and followers

Browse source
This commit is contained in:
Mirai Kumiko 2025-06-19 06:58:05 +02:00
parent 63ce21475e
commit 158e500fe6
Signed by: miraikumiko
GPG key ID: 3F178B1B5E0CB278
1 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

24
lib/nulla/activitypub.ex
View file

@ -122,10 +122,10 @@ defmodule Nulla.ActivityPub do
def following(actor, total) do def following(actor, total) do
Jason.OrderedObject.new( Jason.OrderedObject.new(
"@context": "https://www.w3.org/ns/activitystreams", "@context": "https://www.w3.org/ns/activitystreams",
id: "https://#{actor.domain}/users/#{actor.preferredUsername}/following", id: "#{actor.ap_id}/following",
type: "OrderedCollection", type: "OrderedCollection",
totalItems: total, totalItems: total,
first: "https://#{actor.domain}/users/#{actor.preferredUsername}/following?page=1" first: "#{actor.ap_id}/following?page=1"
) )
end end
@ -134,12 +134,12 @@ defmodule Nulla.ActivityPub do
def following(actor, total, following_list, page, limit) when is_integer(page) and page > 0 do def following(actor, total, following_list, page, limit) when is_integer(page) and page > 0 do
data = [ data = [
"@context": "https://www.w3.org/ns/activitystreams", "@context": "https://www.w3.org/ns/activitystreams",
id: "https://#{actor.domain}/@#{actor.preferredUsername}/following?page=#{page}", id: "#{actor.ap_id}/following?page=#{page}",
type: "OrderedCollectionPage", type: "OrderedCollectionPage",
totalItems: total, totalItems: total,
next: "https://#{actor.domain}/users/#{actor.preferredUsername}/following?page=#{page + 1}", next: "#{actor.ap_id}/following?page=#{page + 1}",
prev: "https://#{actor.domain}/users/#{actor.preferredUsername}/following?page=#{page - 1}", prev: "#{actor.ap_id}/following?page=#{page - 1}",
partOf: "https://#{actor.domain}/users/#{actor.preferredUsername}/following", partOf: "#{actor.ap_id}/following",
orderedItems: following_list orderedItems: following_list
] ]
@ -166,10 +166,10 @@ defmodule Nulla.ActivityPub do
def followers(actor, total) do def followers(actor, total) do
Jason.OrderedObject.new( Jason.OrderedObject.new(
"@context": "https://www.w3.org/ns/activitystreams", "@context": "https://www.w3.org/ns/activitystreams",
id: "https://#{actor.domain}/users/#{actor.preferredUsername}/followers", id: "#{actor.ap_id}/followers",
type: "OrderedCollection", type: "OrderedCollection",
totalItems: total, totalItems: total,
first: "https://#{actor.domain}/users/#{actor.preferredUsername}/followers?page=1" first: "#{actor.ap_id}/followers?page=1"
) )
end end
@ -179,12 +179,12 @@ defmodule Nulla.ActivityPub do
when is_integer(page) and page > 0 do when is_integer(page) and page > 0 do
data = [ data = [
"@context": "https://www.w3.org/ns/activitystreams", "@context": "https://www.w3.org/ns/activitystreams",
id: "https://#{actor.domain}/users#{actor.preferredUsername}/followers?page=#{page}", id: "#{actor.ap_id}/followers?page=#{page}",
type: "OrderedCollectionPage", type: "OrderedCollectionPage",
totalItems: total, totalItems: total,
next: "https://#{actor.domain}/users/#{actor.preferredUsername}/followers?page=#{page + 1}", next: "#{actor.ap_id}/followers?page=#{page + 1}",
prev: "https://#{actor.domain}/users/#{actor.preferredUsername}/followers?page=#{page - 1}", prev: "#{actor.ap_id}/followers?page=#{page - 1}",
partOf: "https://#{actor.domain}/users/#{actor.preferredUsername}/followers", partOf: "#{actor.ap_id}/followers",
orderedItems: followers_list orderedItems: followers_list
] ]