From 6658b8ec42f968881b4a2553a7d78dd58add4f1c Mon Sep 17 00:00:00 2001
From: Lunny Xiao <xiaolunwen@gmail.com>
Date: Sun, 9 Mar 2025 21:13:34 -0700
Subject: [PATCH] Revert unnecessary changes for this PR

---
 models/activities/user_heatmap.go | 12 +++++++++++-
 routers/api/v1/user/user.go       |  2 +-
 routers/web/user/home.go          |  2 +-
 routers/web/user/profile.go       |  2 +-
 services/feed/feed.go             |  2 +-
 services/feed/heatmap.go          | 22 ----------------------
 6 files changed, 15 insertions(+), 27 deletions(-)
 delete mode 100644 services/feed/heatmap.go

diff --git a/models/activities/user_heatmap.go b/models/activities/user_heatmap.go
index 5326986d62..1f8f0f590e 100644
--- a/models/activities/user_heatmap.go
+++ b/models/activities/user_heatmap.go
@@ -19,7 +19,17 @@ type UserHeatmapData struct {
 	Contributions int64              `json:"contributions"`
 }
 
-func GetUserHeatmapData(ctx context.Context, user *user_model.User, team *organization.Team, doer *user_model.User) ([]*UserHeatmapData, error) {
+// GetUserHeatmapDataByUser returns an array of UserHeatmapData
+func GetUserHeatmapDataByUser(ctx context.Context, user, doer *user_model.User) ([]*UserHeatmapData, error) {
+	return getUserHeatmapData(ctx, user, nil, doer)
+}
+
+// GetUserHeatmapDataByUserTeam returns an array of UserHeatmapData
+func GetUserHeatmapDataByUserTeam(ctx context.Context, user *user_model.User, team *organization.Team, doer *user_model.User) ([]*UserHeatmapData, error) {
+	return getUserHeatmapData(ctx, user, team, doer)
+}
+
+func getUserHeatmapData(ctx context.Context, user *user_model.User, team *organization.Team, doer *user_model.User) ([]*UserHeatmapData, error) {
 	hdata := make([]*UserHeatmapData, 0)
 
 	if !ActivityReadable(user, doer) {
diff --git a/routers/api/v1/user/user.go b/routers/api/v1/user/user.go
index 9e6bf769cd..757a548518 100644
--- a/routers/api/v1/user/user.go
+++ b/routers/api/v1/user/user.go
@@ -160,7 +160,7 @@ func GetUserHeatmapData(ctx *context.APIContext) {
 	//   "404":
 	//     "$ref": "#/responses/notFound"
 
-	heatmap, err := feed_service.GetUserHeatmapDataByUser(ctx, ctx.ContextUser, ctx.Doer)
+	heatmap, err := activities_model.GetUserHeatmapDataByUser(ctx, ctx.ContextUser, ctx.Doer)
 	if err != nil {
 		ctx.APIErrorInternal(err)
 		return
diff --git a/routers/web/user/home.go b/routers/web/user/home.go
index dc36c70b85..dc78950cf2 100644
--- a/routers/web/user/home.go
+++ b/routers/web/user/home.go
@@ -109,7 +109,7 @@ func Dashboard(ctx *context.Context) {
 	}
 
 	if setting.Service.EnableUserHeatmap {
-		data, err := feed_service.GetUserHeatmapDataByUserTeam(ctx, ctxUser, ctx.Org.Team, ctx.Doer)
+		data, err := activities_model.GetUserHeatmapDataByUserTeam(ctx, ctxUser, ctx.Org.Team, ctx.Doer)
 		if err != nil {
 			ctx.ServerError("GetUserHeatmapDataByUserTeam", err)
 			return
diff --git a/routers/web/user/profile.go b/routers/web/user/profile.go
index b4eed17547..39f066a53c 100644
--- a/routers/web/user/profile.go
+++ b/routers/web/user/profile.go
@@ -65,7 +65,7 @@ func userProfile(ctx *context.Context) {
 
 	// prepare heatmap data
 	if setting.Service.EnableUserHeatmap {
-		data, err := feed_service.GetUserHeatmapDataByUser(ctx, ctx.ContextUser, ctx.Doer)
+		data, err := activities_model.GetUserHeatmapDataByUser(ctx, ctx.ContextUser, ctx.Doer)
 		if err != nil {
 			ctx.ServerError("GetUserHeatmapDataByUser", err)
 			return
diff --git a/services/feed/feed.go b/services/feed/feed.go
index 61dac3f33a..2225748903 100644
--- a/services/feed/feed.go
+++ b/services/feed/feed.go
@@ -89,7 +89,7 @@ func notifyWatchers(ctx context.Context, act *activities_model.Action, watchers
 			return fmt.Errorf("count user feeds: %w", err)
 		}
 
-		cache.GetCache().Put(userFeedCacheKey(act.UserID), fmt.Sprintf("%d", total), setting.CacheService.TTLSeconds())
+		_ = cache.GetCache().Put(userFeedCacheKey(act.UserID), fmt.Sprintf("%d", total), setting.CacheService.TTLSeconds())
 	}
 
 	return nil
diff --git a/services/feed/heatmap.go b/services/feed/heatmap.go
deleted file mode 100644
index 68c263d9f2..0000000000
--- a/services/feed/heatmap.go
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright 2025 The Gitea Authors. All rights reserved.
-// SPDX-License-Identifier: MIT
-
-package feed
-
-import (
-	"context"
-
-	activities_model "code.gitea.io/gitea/models/activities"
-	"code.gitea.io/gitea/models/organization"
-	user_model "code.gitea.io/gitea/models/user"
-)
-
-// GetUserHeatmapDataByUser returns an array of UserHeatmapData
-func GetUserHeatmapDataByUser(ctx context.Context, user, doer *user_model.User) ([]*activities_model.UserHeatmapData, error) {
-	return activities_model.GetUserHeatmapData(ctx, user, nil, doer)
-}
-
-// GetUserHeatmapDataByUserTeam returns an array of UserHeatmapData
-func GetUserHeatmapDataByUserTeam(ctx context.Context, user *user_model.User, team *organization.Team, doer *user_model.User) ([]*activities_model.UserHeatmapData, error) {
-	return activities_model.GetUserHeatmapData(ctx, user, team, doer)
-}