nextcloud /
server
@@ -34,235 +34,235 @@ |
||
| 34 | 34 | |
| 35 | 35 | class Calendar extends Base { |
| 36 | 36 | |
| 37 | - const SUBJECT_ADD = 'calendar_add'; |
|
| 38 | - const SUBJECT_UPDATE = 'calendar_update'; |
|
| 39 | - const SUBJECT_DELETE = 'calendar_delete'; |
|
| 40 | - const SUBJECT_PUBLISH = 'calendar_publish'; |
|
| 41 | - const SUBJECT_UNPUBLISH = 'calendar_unpublish'; |
|
| 42 | - const SUBJECT_SHARE_USER = 'calendar_user_share'; |
|
| 43 | - const SUBJECT_SHARE_GROUP = 'calendar_group_share'; |
|
| 44 | - const SUBJECT_UNSHARE_USER = 'calendar_user_unshare'; |
|
| 45 | - const SUBJECT_UNSHARE_GROUP = 'calendar_group_unshare'; |
|
| 37 | + const SUBJECT_ADD = 'calendar_add'; |
|
| 38 | + const SUBJECT_UPDATE = 'calendar_update'; |
|
| 39 | + const SUBJECT_DELETE = 'calendar_delete'; |
|
| 40 | + const SUBJECT_PUBLISH = 'calendar_publish'; |
|
| 41 | + const SUBJECT_UNPUBLISH = 'calendar_unpublish'; |
|
| 42 | + const SUBJECT_SHARE_USER = 'calendar_user_share'; |
|
| 43 | + const SUBJECT_SHARE_GROUP = 'calendar_group_share'; |
|
| 44 | + const SUBJECT_UNSHARE_USER = 'calendar_user_unshare'; |
|
| 45 | + const SUBJECT_UNSHARE_GROUP = 'calendar_group_unshare'; |
|
| 46 | 46 | |
| 47 | - /** @var IFactory */ |
|
| 48 | - protected $languageFactory; |
|
| 47 | + /** @var IFactory */ |
|
| 48 | + protected $languageFactory; |
|
| 49 | 49 | |
| 50 | - /** @var IL10N */ |
|
| 51 | - protected $l; |
|
| 50 | + /** @var IL10N */ |
|
| 51 | + protected $l; |
|
| 52 | 52 | |
| 53 | - /** @var IURLGenerator */ |
|
| 54 | - protected $url; |
|
| 53 | + /** @var IURLGenerator */ |
|
| 54 | + protected $url; |
|
| 55 | 55 | |
| 56 | - /** @var IManager */ |
|
| 57 | - protected $activityManager; |
|
| 56 | + /** @var IManager */ |
|
| 57 | + protected $activityManager; |
|
| 58 | 58 | |
| 59 | - /** @var IEventMerger */ |
|
| 60 | - protected $eventMerger; |
|
| 59 | + /** @var IEventMerger */ |
|
| 60 | + protected $eventMerger; |
|
| 61 | 61 | |
| 62 | - /** |
|
| 63 | - * @param IFactory $languageFactory |
|
| 64 | - * @param IURLGenerator $url |
|
| 65 | - * @param IManager $activityManager |
|
| 66 | - * @param IUserManager $userManager |
|
| 67 | - * @param IGroupManager $groupManager |
|
| 68 | - * @param IEventMerger $eventMerger |
|
| 69 | - */ |
|
| 70 | - public function __construct(IFactory $languageFactory, IURLGenerator $url, IManager $activityManager, IUserManager $userManager, IGroupManager $groupManager, IEventMerger $eventMerger) { |
|
| 71 | - parent::__construct($userManager, $groupManager); |
|
| 72 | - $this->languageFactory = $languageFactory; |
|
| 73 | - $this->url = $url; |
|
| 74 | - $this->activityManager = $activityManager; |
|
| 75 | - $this->eventMerger = $eventMerger; |
|
| 76 | - } |
|
| 62 | + /** |
|
| 63 | + * @param IFactory $languageFactory |
|
| 64 | + * @param IURLGenerator $url |
|
| 65 | + * @param IManager $activityManager |
|
| 66 | + * @param IUserManager $userManager |
|
| 67 | + * @param IGroupManager $groupManager |
|
| 68 | + * @param IEventMerger $eventMerger |
|
| 69 | + */ |
|
| 70 | + public function __construct(IFactory $languageFactory, IURLGenerator $url, IManager $activityManager, IUserManager $userManager, IGroupManager $groupManager, IEventMerger $eventMerger) { |
|
| 71 | + parent::__construct($userManager, $groupManager); |
|
| 72 | + $this->languageFactory = $languageFactory; |
|
| 73 | + $this->url = $url; |
|
| 74 | + $this->activityManager = $activityManager; |
|
| 75 | + $this->eventMerger = $eventMerger; |
|
| 76 | + } |
|
| 77 | 77 | |
| 78 | - /** |
|
| 79 | - * @param string $language |
|
| 80 | - * @param IEvent $event |
|
| 81 | - * @param IEvent|null $previousEvent |
|
| 82 | - * @return IEvent |
|
| 83 | - * @throws \InvalidArgumentException |
|
| 84 | - * @since 11.0.0 |
|
| 85 | - */ |
|
| 86 | - public function parse($language, IEvent $event, IEvent $previousEvent = null) { |
|
| 87 | - if ($event->getApp() !== 'dav' || $event->getType() !== 'calendar') { |
|
| 88 | - throw new \InvalidArgumentException(); |
|
| 89 | - } |
|
| 78 | + /** |
|
| 79 | + * @param string $language |
|
| 80 | + * @param IEvent $event |
|
| 81 | + * @param IEvent|null $previousEvent |
|
| 82 | + * @return IEvent |
|
| 83 | + * @throws \InvalidArgumentException |
|
| 84 | + * @since 11.0.0 |
|
| 85 | + */ |
|
| 86 | + public function parse($language, IEvent $event, IEvent $previousEvent = null) { |
|
| 87 | + if ($event->getApp() !== 'dav' || $event->getType() !== 'calendar') { |
|
| 88 | + throw new \InvalidArgumentException(); |
|
| 89 | + } |
|
| 90 | 90 | |
| 91 | - $this->l = $this->languageFactory->get('dav', $language); |
|
| 91 | + $this->l = $this->languageFactory->get('dav', $language); |
|
| 92 | 92 | |
| 93 | - if ($this->activityManager->getRequirePNG()) { |
|
| 94 | - $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'places/calendar-dark.png'))); |
|
| 95 | - } else { |
|
| 96 | - $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'places/calendar-dark.svg'))); |
|
| 97 | - } |
|
| 93 | + if ($this->activityManager->getRequirePNG()) { |
|
| 94 | + $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'places/calendar-dark.png'))); |
|
| 95 | + } else { |
|
| 96 | + $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'places/calendar-dark.svg'))); |
|
| 97 | + } |
|
| 98 | 98 | |
| 99 | - if ($event->getSubject() === self::SUBJECT_ADD) { |
|
| 100 | - $subject = $this->l->t('{actor} created calendar {calendar}'); |
|
| 101 | - } else if ($event->getSubject() === self::SUBJECT_ADD . '_self') { |
|
| 102 | - $subject = $this->l->t('You created calendar {calendar}'); |
|
| 103 | - } else if ($event->getSubject() === self::SUBJECT_DELETE) { |
|
| 104 | - $subject = $this->l->t('{actor} deleted calendar {calendar}'); |
|
| 105 | - } else if ($event->getSubject() === self::SUBJECT_DELETE . '_self') { |
|
| 106 | - $subject = $this->l->t('You deleted calendar {calendar}'); |
|
| 107 | - } else if ($event->getSubject() === self::SUBJECT_UPDATE) { |
|
| 108 | - $subject = $this->l->t('{actor} updated calendar {calendar}'); |
|
| 109 | - } else if ($event->getSubject() === self::SUBJECT_UPDATE . '_self') { |
|
| 110 | - $subject = $this->l->t('You updated calendar {calendar}'); |
|
| 99 | + if ($event->getSubject() === self::SUBJECT_ADD) { |
|
| 100 | + $subject = $this->l->t('{actor} created calendar {calendar}'); |
|
| 101 | + } else if ($event->getSubject() === self::SUBJECT_ADD . '_self') { |
|
| 102 | + $subject = $this->l->t('You created calendar {calendar}'); |
|
| 103 | + } else if ($event->getSubject() === self::SUBJECT_DELETE) { |
|
| 104 | + $subject = $this->l->t('{actor} deleted calendar {calendar}'); |
|
| 105 | + } else if ($event->getSubject() === self::SUBJECT_DELETE . '_self') { |
|
| 106 | + $subject = $this->l->t('You deleted calendar {calendar}'); |
|
| 107 | + } else if ($event->getSubject() === self::SUBJECT_UPDATE) { |
|
| 108 | + $subject = $this->l->t('{actor} updated calendar {calendar}'); |
|
| 109 | + } else if ($event->getSubject() === self::SUBJECT_UPDATE . '_self') { |
|
| 110 | + $subject = $this->l->t('You updated calendar {calendar}'); |
|
| 111 | 111 | |
| 112 | - } else if ($event->getSubject() === self::SUBJECT_PUBLISH . '_self') { |
|
| 113 | - $subject = $this->l->t('You shared calendar {calendar} as public link'); |
|
| 114 | - } else if ($event->getSubject() === self::SUBJECT_UNPUBLISH . '_self') { |
|
| 115 | - $subject = $this->l->t('You removed public link for calendar {calendar}'); |
|
| 112 | + } else if ($event->getSubject() === self::SUBJECT_PUBLISH . '_self') { |
|
| 113 | + $subject = $this->l->t('You shared calendar {calendar} as public link'); |
|
| 114 | + } else if ($event->getSubject() === self::SUBJECT_UNPUBLISH . '_self') { |
|
| 115 | + $subject = $this->l->t('You removed public link for calendar {calendar}'); |
|
| 116 | 116 | |
| 117 | - } else if ($event->getSubject() === self::SUBJECT_SHARE_USER) { |
|
| 118 | - $subject = $this->l->t('{actor} shared calendar {calendar} with you'); |
|
| 119 | - } else if ($event->getSubject() === self::SUBJECT_SHARE_USER . '_you') { |
|
| 120 | - $subject = $this->l->t('You shared calendar {calendar} with {user}'); |
|
| 121 | - } else if ($event->getSubject() === self::SUBJECT_SHARE_USER . '_by') { |
|
| 122 | - $subject = $this->l->t('{actor} shared calendar {calendar} with {user}'); |
|
| 123 | - } else if ($event->getSubject() === self::SUBJECT_UNSHARE_USER) { |
|
| 124 | - $subject = $this->l->t('{actor} unshared calendar {calendar} from you'); |
|
| 125 | - } else if ($event->getSubject() === self::SUBJECT_UNSHARE_USER . '_you') { |
|
| 126 | - $subject = $this->l->t('You unshared calendar {calendar} from {user}'); |
|
| 127 | - } else if ($event->getSubject() === self::SUBJECT_UNSHARE_USER . '_by') { |
|
| 128 | - $subject = $this->l->t('{actor} unshared calendar {calendar} from {user}'); |
|
| 129 | - } else if ($event->getSubject() === self::SUBJECT_UNSHARE_USER . '_self') { |
|
| 130 | - $subject = $this->l->t('{actor} unshared calendar {calendar} from themselves'); |
|
| 117 | + } else if ($event->getSubject() === self::SUBJECT_SHARE_USER) { |
|
| 118 | + $subject = $this->l->t('{actor} shared calendar {calendar} with you'); |
|
| 119 | + } else if ($event->getSubject() === self::SUBJECT_SHARE_USER . '_you') { |
|
| 120 | + $subject = $this->l->t('You shared calendar {calendar} with {user}'); |
|
| 121 | + } else if ($event->getSubject() === self::SUBJECT_SHARE_USER . '_by') { |
|
| 122 | + $subject = $this->l->t('{actor} shared calendar {calendar} with {user}'); |
|
| 123 | + } else if ($event->getSubject() === self::SUBJECT_UNSHARE_USER) { |
|
| 124 | + $subject = $this->l->t('{actor} unshared calendar {calendar} from you'); |
|
| 125 | + } else if ($event->getSubject() === self::SUBJECT_UNSHARE_USER . '_you') { |
|
| 126 | + $subject = $this->l->t('You unshared calendar {calendar} from {user}'); |
|
| 127 | + } else if ($event->getSubject() === self::SUBJECT_UNSHARE_USER . '_by') { |
|
| 128 | + $subject = $this->l->t('{actor} unshared calendar {calendar} from {user}'); |
|
| 129 | + } else if ($event->getSubject() === self::SUBJECT_UNSHARE_USER . '_self') { |
|
| 130 | + $subject = $this->l->t('{actor} unshared calendar {calendar} from themselves'); |
|
| 131 | 131 | |
| 132 | - } else if ($event->getSubject() === self::SUBJECT_SHARE_GROUP . '_you') { |
|
| 133 | - $subject = $this->l->t('You shared calendar {calendar} with group {group}'); |
|
| 134 | - } else if ($event->getSubject() === self::SUBJECT_SHARE_GROUP . '_by') { |
|
| 135 | - $subject = $this->l->t('{actor} shared calendar {calendar} with group {group}'); |
|
| 136 | - } else if ($event->getSubject() === self::SUBJECT_UNSHARE_GROUP . '_you') { |
|
| 137 | - $subject = $this->l->t('You unshared calendar {calendar} from group {group}'); |
|
| 138 | - } else if ($event->getSubject() === self::SUBJECT_UNSHARE_GROUP . '_by') { |
|
| 139 | - $subject = $this->l->t('{actor} unshared calendar {calendar} from group {group}'); |
|
| 140 | - } else { |
|
| 141 | - throw new \InvalidArgumentException(); |
|
| 142 | - } |
|
| 132 | + } else if ($event->getSubject() === self::SUBJECT_SHARE_GROUP . '_you') { |
|
| 133 | + $subject = $this->l->t('You shared calendar {calendar} with group {group}'); |
|
| 134 | + } else if ($event->getSubject() === self::SUBJECT_SHARE_GROUP . '_by') { |
|
| 135 | + $subject = $this->l->t('{actor} shared calendar {calendar} with group {group}'); |
|
| 136 | + } else if ($event->getSubject() === self::SUBJECT_UNSHARE_GROUP . '_you') { |
|
| 137 | + $subject = $this->l->t('You unshared calendar {calendar} from group {group}'); |
|
| 138 | + } else if ($event->getSubject() === self::SUBJECT_UNSHARE_GROUP . '_by') { |
|
| 139 | + $subject = $this->l->t('{actor} unshared calendar {calendar} from group {group}'); |
|
| 140 | + } else { |
|
| 141 | + throw new \InvalidArgumentException(); |
|
| 142 | + } |
|
| 143 | 143 | |
| 144 | - $parsedParameters = $this->getParameters($event); |
|
| 145 | - $this->setSubjects($event, $subject, $parsedParameters); |
|
| 144 | + $parsedParameters = $this->getParameters($event); |
|
| 145 | + $this->setSubjects($event, $subject, $parsedParameters); |
|
| 146 | 146 | |
| 147 | - $event = $this->eventMerger->mergeEvents('calendar', $event, $previousEvent); |
|
| 147 | + $event = $this->eventMerger->mergeEvents('calendar', $event, $previousEvent); |
|
| 148 | 148 | |
| 149 | - if ($event->getChildEvent() === null) { |
|
| 150 | - if (isset($parsedParameters['user'])) { |
|
| 151 | - // Couldn't group by calendar, maybe we can group by users |
|
| 152 | - $event = $this->eventMerger->mergeEvents('user', $event, $previousEvent); |
|
| 153 | - } else if (isset($parsedParameters['group'])) { |
|
| 154 | - // Couldn't group by calendar, maybe we can group by groups |
|
| 155 | - $event = $this->eventMerger->mergeEvents('group', $event, $previousEvent); |
|
| 156 | - } |
|
| 157 | - } |
|
| 149 | + if ($event->getChildEvent() === null) { |
|
| 150 | + if (isset($parsedParameters['user'])) { |
|
| 151 | + // Couldn't group by calendar, maybe we can group by users |
|
| 152 | + $event = $this->eventMerger->mergeEvents('user', $event, $previousEvent); |
|
| 153 | + } else if (isset($parsedParameters['group'])) { |
|
| 154 | + // Couldn't group by calendar, maybe we can group by groups |
|
| 155 | + $event = $this->eventMerger->mergeEvents('group', $event, $previousEvent); |
|
| 156 | + } |
|
| 157 | + } |
|
| 158 | 158 | |
| 159 | - return $event; |
|
| 160 | - } |
|
| 159 | + return $event; |
|
| 160 | + } |
|
| 161 | 161 | |
| 162 | - /** |
|
| 163 | - * @param IEvent $event |
|
| 164 | - * @return array |
|
| 165 | - */ |
|
| 166 | - protected function getParameters(IEvent $event) { |
|
| 167 | - $subject = $event->getSubject(); |
|
| 168 | - $parameters = $event->getSubjectParameters(); |
|
| 162 | + /** |
|
| 163 | + * @param IEvent $event |
|
| 164 | + * @return array |
|
| 165 | + */ |
|
| 166 | + protected function getParameters(IEvent $event) { |
|
| 167 | + $subject = $event->getSubject(); |
|
| 168 | + $parameters = $event->getSubjectParameters(); |
|
| 169 | 169 | |
| 170 | - // Nextcloud 13+ |
|
| 171 | - if (isset($parameters['calendar'])) { |
|
| 172 | - switch ($subject) { |
|
| 173 | - case self::SUBJECT_ADD: |
|
| 174 | - case self::SUBJECT_ADD . '_self': |
|
| 175 | - case self::SUBJECT_DELETE: |
|
| 176 | - case self::SUBJECT_DELETE . '_self': |
|
| 177 | - case self::SUBJECT_UPDATE: |
|
| 178 | - case self::SUBJECT_UPDATE . '_self': |
|
| 179 | - case self::SUBJECT_PUBLISH . '_self': |
|
| 180 | - case self::SUBJECT_UNPUBLISH . '_self': |
|
| 181 | - case self::SUBJECT_SHARE_USER: |
|
| 182 | - case self::SUBJECT_UNSHARE_USER: |
|
| 183 | - case self::SUBJECT_UNSHARE_USER . '_self': |
|
| 184 | - return [ |
|
| 185 | - 'actor' => $this->generateUserParameter($parameters['actor']), |
|
| 186 | - 'calendar' => $this->generateCalendarParameter($parameters['calendar'], $this->l), |
|
| 187 | - ]; |
|
| 188 | - case self::SUBJECT_SHARE_USER . '_you': |
|
| 189 | - case self::SUBJECT_UNSHARE_USER . '_you': |
|
| 190 | - return [ |
|
| 191 | - 'calendar' => $this->generateCalendarParameter($parameters['calendar'], $this->l), |
|
| 192 | - 'user' => $this->generateUserParameter($parameters['user']), |
|
| 193 | - ]; |
|
| 194 | - case self::SUBJECT_SHARE_USER . '_by': |
|
| 195 | - case self::SUBJECT_UNSHARE_USER . '_by': |
|
| 196 | - return [ |
|
| 197 | - 'actor' => $this->generateUserParameter($parameters['actor']), |
|
| 198 | - 'calendar' => $this->generateCalendarParameter($parameters['calendar'], $this->l), |
|
| 199 | - 'user' => $this->generateUserParameter($parameters['user']), |
|
| 200 | - ]; |
|
| 201 | - case self::SUBJECT_SHARE_GROUP . '_you': |
|
| 202 | - case self::SUBJECT_UNSHARE_GROUP . '_you': |
|
| 203 | - return [ |
|
| 204 | - 'calendar' => $this->generateCalendarParameter($parameters['calendar'], $this->l), |
|
| 205 | - 'group' => $this->generateGroupParameter($parameters['group']), |
|
| 206 | - ]; |
|
| 207 | - case self::SUBJECT_SHARE_GROUP . '_by': |
|
| 208 | - case self::SUBJECT_UNSHARE_GROUP . '_by': |
|
| 209 | - return [ |
|
| 210 | - 'actor' => $this->generateUserParameter($parameters['actor']), |
|
| 211 | - 'calendar' => $this->generateCalendarParameter($parameters['calendar'], $this->l), |
|
| 212 | - 'group' => $this->generateGroupParameter($parameters['group']), |
|
| 213 | - ]; |
|
| 214 | - } |
|
| 215 | - } |
|
| 170 | + // Nextcloud 13+ |
|
| 171 | + if (isset($parameters['calendar'])) { |
|
| 172 | + switch ($subject) { |
|
| 173 | + case self::SUBJECT_ADD: |
|
| 174 | + case self::SUBJECT_ADD . '_self': |
|
| 175 | + case self::SUBJECT_DELETE: |
|
| 176 | + case self::SUBJECT_DELETE . '_self': |
|
| 177 | + case self::SUBJECT_UPDATE: |
|
| 178 | + case self::SUBJECT_UPDATE . '_self': |
|
| 179 | + case self::SUBJECT_PUBLISH . '_self': |
|
| 180 | + case self::SUBJECT_UNPUBLISH . '_self': |
|
| 181 | + case self::SUBJECT_SHARE_USER: |
|
| 182 | + case self::SUBJECT_UNSHARE_USER: |
|
| 183 | + case self::SUBJECT_UNSHARE_USER . '_self': |
|
| 184 | + return [ |
|
| 185 | + 'actor' => $this->generateUserParameter($parameters['actor']), |
|
| 186 | + 'calendar' => $this->generateCalendarParameter($parameters['calendar'], $this->l), |
|
| 187 | + ]; |
|
| 188 | + case self::SUBJECT_SHARE_USER . '_you': |
|
| 189 | + case self::SUBJECT_UNSHARE_USER . '_you': |
|
| 190 | + return [ |
|
| 191 | + 'calendar' => $this->generateCalendarParameter($parameters['calendar'], $this->l), |
|
| 192 | + 'user' => $this->generateUserParameter($parameters['user']), |
|
| 193 | + ]; |
|
| 194 | + case self::SUBJECT_SHARE_USER . '_by': |
|
| 195 | + case self::SUBJECT_UNSHARE_USER . '_by': |
|
| 196 | + return [ |
|
| 197 | + 'actor' => $this->generateUserParameter($parameters['actor']), |
|
| 198 | + 'calendar' => $this->generateCalendarParameter($parameters['calendar'], $this->l), |
|
| 199 | + 'user' => $this->generateUserParameter($parameters['user']), |
|
| 200 | + ]; |
|
| 201 | + case self::SUBJECT_SHARE_GROUP . '_you': |
|
| 202 | + case self::SUBJECT_UNSHARE_GROUP . '_you': |
|
| 203 | + return [ |
|
| 204 | + 'calendar' => $this->generateCalendarParameter($parameters['calendar'], $this->l), |
|
| 205 | + 'group' => $this->generateGroupParameter($parameters['group']), |
|
| 206 | + ]; |
|
| 207 | + case self::SUBJECT_SHARE_GROUP . '_by': |
|
| 208 | + case self::SUBJECT_UNSHARE_GROUP . '_by': |
|
| 209 | + return [ |
|
| 210 | + 'actor' => $this->generateUserParameter($parameters['actor']), |
|
| 211 | + 'calendar' => $this->generateCalendarParameter($parameters['calendar'], $this->l), |
|
| 212 | + 'group' => $this->generateGroupParameter($parameters['group']), |
|
| 213 | + ]; |
|
| 214 | + } |
|
| 215 | + } |
|
| 216 | 216 | |
| 217 | - // Legacy - Do NOT Remove unless necessary |
|
| 218 | - // Removing this will break parsing of activities that were created on |
|
| 219 | - // Nextcloud 12, so we should keep this as long as it's acceptable. |
|
| 220 | - // Otherwise if people upgrade over multiple releases in a short period, |
|
| 221 | - // they will get the dead entries in their stream. |
|
| 222 | - switch ($subject) { |
|
| 223 | - case self::SUBJECT_ADD: |
|
| 224 | - case self::SUBJECT_ADD . '_self': |
|
| 225 | - case self::SUBJECT_DELETE: |
|
| 226 | - case self::SUBJECT_DELETE . '_self': |
|
| 227 | - case self::SUBJECT_UPDATE: |
|
| 228 | - case self::SUBJECT_UPDATE . '_self': |
|
| 229 | - case self::SUBJECT_PUBLISH . '_self': |
|
| 230 | - case self::SUBJECT_UNPUBLISH . '_self': |
|
| 231 | - case self::SUBJECT_SHARE_USER: |
|
| 232 | - case self::SUBJECT_UNSHARE_USER: |
|
| 233 | - case self::SUBJECT_UNSHARE_USER . '_self': |
|
| 234 | - return [ |
|
| 235 | - 'actor' => $this->generateUserParameter($parameters[0]), |
|
| 236 | - 'calendar' => $this->generateLegacyCalendarParameter((int)$event->getObjectId(), $parameters[1]), |
|
| 237 | - ]; |
|
| 238 | - case self::SUBJECT_SHARE_USER . '_you': |
|
| 239 | - case self::SUBJECT_UNSHARE_USER . '_you': |
|
| 240 | - return [ |
|
| 241 | - 'user' => $this->generateUserParameter($parameters[0]), |
|
| 242 | - 'calendar' => $this->generateLegacyCalendarParameter((int)$event->getObjectId(), $parameters[1]), |
|
| 243 | - ]; |
|
| 244 | - case self::SUBJECT_SHARE_USER . '_by': |
|
| 245 | - case self::SUBJECT_UNSHARE_USER . '_by': |
|
| 246 | - return [ |
|
| 247 | - 'user' => $this->generateUserParameter($parameters[0]), |
|
| 248 | - 'calendar' => $this->generateLegacyCalendarParameter((int)$event->getObjectId(), $parameters[1]), |
|
| 249 | - 'actor' => $this->generateUserParameter($parameters[2]), |
|
| 250 | - ]; |
|
| 251 | - case self::SUBJECT_SHARE_GROUP . '_you': |
|
| 252 | - case self::SUBJECT_UNSHARE_GROUP . '_you': |
|
| 253 | - return [ |
|
| 254 | - 'group' => $this->generateGroupParameter($parameters[0]), |
|
| 255 | - 'calendar' => $this->generateLegacyCalendarParameter((int)$event->getObjectId(), $parameters[1]), |
|
| 256 | - ]; |
|
| 257 | - case self::SUBJECT_SHARE_GROUP . '_by': |
|
| 258 | - case self::SUBJECT_UNSHARE_GROUP . '_by': |
|
| 259 | - return [ |
|
| 260 | - 'group' => $this->generateGroupParameter($parameters[0]), |
|
| 261 | - 'calendar' => $this->generateLegacyCalendarParameter((int)$event->getObjectId(), $parameters[1]), |
|
| 262 | - 'actor' => $this->generateUserParameter($parameters[2]), |
|
| 263 | - ]; |
|
| 264 | - } |
|
| 217 | + // Legacy - Do NOT Remove unless necessary |
|
| 218 | + // Removing this will break parsing of activities that were created on |
|
| 219 | + // Nextcloud 12, so we should keep this as long as it's acceptable. |
|
| 220 | + // Otherwise if people upgrade over multiple releases in a short period, |
|
| 221 | + // they will get the dead entries in their stream. |
|
| 222 | + switch ($subject) { |
|
| 223 | + case self::SUBJECT_ADD: |
|
| 224 | + case self::SUBJECT_ADD . '_self': |
|
| 225 | + case self::SUBJECT_DELETE: |
|
| 226 | + case self::SUBJECT_DELETE . '_self': |
|
| 227 | + case self::SUBJECT_UPDATE: |
|
| 228 | + case self::SUBJECT_UPDATE . '_self': |
|
| 229 | + case self::SUBJECT_PUBLISH . '_self': |
|
| 230 | + case self::SUBJECT_UNPUBLISH . '_self': |
|
| 231 | + case self::SUBJECT_SHARE_USER: |
|
| 232 | + case self::SUBJECT_UNSHARE_USER: |
|
| 233 | + case self::SUBJECT_UNSHARE_USER . '_self': |
|
| 234 | + return [ |
|
| 235 | + 'actor' => $this->generateUserParameter($parameters[0]), |
|
| 236 | + 'calendar' => $this->generateLegacyCalendarParameter((int)$event->getObjectId(), $parameters[1]), |
|
| 237 | + ]; |
|
| 238 | + case self::SUBJECT_SHARE_USER . '_you': |
|
| 239 | + case self::SUBJECT_UNSHARE_USER . '_you': |
|
| 240 | + return [ |
|
| 241 | + 'user' => $this->generateUserParameter($parameters[0]), |
|
| 242 | + 'calendar' => $this->generateLegacyCalendarParameter((int)$event->getObjectId(), $parameters[1]), |
|
| 243 | + ]; |
|
| 244 | + case self::SUBJECT_SHARE_USER . '_by': |
|
| 245 | + case self::SUBJECT_UNSHARE_USER . '_by': |
|
| 246 | + return [ |
|
| 247 | + 'user' => $this->generateUserParameter($parameters[0]), |
|
| 248 | + 'calendar' => $this->generateLegacyCalendarParameter((int)$event->getObjectId(), $parameters[1]), |
|
| 249 | + 'actor' => $this->generateUserParameter($parameters[2]), |
|
| 250 | + ]; |
|
| 251 | + case self::SUBJECT_SHARE_GROUP . '_you': |
|
| 252 | + case self::SUBJECT_UNSHARE_GROUP . '_you': |
|
| 253 | + return [ |
|
| 254 | + 'group' => $this->generateGroupParameter($parameters[0]), |
|
| 255 | + 'calendar' => $this->generateLegacyCalendarParameter((int)$event->getObjectId(), $parameters[1]), |
|
| 256 | + ]; |
|
| 257 | + case self::SUBJECT_SHARE_GROUP . '_by': |
|
| 258 | + case self::SUBJECT_UNSHARE_GROUP . '_by': |
|
| 259 | + return [ |
|
| 260 | + 'group' => $this->generateGroupParameter($parameters[0]), |
|
| 261 | + 'calendar' => $this->generateLegacyCalendarParameter((int)$event->getObjectId(), $parameters[1]), |
|
| 262 | + 'actor' => $this->generateUserParameter($parameters[2]), |
|
| 263 | + ]; |
|
| 264 | + } |
|
| 265 | 265 | |
| 266 | - throw new \InvalidArgumentException(); |
|
| 267 | - } |
|
| 266 | + throw new \InvalidArgumentException(); |
|
| 267 | + } |
|
| 268 | 268 | } |
@@ -98,44 +98,44 @@ discard block |
||
| 98 | 98 | |
| 99 | 99 | if ($event->getSubject() === self::SUBJECT_ADD) { |
| 100 | 100 | $subject = $this->l->t('{actor} created calendar {calendar}'); |
| 101 | - } else if ($event->getSubject() === self::SUBJECT_ADD . '_self') { |
|
| 101 | + } else if ($event->getSubject() === self::SUBJECT_ADD.'_self') { |
|
| 102 | 102 | $subject = $this->l->t('You created calendar {calendar}'); |
| 103 | 103 | } else if ($event->getSubject() === self::SUBJECT_DELETE) { |
| 104 | 104 | $subject = $this->l->t('{actor} deleted calendar {calendar}'); |
| 105 | - } else if ($event->getSubject() === self::SUBJECT_DELETE . '_self') { |
|
| 105 | + } else if ($event->getSubject() === self::SUBJECT_DELETE.'_self') { |
|
| 106 | 106 | $subject = $this->l->t('You deleted calendar {calendar}'); |
| 107 | 107 | } else if ($event->getSubject() === self::SUBJECT_UPDATE) { |
| 108 | 108 | $subject = $this->l->t('{actor} updated calendar {calendar}'); |
| 109 | - } else if ($event->getSubject() === self::SUBJECT_UPDATE . '_self') { |
|
| 109 | + } else if ($event->getSubject() === self::SUBJECT_UPDATE.'_self') { |
|
| 110 | 110 | $subject = $this->l->t('You updated calendar {calendar}'); |
| 111 | 111 | |
| 112 | - } else if ($event->getSubject() === self::SUBJECT_PUBLISH . '_self') { |
|
| 112 | + } else if ($event->getSubject() === self::SUBJECT_PUBLISH.'_self') { |
|
| 113 | 113 | $subject = $this->l->t('You shared calendar {calendar} as public link'); |
| 114 | - } else if ($event->getSubject() === self::SUBJECT_UNPUBLISH . '_self') { |
|
| 114 | + } else if ($event->getSubject() === self::SUBJECT_UNPUBLISH.'_self') { |
|
| 115 | 115 | $subject = $this->l->t('You removed public link for calendar {calendar}'); |
| 116 | 116 | |
| 117 | 117 | } else if ($event->getSubject() === self::SUBJECT_SHARE_USER) { |
| 118 | 118 | $subject = $this->l->t('{actor} shared calendar {calendar} with you'); |
| 119 | - } else if ($event->getSubject() === self::SUBJECT_SHARE_USER . '_you') { |
|
| 119 | + } else if ($event->getSubject() === self::SUBJECT_SHARE_USER.'_you') { |
|
| 120 | 120 | $subject = $this->l->t('You shared calendar {calendar} with {user}'); |
| 121 | - } else if ($event->getSubject() === self::SUBJECT_SHARE_USER . '_by') { |
|
| 121 | + } else if ($event->getSubject() === self::SUBJECT_SHARE_USER.'_by') { |
|
| 122 | 122 | $subject = $this->l->t('{actor} shared calendar {calendar} with {user}'); |
| 123 | 123 | } else if ($event->getSubject() === self::SUBJECT_UNSHARE_USER) { |
| 124 | 124 | $subject = $this->l->t('{actor} unshared calendar {calendar} from you'); |
| 125 | - } else if ($event->getSubject() === self::SUBJECT_UNSHARE_USER . '_you') { |
|
| 125 | + } else if ($event->getSubject() === self::SUBJECT_UNSHARE_USER.'_you') { |
|
| 126 | 126 | $subject = $this->l->t('You unshared calendar {calendar} from {user}'); |
| 127 | - } else if ($event->getSubject() === self::SUBJECT_UNSHARE_USER . '_by') { |
|
| 127 | + } else if ($event->getSubject() === self::SUBJECT_UNSHARE_USER.'_by') { |
|
| 128 | 128 | $subject = $this->l->t('{actor} unshared calendar {calendar} from {user}'); |
| 129 | - } else if ($event->getSubject() === self::SUBJECT_UNSHARE_USER . '_self') { |
|
| 129 | + } else if ($event->getSubject() === self::SUBJECT_UNSHARE_USER.'_self') { |
|
| 130 | 130 | $subject = $this->l->t('{actor} unshared calendar {calendar} from themselves'); |
| 131 | 131 | |
| 132 | - } else if ($event->getSubject() === self::SUBJECT_SHARE_GROUP . '_you') { |
|
| 132 | + } else if ($event->getSubject() === self::SUBJECT_SHARE_GROUP.'_you') { |
|
| 133 | 133 | $subject = $this->l->t('You shared calendar {calendar} with group {group}'); |
| 134 | - } else if ($event->getSubject() === self::SUBJECT_SHARE_GROUP . '_by') { |
|
| 134 | + } else if ($event->getSubject() === self::SUBJECT_SHARE_GROUP.'_by') { |
|
| 135 | 135 | $subject = $this->l->t('{actor} shared calendar {calendar} with group {group}'); |
| 136 | - } else if ($event->getSubject() === self::SUBJECT_UNSHARE_GROUP . '_you') { |
|
| 136 | + } else if ($event->getSubject() === self::SUBJECT_UNSHARE_GROUP.'_you') { |
|
| 137 | 137 | $subject = $this->l->t('You unshared calendar {calendar} from group {group}'); |
| 138 | - } else if ($event->getSubject() === self::SUBJECT_UNSHARE_GROUP . '_by') { |
|
| 138 | + } else if ($event->getSubject() === self::SUBJECT_UNSHARE_GROUP.'_by') { |
|
| 139 | 139 | $subject = $this->l->t('{actor} unshared calendar {calendar} from group {group}'); |
| 140 | 140 | } else { |
| 141 | 141 | throw new \InvalidArgumentException(); |
@@ -171,41 +171,41 @@ discard block |
||
| 171 | 171 | if (isset($parameters['calendar'])) { |
| 172 | 172 | switch ($subject) { |
| 173 | 173 | case self::SUBJECT_ADD: |
| 174 | - case self::SUBJECT_ADD . '_self': |
|
| 174 | + case self::SUBJECT_ADD.'_self': |
|
| 175 | 175 | case self::SUBJECT_DELETE: |
| 176 | - case self::SUBJECT_DELETE . '_self': |
|
| 176 | + case self::SUBJECT_DELETE.'_self': |
|
| 177 | 177 | case self::SUBJECT_UPDATE: |
| 178 | - case self::SUBJECT_UPDATE . '_self': |
|
| 179 | - case self::SUBJECT_PUBLISH . '_self': |
|
| 180 | - case self::SUBJECT_UNPUBLISH . '_self': |
|
| 178 | + case self::SUBJECT_UPDATE.'_self': |
|
| 179 | + case self::SUBJECT_PUBLISH.'_self': |
|
| 180 | + case self::SUBJECT_UNPUBLISH.'_self': |
|
| 181 | 181 | case self::SUBJECT_SHARE_USER: |
| 182 | 182 | case self::SUBJECT_UNSHARE_USER: |
| 183 | - case self::SUBJECT_UNSHARE_USER . '_self': |
|
| 183 | + case self::SUBJECT_UNSHARE_USER.'_self': |
|
| 184 | 184 | return [ |
| 185 | 185 | 'actor' => $this->generateUserParameter($parameters['actor']), |
| 186 | 186 | 'calendar' => $this->generateCalendarParameter($parameters['calendar'], $this->l), |
| 187 | 187 | ]; |
| 188 | - case self::SUBJECT_SHARE_USER . '_you': |
|
| 189 | - case self::SUBJECT_UNSHARE_USER . '_you': |
|
| 188 | + case self::SUBJECT_SHARE_USER.'_you': |
|
| 189 | + case self::SUBJECT_UNSHARE_USER.'_you': |
|
| 190 | 190 | return [ |
| 191 | 191 | 'calendar' => $this->generateCalendarParameter($parameters['calendar'], $this->l), |
| 192 | 192 | 'user' => $this->generateUserParameter($parameters['user']), |
| 193 | 193 | ]; |
| 194 | - case self::SUBJECT_SHARE_USER . '_by': |
|
| 195 | - case self::SUBJECT_UNSHARE_USER . '_by': |
|
| 194 | + case self::SUBJECT_SHARE_USER.'_by': |
|
| 195 | + case self::SUBJECT_UNSHARE_USER.'_by': |
|
| 196 | 196 | return [ |
| 197 | 197 | 'actor' => $this->generateUserParameter($parameters['actor']), |
| 198 | 198 | 'calendar' => $this->generateCalendarParameter($parameters['calendar'], $this->l), |
| 199 | 199 | 'user' => $this->generateUserParameter($parameters['user']), |
| 200 | 200 | ]; |
| 201 | - case self::SUBJECT_SHARE_GROUP . '_you': |
|
| 202 | - case self::SUBJECT_UNSHARE_GROUP . '_you': |
|
| 201 | + case self::SUBJECT_SHARE_GROUP.'_you': |
|
| 202 | + case self::SUBJECT_UNSHARE_GROUP.'_you': |
|
| 203 | 203 | return [ |
| 204 | 204 | 'calendar' => $this->generateCalendarParameter($parameters['calendar'], $this->l), |
| 205 | 205 | 'group' => $this->generateGroupParameter($parameters['group']), |
| 206 | 206 | ]; |
| 207 | - case self::SUBJECT_SHARE_GROUP . '_by': |
|
| 208 | - case self::SUBJECT_UNSHARE_GROUP . '_by': |
|
| 207 | + case self::SUBJECT_SHARE_GROUP.'_by': |
|
| 208 | + case self::SUBJECT_UNSHARE_GROUP.'_by': |
|
| 209 | 209 | return [ |
| 210 | 210 | 'actor' => $this->generateUserParameter($parameters['actor']), |
| 211 | 211 | 'calendar' => $this->generateCalendarParameter($parameters['calendar'], $this->l), |
@@ -221,44 +221,44 @@ discard block |
||
| 221 | 221 | // they will get the dead entries in their stream. |
| 222 | 222 | switch ($subject) { |
| 223 | 223 | case self::SUBJECT_ADD: |
| 224 | - case self::SUBJECT_ADD . '_self': |
|
| 224 | + case self::SUBJECT_ADD.'_self': |
|
| 225 | 225 | case self::SUBJECT_DELETE: |
| 226 | - case self::SUBJECT_DELETE . '_self': |
|
| 226 | + case self::SUBJECT_DELETE.'_self': |
|
| 227 | 227 | case self::SUBJECT_UPDATE: |
| 228 | - case self::SUBJECT_UPDATE . '_self': |
|
| 229 | - case self::SUBJECT_PUBLISH . '_self': |
|
| 230 | - case self::SUBJECT_UNPUBLISH . '_self': |
|
| 228 | + case self::SUBJECT_UPDATE.'_self': |
|
| 229 | + case self::SUBJECT_PUBLISH.'_self': |
|
| 230 | + case self::SUBJECT_UNPUBLISH.'_self': |
|
| 231 | 231 | case self::SUBJECT_SHARE_USER: |
| 232 | 232 | case self::SUBJECT_UNSHARE_USER: |
| 233 | - case self::SUBJECT_UNSHARE_USER . '_self': |
|
| 233 | + case self::SUBJECT_UNSHARE_USER.'_self': |
|
| 234 | 234 | return [ |
| 235 | 235 | 'actor' => $this->generateUserParameter($parameters[0]), |
| 236 | - 'calendar' => $this->generateLegacyCalendarParameter((int)$event->getObjectId(), $parameters[1]), |
|
| 236 | + 'calendar' => $this->generateLegacyCalendarParameter((int) $event->getObjectId(), $parameters[1]), |
|
| 237 | 237 | ]; |
| 238 | - case self::SUBJECT_SHARE_USER . '_you': |
|
| 239 | - case self::SUBJECT_UNSHARE_USER . '_you': |
|
| 238 | + case self::SUBJECT_SHARE_USER.'_you': |
|
| 239 | + case self::SUBJECT_UNSHARE_USER.'_you': |
|
| 240 | 240 | return [ |
| 241 | 241 | 'user' => $this->generateUserParameter($parameters[0]), |
| 242 | - 'calendar' => $this->generateLegacyCalendarParameter((int)$event->getObjectId(), $parameters[1]), |
|
| 242 | + 'calendar' => $this->generateLegacyCalendarParameter((int) $event->getObjectId(), $parameters[1]), |
|
| 243 | 243 | ]; |
| 244 | - case self::SUBJECT_SHARE_USER . '_by': |
|
| 245 | - case self::SUBJECT_UNSHARE_USER . '_by': |
|
| 244 | + case self::SUBJECT_SHARE_USER.'_by': |
|
| 245 | + case self::SUBJECT_UNSHARE_USER.'_by': |
|
| 246 | 246 | return [ |
| 247 | 247 | 'user' => $this->generateUserParameter($parameters[0]), |
| 248 | - 'calendar' => $this->generateLegacyCalendarParameter((int)$event->getObjectId(), $parameters[1]), |
|
| 248 | + 'calendar' => $this->generateLegacyCalendarParameter((int) $event->getObjectId(), $parameters[1]), |
|
| 249 | 249 | 'actor' => $this->generateUserParameter($parameters[2]), |
| 250 | 250 | ]; |
| 251 | - case self::SUBJECT_SHARE_GROUP . '_you': |
|
| 252 | - case self::SUBJECT_UNSHARE_GROUP . '_you': |
|
| 251 | + case self::SUBJECT_SHARE_GROUP.'_you': |
|
| 252 | + case self::SUBJECT_UNSHARE_GROUP.'_you': |
|
| 253 | 253 | return [ |
| 254 | 254 | 'group' => $this->generateGroupParameter($parameters[0]), |
| 255 | - 'calendar' => $this->generateLegacyCalendarParameter((int)$event->getObjectId(), $parameters[1]), |
|
| 255 | + 'calendar' => $this->generateLegacyCalendarParameter((int) $event->getObjectId(), $parameters[1]), |
|
| 256 | 256 | ]; |
| 257 | - case self::SUBJECT_SHARE_GROUP . '_by': |
|
| 258 | - case self::SUBJECT_UNSHARE_GROUP . '_by': |
|
| 257 | + case self::SUBJECT_SHARE_GROUP.'_by': |
|
| 258 | + case self::SUBJECT_UNSHARE_GROUP.'_by': |
|
| 259 | 259 | return [ |
| 260 | 260 | 'group' => $this->generateGroupParameter($parameters[0]), |
| 261 | - 'calendar' => $this->generateLegacyCalendarParameter((int)$event->getObjectId(), $parameters[1]), |
|
| 261 | + 'calendar' => $this->generateLegacyCalendarParameter((int) $event->getObjectId(), $parameters[1]), |
|
| 262 | 262 | 'actor' => $this->generateUserParameter($parameters[2]), |
| 263 | 263 | ]; |
| 264 | 264 | } |
