From fc646e84cd5266f2c3c5558fc3e24d0ca92a8b22 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=98=99=E2=97=A6=20The=20Tablet=20=E2=9D=80=20GamerGirla?= =?UTF-8?q?ndCo=20=E2=97=A6=E2=9D=A7?= Date: Wed, 13 Aug 2025 14:19:49 -0400 Subject: [PATCH] format files --- models/group/avatar.go | 2 ++ models/group/group.go | 7 ++++++- models/group/group_list.go | 1 + models/group/group_team.go | 3 ++- models/group/group_unit.go | 3 ++- models/organization/team_group.go | 3 ++- models/perm/access/repo_permission.go | 2 +- models/shared/group/org_group.go | 4 +++- modules/templates/util_avatar.go | 2 +- modules/util/slice.go | 2 +- services/group/avatar.go | 11 ++++++----- services/group/group_test.go | 7 +++++-- services/group/team.go | 1 + services/group/update.go | 5 +++-- services/user/user.go | 2 +- 15 files changed, 37 insertions(+), 18 deletions(-) diff --git a/models/group/avatar.go b/models/group/avatar.go index 1af58a9fca..dbecd0b27e 100644 --- a/models/group/avatar.go +++ b/models/group/avatar.go @@ -12,6 +12,7 @@ import ( func (g *Group) CustomAvatarRelativePath() string { return g.Avatar } + func (g *Group) relAvatarLink() string { // If no avatar - path is empty avatarPath := g.CustomAvatarRelativePath() @@ -28,6 +29,7 @@ func (g *Group) AvatarLink(ctx context.Context) string { } return "" } + func (g *Group) AvatarLinkWithSize(size int) string { if g.Avatar == "" { return avatars.DefaultAvatarLink() diff --git a/models/group/group.go b/models/group/group.go index 38108f3495..a4b0be3cdb 100644 --- a/models/group/group.go +++ b/models/group/group.go @@ -16,6 +16,7 @@ import ( "code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/structs" "code.gitea.io/gitea/modules/util" + "xorm.io/builder" ) @@ -129,8 +130,12 @@ func (g *Group) LoadOwner(ctx context.Context) error { } func (g *Group) CanAccess(ctx context.Context, userID int64) (bool, error) { + return g.CanAccessAtLevel(ctx, userID, perm.AccessModeRead) +} + +func (g *Group) CanAccessAtLevel(ctx context.Context, userID int64, level perm.AccessMode) (bool, error) { return db.GetEngine(ctx). - Where(UserOrgTeamPermCond("id", userID, perm.AccessModeRead)).Table("repo_group").Exist() + Where(UserOrgTeamPermCond("id", userID, level)).Table("repo_group").Exist() } func (g *Group) IsOwnedBy(ctx context.Context, userID int64) (bool, error) { diff --git a/models/group/group_list.go b/models/group/group_list.go index bb20b04af9..5086a3fc21 100644 --- a/models/group/group_list.go +++ b/models/group/group_list.go @@ -7,6 +7,7 @@ import ( "code.gitea.io/gitea/models/unit" user_model "code.gitea.io/gitea/models/user" "code.gitea.io/gitea/modules/structs" + "xorm.io/builder" ) diff --git a/models/group/group_team.go b/models/group/group_team.go index 392123cbdd..85992acdb5 100644 --- a/models/group/group_team.go +++ b/models/group/group_team.go @@ -1,12 +1,13 @@ package group import ( + "context" + "code.gitea.io/gitea/models/db" "code.gitea.io/gitea/models/perm" "code.gitea.io/gitea/models/unit" "code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/util" - "context" ) // GroupTeam represents a relation for a team's access to a group diff --git a/models/group/group_unit.go b/models/group/group_unit.go index 30c968b978..2715aecf79 100644 --- a/models/group/group_unit.go +++ b/models/group/group_unit.go @@ -1,10 +1,11 @@ package group import ( + "context" + "code.gitea.io/gitea/models/db" "code.gitea.io/gitea/models/perm" "code.gitea.io/gitea/models/unit" - "context" ) // GroupUnit describes all units of a repository group diff --git a/models/organization/team_group.go b/models/organization/team_group.go index 72a8c9790f..da7931291a 100644 --- a/models/organization/team_group.go +++ b/models/organization/team_group.go @@ -1,11 +1,12 @@ package organization import ( + "context" + "code.gitea.io/gitea/models/db" group_model "code.gitea.io/gitea/models/group" "code.gitea.io/gitea/models/perm" "code.gitea.io/gitea/models/unit" - "context" ) func GetTeamsWithAccessToGroup(ctx context.Context, orgID, groupID int64, mode perm.AccessMode) ([]*Team, error) { diff --git a/models/perm/access/repo_permission.go b/models/perm/access/repo_permission.go index ecb2472b6b..df0440f893 100644 --- a/models/perm/access/repo_permission.go +++ b/models/perm/access/repo_permission.go @@ -4,7 +4,6 @@ package access import ( - group_model "code.gitea.io/gitea/models/group" "context" "errors" "fmt" @@ -14,6 +13,7 @@ import ( actions_model "code.gitea.io/gitea/models/actions" "code.gitea.io/gitea/models/db" + group_model "code.gitea.io/gitea/models/group" "code.gitea.io/gitea/models/organization" perm_model "code.gitea.io/gitea/models/perm" repo_model "code.gitea.io/gitea/models/repo" diff --git a/models/shared/group/org_group.go b/models/shared/group/org_group.go index 5ae4eeacda..509ffedf53 100644 --- a/models/shared/group/org_group.go +++ b/models/shared/group/org_group.go @@ -1,11 +1,13 @@ package group import ( + "context" + "code.gitea.io/gitea/models/db" group_model "code.gitea.io/gitea/models/group" organization_model "code.gitea.io/gitea/models/organization" user_model "code.gitea.io/gitea/models/user" - "context" + "xorm.io/builder" ) diff --git a/modules/templates/util_avatar.go b/modules/templates/util_avatar.go index f2c3e8502b..13de803b82 100644 --- a/modules/templates/util_avatar.go +++ b/modules/templates/util_avatar.go @@ -4,7 +4,6 @@ package templates import ( - group_model "code.gitea.io/gitea/models/group" "context" "html" "html/template" @@ -12,6 +11,7 @@ import ( activities_model "code.gitea.io/gitea/models/activities" "code.gitea.io/gitea/models/avatars" + group_model "code.gitea.io/gitea/models/group" "code.gitea.io/gitea/models/organization" repo_model "code.gitea.io/gitea/models/repo" user_model "code.gitea.io/gitea/models/user" diff --git a/modules/util/slice.go b/modules/util/slice.go index 97857e0f47..a1ebd89b99 100644 --- a/modules/util/slice.go +++ b/modules/util/slice.go @@ -78,7 +78,7 @@ func SliceNilAsEmpty[T any](a []T) []T { return a } -func SliceMap[T any, R any](slice []T, mapper func(it T) R) []R { +func SliceMap[T, R any](slice []T, mapper func(it T) R) []R { ret := make([]R, 0) for _, it := range slice { ret = append(ret, mapper(it)) diff --git a/services/group/avatar.go b/services/group/avatar.go index f38096c6c6..f9d395afbc 100644 --- a/services/group/avatar.go +++ b/services/group/avatar.go @@ -1,16 +1,17 @@ package group import ( - "code.gitea.io/gitea/models/db" - group_model "code.gitea.io/gitea/models/group" - "code.gitea.io/gitea/modules/avatar" - "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/storage" "context" "errors" "fmt" "io" "os" + + "code.gitea.io/gitea/models/db" + group_model "code.gitea.io/gitea/models/group" + "code.gitea.io/gitea/modules/avatar" + "code.gitea.io/gitea/modules/log" + "code.gitea.io/gitea/modules/storage" ) // UploadAvatar saves custom icon for group. diff --git a/services/group/group_test.go b/services/group/group_test.go index 99b7e7c176..9013f44608 100644 --- a/services/group/group_test.go +++ b/services/group/group_test.go @@ -1,13 +1,15 @@ package group import ( + "testing" + "code.gitea.io/gitea/models/db" group_model "code.gitea.io/gitea/models/group" repo_model "code.gitea.io/gitea/models/repo" "code.gitea.io/gitea/models/unittest" + "github.com/stretchr/testify/assert" "golang.org/x/net/context" - "testing" ) // group 12 is private @@ -44,9 +46,10 @@ func TestMoveGroup(t *testing.T) { testfn(132) testfn(150) } + func TestMoveRepo(t *testing.T) { assert.NoError(t, unittest.PrepareTestDatabase()) - cond := repo_model.SearchRepositoryCondition(&repo_model.SearchRepoOptions{ + cond := repo_model.SearchRepositoryCondition(repo_model.SearchRepoOptions{ GroupID: 123, }) origCount := unittest.GetCount(t, new(repo_model.Repository), cond) diff --git a/services/group/team.go b/services/group/team.go index 7fe48ba30a..b22cc3471d 100644 --- a/services/group/team.go +++ b/services/group/team.go @@ -8,6 +8,7 @@ import ( group_model "code.gitea.io/gitea/models/group" org_model "code.gitea.io/gitea/models/organization" "code.gitea.io/gitea/models/perm" + "xorm.io/builder" ) diff --git a/services/group/update.go b/services/group/update.go index 63e131243f..b9394fecd1 100644 --- a/services/group/update.go +++ b/services/group/update.go @@ -1,12 +1,13 @@ package group import ( + "context" + "strings" + "code.gitea.io/gitea/models/db" group_model "code.gitea.io/gitea/models/group" "code.gitea.io/gitea/modules/optional" "code.gitea.io/gitea/modules/structs" - "context" - "strings" ) type UpdateOptions struct { diff --git a/services/user/user.go b/services/user/user.go index 539c848ced..2e31ca858a 100644 --- a/services/user/user.go +++ b/services/user/user.go @@ -4,7 +4,6 @@ package user import ( - group_model "code.gitea.io/gitea/models/group" "context" "fmt" "os" @@ -12,6 +11,7 @@ import ( "time" "code.gitea.io/gitea/models/db" + group_model "code.gitea.io/gitea/models/group" "code.gitea.io/gitea/models/organization" packages_model "code.gitea.io/gitea/models/packages" repo_model "code.gitea.io/gitea/models/repo"