Skip to content

Commit dee1d4f

Browse files
edward-lyedward-ly
committed
feat(dav)!: migrate OCA calendar object events to OCP
Signed-off-by: Edward Ly <[email protected]>
1 parent dd181f4 commit dee1d4f

15 files changed

+27
-495
lines changed

‎apps/dav/composer/composer/autoload_classmap.php‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -255,12 +255,6 @@
255255
'OCA\\DAV\\Events\\CalendarCreatedEvent' => $baseDir . '/../lib/Events/CalendarCreatedEvent.php',
256256
'OCA\\DAV\\Events\\CalendarDeletedEvent' => $baseDir . '/../lib/Events/CalendarDeletedEvent.php',
257257
'OCA\\DAV\\Events\\CalendarMovedToTrashEvent' => $baseDir . '/../lib/Events/CalendarMovedToTrashEvent.php',
258-
'OCA\\DAV\\Events\\CalendarObjectCreatedEvent' => $baseDir . '/../lib/Events/CalendarObjectCreatedEvent.php',
259-
'OCA\\DAV\\Events\\CalendarObjectDeletedEvent' => $baseDir . '/../lib/Events/CalendarObjectDeletedEvent.php',
260-
'OCA\\DAV\\Events\\CalendarObjectMovedEvent' => $baseDir . '/../lib/Events/CalendarObjectMovedEvent.php',
261-
'OCA\\DAV\\Events\\CalendarObjectMovedToTrashEvent' => $baseDir . '/../lib/Events/CalendarObjectMovedToTrashEvent.php',
262-
'OCA\\DAV\\Events\\CalendarObjectRestoredEvent' => $baseDir . '/../lib/Events/CalendarObjectRestoredEvent.php',
263-
'OCA\\DAV\\Events\\CalendarObjectUpdatedEvent' => $baseDir . '/../lib/Events/CalendarObjectUpdatedEvent.php',
264258
'OCA\\DAV\\Events\\CalendarPublishedEvent' => $baseDir . '/../lib/Events/CalendarPublishedEvent.php',
265259
'OCA\\DAV\\Events\\CalendarRestoredEvent' => $baseDir . '/../lib/Events/CalendarRestoredEvent.php',
266260
'OCA\\DAV\\Events\\CalendarShareUpdatedEvent' => $baseDir . '/../lib/Events/CalendarShareUpdatedEvent.php',

‎apps/dav/composer/composer/autoload_static.php‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -270,12 +270,6 @@ class ComposerStaticInitDAV
270270
'OCA\\DAV\\Events\\CalendarCreatedEvent' => __DIR__ . '/..' . '/../lib/Events/CalendarCreatedEvent.php',
271271
'OCA\\DAV\\Events\\CalendarDeletedEvent' => __DIR__ . '/..' . '/../lib/Events/CalendarDeletedEvent.php',
272272
'OCA\\DAV\\Events\\CalendarMovedToTrashEvent' => __DIR__ . '/..' . '/../lib/Events/CalendarMovedToTrashEvent.php',
273-
'OCA\\DAV\\Events\\CalendarObjectCreatedEvent' => __DIR__ . '/..' . '/../lib/Events/CalendarObjectCreatedEvent.php',
274-
'OCA\\DAV\\Events\\CalendarObjectDeletedEvent' => __DIR__ . '/..' . '/../lib/Events/CalendarObjectDeletedEvent.php',
275-
'OCA\\DAV\\Events\\CalendarObjectMovedEvent' => __DIR__ . '/..' . '/../lib/Events/CalendarObjectMovedEvent.php',
276-
'OCA\\DAV\\Events\\CalendarObjectMovedToTrashEvent' => __DIR__ . '/..' . '/../lib/Events/CalendarObjectMovedToTrashEvent.php',
277-
'OCA\\DAV\\Events\\CalendarObjectRestoredEvent' => __DIR__ . '/..' . '/../lib/Events/CalendarObjectRestoredEvent.php',
278-
'OCA\\DAV\\Events\\CalendarObjectUpdatedEvent' => __DIR__ . '/..' . '/../lib/Events/CalendarObjectUpdatedEvent.php',
279273
'OCA\\DAV\\Events\\CalendarPublishedEvent' => __DIR__ . '/..' . '/../lib/Events/CalendarPublishedEvent.php',
280274
'OCA\\DAV\\Events\\CalendarRestoredEvent' => __DIR__ . '/..' . '/../lib/Events/CalendarRestoredEvent.php',
281275
'OCA\\DAV\\Events\\CalendarShareUpdatedEvent' => __DIR__ . '/..' . '/../lib/Events/CalendarShareUpdatedEvent.php',

‎apps/dav/lib/AppInfo/Application.php‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,6 @@
3030
use OCA\DAV\Events\CalendarCreatedEvent;
3131
use OCA\DAV\Events\CalendarDeletedEvent;
3232
use OCA\DAV\Events\CalendarMovedToTrashEvent;
33-
use OCA\DAV\Events\CalendarObjectCreatedEvent;
34-
use OCA\DAV\Events\CalendarObjectDeletedEvent;
35-
use OCA\DAV\Events\CalendarObjectMovedEvent;
36-
use OCA\DAV\Events\CalendarObjectMovedToTrashEvent;
37-
use OCA\DAV\Events\CalendarObjectRestoredEvent;
38-
use OCA\DAV\Events\CalendarObjectUpdatedEvent;
3933
use OCA\DAV\Events\CalendarPublishedEvent;
4034
use OCA\DAV\Events\CalendarRestoredEvent;
4135
use OCA\DAV\Events\CalendarShareUpdatedEvent;
@@ -75,6 +69,12 @@
7569
use OCP\AppFramework\Bootstrap\IBootstrap;
7670
use OCP\AppFramework\Bootstrap\IRegistrationContext;
7771
use OCP\AppFramework\IAppContainer;
72+
use OCP\Calendar\Events\CalendarObjectCreatedEvent;
73+
use OCP\Calendar\Events\CalendarObjectDeletedEvent;
74+
use OCP\Calendar\Events\CalendarObjectMovedEvent;
75+
use OCP\Calendar\Events\CalendarObjectMovedToTrashEvent;
76+
use OCP\Calendar\Events\CalendarObjectRestoredEvent;
77+
use OCP\Calendar\Events\CalendarObjectUpdatedEvent;
7878
use OCP\Calendar\IManager as ICalendarManager;
7979
use OCP\Config\BeforePreferenceDeletedEvent;
8080
use OCP\Config\BeforePreferenceSetEvent;

‎apps/dav/lib/CalDAV/CalDavBackend.php‎

Lines changed: 6 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,6 @@
1919
use OCA\DAV\Events\CalendarCreatedEvent;
2020
use OCA\DAV\Events\CalendarDeletedEvent;
2121
use OCA\DAV\Events\CalendarMovedToTrashEvent;
22-
use OCA\DAV\Events\CalendarObjectCreatedEvent;
23-
use OCA\DAV\Events\CalendarObjectDeletedEvent;
24-
use OCA\DAV\Events\CalendarObjectMovedEvent;
25-
use OCA\DAV\Events\CalendarObjectMovedToTrashEvent;
26-
use OCA\DAV\Events\CalendarObjectRestoredEvent;
27-
use OCA\DAV\Events\CalendarObjectUpdatedEvent;
2822
use OCA\DAV\Events\CalendarPublishedEvent;
2923
use OCA\DAV\Events\CalendarRestoredEvent;
3024
use OCA\DAV\Events\CalendarShareUpdatedEvent;
@@ -34,12 +28,12 @@
3428
use OCA\DAV\Events\SubscriptionDeletedEvent;
3529
use OCA\DAV\Events\SubscriptionUpdatedEvent;
3630
use OCP\AppFramework\Db\TTransactional;
37-
use OCP\Calendar\Events\CalendarObjectCreatedEvent as PublicCalendarObjectCreatedEvent;
38-
use OCP\Calendar\Events\CalendarObjectDeletedEvent as PublicCalendarObjectDeletedEvent;
39-
use OCP\Calendar\Events\CalendarObjectMovedEvent as PublicCalendarObjectMovedEvent;
40-
use OCP\Calendar\Events\CalendarObjectMovedToTrashEvent as PublicCalendarObjectMovedToTrashEvent;
41-
use OCP\Calendar\Events\CalendarObjectRestoredEvent as PublicCalendarObjectRestoredEvent;
42-
use OCP\Calendar\Events\CalendarObjectUpdatedEvent as PublicCalendarObjectUpdatedEvent;
31+
use OCP\Calendar\Events\CalendarObjectCreatedEvent;
32+
use OCP\Calendar\Events\CalendarObjectDeletedEvent;
33+
use OCP\Calendar\Events\CalendarObjectMovedEvent;
34+
use OCP\Calendar\Events\CalendarObjectMovedToTrashEvent;
35+
use OCP\Calendar\Events\CalendarObjectRestoredEvent;
36+
use OCP\Calendar\Events\CalendarObjectUpdatedEvent;
4337
use OCP\Calendar\Exceptions\CalendarException;
4438
use OCP\DB\Exception;
4539
use OCP\DB\QueryBuilder\IQueryBuilder;
@@ -1324,7 +1318,6 @@ public function createCalendarObject($calendarId, $objectUri, $calendarData, $ca
13241318
$shares = $this->getShares($calendarId);
13251319

13261320
$this->dispatcher->dispatchTyped(new CalendarObjectCreatedEvent($calendarId, $calendarRow, $shares, $objectRow));
1327-
$this->dispatcher->dispatchTyped(new PublicCalendarObjectCreatedEvent($calendarId, $calendarRow, $shares, $objectRow));
13281321
} else {
13291322
$subscriptionRow = $this->getSubscriptionById($calendarId);
13301323

@@ -1385,7 +1378,6 @@ public function updateCalendarObject($calendarId, $objectUri, $calendarData, $ca
13851378
$shares = $this->getShares($calendarId);
13861379

13871380
$this->dispatcher->dispatchTyped(new CalendarObjectUpdatedEvent($calendarId, $calendarRow, $shares, $objectRow));
1388-
$this->dispatcher->dispatchTyped(new PublicCalendarObjectUpdatedEvent($calendarId, $calendarRow, $shares, $objectRow));
13891381
} else {
13901382
$subscriptionRow = $this->getSubscriptionById($calendarId);
13911383

@@ -1447,7 +1439,6 @@ public function moveCalendarObject(int $sourceCalendarId, int $targetCalendarId,
14471439
$targetShares = $this->getShares($targetCalendarId);
14481440
$sourceCalendarRow = $this->getCalendarById($sourceCalendarId);
14491441
$this->dispatcher->dispatchTyped(new CalendarObjectMovedEvent($sourceCalendarId, $sourceCalendarRow, $targetCalendarId, $targetCalendarRow, $sourceShares, $targetShares, $object));
1450-
$this->dispatcher->dispatchTyped(new PublicCalendarObjectMovedEvent($sourceCalendarId, $sourceCalendarRow, $targetCalendarId, $targetCalendarRow, $sourceShares, $targetShares, $object));
14511442
}
14521443
return true;
14531444
}, $this->db);
@@ -1506,7 +1497,6 @@ public function deleteCalendarObject($calendarId, $objectUri, $calendarType = se
15061497
$shares = $this->getShares($calendarId);
15071498

15081499
$this->dispatcher->dispatchTyped(new CalendarObjectDeletedEvent($calendarId, $calendarRow, $shares, $data));
1509-
$this->dispatcher->dispatchTyped(new PublicCalendarObjectDeletedEvent($calendarId, $calendarRow, $shares, $data));
15101500
} else {
15111501
$subscriptionRow = $this->getSubscriptionById($calendarId);
15121502

@@ -1556,14 +1546,6 @@ public function deleteCalendarObject($calendarId, $objectUri, $calendarType = se
15561546
$data
15571547
)
15581548
);
1559-
$this->dispatcher->dispatchTyped(
1560-
new PublicCalendarObjectMovedToTrashEvent(
1561-
$calendarId,
1562-
$calendarData,
1563-
$this->getShares($calendarId),
1564-
$data
1565-
)
1566-
);
15671549
}
15681550
}
15691551

@@ -1623,14 +1605,6 @@ public function restoreCalendarObject(array $objectData): void {
16231605
$row
16241606
)
16251607
);
1626-
$this->dispatcher->dispatchTyped(
1627-
new PublicCalendarObjectRestoredEvent(
1628-
(int)$objectData['calendarid'],
1629-
$calendarRow,
1630-
$this->getShares((int)$row['calendarid']),
1631-
$row
1632-
)
1633-
);
16341608
}, $this->db);
16351609
}
16361610

‎apps/dav/lib/Events/CalendarObjectCreatedEvent.php‎

Lines changed: 0 additions & 70 deletions
This file was deleted.

‎apps/dav/lib/Events/CalendarObjectDeletedEvent.php‎

Lines changed: 0 additions & 70 deletions
This file was deleted.

‎apps/dav/lib/Events/CalendarObjectMovedEvent.php‎

Lines changed: 0 additions & 90 deletions
This file was deleted.

0 commit comments

Comments
 (0)