RM-304: base claimer permissions on their support team instead of granting full access

bot/button/handlers/unclaim.go

@@ -145,12 +145,17 @@ func (h *UnclaimHandler) Execute(ctx *context.ButtonContext) {
 
 			switch claimSettings.SwitchPanelClaimBehavior {
 			case database.SwitchPanelKeepAccess:
-				overwrites = append(overwrites, channel.PermissionOverwrite{
-					Id:    whoClaimed,
-					Type:  channel.PermissionTypeMember,
-					Allow: discordpermission.BuildPermissions(logic.StandardPermissions[:]...),
-					Deny:  0,
-				})
+				// Preserve the claimer's existing overwrite, falling back to the full set
+				if existing, ok := logic.FindMemberOverwrite(ch.PermissionOverwrites, whoClaimed); ok {
+					overwrites = append(overwrites, existing)
+				} else {
+					overwrites = append(overwrites, channel.PermissionOverwrite{
+						Id:    whoClaimed,
+						Type:  channel.PermissionTypeMember,
+						Allow: discordpermission.BuildPermissions(logic.StandardPermissions[:]...),
+						Deny:  0,
+					})
+				}
 			case database.SwitchPanelRemoveOnUnclaim:
 				overwrites = append(overwrites, channel.PermissionOverwrite{
 					Id:    whoClaimed,

bot/command/impl/tickets/switchpanel.go

@@ -292,15 +292,21 @@ func (SwitchPanelCommand) Execute(ctx *cmdcontext.SlashCommandContext, panelId i
 			return
 		}
 
-		// GenerateClaimedOverwrites returns nil if the permissions are the same as an unclaimed ticket
-		// so if this is the case, we still need to calculate permissions
+		// If nil, calculate the base permissions and pin the claimer at the user level
 		if overwrites == nil {
-			membersWithClaimer := append(members, claimer)
-			overwrites, err = logic.CreateOverwrites(ctx.Context, ctx, ticket.UserId, &newPanel, newPanel.TargetCategory, membersWithClaimer...)
+			overwrites, err = logic.CreateOverwrites(ctx.Context, ctx, ticket.UserId, &newPanel, newPanel.TargetCategory, members...)
 			if err != nil {
 				ctx.HandleError(err)
 				return
 			}
+
+			claimerOverwrite, err := logic.BuildClaimerOverwrite(ctx.Context, ctx.Worker(), ticket, claimer)
+			if err != nil {
+				ctx.HandleError(err)
+				return
+			}
+
+			overwrites = logic.UpsertMemberOverwrite(overwrites, claimerOverwrite)
 		}
 	}
 

bot/command/impl/tickets/unclaim.go

@@ -141,12 +141,17 @@ func (UnclaimCommand) Execute(ctx *context.SlashCommandContext) {
 
 			switch claimSettings.SwitchPanelClaimBehavior {
 			case database.SwitchPanelKeepAccess:
-				overwrites = append(overwrites, channel.PermissionOverwrite{
-					Id:    whoClaimed,
-					Type:  channel.PermissionTypeMember,
-					Allow: discordpermission.BuildPermissions(logic.StandardPermissions[:]...),
-					Deny:  0,
-				})
+				// Preserve the claimer's existing overwrite, falling back to the full set
+				if existing, ok := logic.FindMemberOverwrite(ch.PermissionOverwrites, whoClaimed); ok {
+					overwrites = append(overwrites, existing)
+				} else {
+					overwrites = append(overwrites, channel.PermissionOverwrite{
+						Id:    whoClaimed,
+						Type:  channel.PermissionTypeMember,
+						Allow: discordpermission.BuildPermissions(logic.StandardPermissions[:]...),
+						Deny:  0,
+					})
+				}
 			case database.SwitchPanelRemoveOnUnclaim:
 				overwrites = append(overwrites, channel.PermissionOverwrite{
 					Id:    whoClaimed,