Skip to content

Commit

Permalink
fix merge
Browse files Browse the repository at this point in the history
  • Loading branch information
ornicar committed Oct 15, 2023
1 parent eb18693 commit 6ce354b
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion modules/team/src/main/TeamApi.scala
Original file line number Diff line number Diff line change
Expand Up @@ -268,7 +268,7 @@ final class TeamApi(
myself <- memberRepo.get(team.id, me)
allowed = userId.isnt(team.createdBy) && kicked.exists: kicked =>
myself.exists: myself =>
kicked.perms.isEmpty || myself.isGranted(_.Admin) || Granter(_.ManageTeam)
kicked.perms.isEmpty || myself.hasPerm(_.Admin) || Granter(_.ManageTeam)
_ <- allowed.so:
// create a request to set declined in order to prevent kicked use to rejoin
val request = Request.make(team.id, userId, "Kicked from team", declined = true)
Expand Down

0 comments on commit 6ce354b

Please sign in to comment.