Merge pull request #1654 from nextcloud/backport/1650/stable28

[stable28] fix(notifications): Don't trigger invite notifications for system groups

lib/Listeners/Notifications/RequestingMember.php

@@ -46,6 +46,8 @@
  * Class RequestingMember
  *
  * @package OCA\Circles\Listeners\Notifications
+ *
+ * @template-implements IEventListener<RequestingCircleMemberEvent|AddingCircleMemberEvent|Event>
  */
 class RequestingMember implements IEventListener {
 	use TNCLogger;
@@ -71,18 +73,27 @@ public function __construct(NotificationService $notificationService) {
 	 * @throws RequestBuilderException
 	 */
 	public function handle(Event $event): void {
-		if (!$event instanceof RequestingCircleMemberEvent && !$event instanceof AddingCircleMemberEvent) {
-			return;
+		if ($event instanceof RequestingCircleMemberEvent) {
+			$this->handleRequestingCircleMemberEvent($event);
+		} elseif ($event instanceof AddingCircleMemberEvent) {
+			$this->handleAddingCircleMemberEvent($event);
 		}
+	}
 
+	public function handleRequestingCircleMemberEvent(RequestingCircleMemberEvent $event): void {
 		$member = $event->getMember();
 
 		if ($event->getType() === CircleGenericEvent::REQUESTED) {
 			$this->notificationService->notificationRequested($member);
-		} elseif ($event->getType() === CircleGenericEvent::JOINED && $event->getCircle()->isConfig(Circle::CFG_INVITE)) {
-			$this->notificationService->markInvitationAsProcessed($member);
 		} else {
 			$this->notificationService->notificationInvited($member);
 		}
 	}
+
+	public function handleAddingCircleMemberEvent(AddingCircleMemberEvent $event): void {
+		if ($event->getType() === CircleGenericEvent::JOINED && $event->getCircle()->isConfig(Circle::CFG_INVITE)) {
+			$member = $event->getMember();
+			$this->notificationService->markInvitationAsProcessed($member);
+		}
+	}
 }