fixing group activities

Signed-off-by: Maxence Lange <maxence@artificial-owl.com>

Author: ArtificialOwl

lib/Activity/ProviderParser.php

@@ -269,6 +269,7 @@ protected function generateExternalMemberParameter(Member $member): array {
 		return [
 			'type' => 'email',
 			'id' => $member->getUserId(),
+			'link' => '',
 			'name' => $member->getDisplayName(),
 			'_parsed' => $member->getDisplayName()
 		];

lib/Activity/ProviderSubjectCircleMember.php

@@ -159,7 +159,7 @@ public function parseSubjectCircleMemberRemove(
 
 		$this->parseCircleMemberEvent(
 			$event, $circle, $member,
-			$this->l10n->t('You removed {member} leave {circle}'),
+			$this->l10n->t('You removed {member} from {circle}'),
 			$this->l10n->t('{author} made {member} leave {circle}')
 		);
 

lib/Service/ActivityService.php

@@ -247,7 +247,31 @@ public function onMemberRemove(Circle $circle, Member $member, int $eventType):
 			return;
 		}
 
+		switch ($member->getUserType()) {
+			case Member::TYPE_USER:
+			case Member::TYPE_MAIL:
+			case Member::TYPE_CONTACT:
+				$this->onMemberRemoveAccount($circle, $member, $eventType);
+				break;
+
+			case Member::TYPE_CIRCLE:
+				$this->onMemberRemoveCircle(
+					$circle,
+					$member,
+					$eventType
+				);
+				break;
+		}
+	}
+
+
+	private function onMemberRemoveAccount(
+		Circle $circle,
+		Member $member,
+		int $eventType
+	): void {
 		$event = $this->generateEvent('circles_as_member');
+
 		try {
 			$event->setSubject(
 				match ($eventType) {
@@ -266,6 +290,40 @@ public function onMemberRemove(Circle $circle, Member $member, int $eventType):
 		$this->publishEvent(
 			$event, array_merge(
 				[$member],
+				$this->memberRequest->getInheritedMembers(
+					$circle->getSingleId(),
+					false,
+					Member::LEVEL_MODERATOR
+				)
+			)
+		);
+	}
+
+	private function onMemberRemoveCircle(
+		Circle $circle,
+		Member $member,
+		int $eventType = CircleGenericEvent::JOINED
+	): void {
+		$event = $this->generateEvent('circles_as_member');
+
+		try {
+			$event->setSubject(
+				match ($eventType) {
+					CircleGenericEvent::LEFT => 'member_circle_left',
+					CircleGenericEvent::REMOVED => 'member_circle_removed'
+				},
+				[
+					'circle' => json_encode($circle),
+					'member' => json_encode($member)
+				]
+			);
+		} catch (UnhandledMatchError $e) {
+			return;
+		}
+
+		$this->publishEvent(
+			$event, array_merge(
+				$this->memberRequest->getInheritedMembers($member->getSingleId(), false, Member::LEVEL_MEMBER),
 				$this->memberRequest->getInheritedMembers($circle->getSingleId(), false, Member::LEVEL_MODERATOR)
 			)
 		);