mstar/linstrom
1
0
Fork 0
Code Issues 27 Pull requests Projects Releases Packages 1 Wiki Activity Actions

Add func to add ap links to local users (untested)
All checks were successful
/ docker (push) Successful in 4m27s
Details

Browse source
This commit is contained in:
Melody Becker 2025-05-15 11:13:58 +02:00
parent e69f53bbd7
commit f991a1f353
7 changed files with 84 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

4
web/public/api/activitypub/activityFollow.go
View file

@ -84,12 +84,12 @@ func FollowFromStorage(ctx context.Context, id string) (*ActivityFollowOut, erro
if follower.RemoteInfo != nil {
out.Actor = follower.RemoteInfo.ApLink
} else {
out.Actor = userIdToApUrl(follower.ID)
out.Actor = activitypub.UserIdToApUrl(follower.ID)
}
if followed.RemoteInfo != nil {
out.Object = followed.RemoteInfo.ApLink
} else {
out.Object = userIdToApUrl(followed.ID)
out.Object = activitypub.UserIdToApUrl(followed.ID)
}
return &out, nil
}

10
web/public/api/activitypub/user.go
View file

@ -72,7 +72,7 @@ func users(w http.ResponseWriter, r *http.Request) {
return
}
apUrl := userIdToApUrl(user.ID)
apUrl := activitypub.UserIdToApUrl(user.ID)
var keyBytes string
if config.GlobalConfig.Experimental.UseEd25519Keys {
keyBytes = shared.KeyBytesToPem(user.PublicKeyEd, true)
@ -160,7 +160,7 @@ func userFollowing(w http.ResponseWriter, r *http.Request) {
webutils.ProblemDetailsStatusOnly(w, http.StatusNotFound)
return
}
apUrl := userIdToApUrl(userId)
apUrl := activitypub.UserIdToApUrl(userId)
var data []byte
followingCount, err := dbgen.UserToUserRelation.CountFollowingForId(userId)
if err != nil {
@ -212,7 +212,7 @@ func userFollowing(w http.ResponseWriter, r *http.Request) {
Context: "https://www.w3.org/ns/activitystreams",
Type: "OrderedCollectionPage",
Id: fmt.Sprintf("%s/following?page=%d", apUrl, pageNr),
PartOf: userIdToApUrl(userId) + "/following",
PartOf: activitypub.UserIdToApUrl(userId) + "/following",
Items: sliceutils.Map(links, func(t string) any { return t }),
}
if hasNextPage {
@ -247,7 +247,7 @@ func userFollowers(w http.ResponseWriter, r *http.Request) {
webutils.ProblemDetailsStatusOnly(w, http.StatusNotFound)
return
}
apUrl := userIdToApUrl(userId)
apUrl := activitypub.UserIdToApUrl(userId)
var data []byte
followersCount, err := dbgen.UserToUserRelation.CountFollowersForId(userId)
if err != nil {
@ -300,7 +300,7 @@ func userFollowers(w http.ResponseWriter, r *http.Request) {
Context: activitypub.BaseLdContext,
Type: "OrderedCollectionPage",
Id: fmt.Sprintf("%s/followers?page=%d", apUrl, pageNr),
PartOf: userIdToApUrl(userId) + "/followers",
PartOf: activitypub.UserIdToApUrl(userId) + "/followers",
Items: sliceutils.Map(links, func(t string) any { return t }),
}
if hasNextPage {

14
web/public/api/activitypub/util.go
View file

@ -1,15 +1 @@
package activitypub
import (
"fmt"
"git.mstar.dev/mstar/linstrom/config"
)
func userIdToApUrl(id string) string {
return fmt.Sprintf(
"%s/api/activitypub/user/%s",
config.GlobalConfig.General.GetFullPublicUrl(),
id,
)
}