From 0577c47ab0839fca0b5025d6cecf6c0493fa1612 Mon Sep 17 00:00:00 2001 From: Your Name Date: Sat, 27 Apr 2024 07:44:57 +0000 Subject: [PATCH] fix --- routes/teams/endpoints/edit_team_member/route.go | 6 +++--- types/teams.go | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/routes/teams/endpoints/edit_team_member/route.go b/routes/teams/endpoints/edit_team_member/route.go index a6b7e9d7..4af9a01d 100644 --- a/routes/teams/endpoints/edit_team_member/route.go +++ b/routes/teams/endpoints/edit_team_member/route.go @@ -106,7 +106,7 @@ func Route(d uapi.RouteData, r *http.Request) uapi.HttpResponse { defer tx.Rollback(d.Context) - if len(payload.Perms) != 0 { + if payload.Perms != nil { if !kittycat.HasPerm(managerPerms, kittycat.Build("team_member", teams.PermissionEdit)) { return uapi.HttpResponse{ Status: http.StatusForbidden, @@ -126,7 +126,7 @@ func Route(d uapi.RouteData, r *http.Request) uapi.HttpResponse { } // Perform initial checks - for _, perm := range payload.Perms { + for _, perm := range *payload.Perms { if !teams.IsValidPerm(perm) { return uapi.HttpResponse{ Status: http.StatusBadRequest, @@ -140,7 +140,7 @@ func Route(d uapi.RouteData, r *http.Request) uapi.HttpResponse { // Right now, we use perm overrides for this // as we do not have a hierarchy system yet newPermsResolved := kittycat.StaffPermissions{ - PermOverrides: payload.Perms, + PermOverrides: *payload.Perms, }.Resolve() // First ensure that the manager can set these permissions diff --git a/types/teams.go b/types/teams.go index ca441e25..7cf3ec2e 100644 --- a/types/teams.go +++ b/types/teams.go @@ -88,9 +88,9 @@ type AddTeamMember struct { } type EditTeamMember struct { - Perms []string `json:"perms" description:"The permissions to set. If empty, will not update"` - Mentionable *bool `json:"mentionable" description:"Whether the user is mentionable Whether the user is mentionable (for alerts in bot-logs etc.)"` - DataHolder *bool `db:"data_holder" json:"data_holder" description:"Whether the user is a data holder responsible for all data on the team. That is, should performing mass-scale operations on them affect the team"` + Perms *[]string `json:"perms" description:"The permissions to set. If empty, will not update"` + Mentionable *bool `json:"mentionable" description:"Whether the user is mentionable Whether the user is mentionable (for alerts in bot-logs etc.)"` + DataHolder *bool `db:"data_holder" json:"data_holder" description:"Whether the user is a data holder responsible for all data on the team. That is, should performing mass-scale operations on them affect the team"` } type UserEntityPerms struct {