Merge pull request #10 from participating-online/9-update-user-endpoi…

…nts-to-u-instead-of-users Update user URLs
sublinks · Dec 6, 2023 · 7e4f2a2 · 7e4f2a2
2 parents a477dbd + 193fdf9
commit 7e4f2a2
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 7 deletions.
diff --git a/internal/activitypub/user.go b/internal/activitypub/user.go
@@ -33,19 +33,25 @@ type User struct {
 	Endpoints         Endpoints `json:"endpoints"`
 }
 
-func NewUser(name string, matrixUserId string, bio string, publickey string, Hostname string) User {
+func NewUser(
+	name string,
+	matrixUserId string,
+	bio string,
+	publickey string,
+	Hostname string,
+) User {
 	user := User{}
 	user.Context = GetContext()
-	user.Id = fmt.Sprintf("https://%s/users/%s", Hostname, name)
+	user.Id = fmt.Sprintf("https://%s/u/%s", Hostname, name)
 	user.PreferredUsername = name
-	user.Inbox = fmt.Sprintf("https://%s/users/%s/inbox", Hostname, name)
-	user.Outbox = fmt.Sprintf("https://%s/users/%s/outbox", Hostname, name)
+	user.Inbox = fmt.Sprintf("https://%s/u/%s/inbox", Hostname, name)
+	user.Outbox = fmt.Sprintf("https://%s/u/%s/outbox", Hostname, name)
 	user.Type = "Person"
 	user.Summary = bio
 	user.MatrixUserId = matrixUserId
-	owner := fmt.Sprintf("https://%s/users/%s", Hostname, name)
+	owner := fmt.Sprintf("https://%s/u/%s", Hostname, name)
 	user.Publickey = PublicKey{
-		Keyid:        fmt.Sprintf("https://%s/users/%s#main-key", Hostname, name),
+		Keyid:        fmt.Sprintf("https://%s/u/%s#main-key", Hostname, name),
 		Owner:        owner,
 		PublicKeyPem: publickey,
 	}

diff --git a/internal/http/routes/user.go b/internal/http/routes/user.go
@@ -13,7 +13,7 @@ import (
 )
 
 func SetupUserRoutes(r *mux.Router) {
-	r.HandleFunc("/users/{user}", getUserInfoHandler).Methods("GET")
+	r.HandleFunc("/u/{user}", getUserInfoHandler).Methods("GET")
 }
 
 func getUserInfoHandler(w http.ResponseWriter, r *http.Request) {