plugins-nextcloud-mirror/spreed
1
0
Fork 0
mirror of https://github.com/nextcloud/spreed.git synced 2025-12-18 05:20:50 +01:00
Code Projects Releases Activity

Merge pull request #12671 from nextcloud/skalidindi53/12670/Moderators-banning-others/themselves

Browse source 
fix: Moderators no longer able to ban themselves or other moderators
This commit is contained in:
Joas Schilling 2024-07-15 16:12:19 +02:00 • committed by GitHub
commit 7b7c2895ad
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 37 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
lib/Service/BanService.php
View file

@ -9,6 +9,7 @@ declare(strict_types=1);
namespace OCA\Talk\Service;
use DateTime;
use OCA\Talk\Manager;
use OCA\Talk\Model\Ban;
use OCA\Talk\Model\BanMapper;
use OCP\AppFramework\Db\DoesNotExistException;
@ -17,6 +18,8 @@ class BanService {
public function __construct(
protected BanMapper $banMapper,
protected Manager $manager,
protected ParticipantService $participantService,
) {
}
@ -34,6 +37,12 @@ class BanService {
throw new \InvalidArgumentException('internalNote');
}
$bannedParticipant = $this->participantService->getParticipantByActor($this->manager->getRoomById($roomId), $bannedType, $bannedId);
if ($bannedParticipant->hasModeratorPermissions()) {
throw new \InvalidArgumentException('moderator');
}
$ban = new Ban();
$ban->setActorId($actorId);
$ban->setActorType($actorType);

2
tests/integration/features/bootstrap/FeatureContext.php
View file

@ -1838,6 +1838,8 @@ class FeatureContext implements Context, SnippetAcceptingContext {
$this->assertStatusCode($this->response, $statusCode);
}
/**
* @Then /^user "([^"]*)" (promotes|demotes) "([^"]*)" in room "([^"]*)" with (\d+) \((v4)\)$/
*

44
tests/integration/features/conversation-1/ban.feature
View file

@ -63,27 +63,35 @@ Feature: conversation/ban
| roomType | 3 |
| roomName | room |
And user "participant2" joins room "room" with 200 (v4)
And user "participant1" bans user "participant3" from room "room" with 200 (v1)
And user "participant1" bans user "participant3" from room "room" with 404 (v1)
| internalNote | BannedInvalid |
# Scenario: Moderator trying to ban moderator
# Given user "participant1" creates room "room" (v4)
# | roomType | 3 |
# | roomName | room |
# And user "participant1" joins room "room" with 200 (v4)
# And user "participant2" joins room "room" with 200 (v4)
# And user "participant1" adds user "participant2" to room "room" with 200 (v4)
# And user "participant1" promotes "participant2" in room "room" with 200 (v4)
# And user "participant1" bans user "participant2" from room "room" with 403 (v1)
# | internalNote | BannedP2 |
Scenario: Moderator trying to ban themselves
Given user "participant1" creates room "room" (v4)
| roomType | 3 |
| roomName | room |
And user "participant1" joins room "room" with 200 (v4)
And user "participant1" bans user "participant1" from room "room" with 400 (v1)
| internalNote | BannedP1 |
Scenario: Moderator trying to ban moderator
Given user "participant1" creates room "room" (v4)
| roomType | 3 |
| roomName | room |
And user "participant1" joins room "room" with 200 (v4)
And user "participant2" joins room "room" with 200 (v4)
And user "participant1" adds user "participant2" to room "room" with 200 (v4)
And user "participant1" promotes "participant2" in room "room" with 200 (v4)
And user "participant1" bans user "participant2" from room "room" with 400 (v1)
| internalNote | BannedP2 |
And user "participant1" demotes "participant2" in room "room" with 200 (v4)
And user "participant1" bans user "participant2" from room "room" with 200 (v1)
| internalNote | BannedP2 |
And user "participant1" sees the following bans in room "room" with 200 (v1)
| actorType | actorId | bannedType | bannedId | internalNote |
| users | participant1 | users | participant2 | BannedP2 |
# Scenario: Moderator trying to ban themselves
# Given user "participant1" creates room "room" (v4)
# | roomType | 3 |
# | roomName | room |
# And user "participant1" joins room "room" with 200 (v4)
# And user "participant1" bans user "participant1" from room "room" with 403 (v1)
# | internalNote | BannedP1 |