added support for addressbook push

Author: JonathanTreffler

lib/AppInfo/Application.php

@@ -6,21 +6,27 @@
 namespace OCA\DavPush\AppInfo;
 
 use OCA\DavPush\Listener\SabrePluginAddListener;
-use OCA\DavPush\Listener\CalendarListener;
+use OCA\DavPush\Listener\ResourceListener;
 
 use OCP\AppFramework\App;
 use OCP\AppFramework\Bootstrap\IBootstrap;
 use OCP\AppFramework\Bootstrap\IRegistrationContext;
 use OCP\AppFramework\Bootstrap\IBootContext;
 
 use OCA\DAV\Events\SabrePluginAddEvent;
+
 use OCA\DAV\Events\CalendarObjectCreatedEvent;
 use OCA\DAV\Events\CalendarObjectMovedToTrashEvent;
 use OCA\DAV\Events\CalendarObjectRestoredEvent;
 use OCA\DAV\Events\CalendarObjectDeletedEvent;
 use OCA\DAV\Events\CalendarObjectUpdatedEvent;
 use OCA\DAV\Events\CalendarObjectMovedEvent;
 
+use OCA\DAV\Events\CardCreatedEvent;
+use OCA\DAV\Events\CardUpdatedEvent;
+use OCA\DAV\Events\CardDeletedEvent;
+use OCA\DAV\Events\CardMovedEvent;
+
 class Application extends App implements IBootstrap {
 	public const APP_ID = 'dav_push';
 
@@ -30,12 +36,18 @@ public function __construct() {
 
 	public function register(IRegistrationContext $context): void {
 		$context->registerEventListener(SabrePluginAddEvent::class, SabrePluginAddListener::class);
-		$context->registerEventListener(CalendarObjectCreatedEvent::class, CalendarListener::class);
-		$context->registerEventListener(CalendarObjectMovedToTrashEvent::class, CalendarListener::class);
-		$context->registerEventListener(CalendarObjectRestoredEvent::class, CalendarListener::class);
-        $context->registerEventListener(CalendarObjectDeletedEvent::class, CalendarListener::class);
-        $context->registerEventListener(CalendarObjectUpdatedEvent::class, CalendarListener::class);
-		$context->registerEventListener(CalendarObjectMovedEvent::class, CalendarListener::class);
+
+		$context->registerEventListener(CalendarObjectCreatedEvent::class, ResourceListener::class);
+		$context->registerEventListener(CalendarObjectMovedToTrashEvent::class, ResourceListener::class);
+		$context->registerEventListener(CalendarObjectRestoredEvent::class, ResourceListener::class);
+        $context->registerEventListener(CalendarObjectDeletedEvent::class, ResourceListener::class);
+        $context->registerEventListener(CalendarObjectUpdatedEvent::class, ResourceListener::class);
+		$context->registerEventListener(CalendarObjectMovedEvent::class, ResourceListener::class);
+
+		$context->registerEventListener(CardCreatedEvent::class, ResourceListener::class);
+		$context->registerEventListener(CardUpdatedEvent::class, ResourceListener::class);
+		$context->registerEventListener(CardDeletedEvent::class, ResourceListener::class);
+        $context->registerEventListener(CardMovedEvent::class, ResourceListener::class);
 	}
 
 	public function boot(IBootContext $context): void {

lib/Listener/CalendarListener.php renamed to lib/Listener/ResourceListener.php

@@ -35,17 +35,19 @@
 use OCA\DAV\Events\CalendarObjectDeletedEvent;
 use OCA\DAV\Events\CalendarObjectUpdatedEvent;
 use OCA\DAV\Events\CalendarObjectMovedEvent;
+
 use OCA\DAV\Events\CardCreatedEvent;
-use OCA\DAV\Events\CardDeletedEvent;
 use OCA\DAV\Events\CardUpdatedEvent;
+use OCA\DAV\Events\CardDeletedEvent;
+use OCA\DAV\Events\CardMovedEvent;
 
 use Psr\Log\LoggerInterface;
 
 use OCA\DavPush\Service\SubscriptionService;
 use OCA\DavPush\Transport\TransportManager;
 use OCA\DavPush\Helper\ErrorHandlingHelper;
 
-class CalendarListener implements IEventListener {
+class ResourceListener implements IEventListener {
 
 	public function __construct(
 		private LoggerInterface $logger,
@@ -59,12 +61,21 @@ public function handle(Event $event): void {
 		if (($event instanceOf CalendarObjectCreatedEvent) || ($event instanceOf CalendarObjectDeletedEvent) ||
 			($event instanceOf CalendarObjectUpdatedEvent) || ($event instanceOf CalendarObjectMovedToTrashEvent) ||
 			($event instanceOf CalendarObjectRestoredEvent)) {
-			$this->notifyAllSubscriptionsToResource("calendar", $event->getCalendarData()['id'], $event->getCalendarData()['{http://sabredav.org/ns}sync-token']);
+			$this->notifyAllSubscriptionsToResource("calendar", $event->getCalendarId(), $event->getCalendarData()['{http://sabredav.org/ns}sync-token']);
 		}
 
 		if($event instanceOf CalendarObjectMovedEvent) {
-			$this->notifyAllSubscriptionsToResource("calendar", $event->getSourceCalendarData()['id'], $event->getSourceCalendarData()['{http://sabredav.org/ns}sync-token']);
-			$this->notifyAllSubscriptionsToResource("calendar", $event->getTargetCalendarData()['id'], $event->getTargetCalendarData()['{http://sabredav.org/ns}sync-token']);
+			$this->notifyAllSubscriptionsToResource("calendar", $event->getSourceCalendarId(), $event->getSourceCalendarData()['{http://sabredav.org/ns}sync-token']);
+			$this->notifyAllSubscriptionsToResource("calendar", $event->getTargetCalendarId(), $event->getTargetCalendarData()['{http://sabredav.org/ns}sync-token']);
+		}
+
+		if (($event instanceOf CardCreatedEvent) || ($event instanceOf CardUpdatedEvent) || ($event instanceOf CardDeletedEvent)) {
+			$this->notifyAllSubscriptionsToResource("addressbook", $event->getAddressBookId(), $event->getAddressBookData()['{http://sabredav.org/ns}sync-token']);
+		}
+
+		if($event instanceOf CardMovedEvent) {
+			$this->notifyAllSubscriptionsToResource("addressbook", $event->getSourceAddressBookId(), $event->getSourceAddressBookData()['{http://sabredav.org/ns}sync-token']);
+			$this->notifyAllSubscriptionsToResource("addressbook", $event->getTargetAddressBookId(), $event->getTargetAddressBookData()['{http://sabredav.org/ns}sync-token']);
 		}
 	}