Skip to content

emulate initiator on CircleJoin #790

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ArtificialOwl merged 2 commits into from
Aug 23, 2021
Merged

emulate initiator on CircleJoin #790

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2e1b42a
emulate initiator on CircleJoin
ArtificialOwl Aug 20, 2021
074034e
emulate visitor on leave
ArtificialOwl Aug 20, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion lib/Db/MemberRequest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
use OCA\Circles\Model\Circle;
use OCA\Circles\Model\FederatedUser;
use OCA\Circles\Model\Member;
use OCA\Circles\Model\Probes\CircleProbe;
use OCA\Circles\Model\Probes\MemberProbe;

/**
Expand Down Expand Up @@ -288,16 +289,21 @@ public function getInheritedMembers(string $singleId, bool $getData = false, int
/**
* @param string $circleId
* @param string $singleId
* @param CircleProbe|null $probe
*
* @return Member
* @throws MemberNotFoundException
* @throws RequestBuilderException
*/
public function getMember(string $circleId, string $singleId): Member {
public function getMember(string $circleId, string $singleId, ?CircleProbe $probe = null): Member {
$qb = $this->getMemberSelectSql();
$qb->limitToCircleId($circleId);
$qb->limitToSingleId($singleId);

if (!is_null($probe)) {
$qb->setOptions([CoreQueryBuilder::MEMBER], $probe->getAsOptions());
}

return $this->getItemFromRequest($qb);
}

Expand Down
17 changes: 12 additions & 5 deletions lib/FederatedItems/CircleLeave.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@
use OCA\Circles\Model\FederatedUser;
use OCA\Circles\Model\Helpers\MemberHelper;
use OCA\Circles\Model\Member;
use OCA\Circles\Model\Probes\CircleProbe;
use OCA\Circles\Service\ConfigService;
use OCA\Circles\Service\EventService;
use OCA\Circles\Service\MembershipService;
Expand Down Expand Up @@ -137,7 +138,13 @@ public function verify(FederatedEvent $event): void {
if ($member->getId() === '') {
try {
// make it works for not-yet-members
$member = $this->memberRequest->getMember($circle->getSingleId(), $member->getSingleId());
$probe = new CircleProbe();
$probe->includeNonVisibleCircles();
$member = $this->memberRequest->getMember(
$circle->getSingleId(),
$member->getSingleId(),
$probe
);
} catch (MemberNotFoundException $e) {
throw new MemberNotFoundException(StatusCode::$CIRCLE_LEAVE[120], 120);
}
Expand Down Expand Up @@ -224,10 +231,10 @@ private function selectNewOwner(Circle $circle): Member {
if ($member->getLevel() > $newOwner->getLevel()) {
$newOwner = $member;
} elseif ($member->getLevel() === $newOwner->getLevel()
&& ($member->getJoined() < $newOwner->getJoined()
|| ($this->configService->isLocalInstance($member->getInstance())
&& !$this->configService->isLocalInstance($newOwner->getInstance()))
)) {
&& ($member->getJoined() < $newOwner->getJoined()
|| ($this->configService->isLocalInstance($member->getInstance())
&& !$this->configService->isLocalInstance($newOwner->getInstance()))
)) {
$newOwner = $member;
}
}
Expand Down
20 changes: 17 additions & 3 deletions lib/Service/CircleService.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -378,9 +378,15 @@ public function circleJoin(string $circleId): array {
$this->federatedUserService->mustHaveCurrentUser();

$probe = new CircleProbe();
$probe->includeNonVisibleCircles();
$probe->includeNonVisibleCircles()
->emulateVisitor();

$circle = $this->circleRequest->getCircle(
$circleId,
$this->federatedUserService->getCurrentUser(),
$probe
);

$circle = $this->circleRequest->getCircle($circleId, $this->federatedUserService->getCurrentUser(), $probe);
if (!$circle->getInitiator()->hasInvitedBy()) {
$this->federatedUserService->setMemberPatron($circle->getInitiator());
}
Expand Down Expand Up @@ -414,7 +420,15 @@ public function circleJoin(string $circleId): array {
public function circleLeave(string $circleId, bool $force = false): array {
$this->federatedUserService->mustHaveCurrentUser();

$circle = $this->circleRequest->getCircle($circleId, $this->federatedUserService->getCurrentUser());
$probe = new CircleProbe();
$probe->includeNonVisibleCircles()
->emulateVisitor();

$circle = $this->circleRequest->getCircle(
$circleId,
$this->federatedUserService->getCurrentUser(),
$probe
);

$event = new FederatedEvent(CircleLeave::class);
$event->setCircle($circle);
Expand Down