优化续播

2026-09-30 03:36:37 +08:00 · 2026-09-01 23:16:11 +08:00
parent 3fe37e050b
commit b503fdee7a
57 changed files with 739 additions and 410 deletions
@@ -192,77 +192,77 @@ func updateUserStatusHandler(svc *service.Container) gin.HandlerFunc {
 			c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
 			return
 		}
-			if req.IsActive {
-				_ = svc.Repo.UserDevice.SetKickedByUser(c.Request.Context(), userID, false)
-			} else {
-				_ = svc.Repo.UserDevice.SetKickedByUser(c.Request.Context(), userID, true)
-			}
-			updated, err := svc.Repo.User.FindByID(c.Request.Context(), userID)
-			if err != nil {
-				c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
-				return
-			}
-			updated.PopulateComputedFields()
-			c.JSON(http.StatusOK, updated)
+		if req.IsActive {
+			_ = svc.Repo.UserDevice.SetKickedByUser(c.Request.Context(), userID, false)
+		} else {
+			_ = svc.Repo.UserDevice.SetKickedByUser(c.Request.Context(), userID, true)
 		}
+		updated, err := svc.Repo.User.FindByID(c.Request.Context(), userID)
+		if err != nil {
+			c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
+			return
+		}
+		updated.PopulateComputedFields()
+		c.JSON(http.StatusOK, updated)
 	}
+}

-	type adminUpdateUserLibrariesReq struct {
-		AllowedLibraryIDs *[]string `json:"allowed_library_ids"`
-	}
+type adminUpdateUserLibrariesReq struct {
+	AllowedLibraryIDs *[]string `json:"allowed_library_ids"`
+}

-	func updateUserLibrariesHandler(svc *service.Container) gin.HandlerFunc {
-		return func(c *gin.Context) {
-			var req adminUpdateUserLibrariesReq
-			if err := c.ShouldBindJSON(&req); err != nil {
-				c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
-				return
-			}
-			userID := c.Param("id")
-			user, err := svc.Repo.User.FindByID(c.Request.Context(), userID)
-			if err != nil {
-				c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
-				return
-			}
-			if user == nil {
-				c.JSON(http.StatusNotFound, gin.H{"error": "user not found"})
-				return
-			}
+func updateUserLibrariesHandler(svc *service.Container) gin.HandlerFunc {
+	return func(c *gin.Context) {
+		var req adminUpdateUserLibrariesReq
+		if err := c.ShouldBindJSON(&req); err != nil {
+			c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
+			return
+		}
+		userID := c.Param("id")
+		user, err := svc.Repo.User.FindByID(c.Request.Context(), userID)
+		if err != nil {
+			c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
+			return
+		}
+		if user == nil {
+			c.JSON(http.StatusNotFound, gin.H{"error": "user not found"})
+			return
+		}

-			var rawJSON string
-			if req.AllowedLibraryIDs != nil && len(*req.AllowedLibraryIDs) > 0 {
-				var cleanIDs []string
-				for _, id := range *req.AllowedLibraryIDs {
-					trimmed := strings.TrimSpace(id)
-					if trimmed != "" {
-						cleanIDs = append(cleanIDs, trimmed)
-					}
-				}
-				if len(cleanIDs) > 0 {
-					data, err := json.Marshal(cleanIDs)
-					if err != nil {
-						c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
-						return
-					}
-					rawJSON = string(data)
+		var rawJSON string
+		if req.AllowedLibraryIDs != nil && len(*req.AllowedLibraryIDs) > 0 {
+			var cleanIDs []string
+			for _, id := range *req.AllowedLibraryIDs {
+				trimmed := strings.TrimSpace(id)
+				if trimmed != "" {
+					cleanIDs = append(cleanIDs, trimmed)
 				}
 			}
-
-			updates := map[string]any{"allowed_library_ids": rawJSON}
-			if err := svc.Repo.User.UpdateFields(c.Request.Context(), userID, updates); err != nil {
-				c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
-				return
+			if len(cleanIDs) > 0 {
+				data, err := json.Marshal(cleanIDs)
+				if err != nil {
+					c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
+					return
+				}
+				rawJSON = string(data)
 			}
-
-			updated, err := svc.Repo.User.FindByID(c.Request.Context(), userID)
-			if err != nil || updated == nil {
-				c.JSON(http.StatusInternalServerError, gin.H{"error": "failed to reload user"})
-				return
-			}
-			updated.PopulateComputedFields()
-			c.JSON(http.StatusOK, updated)
 		}
+
+		updates := map[string]any{"allowed_library_ids": rawJSON}
+		if err := svc.Repo.User.UpdateFields(c.Request.Context(), userID, updates); err != nil {
+			c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
+			return
+		}
+
+		updated, err := svc.Repo.User.FindByID(c.Request.Context(), userID)
+		if err != nil || updated == nil {
+			c.JSON(http.StatusInternalServerError, gin.H{"error": "failed to reload user"})
+			return
+		}
+		updated.PopulateComputedFields()
+		c.JSON(http.StatusOK, updated)
 	}
+}

 func annotateProtectedUsers(ctx context.Context, svc *service.Container, users []model.User) error {
 	firstAdmin, err := svc.Repo.User.FirstAdmin(ctx)