Move stuff, keep working on authenticated fetch

web/public/api/activitypub/user.go

@@ -12,7 +12,7 @@ import (
 	"git.mstar.dev/mstar/goutils/sliceutils"
 	"github.com/rs/zerolog/hlog"
 
-	"git.mstar.dev/mstar/linstrom/activitypub/shared/types"
+	"git.mstar.dev/mstar/linstrom/activitypub"
 	"git.mstar.dev/mstar/linstrom/config"
 	"git.mstar.dev/mstar/linstrom/storage-new"
 	"git.mstar.dev/mstar/linstrom/storage-new/dbgen"
@@ -53,6 +53,7 @@ func users(w http.ResponseWriter, r *http.Request) {
 	}
 	log := hlog.FromRequest(r)
 	userId := r.PathValue("id")
+	log.Debug().Any("headers", r.Header).Msg("request headers")
 	user, err := dbgen.User.Where(dbgen.User.ID.Eq(userId)).
 		Preload(dbgen.User.Icon).Preload(dbgen.User.Banner).
 		Preload(dbgen.User.BeingTypes).
@@ -75,7 +76,7 @@ func users(w http.ResponseWriter, r *http.Request) {
 		keyBytes = keyBytesToPem(user.PublicKeyRsa)
 	}
 	data := Outbound{
-		Context:           types.BaseLdContext,
+		Context:           activitypub.BaseLdContext,
 		Id:                apUrl,
 		Type:              "Person",
 		PreferredUsername: user.Username,
@@ -136,7 +137,12 @@ func userInbox(w http.ResponseWriter, r *http.Request) {
 	log := hlog.FromRequest(r)
 	userId := r.PathValue("id")
 	data, err := io.ReadAll(r.Body)
-	log.Info().Err(err).Str("userId", userId).Bytes("body", data).Msg("Inbox message")
+	log.Info().
+		Err(err).
+		Str("userId", userId).
+		Bytes("body", data).
+		Any("headers", r.Header).
+		Msg("Inbox message")
 }
 
 /*

web/public/api/activitypub/util.go

@@ -9,7 +9,7 @@ import (
 
 func userIdToApUrl(id string) string {
 	return fmt.Sprintf(
-		"%s/api/ap/users/%s",
+		"%s/api/activitypub/user/%s",
 		config.GlobalConfig.General.GetFullPublicUrl(),
 		id,
 	)