nextcloud / server

lib/public/RichObjectStrings/Definitions.php

Indentation +472 added lines, -472 removed lines

@@ -33,478 +33,478 @@
  * @since 11.0.0
  */
 class Definitions {
-	/**
-	 * @var array
-	 * @since 11.0.0
-	 */
-	public $definitions = [
-		'addressbook' => [
-			'author' => 'Nextcloud',
-			'app' => 'dav',
-			'since' => '11.0.0',
-			'parameters' => [
-				'id' => [
-					'since' => '11.0.0',
-					'required' => true,
-					'description' => 'The id used to identify the addressbook on the instance',
-					'example' => '42',
-				],
-				'name' => [
-					'since' => '11.0.0',
-					'required' => true,
-					'description' => 'The display name of the addressbook which should be used in the visual representation',
-					'example' => 'Contacts',
-				],
-			],
-		],
-		'addressbook-contact' => [
-			'author' => 'Nextcloud',
-			'app' => 'dav',
-			'since' => '11.0.0',
-			'parameters' => [
-				'id' => [
-					'since' => '11.0.0',
-					'required' => true,
-					'description' => 'The id used to identify the contact on the instance',
-					'example' => '42',
-				],
-				'name' => [
-					'since' => '11.0.0',
-					'required' => true,
-					'description' => 'The display name of the contact which should be used in the visual representation',
-					'example' => 'John Doe',
-				],
-			],
-		],
-		'announcement' => [
-			'author' => 'Joas Schilling',
-			'app' => 'announcementcenter',
-			'since' => '11.0.0',
-			'parameters' => [
-				'id' => [
-					'since' => '11.0.0',
-					'required' => true, 'description' => 'The id used to identify the announcement on the instance',
-					'example' => '42',
-				],
-				'name' => [
-					'since' => '11.0.0',
-					'required' => true,
-					'description' => 'The announcement subject which should be used in the visual representation',
-					'example' => 'file.txt',
-				],
-				'link' => [
-					'since' => '11.0.0',
-					'required' => false,
-					'description' => 'The full URL to the file',
-					'example' => 'http://localhost/index.php/apps/announcements/#23',
-				],
-			],
-		],
-		'app' => [
-			'author' => 'Nextcloud',
-			'app' => 'updatenotification',
-			'since' => '11.0.0',
-			'parameters' => [
-				'id' => [
-					'since' => '11.0.0',
-					'required' => true, 'description' => 'The app id',
-					'example' => 'updatenotification',
-				],
-				'name' => [
-					'since' => '11.0.0',
-					'required' => true,
-					'description' => 'The name of the app which should be used in the visual representation',
-					'example' => 'Update notification',
-				],
-			],
-		],
-		'calendar' => [
-			'author' => 'Nextcloud',
-			'app' => 'dav',
-			'since' => '11.0.0',
-			'parameters' => [
-				'id' => [
-					'since' => '11.0.0',
-					'required' => true,
-					'description' => 'The id used to identify the calendar on the instance',
-					'example' => '42',
-				],
-				'name' => [
-					'since' => '11.0.0',
-					'required' => true,
-					'description' => 'The display name of the calendar which should be used in the visual representation',
-					'example' => 'Personal',
-				],
-			],
-		],
-		'calendar-event' => [
-			'author' => 'Nextcloud',
-			'app' => 'dav',
-			'since' => '11.0.0',
-			'parameters' => [
-				'id' => [
-					'since' => '11.0.0',
-					'required' => true,
-					'description' => 'The id used to identify the event on the instance',
-					'example' => '42',
-				],
-				'name' => [
-					'since' => '11.0.0',
-					'required' => true,
-					'description' => 'The display name of the event which should be used in the visual representation',
-					'example' => 'Workout',
-				],
-				'link' => [
-					'since' => '19.0.0',
-					'required' => false,
-					'description' => 'A link to the page displaying the calendar',
-					'example' => 'http://localhost/index.php/apps/calendar/dayGridMonth/2020-01-20/edit/sidebar/base64string/1579046400'
-				]
-			],
-		],
-		'call' => [
-			'author' => 'Nextcloud',
-			'app' => 'spreed',
-			'since' => '11.0.2',
-			'parameters' => [
-				'id' => [
-					'since' => '11.0.2',
-					'required' => true,
-					'description' => 'The id used to identify the call on the instance',
-					'example' => '42',
-				],
-				'name' => [
-					'since' => '11.0.2',
-					'required' => true,
-					'description' => 'The display name of the call which should be used in the visual representation',
-					'example' => 'Company call',
-				],
-				'call-type' => [
-					'since' => '11.0.2',
-					'required' => true,
-					'description' => 'The type of the call: one2one, group or public',
-					'example' => 'one2one',
-				],
-			],
-		],
-		'circle' => [
-			'author' => 'Maxence Lange',
-			'app' => 'circles',
-			'since' => '12.0.0',
-			'parameters' => [
-				'id' => [
-					'since' => '12.0.0',
-					'required' => true,
-					'description' => 'The id used to identify the circle on the instance',
-					'example' => '42',
-				],
-				'name' => [
-					'since' => '12.0.0',
-					'required' => true,
-					'description' => 'The display name of the circle which should be used in the visual representation',
-					'example' => 'My friends',
-				],
-				'link' => [
-					'since' => '12.0.0',
-					'required' => true,
-					'description' => 'The full URL to the circle',
-					'example' => 'http://localhost/index.php/apps/circles/#42',
-				],
-			],
-		],
-		'email' => [
-			'author' => 'Nextcloud',
-			'app' => 'sharebymail',
-			'since' => '11.0.0',
-			'parameters' => [
-				'id' => [
-					'since' => '11.0.0',
-					'required' => true,
-					'description' => 'The mail-address used to identify the event on the instance',
-					'example' => 'test@localhost',
-				],
-				'name' => [
-					'since' => '11.0.0',
-					'required' => true,
-					'description' => 'The display name of a matching contact or the email (fallback) which should be used in the visual representation',
-					'example' => 'Foo Bar',
-				],
-			],
-		],
-		'file' => [
-			'author' => 'Nextcloud',
-			'app' => 'dav',
-			'since' => '11.0.0',
-			'parameters' => [
-				'id' => [
-					'since' => '11.0.0',
-					'required' => true,
-					'description' => 'The id used to identify the file on the instance',
-					'example' => '42',
-				],
-				'name' => [
-					'since' => '11.0.0',
-					'required' => true,
-					'description' => 'The file name which should be used in the visual representation',
-					'example' => 'file.txt',
-				],
-				'path' => [
-					'since' => '11.0.0',
-					'required' => true,
-					'description' => 'The full path of the file for the user, should not start with a slash',
-					'example' => 'path/to/file.txt',
-				],
-				'link' => [
-					'since' => '11.0.0',
-					'required' => false,
-					'description' => 'The full URL to the file',
-					'example' => 'http://localhost/index.php/f/42',
-				],
-				'mimetype' => [
-					'since' => '16.0.0',
-					'required' => false,
-					'description' => 'The mimetype of the file/folder to allow clients to show a placeholder',
-					'example' => 'text/plain',
-				],
-				'preview-available' => [
-					'since' => '16.0.0',
-					'required' => false,
-					'description' => 'Whether or not a preview is available. If `no` the mimetype icon should be used',
-					'example' => 'yes',
-				],
-			],
-		],
-		'guest' => [
-			'author' => 'Nextcloud',
-			'app' => 'spreed',
-			'since' => '17.0.0',
-			'parameters' => [
-				'id' => [
-					'since' => '17.0.0',
-					'required' => true,
-					'description' => 'The id used to identify the guest user',
-					'example' => '42',
-				],
-				'name' => [
-					'since' => '17.0.0',
-					'required' => true,
-					'description' => 'Potential displayname of the guest user',
-					'example' => 'Foobar Cats',
-				],
-			],
-		],
-		'highlight' => [
-			'author' => 'Nextcloud',
-			'app' => 'core',
-			'since' => '13.0.0',
-			'parameters' => [
-				'id' => [
-					'since' => '13.0.0',
-					'required' => true,
-					'description' => 'The id used to identify the highlighted object on the instance',
-					'example' => '42',
-				],
-				'name' => [
-					'since' => '13.0.0',
-					'required' => true,
-					'description' => 'The string that should be highlighted.',
-					'example' => 'Hello World',
-				],
-				'link' => [
-					'since' => '13.0.0',
-					'required' => false,
-					'description' => 'The full URL that should be opened when clicking the highlighted text.',
-					'example' => 'http://localhost/index.php/f/42',
-				],
-			],
-		],
-		'open-graph' => [
-			'author' => 'Maxence Lange',
-			'app' => 'mood',
-			'since' => '12.0.0',
-			'parameters' => [
-				'id' => [
-					'since' => '12.0.0',
-					'required' => true,
-					'description' => 'The id used to identify the open graph data on the instance',
-					'example' => '42',
-				],
-				'name' => [
-					'since' => '12.0.0',
-					'required' => true,
-					'description' => 'The open graph title of the website',
-					'example' => 'This is a website',
-				],
-				'description' => [
-					'since' => '12.0.0',
-					'required' => false,
-					'description' => 'The open graph description from the website',
-					'example' => 'This is the description of the website',
-				],
-				'thumb' => [
-					'since' => '12.0.0',
-					'required' => false,
-					'description' => 'The full URL of the open graph thumbnail',
-					'example' => 'http://localhost/index.php/apps/mood/data/image?url=https%3A%2F%2Fthumb.example.com%2Fimage.png',
-				],
-				'website' => [
-					'since' => '12.0.0',
-					'required' => false,
-					'description' => 'The name of the described website',
-					'example' => 'Nextcloud - App Store',
-				],
-				'link' => [
-					'since' => '12.0.0',
-					'required' => false,
-					'description' => 'The full link to the website',
-					'example' => 'https://apps.nextcloud.com/apps/mood',
-				],
-			],
-		],
-		'pending-federated-share' => [
-			'author' => 'Nextcloud',
-			'app' => 'dav',
-			'since' => '11.0.0',
-			'parameters' => [
-				'id' => [
-					'since' => '11.0.0',
-					'required' => true,
-					'description' => 'The id used to identify the federated share on the instance',
-					'example' => '42',
-				],
-				'name' => [
-					'since' => '11.0.0',
-					'required' => true,
-					'description' => 'The name of the shared item which should be used in the visual representation',
-					'example' => 'file.txt',
-				],
-			],
-		],
-		'systemtag' => [
-			'author' => 'Nextcloud',
-			'app' => 'core',
-			'since' => '11.0.0',
-			'parameters' => [
-				'id' => [
-					'since' => '11.0.0',
-					'required' => true,
-					'description' => 'The id used to identify the systemtag on the instance',
-					'example' => '23',
-				],
-				'name' => [
-					'since' => '11.0.0',
-					'required' => true,
-					'description' => 'The display name of the systemtag which should be used in the visual representation',
-					'example' => 'Project 1',
-				],
-				'visibility' => [
-					'since' => '11.0.0',
-					'required' => true,
-					'description' => 'If the user can see the systemtag',
-					'example' => '1',
-				],
-				'assignable' => [
-					'since' => '11.0.0',
-					'required' => true,
-					'description' => 'If the user can assign the systemtag',
-					'example' => '0',
-				],
-			],
-		],
-		'talk-attachment' => [
-			'author' => 'Nextcloud',
-			'app' => 'talk',
-			'since' => '18.0.0',
-			'parameters' => [
-				'id' => [
-					'since' => '18.0.0',
-					'required' => true,
-					'description' => 'The id used to identify the attachment on the instance',
-					'example' => '12345',
-				],
-				'name' => [
-					'since' => '18.0.0',
-					'required' => true,
-					'description' => 'The name of the attachment',
-					'example' => 'John Doe',
-				],
-				'conversation' => [
-					'since' => '18.0.0',
-					'required' => true,
-					'description' => 'The token of the conversation',
-					'example' => 'a1b2c3d4',
-				],
-				'mimetype' => [
-					'since' => '18.0.0',
-					'required' => false,
-					'description' => 'The mimetype of the file/folder to allow clients to show a placeholder',
-					'example' => 'text/plain',
-				],
-				'preview-available' => [
-					'since' => '18.0.0',
-					'required' => false,
-					'description' => 'Whether or not a preview is available. If `no` the mimetype icon should be used',
-					'example' => 'yes',
-				],
-			],
-		],
-		'user' => [
-			'author' => 'Nextcloud',
-			'app' => 'core',
-			'since' => '11.0.0',
-			'parameters' => [
-				'id' => [
-					'since' => '11.0.0',
-					'required' => true,
-					'description' => 'The id used to identify the user on the instance',
-					'example' => 'johndoe',
-				],
-				'name' => [
-					'since' => '11.0.0',
-					'required' => true,
-					'description' => 'The display name of the user which should be used in the visual representation',
-					'example' => 'John Doe',
-				],
-				'server' => [
-					'since' => '11.0.0',
-					'required' => false,
-					'description' => 'The URL of the instance the user lives on',
-					'example' => 'localhost',
-				],
-			],
-		],
-		'user-group' => [
-			'author' => 'Nextcloud',
-			'app' => 'core',
-			'since' => '11.0.0',
-			'parameters' => [
-				'id' => [
-					'since' => '11.0.0',
-					'required' => true,
-					'description' => 'The id used to identify the group on the instance',
-					'example' => 'supportteam',
-				],
-				'name' => [
-					'since' => '11.0.0',
-					'required' => true,
-					'description' => 'The display name of the group which should be used in the visual representation',
-					'example' => 'Support Team',
-				],
-			],
-		],
-	];
+    /**
+     * @var array
+     * @since 11.0.0
+     */
+    public $definitions = [
+        'addressbook' => [
+            'author' => 'Nextcloud',
+            'app' => 'dav',
+            'since' => '11.0.0',
+            'parameters' => [
+                'id' => [
+                    'since' => '11.0.0',
+                    'required' => true,
+                    'description' => 'The id used to identify the addressbook on the instance',
+                    'example' => '42',
+                ],
+                'name' => [
+                    'since' => '11.0.0',
+                    'required' => true,
+                    'description' => 'The display name of the addressbook which should be used in the visual representation',
+                    'example' => 'Contacts',
+                ],
+            ],
+        ],
+        'addressbook-contact' => [
+            'author' => 'Nextcloud',
+            'app' => 'dav',
+            'since' => '11.0.0',
+            'parameters' => [
+                'id' => [
+                    'since' => '11.0.0',
+                    'required' => true,
+                    'description' => 'The id used to identify the contact on the instance',
+                    'example' => '42',
+                ],
+                'name' => [
+                    'since' => '11.0.0',
+                    'required' => true,
+                    'description' => 'The display name of the contact which should be used in the visual representation',
+                    'example' => 'John Doe',
+                ],
+            ],
+        ],
+        'announcement' => [
+            'author' => 'Joas Schilling',
+            'app' => 'announcementcenter',
+            'since' => '11.0.0',
+            'parameters' => [
+                'id' => [
+                    'since' => '11.0.0',
+                    'required' => true, 'description' => 'The id used to identify the announcement on the instance',
+                    'example' => '42',
+                ],
+                'name' => [
+                    'since' => '11.0.0',
+                    'required' => true,
+                    'description' => 'The announcement subject which should be used in the visual representation',
+                    'example' => 'file.txt',
+                ],
+                'link' => [
+                    'since' => '11.0.0',
+                    'required' => false,
+                    'description' => 'The full URL to the file',
+                    'example' => 'http://localhost/index.php/apps/announcements/#23',
+                ],
+            ],
+        ],
+        'app' => [
+            'author' => 'Nextcloud',
+            'app' => 'updatenotification',
+            'since' => '11.0.0',
+            'parameters' => [
+                'id' => [
+                    'since' => '11.0.0',
+                    'required' => true, 'description' => 'The app id',
+                    'example' => 'updatenotification',
+                ],
+                'name' => [
+                    'since' => '11.0.0',
+                    'required' => true,
+                    'description' => 'The name of the app which should be used in the visual representation',
+                    'example' => 'Update notification',
+                ],
+            ],
+        ],
+        'calendar' => [
+            'author' => 'Nextcloud',
+            'app' => 'dav',
+            'since' => '11.0.0',
+            'parameters' => [
+                'id' => [
+                    'since' => '11.0.0',
+                    'required' => true,
+                    'description' => 'The id used to identify the calendar on the instance',
+                    'example' => '42',
+                ],
+                'name' => [
+                    'since' => '11.0.0',
+                    'required' => true,
+                    'description' => 'The display name of the calendar which should be used in the visual representation',
+                    'example' => 'Personal',
+                ],
+            ],
+        ],
+        'calendar-event' => [
+            'author' => 'Nextcloud',
+            'app' => 'dav',
+            'since' => '11.0.0',
+            'parameters' => [
+                'id' => [
+                    'since' => '11.0.0',
+                    'required' => true,
+                    'description' => 'The id used to identify the event on the instance',
+                    'example' => '42',
+                ],
+                'name' => [
+                    'since' => '11.0.0',
+                    'required' => true,
+                    'description' => 'The display name of the event which should be used in the visual representation',
+                    'example' => 'Workout',
+                ],
+                'link' => [
+                    'since' => '19.0.0',
+                    'required' => false,
+                    'description' => 'A link to the page displaying the calendar',
+                    'example' => 'http://localhost/index.php/apps/calendar/dayGridMonth/2020-01-20/edit/sidebar/base64string/1579046400'
+                ]
+            ],
+        ],
+        'call' => [
+            'author' => 'Nextcloud',
+            'app' => 'spreed',
+            'since' => '11.0.2',
+            'parameters' => [
+                'id' => [
+                    'since' => '11.0.2',
+                    'required' => true,
+                    'description' => 'The id used to identify the call on the instance',
+                    'example' => '42',
+                ],
+                'name' => [
+                    'since' => '11.0.2',
+                    'required' => true,
+                    'description' => 'The display name of the call which should be used in the visual representation',
+                    'example' => 'Company call',
+                ],
+                'call-type' => [
+                    'since' => '11.0.2',
+                    'required' => true,
+                    'description' => 'The type of the call: one2one, group or public',
+                    'example' => 'one2one',
+                ],
+            ],
+        ],
+        'circle' => [
+            'author' => 'Maxence Lange',
+            'app' => 'circles',
+            'since' => '12.0.0',
+            'parameters' => [
+                'id' => [
+                    'since' => '12.0.0',
+                    'required' => true,
+                    'description' => 'The id used to identify the circle on the instance',
+                    'example' => '42',
+                ],
+                'name' => [
+                    'since' => '12.0.0',
+                    'required' => true,
+                    'description' => 'The display name of the circle which should be used in the visual representation',
+                    'example' => 'My friends',
+                ],
+                'link' => [
+                    'since' => '12.0.0',
+                    'required' => true,
+                    'description' => 'The full URL to the circle',
+                    'example' => 'http://localhost/index.php/apps/circles/#42',
+                ],
+            ],
+        ],
+        'email' => [
+            'author' => 'Nextcloud',
+            'app' => 'sharebymail',
+            'since' => '11.0.0',
+            'parameters' => [
+                'id' => [
+                    'since' => '11.0.0',
+                    'required' => true,
+                    'description' => 'The mail-address used to identify the event on the instance',
+                    'example' => 'test@localhost',
+                ],
+                'name' => [
+                    'since' => '11.0.0',
+                    'required' => true,
+                    'description' => 'The display name of a matching contact or the email (fallback) which should be used in the visual representation',
+                    'example' => 'Foo Bar',
+                ],
+            ],
+        ],
+        'file' => [
+            'author' => 'Nextcloud',
+            'app' => 'dav',
+            'since' => '11.0.0',
+            'parameters' => [
+                'id' => [
+                    'since' => '11.0.0',
+                    'required' => true,
+                    'description' => 'The id used to identify the file on the instance',
+                    'example' => '42',
+                ],
+                'name' => [
+                    'since' => '11.0.0',
+                    'required' => true,
+                    'description' => 'The file name which should be used in the visual representation',
+                    'example' => 'file.txt',
+                ],
+                'path' => [
+                    'since' => '11.0.0',
+                    'required' => true,
+                    'description' => 'The full path of the file for the user, should not start with a slash',
+                    'example' => 'path/to/file.txt',
+                ],
+                'link' => [
+                    'since' => '11.0.0',
+                    'required' => false,
+                    'description' => 'The full URL to the file',
+                    'example' => 'http://localhost/index.php/f/42',
+                ],
+                'mimetype' => [
+                    'since' => '16.0.0',
+                    'required' => false,
+                    'description' => 'The mimetype of the file/folder to allow clients to show a placeholder',
+                    'example' => 'text/plain',
+                ],
+                'preview-available' => [
+                    'since' => '16.0.0',
+                    'required' => false,
+                    'description' => 'Whether or not a preview is available. If `no` the mimetype icon should be used',
+                    'example' => 'yes',
+                ],
+            ],
+        ],
+        'guest' => [
+            'author' => 'Nextcloud',
+            'app' => 'spreed',
+            'since' => '17.0.0',
+            'parameters' => [
+                'id' => [
+                    'since' => '17.0.0',
+                    'required' => true,
+                    'description' => 'The id used to identify the guest user',
+                    'example' => '42',
+                ],
+                'name' => [
+                    'since' => '17.0.0',
+                    'required' => true,
+                    'description' => 'Potential displayname of the guest user',
+                    'example' => 'Foobar Cats',
+                ],
+            ],
+        ],
+        'highlight' => [
+            'author' => 'Nextcloud',
+            'app' => 'core',
+            'since' => '13.0.0',
+            'parameters' => [
+                'id' => [
+                    'since' => '13.0.0',
+                    'required' => true,
+                    'description' => 'The id used to identify the highlighted object on the instance',
+                    'example' => '42',
+                ],
+                'name' => [
+                    'since' => '13.0.0',
+                    'required' => true,
+                    'description' => 'The string that should be highlighted.',
+                    'example' => 'Hello World',
+                ],
+                'link' => [
+                    'since' => '13.0.0',
+                    'required' => false,
+                    'description' => 'The full URL that should be opened when clicking the highlighted text.',
+                    'example' => 'http://localhost/index.php/f/42',
+                ],
+            ],
+        ],
+        'open-graph' => [
+            'author' => 'Maxence Lange',
+            'app' => 'mood',
+            'since' => '12.0.0',
+            'parameters' => [
+                'id' => [
+                    'since' => '12.0.0',
+                    'required' => true,
+                    'description' => 'The id used to identify the open graph data on the instance',
+                    'example' => '42',
+                ],
+                'name' => [
+                    'since' => '12.0.0',
+                    'required' => true,
+                    'description' => 'The open graph title of the website',
+                    'example' => 'This is a website',
+                ],
+                'description' => [
+                    'since' => '12.0.0',
+                    'required' => false,
+                    'description' => 'The open graph description from the website',
+                    'example' => 'This is the description of the website',
+                ],
+                'thumb' => [
+                    'since' => '12.0.0',
+                    'required' => false,
+                    'description' => 'The full URL of the open graph thumbnail',
+                    'example' => 'http://localhost/index.php/apps/mood/data/image?url=https%3A%2F%2Fthumb.example.com%2Fimage.png',
+                ],
+                'website' => [
+                    'since' => '12.0.0',
+                    'required' => false,
+                    'description' => 'The name of the described website',
+                    'example' => 'Nextcloud - App Store',
+                ],
+                'link' => [
+                    'since' => '12.0.0',
+                    'required' => false,
+                    'description' => 'The full link to the website',
+                    'example' => 'https://apps.nextcloud.com/apps/mood',
+                ],
+            ],
+        ],
+        'pending-federated-share' => [
+            'author' => 'Nextcloud',
+            'app' => 'dav',
+            'since' => '11.0.0',
+            'parameters' => [
+                'id' => [
+                    'since' => '11.0.0',
+                    'required' => true,
+                    'description' => 'The id used to identify the federated share on the instance',
+                    'example' => '42',
+                ],
+                'name' => [
+                    'since' => '11.0.0',
+                    'required' => true,
+                    'description' => 'The name of the shared item which should be used in the visual representation',
+                    'example' => 'file.txt',
+                ],
+            ],
+        ],
+        'systemtag' => [
+            'author' => 'Nextcloud',
+            'app' => 'core',
+            'since' => '11.0.0',
+            'parameters' => [
+                'id' => [
+                    'since' => '11.0.0',
+                    'required' => true,
+                    'description' => 'The id used to identify the systemtag on the instance',
+                    'example' => '23',
+                ],
+                'name' => [
+                    'since' => '11.0.0',
+                    'required' => true,
+                    'description' => 'The display name of the systemtag which should be used in the visual representation',
+                    'example' => 'Project 1',
+                ],
+                'visibility' => [
+                    'since' => '11.0.0',
+                    'required' => true,
+                    'description' => 'If the user can see the systemtag',
+                    'example' => '1',
+                ],
+                'assignable' => [
+                    'since' => '11.0.0',
+                    'required' => true,
+                    'description' => 'If the user can assign the systemtag',
+                    'example' => '0',
+                ],
+            ],
+        ],
+        'talk-attachment' => [
+            'author' => 'Nextcloud',
+            'app' => 'talk',
+            'since' => '18.0.0',
+            'parameters' => [
+                'id' => [
+                    'since' => '18.0.0',
+                    'required' => true,
+                    'description' => 'The id used to identify the attachment on the instance',
+                    'example' => '12345',
+                ],
+                'name' => [
+                    'since' => '18.0.0',
+                    'required' => true,
+                    'description' => 'The name of the attachment',
+                    'example' => 'John Doe',
+                ],
+                'conversation' => [
+                    'since' => '18.0.0',
+                    'required' => true,
+                    'description' => 'The token of the conversation',
+                    'example' => 'a1b2c3d4',
+                ],
+                'mimetype' => [
+                    'since' => '18.0.0',
+                    'required' => false,
+                    'description' => 'The mimetype of the file/folder to allow clients to show a placeholder',
+                    'example' => 'text/plain',
+                ],
+                'preview-available' => [
+                    'since' => '18.0.0',
+                    'required' => false,
+                    'description' => 'Whether or not a preview is available. If `no` the mimetype icon should be used',
+                    'example' => 'yes',
+                ],
+            ],
+        ],
+        'user' => [
+            'author' => 'Nextcloud',
+            'app' => 'core',
+            'since' => '11.0.0',
+            'parameters' => [
+                'id' => [
+                    'since' => '11.0.0',
+                    'required' => true,
+                    'description' => 'The id used to identify the user on the instance',
+                    'example' => 'johndoe',
+                ],
+                'name' => [
+                    'since' => '11.0.0',
+                    'required' => true,
+                    'description' => 'The display name of the user which should be used in the visual representation',
+                    'example' => 'John Doe',
+                ],
+                'server' => [
+                    'since' => '11.0.0',
+                    'required' => false,
+                    'description' => 'The URL of the instance the user lives on',
+                    'example' => 'localhost',
+                ],
+            ],
+        ],
+        'user-group' => [
+            'author' => 'Nextcloud',
+            'app' => 'core',
+            'since' => '11.0.0',
+            'parameters' => [
+                'id' => [
+                    'since' => '11.0.0',
+                    'required' => true,
+                    'description' => 'The id used to identify the group on the instance',
+                    'example' => 'supportteam',
+                ],
+                'name' => [
+                    'since' => '11.0.0',
+                    'required' => true,
+                    'description' => 'The display name of the group which should be used in the visual representation',
+                    'example' => 'Support Team',
+                ],
+            ],
+        ],
+    ];
 
-	/**
-	 * @param string $type
-	 * @return array
-	 * @throws InvalidObjectExeption
-	 * @since 11.0.0
-	 */
-	public function getDefinition($type) {
-		if (isset($this->definitions[$type])) {
-			return $this->definitions[$type];
-		}
+    /**
+     * @param string $type
+     * @return array
+     * @throws InvalidObjectExeption
+     * @since 11.0.0
+     */
+    public function getDefinition($type) {
+        if (isset($this->definitions[$type])) {
+            return $this->definitions[$type];
+        }
 
-		throw new InvalidObjectExeption('Object type is undefined');
-	}
+        throw new InvalidObjectExeption('Object type is undefined');
+    }
 }

apps/dav/lib/CalDAV/Activity/Provider/Calendar.php

Indentation +207 added lines, -207 removed lines

@@ -37,228 +37,228 @@
 use OCP\L10N\IFactory;
 
 class Calendar extends Base {
-	public const SUBJECT_ADD = 'calendar_add';
-	public const SUBJECT_UPDATE = 'calendar_update';
-	public const SUBJECT_DELETE = 'calendar_delete';
-	public const SUBJECT_PUBLISH = 'calendar_publish';
-	public const SUBJECT_UNPUBLISH = 'calendar_unpublish';
-	public const SUBJECT_SHARE_USER = 'calendar_user_share';
-	public const SUBJECT_SHARE_GROUP = 'calendar_group_share';
-	public const SUBJECT_UNSHARE_USER = 'calendar_user_unshare';
-	public const SUBJECT_UNSHARE_GROUP = 'calendar_group_unshare';
+    public const SUBJECT_ADD = 'calendar_add';
+    public const SUBJECT_UPDATE = 'calendar_update';
+    public const SUBJECT_DELETE = 'calendar_delete';
+    public const SUBJECT_PUBLISH = 'calendar_publish';
+    public const SUBJECT_UNPUBLISH = 'calendar_unpublish';
+    public const SUBJECT_SHARE_USER = 'calendar_user_share';
+    public const SUBJECT_SHARE_GROUP = 'calendar_group_share';
+    public const SUBJECT_UNSHARE_USER = 'calendar_user_unshare';
+    public const SUBJECT_UNSHARE_GROUP = 'calendar_group_unshare';
 
-	/** @var IFactory */
-	protected $languageFactory;
+    /** @var IFactory */
+    protected $languageFactory;
 
-	/** @var IL10N */
-	protected $l;
+    /** @var IL10N */
+    protected $l;
 
-	/** @var IManager */
-	protected $activityManager;
+    /** @var IManager */
+    protected $activityManager;
 
-	/** @var IEventMerger */
-	protected $eventMerger;
+    /** @var IEventMerger */
+    protected $eventMerger;
 
-	/**
-	 * @param IFactory $languageFactory
-	 * @param IURLGenerator $url
-	 * @param IManager $activityManager
-	 * @param IUserManager $userManager
-	 * @param IGroupManager $groupManager
-	 * @param IEventMerger $eventMerger
-	 */
-	public function __construct(IFactory $languageFactory, IURLGenerator $url, IManager $activityManager, IUserManager $userManager, IGroupManager $groupManager, IEventMerger $eventMerger) {
-		parent::__construct($userManager, $groupManager, $url);
-		$this->languageFactory = $languageFactory;
-		$this->activityManager = $activityManager;
-		$this->eventMerger = $eventMerger;
-	}
+    /**
+     * @param IFactory $languageFactory
+     * @param IURLGenerator $url
+     * @param IManager $activityManager
+     * @param IUserManager $userManager
+     * @param IGroupManager $groupManager
+     * @param IEventMerger $eventMerger
+     */
+    public function __construct(IFactory $languageFactory, IURLGenerator $url, IManager $activityManager, IUserManager $userManager, IGroupManager $groupManager, IEventMerger $eventMerger) {
+        parent::__construct($userManager, $groupManager, $url);
+        $this->languageFactory = $languageFactory;
+        $this->activityManager = $activityManager;
+        $this->eventMerger = $eventMerger;
+    }
 
-	/**
-	 * @param string $language
-	 * @param IEvent $event
-	 * @param IEvent|null $previousEvent
-	 * @return IEvent
-	 * @throws \InvalidArgumentException
-	 * @since 11.0.0
-	 */
-	public function parse($language, IEvent $event, IEvent $previousEvent = null) {
-		if ($event->getApp() !== 'dav' || $event->getType() !== 'calendar') {
-			throw new \InvalidArgumentException();
-		}
+    /**
+     * @param string $language
+     * @param IEvent $event
+     * @param IEvent|null $previousEvent
+     * @return IEvent
+     * @throws \InvalidArgumentException
+     * @since 11.0.0
+     */
+    public function parse($language, IEvent $event, IEvent $previousEvent = null) {
+        if ($event->getApp() !== 'dav' || $event->getType() !== 'calendar') {
+            throw new \InvalidArgumentException();
+        }
 
-		$this->l = $this->languageFactory->get('dav', $language);
+        $this->l = $this->languageFactory->get('dav', $language);
 
-		if ($this->activityManager->getRequirePNG()) {
-			$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'places/calendar-dark.png')));
-		} else {
-			$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'places/calendar.svg')));
-		}
+        if ($this->activityManager->getRequirePNG()) {
+            $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'places/calendar-dark.png')));
+        } else {
+            $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'places/calendar.svg')));
+        }
 
-		if ($event->getSubject() === self::SUBJECT_ADD) {
-			$subject = $this->l->t('{actor} created calendar {calendar}');
-		} elseif ($event->getSubject() === self::SUBJECT_ADD . '_self') {
-			$subject = $this->l->t('You created calendar {calendar}');
-		} elseif ($event->getSubject() === self::SUBJECT_DELETE) {
-			$subject = $this->l->t('{actor} deleted calendar {calendar}');
-		} elseif ($event->getSubject() === self::SUBJECT_DELETE . '_self') {
-			$subject = $this->l->t('You deleted calendar {calendar}');
-		} elseif ($event->getSubject() === self::SUBJECT_UPDATE) {
-			$subject = $this->l->t('{actor} updated calendar {calendar}');
-		} elseif ($event->getSubject() === self::SUBJECT_UPDATE . '_self') {
-			$subject = $this->l->t('You updated calendar {calendar}');
-		} elseif ($event->getSubject() === self::SUBJECT_PUBLISH . '_self') {
-			$subject = $this->l->t('You shared calendar {calendar} as public link');
-		} elseif ($event->getSubject() === self::SUBJECT_UNPUBLISH . '_self') {
-			$subject = $this->l->t('You removed public link for calendar {calendar}');
-		} elseif ($event->getSubject() === self::SUBJECT_SHARE_USER) {
-			$subject = $this->l->t('{actor} shared calendar {calendar} with you');
-		} elseif ($event->getSubject() === self::SUBJECT_SHARE_USER . '_you') {
-			$subject = $this->l->t('You shared calendar {calendar} with {user}');
-		} elseif ($event->getSubject() === self::SUBJECT_SHARE_USER . '_by') {
-			$subject = $this->l->t('{actor} shared calendar {calendar} with {user}');
-		} elseif ($event->getSubject() === self::SUBJECT_UNSHARE_USER) {
-			$subject = $this->l->t('{actor} unshared calendar {calendar} from you');
-		} elseif ($event->getSubject() === self::SUBJECT_UNSHARE_USER . '_you') {
-			$subject = $this->l->t('You unshared calendar {calendar} from {user}');
-		} elseif ($event->getSubject() === self::SUBJECT_UNSHARE_USER . '_by') {
-			$subject = $this->l->t('{actor} unshared calendar {calendar} from {user}');
-		} elseif ($event->getSubject() === self::SUBJECT_UNSHARE_USER . '_self') {
-			$subject = $this->l->t('{actor} unshared calendar {calendar} from themselves');
-		} elseif ($event->getSubject() === self::SUBJECT_SHARE_GROUP . '_you') {
-			$subject = $this->l->t('You shared calendar {calendar} with group {group}');
-		} elseif ($event->getSubject() === self::SUBJECT_SHARE_GROUP . '_by') {
-			$subject = $this->l->t('{actor} shared calendar {calendar} with group {group}');
-		} elseif ($event->getSubject() === self::SUBJECT_UNSHARE_GROUP . '_you') {
-			$subject = $this->l->t('You unshared calendar {calendar} from group {group}');
-		} elseif ($event->getSubject() === self::SUBJECT_UNSHARE_GROUP . '_by') {
-			$subject = $this->l->t('{actor} unshared calendar {calendar} from group {group}');
-		} else {
-			throw new \InvalidArgumentException();
-		}
+        if ($event->getSubject() === self::SUBJECT_ADD) {
+            $subject = $this->l->t('{actor} created calendar {calendar}');
+        } elseif ($event->getSubject() === self::SUBJECT_ADD . '_self') {
+            $subject = $this->l->t('You created calendar {calendar}');
+        } elseif ($event->getSubject() === self::SUBJECT_DELETE) {
+            $subject = $this->l->t('{actor} deleted calendar {calendar}');
+        } elseif ($event->getSubject() === self::SUBJECT_DELETE . '_self') {
+            $subject = $this->l->t('You deleted calendar {calendar}');
+        } elseif ($event->getSubject() === self::SUBJECT_UPDATE) {
+            $subject = $this->l->t('{actor} updated calendar {calendar}');
+        } elseif ($event->getSubject() === self::SUBJECT_UPDATE . '_self') {
+            $subject = $this->l->t('You updated calendar {calendar}');
+        } elseif ($event->getSubject() === self::SUBJECT_PUBLISH . '_self') {
+            $subject = $this->l->t('You shared calendar {calendar} as public link');
+        } elseif ($event->getSubject() === self::SUBJECT_UNPUBLISH . '_self') {
+            $subject = $this->l->t('You removed public link for calendar {calendar}');
+        } elseif ($event->getSubject() === self::SUBJECT_SHARE_USER) {
+            $subject = $this->l->t('{actor} shared calendar {calendar} with you');
+        } elseif ($event->getSubject() === self::SUBJECT_SHARE_USER . '_you') {
+            $subject = $this->l->t('You shared calendar {calendar} with {user}');
+        } elseif ($event->getSubject() === self::SUBJECT_SHARE_USER . '_by') {
+            $subject = $this->l->t('{actor} shared calendar {calendar} with {user}');
+        } elseif ($event->getSubject() === self::SUBJECT_UNSHARE_USER) {
+            $subject = $this->l->t('{actor} unshared calendar {calendar} from you');
+        } elseif ($event->getSubject() === self::SUBJECT_UNSHARE_USER . '_you') {
+            $subject = $this->l->t('You unshared calendar {calendar} from {user}');
+        } elseif ($event->getSubject() === self::SUBJECT_UNSHARE_USER . '_by') {
+            $subject = $this->l->t('{actor} unshared calendar {calendar} from {user}');
+        } elseif ($event->getSubject() === self::SUBJECT_UNSHARE_USER . '_self') {
+            $subject = $this->l->t('{actor} unshared calendar {calendar} from themselves');
+        } elseif ($event->getSubject() === self::SUBJECT_SHARE_GROUP . '_you') {
+            $subject = $this->l->t('You shared calendar {calendar} with group {group}');
+        } elseif ($event->getSubject() === self::SUBJECT_SHARE_GROUP . '_by') {
+            $subject = $this->l->t('{actor} shared calendar {calendar} with group {group}');
+        } elseif ($event->getSubject() === self::SUBJECT_UNSHARE_GROUP . '_you') {
+            $subject = $this->l->t('You unshared calendar {calendar} from group {group}');
+        } elseif ($event->getSubject() === self::SUBJECT_UNSHARE_GROUP . '_by') {
+            $subject = $this->l->t('{actor} unshared calendar {calendar} from group {group}');
+        } else {
+            throw new \InvalidArgumentException();
+        }
 
-		$parsedParameters = $this->getParameters($event);
-		$this->setSubjects($event, $subject, $parsedParameters);
+        $parsedParameters = $this->getParameters($event);
+        $this->setSubjects($event, $subject, $parsedParameters);
 
-		$event = $this->eventMerger->mergeEvents('calendar', $event, $previousEvent);
+        $event = $this->eventMerger->mergeEvents('calendar', $event, $previousEvent);
 
-		if ($event->getChildEvent() === null) {
-			if (isset($parsedParameters['user'])) {
-				// Couldn't group by calendar, maybe we can group by users
-				$event = $this->eventMerger->mergeEvents('user', $event, $previousEvent);
-			} elseif (isset($parsedParameters['group'])) {
-				// Couldn't group by calendar, maybe we can group by groups
-				$event = $this->eventMerger->mergeEvents('group', $event, $previousEvent);
-			}
-		}
+        if ($event->getChildEvent() === null) {
+            if (isset($parsedParameters['user'])) {
+                // Couldn't group by calendar, maybe we can group by users
+                $event = $this->eventMerger->mergeEvents('user', $event, $previousEvent);
+            } elseif (isset($parsedParameters['group'])) {
+                // Couldn't group by calendar, maybe we can group by groups
+                $event = $this->eventMerger->mergeEvents('group', $event, $previousEvent);
+            }
+        }
 
-		return $event;
-	}
+        return $event;
+    }
 
-	/**
-	 * @param IEvent $event
-	 * @return array
-	 */
-	protected function getParameters(IEvent $event) {
-		$subject = $event->getSubject();
-		$parameters = $event->getSubjectParameters();
+    /**
+     * @param IEvent $event
+     * @return array
+     */
+    protected function getParameters(IEvent $event) {
+        $subject = $event->getSubject();
+        $parameters = $event->getSubjectParameters();
 
-		// Nextcloud 13+
-		if (isset($parameters['calendar'])) {
-			switch ($subject) {
-				case self::SUBJECT_ADD:
-				case self::SUBJECT_ADD . '_self':
-				case self::SUBJECT_DELETE:
-				case self::SUBJECT_DELETE . '_self':
-				case self::SUBJECT_UPDATE:
-				case self::SUBJECT_UPDATE . '_self':
-				case self::SUBJECT_PUBLISH . '_self':
-				case self::SUBJECT_UNPUBLISH . '_self':
-				case self::SUBJECT_SHARE_USER:
-				case self::SUBJECT_UNSHARE_USER:
-				case self::SUBJECT_UNSHARE_USER . '_self':
-					return [
-						'actor' => $this->generateUserParameter($parameters['actor']),
-						'calendar' => $this->generateCalendarParameter($parameters['calendar'], $this->l),
-					];
-				case self::SUBJECT_SHARE_USER . '_you':
-				case self::SUBJECT_UNSHARE_USER . '_you':
-					return [
-						'calendar' => $this->generateCalendarParameter($parameters['calendar'], $this->l),
-						'user' => $this->generateUserParameter($parameters['user']),
-					];
-				case self::SUBJECT_SHARE_USER . '_by':
-				case self::SUBJECT_UNSHARE_USER . '_by':
-					return [
-						'actor' => $this->generateUserParameter($parameters['actor']),
-						'calendar' => $this->generateCalendarParameter($parameters['calendar'], $this->l),
-						'user' => $this->generateUserParameter($parameters['user']),
-					];
-				case self::SUBJECT_SHARE_GROUP . '_you':
-				case self::SUBJECT_UNSHARE_GROUP . '_you':
-					return [
-						'calendar' => $this->generateCalendarParameter($parameters['calendar'], $this->l),
-						'group' => $this->generateGroupParameter($parameters['group']),
-					];
-				case self::SUBJECT_SHARE_GROUP . '_by':
-				case self::SUBJECT_UNSHARE_GROUP . '_by':
-					return [
-						'actor' => $this->generateUserParameter($parameters['actor']),
-						'calendar' => $this->generateCalendarParameter($parameters['calendar'], $this->l),
-						'group' => $this->generateGroupParameter($parameters['group']),
-					];
-			}
-		}
+        // Nextcloud 13+
+        if (isset($parameters['calendar'])) {
+            switch ($subject) {
+                case self::SUBJECT_ADD:
+                case self::SUBJECT_ADD . '_self':
+                case self::SUBJECT_DELETE:
+                case self::SUBJECT_DELETE . '_self':
+                case self::SUBJECT_UPDATE:
+                case self::SUBJECT_UPDATE . '_self':
+                case self::SUBJECT_PUBLISH . '_self':
+                case self::SUBJECT_UNPUBLISH . '_self':
+                case self::SUBJECT_SHARE_USER:
+                case self::SUBJECT_UNSHARE_USER:
+                case self::SUBJECT_UNSHARE_USER . '_self':
+                    return [
+                        'actor' => $this->generateUserParameter($parameters['actor']),
+                        'calendar' => $this->generateCalendarParameter($parameters['calendar'], $this->l),
+                    ];
+                case self::SUBJECT_SHARE_USER . '_you':
+                case self::SUBJECT_UNSHARE_USER . '_you':
+                    return [
+                        'calendar' => $this->generateCalendarParameter($parameters['calendar'], $this->l),
+                        'user' => $this->generateUserParameter($parameters['user']),
+                    ];
+                case self::SUBJECT_SHARE_USER . '_by':
+                case self::SUBJECT_UNSHARE_USER . '_by':
+                    return [
+                        'actor' => $this->generateUserParameter($parameters['actor']),
+                        'calendar' => $this->generateCalendarParameter($parameters['calendar'], $this->l),
+                        'user' => $this->generateUserParameter($parameters['user']),
+                    ];
+                case self::SUBJECT_SHARE_GROUP . '_you':
+                case self::SUBJECT_UNSHARE_GROUP . '_you':
+                    return [
+                        'calendar' => $this->generateCalendarParameter($parameters['calendar'], $this->l),
+                        'group' => $this->generateGroupParameter($parameters['group']),
+                    ];
+                case self::SUBJECT_SHARE_GROUP . '_by':
+                case self::SUBJECT_UNSHARE_GROUP . '_by':
+                    return [
+                        'actor' => $this->generateUserParameter($parameters['actor']),
+                        'calendar' => $this->generateCalendarParameter($parameters['calendar'], $this->l),
+                        'group' => $this->generateGroupParameter($parameters['group']),
+                    ];
+            }
+        }
 
-		// Legacy - Do NOT Remove unless necessary
-		// Removing this will break parsing of activities that were created on
-		// Nextcloud 12, so we should keep this as long as it's acceptable.
-		// Otherwise if people upgrade over multiple releases in a short period,
-		// they will get the dead entries in their stream.
-		switch ($subject) {
-			case self::SUBJECT_ADD:
-			case self::SUBJECT_ADD . '_self':
-			case self::SUBJECT_DELETE:
-			case self::SUBJECT_DELETE . '_self':
-			case self::SUBJECT_UPDATE:
-			case self::SUBJECT_UPDATE . '_self':
-			case self::SUBJECT_PUBLISH . '_self':
-			case self::SUBJECT_UNPUBLISH . '_self':
-			case self::SUBJECT_SHARE_USER:
-			case self::SUBJECT_UNSHARE_USER:
-			case self::SUBJECT_UNSHARE_USER . '_self':
-				return [
-					'actor' => $this->generateUserParameter($parameters[0]),
-					'calendar' => $this->generateLegacyCalendarParameter((int)$event->getObjectId(), $parameters[1]),
-				];
-			case self::SUBJECT_SHARE_USER . '_you':
-			case self::SUBJECT_UNSHARE_USER . '_you':
-				return [
-					'user' => $this->generateUserParameter($parameters[0]),
-					'calendar' => $this->generateLegacyCalendarParameter((int)$event->getObjectId(), $parameters[1]),
-				];
-			case self::SUBJECT_SHARE_USER . '_by':
-			case self::SUBJECT_UNSHARE_USER . '_by':
-				return [
-					'user' => $this->generateUserParameter($parameters[0]),
-					'calendar' => $this->generateLegacyCalendarParameter((int)$event->getObjectId(), $parameters[1]),
-					'actor' => $this->generateUserParameter($parameters[2]),
-				];
-			case self::SUBJECT_SHARE_GROUP . '_you':
-			case self::SUBJECT_UNSHARE_GROUP . '_you':
-				return [
-					'group' => $this->generateGroupParameter($parameters[0]),
-					'calendar' => $this->generateLegacyCalendarParameter((int)$event->getObjectId(), $parameters[1]),
-				];
-			case self::SUBJECT_SHARE_GROUP . '_by':
-			case self::SUBJECT_UNSHARE_GROUP . '_by':
-				return [
-					'group' => $this->generateGroupParameter($parameters[0]),
-					'calendar' => $this->generateLegacyCalendarParameter((int)$event->getObjectId(), $parameters[1]),
-					'actor' => $this->generateUserParameter($parameters[2]),
-				];
-		}
+        // Legacy - Do NOT Remove unless necessary
+        // Removing this will break parsing of activities that were created on
+        // Nextcloud 12, so we should keep this as long as it's acceptable.
+        // Otherwise if people upgrade over multiple releases in a short period,
+        // they will get the dead entries in their stream.
+        switch ($subject) {
+            case self::SUBJECT_ADD:
+            case self::SUBJECT_ADD . '_self':
+            case self::SUBJECT_DELETE:
+            case self::SUBJECT_DELETE . '_self':
+            case self::SUBJECT_UPDATE:
+            case self::SUBJECT_UPDATE . '_self':
+            case self::SUBJECT_PUBLISH . '_self':
+            case self::SUBJECT_UNPUBLISH . '_self':
+            case self::SUBJECT_SHARE_USER:
+            case self::SUBJECT_UNSHARE_USER:
+            case self::SUBJECT_UNSHARE_USER . '_self':
+                return [
+                    'actor' => $this->generateUserParameter($parameters[0]),
+                    'calendar' => $this->generateLegacyCalendarParameter((int)$event->getObjectId(), $parameters[1]),
+                ];
+            case self::SUBJECT_SHARE_USER . '_you':
+            case self::SUBJECT_UNSHARE_USER . '_you':
+                return [
+                    'user' => $this->generateUserParameter($parameters[0]),
+                    'calendar' => $this->generateLegacyCalendarParameter((int)$event->getObjectId(), $parameters[1]),
+                ];
+            case self::SUBJECT_SHARE_USER . '_by':
+            case self::SUBJECT_UNSHARE_USER . '_by':
+                return [
+                    'user' => $this->generateUserParameter($parameters[0]),
+                    'calendar' => $this->generateLegacyCalendarParameter((int)$event->getObjectId(), $parameters[1]),
+                    'actor' => $this->generateUserParameter($parameters[2]),
+                ];
+            case self::SUBJECT_SHARE_GROUP . '_you':
+            case self::SUBJECT_UNSHARE_GROUP . '_you':
+                return [
+                    'group' => $this->generateGroupParameter($parameters[0]),
+                    'calendar' => $this->generateLegacyCalendarParameter((int)$event->getObjectId(), $parameters[1]),
+                ];
+            case self::SUBJECT_SHARE_GROUP . '_by':
+            case self::SUBJECT_UNSHARE_GROUP . '_by':
+                return [
+                    'group' => $this->generateGroupParameter($parameters[0]),
+                    'calendar' => $this->generateLegacyCalendarParameter((int)$event->getObjectId(), $parameters[1]),
+                    'actor' => $this->generateUserParameter($parameters[2]),
+                ];
+        }
 
-		throw new \InvalidArgumentException();
-	}
+        throw new \InvalidArgumentException();
+    }
 }

apps/dav/lib/CalDAV/Activity/Provider/Base.php

Indentation +132 added lines, -132 removed lines

@@ -36,136 +36,136 @@
 
 abstract class Base implements IProvider {
 
-	/** @var IUserManager */
-	protected $userManager;
-
-	/** @var string[]  */
-	protected $userDisplayNames = [];
-
-	/** @var IGroupManager */
-	protected $groupManager;
-
-	/** @var string[] */
-	protected $groupDisplayNames = [];
-
-	/** @var IURLGenerator */
-	protected $url;
-
-	/**
-	 * @param IUserManager $userManager
-	 * @param IGroupManager $groupManager
-	 * @param IURLGenerator $urlGenerator
-	 */
-	public function __construct(IUserManager $userManager, IGroupManager $groupManager, IURLGenerator $urlGenerator) {
-		$this->userManager = $userManager;
-		$this->groupManager = $groupManager;
-		$this->url = $urlGenerator;
-	}
-
-	/**
-	 * @param IEvent $event
-	 * @param string $subject
-	 * @param array $parameters
-	 */
-	protected function setSubjects(IEvent $event, $subject, array $parameters) {
-		$placeholders = $replacements = [];
-		foreach ($parameters as $placeholder => $parameter) {
-			$placeholders[] = '{' . $placeholder . '}';
-			$replacements[] = $parameter['name'];
-		}
-
-		$event->setParsedSubject(str_replace($placeholders, $replacements, $subject))
-			->setRichSubject($subject, $parameters);
-	}
-
-	/**
-	 * @param array $data
-	 * @param IL10N $l
-	 * @return array
-	 */
-	protected function generateCalendarParameter($data, IL10N $l) {
-		if ($data['uri'] === CalDavBackend::PERSONAL_CALENDAR_URI &&
-			$data['name'] === CalDavBackend::PERSONAL_CALENDAR_NAME) {
-			return [
-				'type' => 'calendar',
-				'id' => $data['id'],
-				'name' => $l->t('Personal'),
-			];
-		}
-
-		return [
-			'type' => 'calendar',
-			'id' => $data['id'],
-			'name' => $data['name'],
-		];
-	}
-
-	/**
-	 * @param int $id
-	 * @param string $name
-	 * @return array
-	 */
-	protected function generateLegacyCalendarParameter($id, $name) {
-		return [
-			'type' => 'calendar',
-			'id' => $id,
-			'name' => $name,
-		];
-	}
-
-	/**
-	 * @param string $uid
-	 * @return array
-	 */
-	protected function generateUserParameter($uid) {
-		if (!isset($this->userDisplayNames[$uid])) {
-			$this->userDisplayNames[$uid] = $this->getUserDisplayName($uid);
-		}
-
-		return [
-			'type' => 'user',
-			'id' => $uid,
-			'name' => $this->userDisplayNames[$uid],
-		];
-	}
-
-	/**
-	 * @param string $uid
-	 * @return string
-	 */
-	protected function getUserDisplayName($uid) {
-		$user = $this->userManager->get($uid);
-		if ($user instanceof IUser) {
-			return $user->getDisplayName();
-		}
-		return $uid;
-	}
-
-	/**
-	 * @param string $gid
-	 * @return array
-	 */
-	protected function generateGroupParameter($gid) {
-		if (!isset($this->groupDisplayNames[$gid])) {
-			$this->groupDisplayNames[$gid] = $this->getGroupDisplayName($gid);
-		}
-
-		return [
-			'type' => 'user-group',
-			'id' => $gid,
-			'name' => $this->groupDisplayNames[$gid],
-		];
-	}
-
-	/**
-	 * @param string $gid
-	 * @return string
-	 */
-	protected function getGroupDisplayName($gid) {
-		$group = $this->groupManager->get($gid);
-		if ($group instanceof IGroup) {
-			return $group->getDisplayName();
-		}
-		return $gid;
-	}
+    /** @var IUserManager */
+    protected $userManager;
+
+    /** @var string[]  */
+    protected $userDisplayNames = [];
+
+    /** @var IGroupManager */
+    protected $groupManager;
+
+    /** @var string[] */
+    protected $groupDisplayNames = [];
+
+    /** @var IURLGenerator */
+    protected $url;
+
+    /**
+     * @param IUserManager $userManager
+     * @param IGroupManager $groupManager
+     * @param IURLGenerator $urlGenerator
+     */
+    public function __construct(IUserManager $userManager, IGroupManager $groupManager, IURLGenerator $urlGenerator) {
+        $this->userManager = $userManager;
+        $this->groupManager = $groupManager;
+        $this->url = $urlGenerator;
+    }
+
+    /**
+     * @param IEvent $event
+     * @param string $subject
+     * @param array $parameters
+     */
+    protected function setSubjects(IEvent $event, $subject, array $parameters) {
+        $placeholders = $replacements = [];
+        foreach ($parameters as $placeholder => $parameter) {
+            $placeholders[] = '{' . $placeholder . '}';
+            $replacements[] = $parameter['name'];
+        }
+
+        $event->setParsedSubject(str_replace($placeholders, $replacements, $subject))
+            ->setRichSubject($subject, $parameters);
+    }
+
+    /**
+     * @param array $data
+     * @param IL10N $l
+     * @return array
+     */
+    protected function generateCalendarParameter($data, IL10N $l) {
+        if ($data['uri'] === CalDavBackend::PERSONAL_CALENDAR_URI &&
+            $data['name'] === CalDavBackend::PERSONAL_CALENDAR_NAME) {
+            return [
+                'type' => 'calendar',
+                'id' => $data['id'],
+                'name' => $l->t('Personal'),
+            ];
+        }
+
+        return [
+            'type' => 'calendar',
+            'id' => $data['id'],
+            'name' => $data['name'],
+        ];
+    }
+
+    /**
+     * @param int $id
+     * @param string $name
+     * @return array
+     */
+    protected function generateLegacyCalendarParameter($id, $name) {
+        return [
+            'type' => 'calendar',
+            'id' => $id,
+            'name' => $name,
+        ];
+    }
+
+    /**
+     * @param string $uid
+     * @return array
+     */
+    protected function generateUserParameter($uid) {
+        if (!isset($this->userDisplayNames[$uid])) {
+            $this->userDisplayNames[$uid] = $this->getUserDisplayName($uid);
+        }
+
+        return [
+            'type' => 'user',
+            'id' => $uid,
+            'name' => $this->userDisplayNames[$uid],
+        ];
+    }
+
+    /**
+     * @param string $uid
+     * @return string
+     */
+    protected function getUserDisplayName($uid) {
+        $user = $this->userManager->get($uid);
+        if ($user instanceof IUser) {
+            return $user->getDisplayName();
+        }
+        return $uid;
+    }
+
+    /**
+     * @param string $gid
+     * @return array
+     */
+    protected function generateGroupParameter($gid) {
+        if (!isset($this->groupDisplayNames[$gid])) {
+            $this->groupDisplayNames[$gid] = $this->getGroupDisplayName($gid);
+        }
+
+        return [
+            'type' => 'user-group',
+            'id' => $gid,
+            'name' => $this->groupDisplayNames[$gid],
+        ];
+    }
+
+    /**
+     * @param string $gid
+     * @return string
+     */
+    protected function getGroupDisplayName($gid) {
+        $group = $this->groupManager->get($gid);
+        if ($group instanceof IGroup) {
+            return $group->getDisplayName();
+        }
+        return $gid;
+    }
 }

apps/dav/lib/CalDAV/Activity/Provider/Event.php

Indentation +179 added lines, -179 removed lines

@@ -38,183 +38,183 @@
 use OCP\L10N\IFactory;
 
 class Event extends Base {
-	public const SUBJECT_OBJECT_ADD = 'object_add';
-	public const SUBJECT_OBJECT_UPDATE = 'object_update';
-	public const SUBJECT_OBJECT_DELETE = 'object_delete';
-
-	/** @var IFactory */
-	protected $languageFactory;
-
-	/** @var IL10N */
-	protected $l;
-
-	/** @var IManager */
-	protected $activityManager;
-
-	/** @var IEventMerger */
-	protected $eventMerger;
-
-	/** @var IAppManager */
-	protected $appManager;
-
-	/**
-	 * @param IFactory $languageFactory
-	 * @param IURLGenerator $url
-	 * @param IManager $activityManager
-	 * @param IUserManager $userManager
-	 * @param IGroupManager $groupManager
-	 * @param IEventMerger $eventMerger
-	 * @param IAppManager $appManager
-	 */
-	public function __construct(IFactory $languageFactory, IURLGenerator $url, IManager $activityManager, IUserManager $userManager, IGroupManager $groupManager, IEventMerger $eventMerger, IAppManager $appManager) {
-		parent::__construct($userManager, $groupManager, $url);
-		$this->languageFactory = $languageFactory;
-		$this->activityManager = $activityManager;
-		$this->eventMerger = $eventMerger;
-		$this->appManager = $appManager;
-	}
-
-	/**
-	 * @param array $eventData
-	 * @return array
-	 */
-	protected function generateObjectParameter(array $eventData) {
-		if (!isset($eventData['id']) || !isset($eventData['name'])) {
-			throw new \InvalidArgumentException();
-		}
-
-		$params = [
-			'type' => 'calendar-event',
-			'id' => $eventData['id'],
-			'name' => $eventData['name'],
-
-		];
-		if (isset($eventData['link']) && is_array($eventData['link']) && $this->appManager->isEnabledForUser('calendar')) {
-			try {
-				// The calendar app needs to be manually loaded for the routes to be loaded
-				OC_App::loadApp('calendar');
-				$linkData = $eventData['link'];
-				$objectId = base64_encode('/remote.php/dav/calendars/' . $linkData['owner'] . '/' . $linkData['calendar_uri'] . '/' . $linkData['object_uri']);
-				$link = [
-					'view' => 'dayGridMonth',
-					'timeRange' => 'now',
-					'mode' => 'sidebar',
-					'objectId' => $objectId,
-					'recurrenceId' => 'next'
-				];
-				$params['link'] = $this->url->linkToRouteAbsolute('calendar.view.indexview.timerange.edit', $link);
-			} catch (\Exception $error) {
-				// Do nothing
-			}
-		}
-		return $params;
-	}
-
-	/**
-	 * @param string $language
-	 * @param IEvent $event
-	 * @param IEvent|null $previousEvent
-	 * @return IEvent
-	 * @throws \InvalidArgumentException
-	 * @since 11.0.0
-	 */
-	public function parse($language, IEvent $event, IEvent $previousEvent = null) {
-		if ($event->getApp() !== 'dav' || $event->getType() !== 'calendar_event') {
-			throw new \InvalidArgumentException();
-		}
-
-		$this->l = $this->languageFactory->get('dav', $language);
-
-		if ($this->activityManager->getRequirePNG()) {
-			$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'places/calendar-dark.png')));
-		} else {
-			$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'places/calendar.svg')));
-		}
-
-		if ($event->getSubject() === self::SUBJECT_OBJECT_ADD . '_event') {
-			$subject = $this->l->t('{actor} created event {event} in calendar {calendar}');
-		} elseif ($event->getSubject() === self::SUBJECT_OBJECT_ADD . '_event_self') {
-			$subject = $this->l->t('You created event {event} in calendar {calendar}');
-		} elseif ($event->getSubject() === self::SUBJECT_OBJECT_DELETE . '_event') {
-			$subject = $this->l->t('{actor} deleted event {event} from calendar {calendar}');
-		} elseif ($event->getSubject() === self::SUBJECT_OBJECT_DELETE . '_event_self') {
-			$subject = $this->l->t('You deleted event {event} from calendar {calendar}');
-		} elseif ($event->getSubject() === self::SUBJECT_OBJECT_UPDATE . '_event') {
-			$subject = $this->l->t('{actor} updated event {event} in calendar {calendar}');
-		} elseif ($event->getSubject() === self::SUBJECT_OBJECT_UPDATE . '_event_self') {
-			$subject = $this->l->t('You updated event {event} in calendar {calendar}');
-		} else {
-			throw new \InvalidArgumentException();
-		}
-
-		$parsedParameters = $this->getParameters($event);
-		$this->setSubjects($event, $subject, $parsedParameters);
-
-		$event = $this->eventMerger->mergeEvents('event', $event, $previousEvent);
-
-		return $event;
-	}
-
-	/**
-	 * @param IEvent $event
-	 * @return array
-	 */
-	protected function getParameters(IEvent $event) {
-		$subject = $event->getSubject();
-		$parameters = $event->getSubjectParameters();
-
-		// Nextcloud 13+
-		if (isset($parameters['calendar'])) {
-			switch ($subject) {
-				case self::SUBJECT_OBJECT_ADD . '_event':
-				case self::SUBJECT_OBJECT_DELETE . '_event':
-				case self::SUBJECT_OBJECT_UPDATE . '_event':
-					return [
-						'actor' => $this->generateUserParameter($parameters['actor']),
-						'calendar' => $this->generateCalendarParameter($parameters['calendar'], $this->l),
-						'event' => $this->generateClassifiedObjectParameter($parameters['object']),
-					];
-				case self::SUBJECT_OBJECT_ADD . '_event_self':
-				case self::SUBJECT_OBJECT_DELETE . '_event_self':
-				case self::SUBJECT_OBJECT_UPDATE . '_event_self':
-					return [
-						'calendar' => $this->generateCalendarParameter($parameters['calendar'], $this->l),
-						'event' => $this->generateClassifiedObjectParameter($parameters['object']),
-					];
-			}
-		}
-
-		// Legacy - Do NOT Remove unless necessary
-		// Removing this will break parsing of activities that were created on
-		// Nextcloud 12, so we should keep this as long as it's acceptable.
-		// Otherwise if people upgrade over multiple releases in a short period,
-		// they will get the dead entries in their stream.
-		switch ($subject) {
-			case self::SUBJECT_OBJECT_ADD . '_event':
-			case self::SUBJECT_OBJECT_DELETE . '_event':
-			case self::SUBJECT_OBJECT_UPDATE . '_event':
-				return [
-					'actor' => $this->generateUserParameter($parameters[0]),
-					'calendar' => $this->generateLegacyCalendarParameter((int)$event->getObjectId(), $parameters[1]),
-					'event' => $this->generateObjectParameter($parameters[2]),
-				];
-			case self::SUBJECT_OBJECT_ADD . '_event_self':
-			case self::SUBJECT_OBJECT_DELETE . '_event_self':
-			case self::SUBJECT_OBJECT_UPDATE . '_event_self':
-				return [
-					'calendar' => $this->generateLegacyCalendarParameter((int)$event->getObjectId(), $parameters[1]),
-					'event' => $this->generateObjectParameter($parameters[2]),
-				];
-		}
-
-		throw new \InvalidArgumentException();
-	}
-
-	private function generateClassifiedObjectParameter(array $eventData) {
-		$parameter = $this->generateObjectParameter($eventData);
-		if (!empty($eventData['classified'])) {
-			$parameter['name'] = $this->l->t('Busy');
-		}
-		return $parameter;
-	}
+    public const SUBJECT_OBJECT_ADD = 'object_add';
+    public const SUBJECT_OBJECT_UPDATE = 'object_update';
+    public const SUBJECT_OBJECT_DELETE = 'object_delete';
+
+    /** @var IFactory */
+    protected $languageFactory;
+
+    /** @var IL10N */
+    protected $l;
+
+    /** @var IManager */
+    protected $activityManager;
+
+    /** @var IEventMerger */
+    protected $eventMerger;
+
+    /** @var IAppManager */
+    protected $appManager;
+
+    /**
+     * @param IFactory $languageFactory
+     * @param IURLGenerator $url
+     * @param IManager $activityManager
+     * @param IUserManager $userManager
+     * @param IGroupManager $groupManager
+     * @param IEventMerger $eventMerger
+     * @param IAppManager $appManager
+     */
+    public function __construct(IFactory $languageFactory, IURLGenerator $url, IManager $activityManager, IUserManager $userManager, IGroupManager $groupManager, IEventMerger $eventMerger, IAppManager $appManager) {
+        parent::__construct($userManager, $groupManager, $url);
+        $this->languageFactory = $languageFactory;
+        $this->activityManager = $activityManager;
+        $this->eventMerger = $eventMerger;
+        $this->appManager = $appManager;
+    }
+
+    /**
+     * @param array $eventData
+     * @return array
+     */
+    protected function generateObjectParameter(array $eventData) {
+        if (!isset($eventData['id']) || !isset($eventData['name'])) {
+            throw new \InvalidArgumentException();
+        }
+
+        $params = [
+            'type' => 'calendar-event',
+            'id' => $eventData['id'],
+            'name' => $eventData['name'],
+
+        ];
+        if (isset($eventData['link']) && is_array($eventData['link']) && $this->appManager->isEnabledForUser('calendar')) {
+            try {
+                // The calendar app needs to be manually loaded for the routes to be loaded
+                OC_App::loadApp('calendar');
+                $linkData = $eventData['link'];
+                $objectId = base64_encode('/remote.php/dav/calendars/' . $linkData['owner'] . '/' . $linkData['calendar_uri'] . '/' . $linkData['object_uri']);
+                $link = [
+                    'view' => 'dayGridMonth',
+                    'timeRange' => 'now',
+                    'mode' => 'sidebar',
+                    'objectId' => $objectId,
+                    'recurrenceId' => 'next'
+                ];
+                $params['link'] = $this->url->linkToRouteAbsolute('calendar.view.indexview.timerange.edit', $link);
+            } catch (\Exception $error) {
+                // Do nothing
+            }
+        }
+        return $params;
+    }
+
+    /**
+     * @param string $language
+     * @param IEvent $event
+     * @param IEvent|null $previousEvent
+     * @return IEvent
+     * @throws \InvalidArgumentException
+     * @since 11.0.0
+     */
+    public function parse($language, IEvent $event, IEvent $previousEvent = null) {
+        if ($event->getApp() !== 'dav' || $event->getType() !== 'calendar_event') {
+            throw new \InvalidArgumentException();
+        }
+
+        $this->l = $this->languageFactory->get('dav', $language);
+
+        if ($this->activityManager->getRequirePNG()) {
+            $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'places/calendar-dark.png')));
+        } else {
+            $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'places/calendar.svg')));
+        }
+
+        if ($event->getSubject() === self::SUBJECT_OBJECT_ADD . '_event') {
+            $subject = $this->l->t('{actor} created event {event} in calendar {calendar}');
+        } elseif ($event->getSubject() === self::SUBJECT_OBJECT_ADD . '_event_self') {
+            $subject = $this->l->t('You created event {event} in calendar {calendar}');
+        } elseif ($event->getSubject() === self::SUBJECT_OBJECT_DELETE . '_event') {
+            $subject = $this->l->t('{actor} deleted event {event} from calendar {calendar}');
+        } elseif ($event->getSubject() === self::SUBJECT_OBJECT_DELETE . '_event_self') {
+            $subject = $this->l->t('You deleted event {event} from calendar {calendar}');
+        } elseif ($event->getSubject() === self::SUBJECT_OBJECT_UPDATE . '_event') {
+            $subject = $this->l->t('{actor} updated event {event} in calendar {calendar}');
+        } elseif ($event->getSubject() === self::SUBJECT_OBJECT_UPDATE . '_event_self') {
+            $subject = $this->l->t('You updated event {event} in calendar {calendar}');
+        } else {
+            throw new \InvalidArgumentException();
+        }
+
+        $parsedParameters = $this->getParameters($event);
+        $this->setSubjects($event, $subject, $parsedParameters);
+
+        $event = $this->eventMerger->mergeEvents('event', $event, $previousEvent);
+
+        return $event;
+    }
+
+    /**
+     * @param IEvent $event
+     * @return array
+     */
+    protected function getParameters(IEvent $event) {
+        $subject = $event->getSubject();
+        $parameters = $event->getSubjectParameters();
+
+        // Nextcloud 13+
+        if (isset($parameters['calendar'])) {
+            switch ($subject) {
+                case self::SUBJECT_OBJECT_ADD . '_event':
+                case self::SUBJECT_OBJECT_DELETE . '_event':
+                case self::SUBJECT_OBJECT_UPDATE . '_event':
+                    return [
+                        'actor' => $this->generateUserParameter($parameters['actor']),
+                        'calendar' => $this->generateCalendarParameter($parameters['calendar'], $this->l),
+                        'event' => $this->generateClassifiedObjectParameter($parameters['object']),
+                    ];
+                case self::SUBJECT_OBJECT_ADD . '_event_self':
+                case self::SUBJECT_OBJECT_DELETE . '_event_self':
+                case self::SUBJECT_OBJECT_UPDATE . '_event_self':
+                    return [
+                        'calendar' => $this->generateCalendarParameter($parameters['calendar'], $this->l),
+                        'event' => $this->generateClassifiedObjectParameter($parameters['object']),
+                    ];
+            }
+        }
+
+        // Legacy - Do NOT Remove unless necessary
+        // Removing this will break parsing of activities that were created on
+        // Nextcloud 12, so we should keep this as long as it's acceptable.
+        // Otherwise if people upgrade over multiple releases in a short period,
+        // they will get the dead entries in their stream.
+        switch ($subject) {
+            case self::SUBJECT_OBJECT_ADD . '_event':
+            case self::SUBJECT_OBJECT_DELETE . '_event':
+            case self::SUBJECT_OBJECT_UPDATE . '_event':
+                return [
+                    'actor' => $this->generateUserParameter($parameters[0]),
+                    'calendar' => $this->generateLegacyCalendarParameter((int)$event->getObjectId(), $parameters[1]),
+                    'event' => $this->generateObjectParameter($parameters[2]),
+                ];
+            case self::SUBJECT_OBJECT_ADD . '_event_self':
+            case self::SUBJECT_OBJECT_DELETE . '_event_self':
+            case self::SUBJECT_OBJECT_UPDATE . '_event_self':
+                return [
+                    'calendar' => $this->generateLegacyCalendarParameter((int)$event->getObjectId(), $parameters[1]),
+                    'event' => $this->generateObjectParameter($parameters[2]),
+                ];
+        }
+
+        throw new \InvalidArgumentException();
+    }
+
+    private function generateClassifiedObjectParameter(array $eventData) {
+        $parameter = $this->generateObjectParameter($eventData);
+        if (!empty($eventData['classified'])) {
+            $parameter['name'] = $this->l->t('Busy');
+        }
+        return $parameter;
+    }
 }

Spacing +21 added lines, -21 removed lines

@@ -94,7 +94,7 @@ 
 				// The calendar app needs to be manually loaded for the routes to be loaded
 				OC_App::loadApp('calendar');
 				$linkData = $eventData['link'];
-				$objectId = base64_encode('/remote.php/dav/calendars/' . $linkData['owner'] . '/' . $linkData['calendar_uri'] . '/' . $linkData['object_uri']);
+				$objectId = base64_encode('/remote.php/dav/calendars/'.$linkData['owner'].'/'.$linkData['calendar_uri'].'/'.$linkData['object_uri']);
 				$link = [
 					'view' => 'dayGridMonth',
 					'timeRange' => 'now',
@@ -131,17 +131,17 @@ 
 			$event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'places/calendar.svg')));
 		}
 
-		if ($event->getSubject() === self::SUBJECT_OBJECT_ADD . '_event') {
+		if ($event->getSubject() === self::SUBJECT_OBJECT_ADD.'_event') {
 			$subject = $this->l->t('{actor} created event {event} in calendar {calendar}');
-		} elseif ($event->getSubject() === self::SUBJECT_OBJECT_ADD . '_event_self') {
+		} elseif ($event->getSubject() === self::SUBJECT_OBJECT_ADD.'_event_self') {
 			$subject = $this->l->t('You created event {event} in calendar {calendar}');
-		} elseif ($event->getSubject() === self::SUBJECT_OBJECT_DELETE . '_event') {
+		} elseif ($event->getSubject() === self::SUBJECT_OBJECT_DELETE.'_event') {
 			$subject = $this->l->t('{actor} deleted event {event} from calendar {calendar}');
-		} elseif ($event->getSubject() === self::SUBJECT_OBJECT_DELETE . '_event_self') {
+		} elseif ($event->getSubject() === self::SUBJECT_OBJECT_DELETE.'_event_self') {
 			$subject = $this->l->t('You deleted event {event} from calendar {calendar}');
-		} elseif ($event->getSubject() === self::SUBJECT_OBJECT_UPDATE . '_event') {
+		} elseif ($event->getSubject() === self::SUBJECT_OBJECT_UPDATE.'_event') {
 			$subject = $this->l->t('{actor} updated event {event} in calendar {calendar}');
-		} elseif ($event->getSubject() === self::SUBJECT_OBJECT_UPDATE . '_event_self') {
+		} elseif ($event->getSubject() === self::SUBJECT_OBJECT_UPDATE.'_event_self') {
 			$subject = $this->l->t('You updated event {event} in calendar {calendar}');
 		} else {
 			throw new \InvalidArgumentException();
@@ -166,17 +166,17 @@ 
 		// Nextcloud 13+
 		if (isset($parameters['calendar'])) {
 			switch ($subject) {
-				case self::SUBJECT_OBJECT_ADD . '_event':
-				case self::SUBJECT_OBJECT_DELETE . '_event':
-				case self::SUBJECT_OBJECT_UPDATE . '_event':
+				case self::SUBJECT_OBJECT_ADD.'_event':
+				case self::SUBJECT_OBJECT_DELETE.'_event':
+				case self::SUBJECT_OBJECT_UPDATE.'_event':
 					return [
 						'actor' => $this->generateUserParameter($parameters['actor']),
 						'calendar' => $this->generateCalendarParameter($parameters['calendar'], $this->l),
 						'event' => $this->generateClassifiedObjectParameter($parameters['object']),
 					];
-				case self::SUBJECT_OBJECT_ADD . '_event_self':
-				case self::SUBJECT_OBJECT_DELETE . '_event_self':
-				case self::SUBJECT_OBJECT_UPDATE . '_event_self':
+				case self::SUBJECT_OBJECT_ADD.'_event_self':
+				case self::SUBJECT_OBJECT_DELETE.'_event_self':
+				case self::SUBJECT_OBJECT_UPDATE.'_event_self':
 					return [
 						'calendar' => $this->generateCalendarParameter($parameters['calendar'], $this->l),
 						'event' => $this->generateClassifiedObjectParameter($parameters['object']),
@@ -190,19 +190,19 @@ 
 		// Otherwise if people upgrade over multiple releases in a short period,
 		// they will get the dead entries in their stream.
 		switch ($subject) {
-			case self::SUBJECT_OBJECT_ADD . '_event':
-			case self::SUBJECT_OBJECT_DELETE . '_event':
-			case self::SUBJECT_OBJECT_UPDATE . '_event':
+			case self::SUBJECT_OBJECT_ADD.'_event':
+			case self::SUBJECT_OBJECT_DELETE.'_event':
+			case self::SUBJECT_OBJECT_UPDATE.'_event':
 				return [
 					'actor' => $this->generateUserParameter($parameters[0]),
-					'calendar' => $this->generateLegacyCalendarParameter((int)$event->getObjectId(), $parameters[1]),
+					'calendar' => $this->generateLegacyCalendarParameter((int) $event->getObjectId(), $parameters[1]),
 					'event' => $this->generateObjectParameter($parameters[2]),
 				];
-			case self::SUBJECT_OBJECT_ADD . '_event_self':
-			case self::SUBJECT_OBJECT_DELETE . '_event_self':
-			case self::SUBJECT_OBJECT_UPDATE . '_event_self':
+			case self::SUBJECT_OBJECT_ADD.'_event_self':
+			case self::SUBJECT_OBJECT_DELETE.'_event_self':
+			case self::SUBJECT_OBJECT_UPDATE.'_event_self':
 				return [
-					'calendar' => $this->generateLegacyCalendarParameter((int)$event->getObjectId(), $parameters[1]),
+					'calendar' => $this->generateLegacyCalendarParameter((int) $event->getObjectId(), $parameters[1]),
 					'event' => $this->generateObjectParameter($parameters[2]),
 				];
 		}

apps/dav/lib/CalDAV/Activity/Backend.php

Indentation +484 added lines, -484 removed lines

@@ -45,488 +45,488 @@
  */
 class Backend {
 
-	/** @var IActivityManager */
-	protected $activityManager;
-
-	/** @var IGroupManager */
-	protected $groupManager;
-
-	/** @var IUserSession */
-	protected $userSession;
-
-	/** @var IAppManager */
-	protected $appManager;
-
-	public function __construct(IActivityManager $activityManager, IGroupManager $groupManager, IUserSession $userSession, IAppManager $appManager) {
-		$this->activityManager = $activityManager;
-		$this->groupManager = $groupManager;
-		$this->userSession = $userSession;
-		$this->appManager = $appManager;
-	}
-
-	/**
-	 * Creates activities when a calendar was creates
-	 *
-	 * @param array $calendarData
-	 */
-	public function onCalendarAdd(array $calendarData) {
-		$this->triggerCalendarActivity(Calendar::SUBJECT_ADD, $calendarData);
-	}
-
-	/**
-	 * Creates activities when a calendar was updated
-	 *
-	 * @param array $calendarData
-	 * @param array $shares
-	 * @param array $properties
-	 */
-	public function onCalendarUpdate(array $calendarData, array $shares, array $properties) {
-		$this->triggerCalendarActivity(Calendar::SUBJECT_UPDATE, $calendarData, $shares, $properties);
-	}
-
-	/**
-	 * Creates activities when a calendar was deleted
-	 *
-	 * @param array $calendarData
-	 * @param array $shares
-	 */
-	public function onCalendarDelete(array $calendarData, array $shares) {
-		$this->triggerCalendarActivity(Calendar::SUBJECT_DELETE, $calendarData, $shares);
-	}
-
-	/**
-	 * Creates activities when a calendar was (un)published
-	 *
-	 * @param array $calendarData
-	 * @param bool $publishStatus
-	 */
-	public function onCalendarPublication(array $calendarData, $publishStatus) {
-		$this->triggerCalendarActivity($publishStatus ? Calendar::SUBJECT_PUBLISH : Calendar::SUBJECT_UNPUBLISH, $calendarData);
-	}
-
-	/**
-	 * Creates activities for all related users when a calendar was touched
-	 *
-	 * @param string $action
-	 * @param array $calendarData
-	 * @param array $shares
-	 * @param array $changedProperties
-	 */
-	protected function triggerCalendarActivity($action, array $calendarData, array $shares = [], array $changedProperties = []) {
-		if (!isset($calendarData['principaluri'])) {
-			return;
-		}
-
-		$principal = explode('/', $calendarData['principaluri']);
-		$owner = array_pop($principal);
-
-		$currentUser = $this->userSession->getUser();
-		if ($currentUser instanceof IUser) {
-			$currentUser = $currentUser->getUID();
-		} else {
-			$currentUser = $owner;
-		}
-
-		$event = $this->activityManager->generateEvent();
-		$event->setApp('dav')
-			->setObject('calendar', (int) $calendarData['id'])
-			->setType('calendar')
-			->setAuthor($currentUser);
-
-		$changedVisibleInformation = array_intersect([
-			'{DAV:}displayname',
-			'{http://apple.com/ns/ical/}calendar-color'
-		], array_keys($changedProperties));
-
-		if (empty($shares) || ($action === Calendar::SUBJECT_UPDATE && empty($changedVisibleInformation))) {
-			$users = [$owner];
-		} else {
-			$users = $this->getUsersForShares($shares);
-			$users[] = $owner;
-		}
-
-		foreach ($users as $user) {
-			$event->setAffectedUser($user)
-				->setSubject(
-					$user === $currentUser ? $action . '_self' : $action,
-					[
-						'actor' => $currentUser,
-						'calendar' => [
-							'id' => (int) $calendarData['id'],
-							'uri' => $calendarData['uri'],
-							'name' => $calendarData['{DAV:}displayname'],
-						],
-					]
-				);
-			$this->activityManager->publish($event);
-		}
-	}
-
-	/**
-	 * Creates activities for all related users when a calendar was (un-)shared
-	 *
-	 * @param array $calendarData
-	 * @param array $shares
-	 * @param array $add
-	 * @param array $remove
-	 */
-	public function onCalendarUpdateShares(array $calendarData, array $shares, array $add, array $remove) {
-		$principal = explode('/', $calendarData['principaluri']);
-		$owner = $principal[2];
-
-		$currentUser = $this->userSession->getUser();
-		if ($currentUser instanceof IUser) {
-			$currentUser = $currentUser->getUID();
-		} else {
-			$currentUser = $owner;
-		}
-
-		$event = $this->activityManager->generateEvent();
-		$event->setApp('dav')
-			->setObject('calendar', (int) $calendarData['id'])
-			->setType('calendar')
-			->setAuthor($currentUser);
-
-		foreach ($remove as $principal) {
-			// principal:principals/users/test
-			$parts = explode(':', $principal, 2);
-			if ($parts[0] !== 'principal') {
-				continue;
-			}
-			$principal = explode('/', $parts[1]);
-
-			if ($principal[1] === 'users') {
-				$this->triggerActivityUser(
-					$principal[2],
-					$event,
-					$calendarData,
-					Calendar::SUBJECT_UNSHARE_USER,
-					Calendar::SUBJECT_DELETE . '_self'
-				);
-
-				if ($owner !== $principal[2]) {
-					$parameters = [
-						'actor' => $event->getAuthor(),
-						'calendar' => [
-							'id' => (int) $calendarData['id'],
-							'uri' => $calendarData['uri'],
-							'name' => $calendarData['{DAV:}displayname'],
-						],
-						'user' => $principal[2],
-					];
-
-					if ($owner === $event->getAuthor()) {
-						$subject = Calendar::SUBJECT_UNSHARE_USER . '_you';
-					} elseif ($principal[2] === $event->getAuthor()) {
-						$subject = Calendar::SUBJECT_UNSHARE_USER . '_self';
-					} else {
-						$event->setAffectedUser($event->getAuthor())
-							->setSubject(Calendar::SUBJECT_UNSHARE_USER . '_you', $parameters);
-						$this->activityManager->publish($event);
-
-						$subject = Calendar::SUBJECT_UNSHARE_USER . '_by';
-					}
-
-					$event->setAffectedUser($owner)
-						->setSubject($subject, $parameters);
-					$this->activityManager->publish($event);
-				}
-			} elseif ($principal[1] === 'groups') {
-				$this->triggerActivityGroup($principal[2], $event, $calendarData, Calendar::SUBJECT_UNSHARE_USER);
-
-				$parameters = [
-					'actor' => $event->getAuthor(),
-					'calendar' => [
-						'id' => (int) $calendarData['id'],
-						'uri' => $calendarData['uri'],
-						'name' => $calendarData['{DAV:}displayname'],
-					],
-					'group' => $principal[2],
-				];
-
-				if ($owner === $event->getAuthor()) {
-					$subject = Calendar::SUBJECT_UNSHARE_GROUP . '_you';
-				} else {
-					$event->setAffectedUser($event->getAuthor())
-						->setSubject(Calendar::SUBJECT_UNSHARE_GROUP . '_you', $parameters);
-					$this->activityManager->publish($event);
-
-					$subject = Calendar::SUBJECT_UNSHARE_GROUP . '_by';
-				}
-
-				$event->setAffectedUser($owner)
-					->setSubject($subject, $parameters);
-				$this->activityManager->publish($event);
-			}
-		}
-
-		foreach ($add as $share) {
-			if ($this->isAlreadyShared($share['href'], $shares)) {
-				continue;
-			}
-
-			// principal:principals/users/test
-			$parts = explode(':', $share['href'], 2);
-			if ($parts[0] !== 'principal') {
-				continue;
-			}
-			$principal = explode('/', $parts[1]);
-
-			if ($principal[1] === 'users') {
-				$this->triggerActivityUser($principal[2], $event, $calendarData, Calendar::SUBJECT_SHARE_USER);
-
-				if ($owner !== $principal[2]) {
-					$parameters = [
-						'actor' => $event->getAuthor(),
-						'calendar' => [
-							'id' => (int) $calendarData['id'],
-							'uri' => $calendarData['uri'],
-							'name' => $calendarData['{DAV:}displayname'],
-						],
-						'user' => $principal[2],
-					];
-
-					if ($owner === $event->getAuthor()) {
-						$subject = Calendar::SUBJECT_SHARE_USER . '_you';
-					} else {
-						$event->setAffectedUser($event->getAuthor())
-							->setSubject(Calendar::SUBJECT_SHARE_USER . '_you', $parameters);
-						$this->activityManager->publish($event);
-
-						$subject = Calendar::SUBJECT_SHARE_USER . '_by';
-					}
-
-					$event->setAffectedUser($owner)
-						->setSubject($subject, $parameters);
-					$this->activityManager->publish($event);
-				}
-			} elseif ($principal[1] === 'groups') {
-				$this->triggerActivityGroup($principal[2], $event, $calendarData, Calendar::SUBJECT_SHARE_USER);
-
-				$parameters = [
-					'actor' => $event->getAuthor(),
-					'calendar' => [
-						'id' => (int) $calendarData['id'],
-						'uri' => $calendarData['uri'],
-						'name' => $calendarData['{DAV:}displayname'],
-					],
-					'group' => $principal[2],
-				];
-
-				if ($owner === $event->getAuthor()) {
-					$subject = Calendar::SUBJECT_SHARE_GROUP . '_you';
-				} else {
-					$event->setAffectedUser($event->getAuthor())
-						->setSubject(Calendar::SUBJECT_SHARE_GROUP . '_you', $parameters);
-					$this->activityManager->publish($event);
-
-					$subject = Calendar::SUBJECT_SHARE_GROUP . '_by';
-				}
-
-				$event->setAffectedUser($owner)
-					->setSubject($subject, $parameters);
-				$this->activityManager->publish($event);
-			}
-		}
-	}
-
-	/**
-	 * Checks if a calendar is already shared with a principal
-	 *
-	 * @param string $principal
-	 * @param array[] $shares
-	 * @return bool
-	 */
-	protected function isAlreadyShared($principal, $shares) {
-		foreach ($shares as $share) {
-			if ($principal === $share['href']) {
-				return true;
-			}
-		}
-
-		return false;
-	}
-
-	/**
-	 * Creates the given activity for all members of the given group
-	 *
-	 * @param string $gid
-	 * @param IEvent $event
-	 * @param array $properties
-	 * @param string $subject
-	 */
-	protected function triggerActivityGroup($gid, IEvent $event, array $properties, $subject) {
-		$group = $this->groupManager->get($gid);
-
-		if ($group instanceof IGroup) {
-			foreach ($group->getUsers() as $user) {
-				// Exclude current user
-				if ($user->getUID() !== $event->getAuthor()) {
-					$this->triggerActivityUser($user->getUID(), $event, $properties, $subject);
-				}
-			}
-		}
-	}
-
-	/**
-	 * Creates the given activity for the given user
-	 *
-	 * @param string $user
-	 * @param IEvent $event
-	 * @param array $properties
-	 * @param string $subject
-	 * @param string $subjectSelf
-	 */
-	protected function triggerActivityUser($user, IEvent $event, array $properties, $subject, $subjectSelf = '') {
-		$event->setAffectedUser($user)
-			->setSubject(
-				$user === $event->getAuthor() && $subjectSelf ? $subjectSelf : $subject,
-				[
-					'actor' => $event->getAuthor(),
-					'calendar' => [
-						'id' => (int) $properties['id'],
-						'uri' => $properties['uri'],
-						'name' => $properties['{DAV:}displayname'],
-					],
-				]
-			);
-
-		$this->activityManager->publish($event);
-	}
-
-	/**
-	 * Creates activities when a calendar object was created/updated/deleted
-	 *
-	 * @param string $action
-	 * @param array $calendarData
-	 * @param array $shares
-	 * @param array $objectData
-	 */
-	public function onTouchCalendarObject($action, array $calendarData, array $shares, array $objectData) {
-		if (!isset($calendarData['principaluri'])) {
-			return;
-		}
-
-		$principal = explode('/', $calendarData['principaluri']);
-		$owner = array_pop($principal);
-
-		$currentUser = $this->userSession->getUser();
-		if ($currentUser instanceof IUser) {
-			$currentUser = $currentUser->getUID();
-		} else {
-			$currentUser = $owner;
-		}
-
-		$classification = $objectData['classification'] ?? CalDavBackend::CLASSIFICATION_PUBLIC;
-		$object = $this->getObjectNameAndType($objectData);
-		$action = $action . '_' . $object['type'];
-
-		if ($object['type'] === 'todo' && strpos($action, Event::SUBJECT_OBJECT_UPDATE) === 0 && $object['status'] === 'COMPLETED') {
-			$action .= '_completed';
-		} elseif ($object['type'] === 'todo' && strpos($action, Event::SUBJECT_OBJECT_UPDATE) === 0 && $object['status'] === 'NEEDS-ACTION') {
-			$action .= '_needs_action';
-		}
-
-		$event = $this->activityManager->generateEvent();
-		$event->setApp('dav')
-			->setObject('calendar', (int) $calendarData['id'])
-			->setType($object['type'] === 'event' ? 'calendar_event' : 'calendar_todo')
-			->setAuthor($currentUser);
-
-		$users = $this->getUsersForShares($shares);
-		$users[] = $owner;
-
-		// Users for share can return the owner itself if the calendar is published
-		foreach (array_unique($users) as $user) {
-			if ($classification === CalDavBackend::CLASSIFICATION_PRIVATE && $user !== $owner) {
-				// Private events are only shown to the owner
-				continue;
-			}
-
-			$params = [
-				'actor' => $event->getAuthor(),
-				'calendar' => [
-					'id' => (int) $calendarData['id'],
-					'uri' => $calendarData['uri'],
-					'name' => $calendarData['{DAV:}displayname'],
-				],
-				'object' => [
-					'id' => $object['id'],
-					'name' => $classification === CalDavBackend::CLASSIFICATION_CONFIDENTIAL && $user !== $owner ? 'Busy' : $object['name'],
-					'classified' => $classification === CalDavBackend::CLASSIFICATION_CONFIDENTIAL && $user !== $owner,
-				],
-			];
-
-			if ($object['type'] === 'event' && strpos($action, Event::SUBJECT_OBJECT_DELETE) === false && $this->appManager->isEnabledForUser('calendar')) {
-				$params['object']['link']['object_uri'] = $objectData['uri'];
-				$params['object']['link']['calendar_uri'] = $calendarData['uri'];
-				$params['object']['link']['owner'] = $owner;
-			}
-
-
-			$event->setAffectedUser($user)
-				->setSubject(
-					$user === $currentUser ? $action . '_self' : $action,
-					$params
-				);
-
-			$this->activityManager->publish($event);
-		}
-	}
-
-	/**
-	 * @param array $objectData
-	 * @return string[]|bool
-	 */
-	protected function getObjectNameAndType(array $objectData) {
-		$vObject = Reader::read($objectData['calendardata']);
-		$component = $componentType = null;
-		foreach ($vObject->getComponents() as $component) {
-			if (in_array($component->name, ['VEVENT', 'VTODO'])) {
-				$componentType = $component->name;
-				break;
-			}
-		}
-
-		if (!$componentType) {
-			// Calendar objects must have a VEVENT or VTODO component
-			return false;
-		}
-
-		if ($componentType === 'VEVENT') {
-			return ['id' => (string) $component->UID, 'name' => (string) $component->SUMMARY, 'type' => 'event'];
-		}
-		return ['id' => (string) $component->UID, 'name' => (string) $component->SUMMARY, 'type' => 'todo', 'status' => (string) $component->STATUS];
-	}
-
-	/**
-	 * Get all users that have access to a given calendar
-	 *
-	 * @param array $shares
-	 * @return string[]
-	 */
-	protected function getUsersForShares(array $shares) {
-		$users = $groups = [];
-		foreach ($shares as $share) {
-			$principal = explode('/', $share['{http://owncloud.org/ns}principal']);
-			if ($principal[1] === 'users') {
-				$users[] = $principal[2];
-			} elseif ($principal[1] === 'groups') {
-				$groups[] = $principal[2];
-			}
-		}
-
-		if (!empty($groups)) {
-			foreach ($groups as $gid) {
-				$group = $this->groupManager->get($gid);
-				if ($group instanceof IGroup) {
-					foreach ($group->getUsers() as $user) {
-						$users[] = $user->getUID();
-					}
-				}
-			}
-		}
-
-		return array_unique($users);
-	}
+    /** @var IActivityManager */
+    protected $activityManager;
+
+    /** @var IGroupManager */
+    protected $groupManager;
+
+    /** @var IUserSession */
+    protected $userSession;
+
+    /** @var IAppManager */
+    protected $appManager;
+
+    public function __construct(IActivityManager $activityManager, IGroupManager $groupManager, IUserSession $userSession, IAppManager $appManager) {
+        $this->activityManager = $activityManager;
+        $this->groupManager = $groupManager;
+        $this->userSession = $userSession;
+        $this->appManager = $appManager;
+    }
+
+    /**
+     * Creates activities when a calendar was creates
+     *
+     * @param array $calendarData
+     */
+    public function onCalendarAdd(array $calendarData) {
+        $this->triggerCalendarActivity(Calendar::SUBJECT_ADD, $calendarData);
+    }
+
+    /**
+     * Creates activities when a calendar was updated
+     *
+     * @param array $calendarData
+     * @param array $shares
+     * @param array $properties
+     */
+    public function onCalendarUpdate(array $calendarData, array $shares, array $properties) {
+        $this->triggerCalendarActivity(Calendar::SUBJECT_UPDATE, $calendarData, $shares, $properties);
+    }
+
+    /**
+     * Creates activities when a calendar was deleted
+     *
+     * @param array $calendarData
+     * @param array $shares
+     */
+    public function onCalendarDelete(array $calendarData, array $shares) {
+        $this->triggerCalendarActivity(Calendar::SUBJECT_DELETE, $calendarData, $shares);
+    }
+
+    /**
+     * Creates activities when a calendar was (un)published
+     *
+     * @param array $calendarData
+     * @param bool $publishStatus
+     */
+    public function onCalendarPublication(array $calendarData, $publishStatus) {
+        $this->triggerCalendarActivity($publishStatus ? Calendar::SUBJECT_PUBLISH : Calendar::SUBJECT_UNPUBLISH, $calendarData);
+    }
+
+    /**
+     * Creates activities for all related users when a calendar was touched
+     *
+     * @param string $action
+     * @param array $calendarData
+     * @param array $shares
+     * @param array $changedProperties
+     */
+    protected function triggerCalendarActivity($action, array $calendarData, array $shares = [], array $changedProperties = []) {
+        if (!isset($calendarData['principaluri'])) {
+            return;
+        }
+
+        $principal = explode('/', $calendarData['principaluri']);
+        $owner = array_pop($principal);
+
+        $currentUser = $this->userSession->getUser();
+        if ($currentUser instanceof IUser) {
+            $currentUser = $currentUser->getUID();
+        } else {
+            $currentUser = $owner;
+        }
+
+        $event = $this->activityManager->generateEvent();
+        $event->setApp('dav')
+            ->setObject('calendar', (int) $calendarData['id'])
+            ->setType('calendar')
+            ->setAuthor($currentUser);
+
+        $changedVisibleInformation = array_intersect([
+            '{DAV:}displayname',
+            '{http://apple.com/ns/ical/}calendar-color'
+        ], array_keys($changedProperties));
+
+        if (empty($shares) || ($action === Calendar::SUBJECT_UPDATE && empty($changedVisibleInformation))) {
+            $users = [$owner];
+        } else {
+            $users = $this->getUsersForShares($shares);
+            $users[] = $owner;
+        }
+
+        foreach ($users as $user) {
+            $event->setAffectedUser($user)
+                ->setSubject(
+                    $user === $currentUser ? $action . '_self' : $action,
+                    [
+                        'actor' => $currentUser,
+                        'calendar' => [
+                            'id' => (int) $calendarData['id'],
+                            'uri' => $calendarData['uri'],
+                            'name' => $calendarData['{DAV:}displayname'],
+                        ],
+                    ]
+                );
+            $this->activityManager->publish($event);
+        }
+    }
+
+    /**
+     * Creates activities for all related users when a calendar was (un-)shared
+     *
+     * @param array $calendarData
+     * @param array $shares
+     * @param array $add
+     * @param array $remove
+     */
+    public function onCalendarUpdateShares(array $calendarData, array $shares, array $add, array $remove) {
+        $principal = explode('/', $calendarData['principaluri']);
+        $owner = $principal[2];
+
+        $currentUser = $this->userSession->getUser();
+        if ($currentUser instanceof IUser) {
+            $currentUser = $currentUser->getUID();
+        } else {
+            $currentUser = $owner;
+        }
+
+        $event = $this->activityManager->generateEvent();
+        $event->setApp('dav')
+            ->setObject('calendar', (int) $calendarData['id'])
+            ->setType('calendar')
+            ->setAuthor($currentUser);
+
+        foreach ($remove as $principal) {
+            // principal:principals/users/test
+            $parts = explode(':', $principal, 2);
+            if ($parts[0] !== 'principal') {
+                continue;
+            }
+            $principal = explode('/', $parts[1]);
+
+            if ($principal[1] === 'users') {
+                $this->triggerActivityUser(
+                    $principal[2],
+                    $event,
+                    $calendarData,
+                    Calendar::SUBJECT_UNSHARE_USER,
+                    Calendar::SUBJECT_DELETE . '_self'
+                );
+
+                if ($owner !== $principal[2]) {
+                    $parameters = [
+                        'actor' => $event->getAuthor(),
+                        'calendar' => [
+                            'id' => (int) $calendarData['id'],
+                            'uri' => $calendarData['uri'],
+                            'name' => $calendarData['{DAV:}displayname'],
+                        ],
+                        'user' => $principal[2],
+                    ];
+
+                    if ($owner === $event->getAuthor()) {
+                        $subject = Calendar::SUBJECT_UNSHARE_USER . '_you';
+                    } elseif ($principal[2] === $event->getAuthor()) {
+                        $subject = Calendar::SUBJECT_UNSHARE_USER . '_self';
+                    } else {
+                        $event->setAffectedUser($event->getAuthor())
+                            ->setSubject(Calendar::SUBJECT_UNSHARE_USER . '_you', $parameters);
+                        $this->activityManager->publish($event);
+
+                        $subject = Calendar::SUBJECT_UNSHARE_USER . '_by';
+                    }
+
+                    $event->setAffectedUser($owner)
+                        ->setSubject($subject, $parameters);
+                    $this->activityManager->publish($event);
+                }
+            } elseif ($principal[1] === 'groups') {
+                $this->triggerActivityGroup($principal[2], $event, $calendarData, Calendar::SUBJECT_UNSHARE_USER);
+
+                $parameters = [
+                    'actor' => $event->getAuthor(),
+                    'calendar' => [
+                        'id' => (int) $calendarData['id'],
+                        'uri' => $calendarData['uri'],
+                        'name' => $calendarData['{DAV:}displayname'],
+                    ],
+                    'group' => $principal[2],
+                ];
+
+                if ($owner === $event->getAuthor()) {
+                    $subject = Calendar::SUBJECT_UNSHARE_GROUP . '_you';
+                } else {
+                    $event->setAffectedUser($event->getAuthor())
+                        ->setSubject(Calendar::SUBJECT_UNSHARE_GROUP . '_you', $parameters);
+                    $this->activityManager->publish($event);
+
+                    $subject = Calendar::SUBJECT_UNSHARE_GROUP . '_by';
+                }
+
+                $event->setAffectedUser($owner)
+                    ->setSubject($subject, $parameters);
+                $this->activityManager->publish($event);
+            }
+        }
+
+        foreach ($add as $share) {
+            if ($this->isAlreadyShared($share['href'], $shares)) {
+                continue;
+            }
+
+            // principal:principals/users/test
+            $parts = explode(':', $share['href'], 2);
+            if ($parts[0] !== 'principal') {
+                continue;
+            }
+            $principal = explode('/', $parts[1]);
+
+            if ($principal[1] === 'users') {
+                $this->triggerActivityUser($principal[2], $event, $calendarData, Calendar::SUBJECT_SHARE_USER);
+
+                if ($owner !== $principal[2]) {
+                    $parameters = [
+                        'actor' => $event->getAuthor(),
+                        'calendar' => [
+                            'id' => (int) $calendarData['id'],
+                            'uri' => $calendarData['uri'],
+                            'name' => $calendarData['{DAV:}displayname'],
+                        ],
+                        'user' => $principal[2],
+                    ];
+
+                    if ($owner === $event->getAuthor()) {
+                        $subject = Calendar::SUBJECT_SHARE_USER . '_you';
+                    } else {
+                        $event->setAffectedUser($event->getAuthor())
+                            ->setSubject(Calendar::SUBJECT_SHARE_USER . '_you', $parameters);
+                        $this->activityManager->publish($event);
+
+                        $subject = Calendar::SUBJECT_SHARE_USER . '_by';
+                    }
+
+                    $event->setAffectedUser($owner)
+                        ->setSubject($subject, $parameters);
+                    $this->activityManager->publish($event);
+                }
+            } elseif ($principal[1] === 'groups') {
+                $this->triggerActivityGroup($principal[2], $event, $calendarData, Calendar::SUBJECT_SHARE_USER);
+
+                $parameters = [
+                    'actor' => $event->getAuthor(),
+                    'calendar' => [
+                        'id' => (int) $calendarData['id'],
+                        'uri' => $calendarData['uri'],
+                        'name' => $calendarData['{DAV:}displayname'],
+                    ],
+                    'group' => $principal[2],
+                ];
+
+                if ($owner === $event->getAuthor()) {
+                    $subject = Calendar::SUBJECT_SHARE_GROUP . '_you';
+                } else {
+                    $event->setAffectedUser($event->getAuthor())
+                        ->setSubject(Calendar::SUBJECT_SHARE_GROUP . '_you', $parameters);
+                    $this->activityManager->publish($event);
+
+                    $subject = Calendar::SUBJECT_SHARE_GROUP . '_by';
+                }
+
+                $event->setAffectedUser($owner)
+                    ->setSubject($subject, $parameters);
+                $this->activityManager->publish($event);
+            }
+        }
+    }
+
+    /**
+     * Checks if a calendar is already shared with a principal
+     *
+     * @param string $principal
+     * @param array[] $shares
+     * @return bool
+     */
+    protected function isAlreadyShared($principal, $shares) {
+        foreach ($shares as $share) {
+            if ($principal === $share['href']) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+
+    /**
+     * Creates the given activity for all members of the given group
+     *
+     * @param string $gid
+     * @param IEvent $event
+     * @param array $properties
+     * @param string $subject
+     */
+    protected function triggerActivityGroup($gid, IEvent $event, array $properties, $subject) {
+        $group = $this->groupManager->get($gid);
+
+        if ($group instanceof IGroup) {
+            foreach ($group->getUsers() as $user) {
+                // Exclude current user
+                if ($user->getUID() !== $event->getAuthor()) {
+                    $this->triggerActivityUser($user->getUID(), $event, $properties, $subject);
+                }
+            }
+        }
+    }
+
+    /**
+     * Creates the given activity for the given user
+     *
+     * @param string $user
+     * @param IEvent $event
+     * @param array $properties
+     * @param string $subject
+     * @param string $subjectSelf
+     */
+    protected function triggerActivityUser($user, IEvent $event, array $properties, $subject, $subjectSelf = '') {
+        $event->setAffectedUser($user)
+            ->setSubject(
+                $user === $event->getAuthor() && $subjectSelf ? $subjectSelf : $subject,
+                [
+                    'actor' => $event->getAuthor(),
+                    'calendar' => [
+                        'id' => (int) $properties['id'],
+                        'uri' => $properties['uri'],
+                        'name' => $properties['{DAV:}displayname'],
+                    ],
+                ]
+            );
+
+        $this->activityManager->publish($event);
+    }
+
+    /**
+     * Creates activities when a calendar object was created/updated/deleted
+     *
+     * @param string $action
+     * @param array $calendarData
+     * @param array $shares
+     * @param array $objectData
+     */
+    public function onTouchCalendarObject($action, array $calendarData, array $shares, array $objectData) {
+        if (!isset($calendarData['principaluri'])) {
+            return;
+        }
+
+        $principal = explode('/', $calendarData['principaluri']);
+        $owner = array_pop($principal);
+
+        $currentUser = $this->userSession->getUser();
+        if ($currentUser instanceof IUser) {
+            $currentUser = $currentUser->getUID();
+        } else {
+            $currentUser = $owner;
+        }
+
+        $classification = $objectData['classification'] ?? CalDavBackend::CLASSIFICATION_PUBLIC;
+        $object = $this->getObjectNameAndType($objectData);
+        $action = $action . '_' . $object['type'];
+
+        if ($object['type'] === 'todo' && strpos($action, Event::SUBJECT_OBJECT_UPDATE) === 0 && $object['status'] === 'COMPLETED') {
+            $action .= '_completed';
+        } elseif ($object['type'] === 'todo' && strpos($action, Event::SUBJECT_OBJECT_UPDATE) === 0 && $object['status'] === 'NEEDS-ACTION') {
+            $action .= '_needs_action';
+        }
+
+        $event = $this->activityManager->generateEvent();
+        $event->setApp('dav')
+            ->setObject('calendar', (int) $calendarData['id'])
+            ->setType($object['type'] === 'event' ? 'calendar_event' : 'calendar_todo')
+            ->setAuthor($currentUser);
+
+        $users = $this->getUsersForShares($shares);
+        $users[] = $owner;
+
+        // Users for share can return the owner itself if the calendar is published
+        foreach (array_unique($users) as $user) {
+            if ($classification === CalDavBackend::CLASSIFICATION_PRIVATE && $user !== $owner) {
+                // Private events are only shown to the owner
+                continue;
+            }
+
+            $params = [
+                'actor' => $event->getAuthor(),
+                'calendar' => [
+                    'id' => (int) $calendarData['id'],
+                    'uri' => $calendarData['uri'],
+                    'name' => $calendarData['{DAV:}displayname'],
+                ],
+                'object' => [
+                    'id' => $object['id'],
+                    'name' => $classification === CalDavBackend::CLASSIFICATION_CONFIDENTIAL && $user !== $owner ? 'Busy' : $object['name'],
+                    'classified' => $classification === CalDavBackend::CLASSIFICATION_CONFIDENTIAL && $user !== $owner,
+                ],
+            ];
+
+            if ($object['type'] === 'event' && strpos($action, Event::SUBJECT_OBJECT_DELETE) === false && $this->appManager->isEnabledForUser('calendar')) {
+                $params['object']['link']['object_uri'] = $objectData['uri'];
+                $params['object']['link']['calendar_uri'] = $calendarData['uri'];
+                $params['object']['link']['owner'] = $owner;
+            }
+
+
+            $event->setAffectedUser($user)
+                ->setSubject(
+                    $user === $currentUser ? $action . '_self' : $action,
+                    $params
+                );
+
+            $this->activityManager->publish($event);
+        }
+    }
+
+    /**
+     * @param array $objectData
+     * @return string[]|bool
+     */
+    protected function getObjectNameAndType(array $objectData) {
+        $vObject = Reader::read($objectData['calendardata']);
+        $component = $componentType = null;
+        foreach ($vObject->getComponents() as $component) {
+            if (in_array($component->name, ['VEVENT', 'VTODO'])) {
+                $componentType = $component->name;
+                break;
+            }
+        }
+
+        if (!$componentType) {
+            // Calendar objects must have a VEVENT or VTODO component
+            return false;
+        }
+
+        if ($componentType === 'VEVENT') {
+            return ['id' => (string) $component->UID, 'name' => (string) $component->SUMMARY, 'type' => 'event'];
+        }
+        return ['id' => (string) $component->UID, 'name' => (string) $component->SUMMARY, 'type' => 'todo', 'status' => (string) $component->STATUS];
+    }
+
+    /**
+     * Get all users that have access to a given calendar
+     *
+     * @param array $shares
+     * @return string[]
+     */
+    protected function getUsersForShares(array $shares) {
+        $users = $groups = [];
+        foreach ($shares as $share) {
+            $principal = explode('/', $share['{http://owncloud.org/ns}principal']);
+            if ($principal[1] === 'users') {
+                $users[] = $principal[2];
+            } elseif ($principal[1] === 'groups') {
+                $groups[] = $principal[2];
+            }
+        }
+
+        if (!empty($groups)) {
+            foreach ($groups as $gid) {
+                $group = $this->groupManager->get($gid);
+                if ($group instanceof IGroup) {
+                    foreach ($group->getUsers() as $user) {
+                        $users[] = $user->getUID();
+                    }
+                }
+            }
+        }
+
+        return array_unique($users);
+    }
 }

Spacing +17 added lines, -17 removed lines

@@ -148,7 +148,7 @@ 
 		foreach ($users as $user) {
 			$event->setAffectedUser($user)
 				->setSubject(
-					$user === $currentUser ? $action . '_self' : $action,
+					$user === $currentUser ? $action.'_self' : $action,
 					[
 						'actor' => $currentUser,
 						'calendar' => [
@@ -201,7 +201,7 @@ 
 					$event,
 					$calendarData,
 					Calendar::SUBJECT_UNSHARE_USER,
-					Calendar::SUBJECT_DELETE . '_self'
+					Calendar::SUBJECT_DELETE.'_self'
 				);
 
 				if ($owner !== $principal[2]) {
@@ -216,15 +216,15 @@ 
 					];
 
 					if ($owner === $event->getAuthor()) {
-						$subject = Calendar::SUBJECT_UNSHARE_USER . '_you';
+						$subject = Calendar::SUBJECT_UNSHARE_USER.'_you';
 					} elseif ($principal[2] === $event->getAuthor()) {
-						$subject = Calendar::SUBJECT_UNSHARE_USER . '_self';
+						$subject = Calendar::SUBJECT_UNSHARE_USER.'_self';
 					} else {
 						$event->setAffectedUser($event->getAuthor())
-							->setSubject(Calendar::SUBJECT_UNSHARE_USER . '_you', $parameters);
+							->setSubject(Calendar::SUBJECT_UNSHARE_USER.'_you', $parameters);
 						$this->activityManager->publish($event);
 
-						$subject = Calendar::SUBJECT_UNSHARE_USER . '_by';
+						$subject = Calendar::SUBJECT_UNSHARE_USER.'_by';
 					}
 
 					$event->setAffectedUser($owner)
@@ -245,13 +245,13 @@ 
 				];
 
 				if ($owner === $event->getAuthor()) {
-					$subject = Calendar::SUBJECT_UNSHARE_GROUP . '_you';
+					$subject = Calendar::SUBJECT_UNSHARE_GROUP.'_you';
 				} else {
 					$event->setAffectedUser($event->getAuthor())
-						->setSubject(Calendar::SUBJECT_UNSHARE_GROUP . '_you', $parameters);
+						->setSubject(Calendar::SUBJECT_UNSHARE_GROUP.'_you', $parameters);
 					$this->activityManager->publish($event);
 
-					$subject = Calendar::SUBJECT_UNSHARE_GROUP . '_by';
+					$subject = Calendar::SUBJECT_UNSHARE_GROUP.'_by';
 				}
 
 				$event->setAffectedUser($owner)
@@ -287,13 +287,13 @@ 
 					];
 
 					if ($owner === $event->getAuthor()) {
-						$subject = Calendar::SUBJECT_SHARE_USER . '_you';
+						$subject = Calendar::SUBJECT_SHARE_USER.'_you';
 					} else {
 						$event->setAffectedUser($event->getAuthor())
-							->setSubject(Calendar::SUBJECT_SHARE_USER . '_you', $parameters);
+							->setSubject(Calendar::SUBJECT_SHARE_USER.'_you', $parameters);
 						$this->activityManager->publish($event);
 
-						$subject = Calendar::SUBJECT_SHARE_USER . '_by';
+						$subject = Calendar::SUBJECT_SHARE_USER.'_by';
 					}
 
 					$event->setAffectedUser($owner)
@@ -314,13 +314,13 @@ 
 				];
 
 				if ($owner === $event->getAuthor()) {
-					$subject = Calendar::SUBJECT_SHARE_GROUP . '_you';
+					$subject = Calendar::SUBJECT_SHARE_GROUP.'_you';
 				} else {
 					$event->setAffectedUser($event->getAuthor())
-						->setSubject(Calendar::SUBJECT_SHARE_GROUP . '_you', $parameters);
+						->setSubject(Calendar::SUBJECT_SHARE_GROUP.'_you', $parameters);
 					$this->activityManager->publish($event);
 
-					$subject = Calendar::SUBJECT_SHARE_GROUP . '_by';
+					$subject = Calendar::SUBJECT_SHARE_GROUP.'_by';
 				}
 
 				$event->setAffectedUser($owner)
@@ -419,7 +419,7 @@ 
 
 		$classification = $objectData['classification'] ?? CalDavBackend::CLASSIFICATION_PUBLIC;
 		$object = $this->getObjectNameAndType($objectData);
-		$action = $action . '_' . $object['type'];
+		$action = $action.'_'.$object['type'];
 
 		if ($object['type'] === 'todo' && strpos($action, Event::SUBJECT_OBJECT_UPDATE) === 0 && $object['status'] === 'COMPLETED') {
 			$action .= '_completed';
@@ -466,7 +466,7 @@ 
 
 			$event->setAffectedUser($user)
 				->setSubject(
-					$user === $currentUser ? $action . '_self' : $action,
+					$user === $currentUser ? $action.'_self' : $action,
 					$params
 				);