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
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 0 additions & 2 deletions appinfo/routes.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,8 @@
* SPDX-License-Identifier: AGPL-3.0-or-later
*/


return [
'ocs' => [

// LocalController
['name' => 'Local#circles', 'url' => '/circles', 'verb' => 'GET'],
['name' => 'Local#probeCircles', 'url' => '/probecircles', 'verb' => 'GET'],
Expand Down
9 changes: 0 additions & 9 deletions lib/Activity/Deprecated/ProviderSubjectMember.php
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,6 @@ private function parseSubjectMemberJoinOnInvite(
throw new FakeException();
}


/**
* @param IEvent $event
* @param Circle $circle
Expand Down Expand Up @@ -119,7 +118,6 @@ private function parseSubjectMemberAddNotLocalMember(
throw new FakeException();
}


/**
* @param IEvent $event
* @param Circle $circle
Expand All @@ -146,7 +144,6 @@ private function parseSubjectMemberAddClosedCircle(
throw new FakeException();
}


/**
* @param IEvent $event
* @param Circle $circle
Expand Down Expand Up @@ -174,7 +171,6 @@ public function parseSubjectMemberLeft(
throw new FakeException();
}


/**
* @param IEvent $event
* @param Circle $circle
Expand All @@ -201,7 +197,6 @@ private function parseSubjectNonMemberLeftInvite(
throw new FakeException();
}


/**
* @param IEvent $event
* @param Circle $circle
Expand All @@ -228,7 +223,6 @@ private function parseSubjectNonMemberLeftRequest(
throw new FakeException();
}


/**
* @param IEvent $event
* @param Circle $circle
Expand Down Expand Up @@ -282,7 +276,6 @@ private function parseSubjectMemberRemoveNotLocalMember(
throw new FakeException();
}


/**
* @param IEvent $event
* @param Circle $circle
Expand Down Expand Up @@ -357,7 +350,6 @@ public function parseMemberInvited(IEvent $event, Circle $circle, Member $member
throw new FakeException();
}


/**
* @param IEvent $event
* @param Circle $circle
Expand Down Expand Up @@ -386,7 +378,6 @@ public function parseMemberLevel(
throw new FakeException();
}


/**
* @param IEvent $event
* @param Circle $circle
Expand Down
1 change: 0 additions & 1 deletion lib/Activity/ProviderParser.php
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,6 @@ protected function isViewerTheAuthor(array $initiator, string $userId): bool {
return (($initiator['type'] ?? 0) === Member::TYPE_USER && ($initiator['userId'] ?? '') === $userId);
}


/**
* @param array $member
*
Expand Down
9 changes: 0 additions & 9 deletions lib/Activity/ProviderSubjectMember.php
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,6 @@ private function parseSubjectMemberJoinOnInvite(
throw new FakeException();
}


/**
* @param IEvent $event
* @param array $params
Expand Down Expand Up @@ -111,7 +110,6 @@ private function parseSubjectMemberAddNotLocalMember(
throw new FakeException();
}


/**
* @param IEvent $event
* @param array $params
Expand All @@ -136,7 +134,6 @@ private function parseSubjectMemberAddClosedCircle(
throw new FakeException();
}


/**
* @param IEvent $event
* @param array $params
Expand All @@ -162,7 +159,6 @@ public function parseSubjectMemberLeft(
throw new FakeException();
}


/**
* @param IEvent $event
* @param array $params
Expand All @@ -187,7 +183,6 @@ private function parseSubjectNonMemberLeftInvite(
throw new FakeException();
}


/**
* @param IEvent $event
* @param array $params
Expand All @@ -212,7 +207,6 @@ private function parseSubjectNonMemberLeftRequest(
throw new FakeException();
}


/**
* @param IEvent $event
* @param array $params
Expand Down Expand Up @@ -262,7 +256,6 @@ private function parseSubjectMemberRemoveNotLocalMember(
throw new FakeException();
}


/**
* @param IEvent $event
* @param array $params
Expand Down Expand Up @@ -333,7 +326,6 @@ public function parseMemberInvited(IEvent $event, array $params): void {
throw new FakeException();
}


/**
* @param IEvent $event
* @param array $params
Expand All @@ -360,7 +352,6 @@ public function parseMemberLevel(
throw new FakeException();
}


/**
* @param IEvent $event
* @param array $params
Expand Down
8 changes: 1 addition & 7 deletions lib/Activity/SettingAsMember.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
* SPDX-FileCopyrightText: 2017 Nextcloud GmbH and Nextcloud contributors
* SPDX-License-Identifier: AGPL-3.0-or-later
*/

namespace OCA\Circles\Activity;

use OCP\Activity\ISetting;
Expand All @@ -15,7 +16,6 @@ public function __construct(
) {
}


/**
* @return string Lowercase a-z and underscore only identifier
* @since 11.0.0
Expand All @@ -24,7 +24,6 @@ public function getIdentifier() {
return 'circles_as_member';
}


/**
* @return string A translated string
* @since 11.0.0
Expand All @@ -33,7 +32,6 @@ public function getName() {
return $this->l10n->t('On events happening in a <strong>team</strong> of which you are a member');
}


/**
* @return int whether the filter should be rather on the top or bottom of
* the admin section. The filters are arranged in ascending order of the
Expand All @@ -44,7 +42,6 @@ public function getPriority() {
return 60;
}


/**
* @return bool True when the option can be changed for the stream
* @since 11.0.0
Expand All @@ -53,7 +50,6 @@ public function canChangeStream() {
return true;
}


/**
* @return bool True when the option can be changed for the stream
* @since 11.0.0
Expand All @@ -62,7 +58,6 @@ public function isDefaultEnabledStream() {
return true;
}


/**
* @return bool True when the option can be changed for the mail
* @since 11.0.0
Expand All @@ -71,7 +66,6 @@ public function canChangeMail() {
return true;
}


/**
* @return bool True when the option can be changed for the stream
* @since 11.0.0
Expand Down
7 changes: 0 additions & 7 deletions lib/Activity/SettingAsNonMember.php
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ public function __construct(
) {
}


/**
* @return string Lowercase a-z and underscore only identifier
* @since 11.0.0
Expand All @@ -27,7 +26,6 @@ public function getIdentifier() {
return 'circles_as_non_member';
}


/**
* @return string A translated string
* @since 11.0.0
Expand All @@ -36,7 +34,6 @@ public function getName() {
return $this->l10n->t('On global events happening in any <strong>team</strong>');
}


/**
* @return int whether the filter should be rather on the top or bottom of
* the admin section. The filters are arranged in ascending order of the
Expand All @@ -47,7 +44,6 @@ public function getPriority() {
return 60;
}


/**
* @return bool True when the option can be changed for the stream
* @since 11.0.0
Expand All @@ -56,7 +52,6 @@ public function canChangeStream() {
return true;
}


/**
* @return bool True when the option can be changed for the stream
* @since 11.0.0
Expand All @@ -65,7 +60,6 @@ public function isDefaultEnabledStream() {
return false;
}


/**
* @return bool True when the option can be changed for the mail
* @since 11.0.0
Expand All @@ -74,7 +68,6 @@ public function canChangeMail() {
return true;
}


/**
* @return bool True when the option can be changed for the stream
* @since 11.0.0
Expand Down
5 changes: 0 additions & 5 deletions lib/Api/v1/Circles.php
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ class Circles {
public const LEVEL_ADMIN = Member::LEVEL_ADMIN;
public const LEVEL_OWNER = Member::LEVEL_OWNER;


/**
* Circles::listCircles();
*
Expand Down Expand Up @@ -88,7 +87,6 @@ public static function listCircles($type, $name = '', $level = 0, $userId = '',
return $circleService->getCircles($probe);
}


/**
* @param string $userId
* @param bool $forceAll
Expand Down Expand Up @@ -131,7 +129,6 @@ public static function joinedCircles($userId = '', $forceAll = false) {
return $circleService->probeCircles($probe);
}


/**
* @param string $circleUniqueId
* @param bool $forceAll
Expand Down Expand Up @@ -171,7 +168,6 @@ public static function detailsCircle(string $circleUniqueId, bool $forceAll = fa
return $circleService->getCircle($circleUniqueId);
}


/**
* @param string $circleUniqueId
* @param string $ident
Expand All @@ -195,7 +191,6 @@ public static function getMember($circleUniqueId, $ident, $type, $forceAll = fal
return $circlesManager->getLink($circleUniqueId, $federatedUser->getSingleId());
}


/**
* @param array $circleUniqueIds
*
Expand Down
2 changes: 0 additions & 2 deletions lib/AppInfo/Application.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,11 @@

declare(strict_types=1);


/**
* SPDX-FileCopyrightText: 2017 Nextcloud GmbH and Nextcloud contributors
* SPDX-License-Identifier: AGPL-3.0-or-later
*/


namespace OCA\Circles\AppInfo;

use OCA\Circles\ConfigLexicon;
Expand Down
4 changes: 2 additions & 2 deletions lib/AppInfo/Capabilities.php
Original file line number Diff line number Diff line change
Expand Up @@ -109,8 +109,8 @@ private function getCapabilitiesCircleConstants(): array {
Circle::CFG_FEDERATED => $this->l10n->t('Federated'),
Circle::CFG_MOUNTPOINT => $this->l10n->t('Mount point')
],
'source' =>
[
'source'
=> [
'core' => [
Member::TYPE_USER => $this->l10n->t('Nextcloud Account'),
Member::TYPE_GROUP => $this->l10n->t('Nextcloud Group'),
Expand Down
Loading
Loading