Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
14 changes: 11 additions & 3 deletions lib/Model/Circle.php
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,7 @@ class Circle extends ManagedModel implements IEntity, IDeserializable, INC22Quer
4 => 'Email Address',
8 => 'Contact',
16 => 'Circle',
10000 => 'Nextcloud App',
10001 => 'Circles App',
10002 => 'Admin Command Line'
];
Expand Down Expand Up @@ -555,9 +556,7 @@ public function getMemberships(): array {
* @throws RequestBuilderException
*/
public function getLink(string $singleId, bool $detailed = false): Membership {
$this->getManager()->getLink($this, $singleId, $detailed);

throw new MembershipNotFoundException();
return $this->getManager()->getLink($this, $singleId, $detailed);
}


Expand Down Expand Up @@ -631,6 +630,15 @@ public function getInstance(): string {
}


/**
* @return bool
* @throws OwnerNotFoundException
*/
public function isLocal(): bool {
return $this->getManager()->isLocalInstance($this->getInstance());
}


/**
* @param int $population
*
Expand Down
7 changes: 7 additions & 0 deletions lib/Service/FederatedUserService.php
Original file line number Diff line number Diff line change
Expand Up @@ -317,6 +317,13 @@ public function bypassCurrentUserCondition(bool $bypass): void {
$this->bypass = $bypass;
}

/**
* @return bool
*/
public function canBypassCurrentUserCondition(): bool {
return $this->bypass;
}


/**
* @param bool $initiatedByOcc
Expand Down