From 7f3b5ea69573a50240fa0f7dc6161c2a8ce9a8c9 Mon Sep 17 00:00:00 2001
From: Marcus Pasell <3690498+rickyrombo@users.noreply.github.com>
Date: Wed, 11 Feb 2026 19:49:03 -0800
Subject: [PATCH] Use getMyId not getUserId in manage-entity requests

---
 api/v1_comments.go           | 16 ++++++++--------
 api/v1_developer_apps.go     |  6 +++---
 api/v1_playlist.go           |  6 +++---
 api/v1_playlist_favorites.go |  4 ++--
 api/v1_playlist_reposts.go   |  4 ++--
 api/v1_playlist_shares.go    |  2 +-
 api/v1_track.go              |  6 +++---
 api/v1_track_downloads.go    |  2 +-
 api/v1_track_favorites.go    |  4 ++--
 api/v1_track_reposts.go      |  4 ++--
 api/v1_track_shares.go       |  2 +-
 api/v1_users.go              |  2 +-
 api/v1_users_followers.go    |  4 ++--
 api/v1_users_muted.go        |  4 ++--
 api/v1_users_subscribers.go  |  4 ++--
 15 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/api/v1_comments.go b/api/v1_comments.go
index 38c34438..f161735f 100644
--- a/api/v1_comments.go
+++ b/api/v1_comments.go
@@ -122,7 +122,7 @@ func (app *ApiServer) queryFullComments(
 }
 
 func (app *ApiServer) postV1Comment(c *fiber.Ctx) error {
-	userID := app.getUserId(c)
+	userID := app.getMyId(c)
 
 	var req CreateCommentRequest
 	if err := c.BodyParser(&req); err != nil {
@@ -188,7 +188,7 @@ func (app *ApiServer) postV1Comment(c *fiber.Ctx) error {
 }
 
 func (app *ApiServer) putV1Comment(c *fiber.Ctx) error {
-	userID := app.getUserId(c)
+	userID := app.getMyId(c)
 	commentID, err := trashid.DecodeHashId(c.Params("commentId"))
 	if err != nil {
 		return err
@@ -242,7 +242,7 @@ func (app *ApiServer) putV1Comment(c *fiber.Ctx) error {
 }
 
 func (app *ApiServer) deleteV1Comment(c *fiber.Ctx) error {
-	userID := app.getUserId(c)
+	userID := app.getMyId(c)
 	commentID, err := trashid.DecodeHashId(c.Params("commentId"))
 	if err != nil {
 		return err
@@ -280,7 +280,7 @@ func (app *ApiServer) deleteV1Comment(c *fiber.Ctx) error {
 }
 
 func (app *ApiServer) postV1CommentReact(c *fiber.Ctx) error {
-	userID := app.getUserId(c)
+	userID := app.getMyId(c)
 	commentID, err := trashid.DecodeHashId(c.Params("commentId"))
 	if err != nil {
 		return err
@@ -339,7 +339,7 @@ func (app *ApiServer) postV1CommentReact(c *fiber.Ctx) error {
 }
 
 func (app *ApiServer) deleteV1CommentReact(c *fiber.Ctx) error {
-	userID := app.getUserId(c)
+	userID := app.getMyId(c)
 	commentID, err := trashid.DecodeHashId(c.Params("commentId"))
 	if err != nil {
 		return err
@@ -393,7 +393,7 @@ func (app *ApiServer) deleteV1CommentReact(c *fiber.Ctx) error {
 }
 
 func (app *ApiServer) postV1CommentPin(c *fiber.Ctx) error {
-	userID := app.getUserId(c)
+	userID := app.getMyId(c)
 	commentID, err := trashid.DecodeHashId(c.Params("commentId"))
 	if err != nil {
 		return err
@@ -451,7 +451,7 @@ func (app *ApiServer) postV1CommentPin(c *fiber.Ctx) error {
 }
 
 func (app *ApiServer) deleteV1CommentPin(c *fiber.Ctx) error {
-	userID := app.getUserId(c)
+	userID := app.getMyId(c)
 	commentID, err := trashid.DecodeHashId(c.Params("commentId"))
 	if err != nil {
 		return err
@@ -504,7 +504,7 @@ func (app *ApiServer) deleteV1CommentPin(c *fiber.Ctx) error {
 }
 
 func (app *ApiServer) postV1CommentReport(c *fiber.Ctx) error {
-	userID := app.getUserId(c)
+	userID := app.getMyId(c)
 	commentID, err := trashid.DecodeHashId(c.Params("commentId"))
 	if err != nil {
 		return err
diff --git a/api/v1_developer_apps.go b/api/v1_developer_apps.go
index 31788897..60703026 100644
--- a/api/v1_developer_apps.go
+++ b/api/v1_developer_apps.go
@@ -59,7 +59,7 @@ func (app *ApiServer) v1DeveloperApps(c *fiber.Ctx) error {
 }
 
 func (app *ApiServer) postV1DeveloperApp(c *fiber.Ctx) error {
-	userID := app.getUserId(c)
+	userID := app.getMyId(c)
 
 	var req CreateDeveloperAppRequest
 	if err := c.BodyParser(&req); err != nil {
@@ -111,7 +111,7 @@ func (app *ApiServer) postV1DeveloperApp(c *fiber.Ctx) error {
 }
 
 func (app *ApiServer) putV1DeveloperApp(c *fiber.Ctx) error {
-	userID := app.getUserId(c)
+	userID := app.getMyId(c)
 	address := c.Params("address")
 
 	var req UpdateDeveloperAppRequest
@@ -161,7 +161,7 @@ func (app *ApiServer) putV1DeveloperApp(c *fiber.Ctx) error {
 }
 
 func (app *ApiServer) deleteV1DeveloperApp(c *fiber.Ctx) error {
-	userID := app.getUserId(c)
+	userID := app.getMyId(c)
 	address := c.Params("address")
 
 	signer, err := app.getApiSigner(c)
diff --git a/api/v1_playlist.go b/api/v1_playlist.go
index 18eb2701..fa3a3fa2 100644
--- a/api/v1_playlist.go
+++ b/api/v1_playlist.go
@@ -89,7 +89,7 @@ func (app *ApiServer) v1Playlist(c *fiber.Ctx) error {
 }
 
 func (app *ApiServer) postV1Playlists(c *fiber.Ctx) error {
-	userID := app.getUserId(c)
+	userID := app.getMyId(c)
 
 	// Parse and validate request body
 	var req CreatePlaylistRequest
@@ -182,7 +182,7 @@ func (app *ApiServer) postV1Playlists(c *fiber.Ctx) error {
 }
 
 func (app *ApiServer) putV1Playlist(c *fiber.Ctx) error {
-	userID := app.getUserId(c)
+	userID := app.getMyId(c)
 	playlistID, err := trashid.DecodeHashId(c.Params("playlistId"))
 	if err != nil {
 		return err
@@ -269,7 +269,7 @@ func (app *ApiServer) putV1Playlist(c *fiber.Ctx) error {
 }
 
 func (app *ApiServer) deleteV1Playlist(c *fiber.Ctx) error {
-	userID := app.getUserId(c)
+	userID := app.getMyId(c)
 	playlistID, err := trashid.DecodeHashId(c.Params("playlistId"))
 	if err != nil {
 		return err
diff --git a/api/v1_playlist_favorites.go b/api/v1_playlist_favorites.go
index f14a9804..732013d4 100644
--- a/api/v1_playlist_favorites.go
+++ b/api/v1_playlist_favorites.go
@@ -39,7 +39,7 @@ func (app *ApiServer) v1PlaylistFavorites(c *fiber.Ctx) error {
 }
 
 func (app *ApiServer) postV1PlaylistFavorite(c *fiber.Ctx) error {
-	userID := app.getUserId(c)
+	userID := app.getMyId(c)
 	playlistID, err := trashid.DecodeHashId(c.Params("playlistId"))
 	if err != nil {
 		return err
@@ -77,7 +77,7 @@ func (app *ApiServer) postV1PlaylistFavorite(c *fiber.Ctx) error {
 }
 
 func (app *ApiServer) deleteV1PlaylistFavorite(c *fiber.Ctx) error {
-	userID := app.getUserId(c)
+	userID := app.getMyId(c)
 	playlistID, err := trashid.DecodeHashId(c.Params("playlistId"))
 	if err != nil {
 		return err
diff --git a/api/v1_playlist_reposts.go b/api/v1_playlist_reposts.go
index 695a2745..58eb8fcc 100644
--- a/api/v1_playlist_reposts.go
+++ b/api/v1_playlist_reposts.go
@@ -39,7 +39,7 @@ func (app *ApiServer) v1PlaylistReposts(c *fiber.Ctx) error {
 }
 
 func (app *ApiServer) postV1PlaylistRepost(c *fiber.Ctx) error {
-	userID := app.getUserId(c)
+	userID := app.getMyId(c)
 	playlistID, err := trashid.DecodeHashId(c.Params("playlistId"))
 	if err != nil {
 		return err
@@ -77,7 +77,7 @@ func (app *ApiServer) postV1PlaylistRepost(c *fiber.Ctx) error {
 }
 
 func (app *ApiServer) deleteV1PlaylistRepost(c *fiber.Ctx) error {
-	userID := app.getUserId(c)
+	userID := app.getMyId(c)
 	playlistID, err := trashid.DecodeHashId(c.Params("playlistId"))
 	if err != nil {
 		return err
diff --git a/api/v1_playlist_shares.go b/api/v1_playlist_shares.go
index c6ea934f..2d64e151 100644
--- a/api/v1_playlist_shares.go
+++ b/api/v1_playlist_shares.go
@@ -13,7 +13,7 @@ import (
 )
 
 func (app *ApiServer) postV1PlaylistShare(c *fiber.Ctx) error {
-	userID := app.getUserId(c)
+	userID := app.getMyId(c)
 	playlistID, err := trashid.DecodeHashId(c.Params("playlistId"))
 	if err != nil {
 		return err
diff --git a/api/v1_track.go b/api/v1_track.go
index 6da12699..0e593aa9 100644
--- a/api/v1_track.go
+++ b/api/v1_track.go
@@ -216,7 +216,7 @@ func (app *ApiServer) v1Track(c *fiber.Ctx) error {
 }
 
 func (app *ApiServer) postV1Tracks(c *fiber.Ctx) error {
-	userID := app.getUserId(c)
+	userID := app.getMyId(c)
 
 	// Parse and validate request body
 	var req CreateTrackRequest
@@ -309,7 +309,7 @@ func (app *ApiServer) postV1Tracks(c *fiber.Ctx) error {
 }
 
 func (app *ApiServer) putV1Track(c *fiber.Ctx) error {
-	userID := app.getUserId(c)
+	userID := app.getMyId(c)
 	trackID, err := trashid.DecodeHashId(c.Params("trackId"))
 	if err != nil {
 		return err
@@ -396,7 +396,7 @@ func (app *ApiServer) putV1Track(c *fiber.Ctx) error {
 }
 
 func (app *ApiServer) deleteV1Track(c *fiber.Ctx) error {
-	userID := app.getUserId(c)
+	userID := app.getMyId(c)
 	trackID, err := trashid.DecodeHashId(c.Params("trackId"))
 	if err != nil {
 		return err
diff --git a/api/v1_track_downloads.go b/api/v1_track_downloads.go
index 041c8ef2..c4162803 100644
--- a/api/v1_track_downloads.go
+++ b/api/v1_track_downloads.go
@@ -25,7 +25,7 @@ type DownloadMetadata struct {
 }
 
 func (app *ApiServer) postV1TrackDownload(c *fiber.Ctx) error {
-	userID := app.getUserId(c)
+	userID := app.getMyId(c)
 	trackID, err := trashid.DecodeHashId(c.Params("trackId"))
 	if err != nil {
 		return err
diff --git a/api/v1_track_favorites.go b/api/v1_track_favorites.go
index 7ee5ef6c..4d35f4c3 100644
--- a/api/v1_track_favorites.go
+++ b/api/v1_track_favorites.go
@@ -39,7 +39,7 @@ func (app *ApiServer) v1TrackFavorites(c *fiber.Ctx) error {
 }
 
 func (app *ApiServer) postV1TrackFavorite(c *fiber.Ctx) error {
-	userID := app.getUserId(c)
+	userID := app.getMyId(c)
 	trackID, err := trashid.DecodeHashId(c.Params("trackId"))
 	if err != nil {
 		return err
@@ -77,7 +77,7 @@ func (app *ApiServer) postV1TrackFavorite(c *fiber.Ctx) error {
 }
 
 func (app *ApiServer) deleteV1TrackFavorite(c *fiber.Ctx) error {
-	userID := app.getUserId(c)
+	userID := app.getMyId(c)
 	trackID, err := trashid.DecodeHashId(c.Params("trackId"))
 	if err != nil {
 		return err
diff --git a/api/v1_track_reposts.go b/api/v1_track_reposts.go
index 6e512b4c..e9e0bc14 100644
--- a/api/v1_track_reposts.go
+++ b/api/v1_track_reposts.go
@@ -39,7 +39,7 @@ func (app *ApiServer) v1TrackReposts(c *fiber.Ctx) error {
 }
 
 func (app *ApiServer) postV1TrackRepost(c *fiber.Ctx) error {
-	userID := app.getUserId(c)
+	userID := app.getMyId(c)
 	trackID, err := trashid.DecodeHashId(c.Params("trackId"))
 	if err != nil {
 		return err
@@ -79,7 +79,7 @@ func (app *ApiServer) postV1TrackRepost(c *fiber.Ctx) error {
 }
 
 func (app *ApiServer) deleteV1TrackRepost(c *fiber.Ctx) error {
-	userID := app.getUserId(c)
+	userID := app.getMyId(c)
 	trackID, err := trashid.DecodeHashId(c.Params("trackId"))
 	if err != nil {
 		return err
diff --git a/api/v1_track_shares.go b/api/v1_track_shares.go
index 58c7b310..c1de7b41 100644
--- a/api/v1_track_shares.go
+++ b/api/v1_track_shares.go
@@ -13,7 +13,7 @@ import (
 )
 
 func (app *ApiServer) postV1TrackShare(c *fiber.Ctx) error {
-	userID := app.getUserId(c)
+	userID := app.getMyId(c)
 	trackID, err := trashid.DecodeHashId(c.Params("trackId"))
 	if err != nil {
 		return err
diff --git a/api/v1_users.go b/api/v1_users.go
index f1c0a80d..cc9345be 100644
--- a/api/v1_users.go
+++ b/api/v1_users.go
@@ -225,7 +225,7 @@ func (app *ApiServer) queryUsers(c *fiber.Ctx, sql string, args pgx.NamedArgs) e
 }
 
 func (app *ApiServer) putV1User(c *fiber.Ctx) error {
-	userID := app.getUserId(c)
+	userID := app.getMyId(c)
 	targetUserID, err := trashid.DecodeHashId(c.Params("userId"))
 	if err != nil {
 		return err
diff --git a/api/v1_users_followers.go b/api/v1_users_followers.go
index e79699f8..c1fe86a7 100644
--- a/api/v1_users_followers.go
+++ b/api/v1_users_followers.go
@@ -36,7 +36,7 @@ func (app *ApiServer) v1UsersFollowers(c *fiber.Ctx) error {
 }
 
 func (app *ApiServer) postV1UserFollow(c *fiber.Ctx) error {
-	userID := app.getUserId(c)
+	userID := app.getMyId(c)
 	followeeUserID, err := trashid.DecodeHashId(c.Params("userId"))
 	if err != nil {
 		return err
@@ -74,7 +74,7 @@ func (app *ApiServer) postV1UserFollow(c *fiber.Ctx) error {
 }
 
 func (app *ApiServer) deleteV1UserFollow(c *fiber.Ctx) error {
-	userID := app.getUserId(c)
+	userID := app.getMyId(c)
 	followeeUserID, err := trashid.DecodeHashId(c.Params("userId"))
 	if err != nil {
 		return err
diff --git a/api/v1_users_muted.go b/api/v1_users_muted.go
index 487cbbf2..e41ef9e6 100644
--- a/api/v1_users_muted.go
+++ b/api/v1_users_muted.go
@@ -30,7 +30,7 @@ func (app *ApiServer) v1UsersMuted(c *fiber.Ctx) error {
 }
 
 func (app *ApiServer) postV1UserMute(c *fiber.Ctx) error {
-	userID := app.getUserId(c)
+	userID := app.getMyId(c)
 	mutedUserID, err := trashid.DecodeHashId(c.Params("userId"))
 	if err != nil {
 		return err
@@ -68,7 +68,7 @@ func (app *ApiServer) postV1UserMute(c *fiber.Ctx) error {
 }
 
 func (app *ApiServer) deleteV1UserMute(c *fiber.Ctx) error {
-	userID := app.getUserId(c)
+	userID := app.getMyId(c)
 	mutedUserID, err := trashid.DecodeHashId(c.Params("userId"))
 	if err != nil {
 		return err
diff --git a/api/v1_users_subscribers.go b/api/v1_users_subscribers.go
index 6d67dacc..8f2f32e4 100644
--- a/api/v1_users_subscribers.go
+++ b/api/v1_users_subscribers.go
@@ -35,7 +35,7 @@ func (app *ApiServer) v1UsersSubscribers(c *fiber.Ctx) error {
 }
 
 func (app *ApiServer) postV1UserSubscribe(c *fiber.Ctx) error {
-	userID := app.getUserId(c)
+	userID := app.getMyId(c)
 	subscribeeUserID, err := trashid.DecodeHashId(c.Params("userId"))
 	if err != nil {
 		return err
@@ -73,7 +73,7 @@ func (app *ApiServer) postV1UserSubscribe(c *fiber.Ctx) error {
 }
 
 func (app *ApiServer) deleteV1UserSubscribe(c *fiber.Ctx) error {
-	userID := app.getUserId(c)
+	userID := app.getMyId(c)
 	subscribeeUserID, err := trashid.DecodeHashId(c.Params("userId"))
 	if err != nil {
 		return err