From beb0232a25105ddf3b90134a98283e9d30211d78 Mon Sep 17 00:00:00 2001
From: memoclaw <265580040+memoclaw@users.noreply.github.com>
Date: Wed, 25 Mar 2026 00:11:32 +0800
Subject: [PATCH] fix: restore webhook setting conversion formatting

---
 server/router/api/v1/resource_name.go |  9 ---------
 server/router/api/v1/user_service.go  | 14 +++++++-------
 2 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/server/router/api/v1/resource_name.go b/server/router/api/v1/resource_name.go
index a25af25d1..070a8440a 100644
--- a/server/router/api/v1/resource_name.go
+++ b/server/router/api/v1/resource_name.go
@@ -77,15 +77,6 @@ func ExtractUserIDFromName(name string) (int32, error) {
 	return id, nil
 }
 
-// extractUserIdentifierFromName extracts the username token from a user resource name.
-func extractUserIdentifierFromName(name string) string {
-	username, err := ExtractUsernameFromName(name)
-	if err != nil {
-		return ""
-	}
-	return username
-}
-
 // ExtractMemoUIDFromName returns the memo UID from a resource name.
 // e.g., "memos/uuid" -> "uuid".
 func ExtractMemoUIDFromName(name string) (string, error) {
diff --git a/server/router/api/v1/user_service.go b/server/router/api/v1/user_service.go
index 9dd6a2ca0..d9102f947 100644
--- a/server/router/api/v1/user_service.go
+++ b/server/router/api/v1/user_service.go
@@ -1084,13 +1084,13 @@ func convertUserSettingFromStore(storeSetting *storepb.UserSetting, user *store.
 		}
 	case storepb.UserSetting_WEBHOOKS:
 		webhooks := storeSetting.GetWebhooks()
-			apiWebhooks := make([]*v1pb.UserWebhook, 0, len(webhooks.Webhooks))
-			for _, webhook := range webhooks.Webhooks {
-				apiWebhook := &v1pb.UserWebhook{
-					Name:        fmt.Sprintf("%s/webhooks/%s", BuildUserName(user.Username), webhook.Id),
-					Url:         webhook.Url,
-					DisplayName: webhook.Title,
-				}
+		apiWebhooks := make([]*v1pb.UserWebhook, 0, len(webhooks.Webhooks))
+		for _, webhook := range webhooks.Webhooks {
+			apiWebhook := &v1pb.UserWebhook{
+				Name:        fmt.Sprintf("%s/webhooks/%s", BuildUserName(user.Username), webhook.Id),
+				Url:         webhook.Url,
+				DisplayName: webhook.Title,
+			}
 			apiWebhooks = append(apiWebhooks, apiWebhook)
 		}
 		setting.Value = &v1pb.UserSetting_WebhooksSetting_{