tyler.durden/gitea
1
0
Fork 0
mirror of https://github.com/go-gitea/gitea.git synced 2025-07-21 12:55:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

Revert unnecessary changes for this PR

Browse Source
This commit is contained in:
Lunny Xiao 2025-03-09 21:13:34 -07:00
parent a675bfec62
commit 6658b8ec42
No known key found for this signature in database
GPG Key ID: C3B7C91B632F738A
6 changed files with 15 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
models/activities/user_heatmap.go
View File

@ -19,7 +19,17 @@ type UserHeatmapData struct {
Contributions int64 `json:"contributions"` 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) hdata := make([]*UserHeatmapData, 0)
if !ActivityReadable(user, doer) { if !ActivityReadable(user, doer) {

2
routers/api/v1/user/user.go
View File

@ -160,7 +160,7 @@ func GetUserHeatmapData(ctx *context.APIContext) {
// "404": // "404":
// "$ref": "#/responses/notFound" // "$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 { if err != nil {
ctx.APIErrorInternal(err) ctx.APIErrorInternal(err)
return return

2
routers/web/user/home.go
View File

@ -109,7 +109,7 @@ func Dashboard(ctx *context.Context) {
} }
if setting.Service.EnableUserHeatmap { 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 { if err != nil {
ctx.ServerError("GetUserHeatmapDataByUserTeam", err) ctx.ServerError("GetUserHeatmapDataByUserTeam", err)
return return

2
routers/web/user/profile.go
View File

@ -65,7 +65,7 @@ func userProfile(ctx *context.Context) {
// prepare heatmap data // prepare heatmap data
if setting.Service.EnableUserHeatmap { 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 { if err != nil {
ctx.ServerError("GetUserHeatmapDataByUser", err) ctx.ServerError("GetUserHeatmapDataByUser", err)
return return

2
services/feed/feed.go
View File

@ -89,7 +89,7 @@ func notifyWatchers(ctx context.Context, act *activities_model.Action, watchers
return fmt.Errorf("count user feeds: %w", err) 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 return nil

22
services/feed/heatmap.go
View File

@ -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)
}