Skip to content

[stable18] Better 'creation_activity' option handling #412

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 1 commit into from
Apr 10, 2020
Merged

[stable18] Better 'creation_activity' option handling #412

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
25 changes: 14 additions & 11 deletions lib/Service/EventsService.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,21 +126,22 @@ public function __construct(
* @param Circle $circle
*/
public function onCircleCreation(Circle $circle) {
if ($this->configService->getAppValue(ConfigService::CIRCLES_ACTIVITY_ON_CREATION) !== '1'
|| ($circle->getType() !== Circle::CIRCLES_PUBLIC
&& $circle->getType() !== Circle::CIRCLES_CLOSED)) {
if ($circle->getType() !== Circle::CIRCLES_PUBLIC
&& $circle->getType() !== Circle::CIRCLES_CLOSED) {
return;
}

$event = $this->generateEvent('circles_as_non_member');
$event->setSubject('circle_create', ['circle' => json_encode($circle)]);
if ($this->configService->getAppValue(ConfigService::CIRCLES_ACTIVITY_ON_CREATION) === '1') {
$event = $this->generateEvent('circles_as_non_member');
$event->setSubject('circle_create', ['circle' => json_encode($circle)]);

$this->userManager->callForSeenUsers(
function($user) use ($event) {
/** @var IUser $user */
$this->publishEvent($event, [$user]);
}
);
$this->userManager->callForSeenUsers(
function($user) use ($event) {
/** @var IUser $user */
$this->publishEvent($event, [$user]);
}
);
}

$this->dispatch('\OCA\Circles::onCircleCreation', ['circle' => $circle]);
}
Expand Down Expand Up @@ -213,6 +214,7 @@ public function onMemberNew(Circle $circle, Member $member) {
)
)
);

$this->dispatch('\OCA\Circles::onMemberNew', ['circle' => $circle, 'member' => $member]);

$this->notificationOnMemberNew($circle, $member);
Expand Down Expand Up @@ -340,6 +342,7 @@ public function onMemberLeaving(Circle $circle, Member $member) {
)
)
);

$this->dispatch('\OCA\Circles::onMemberLeaving', ['circle' => $circle, 'member' => $member]);

$this->deleteNotification('membership', $member->getMemberId());
Expand Down