merge file activity settings into a single 'favorite changed' item #481
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
icewind1991
force-pushed
the
activity-settings-cleanup
branch
2 times, most recently
from
80101e0 to
7a7cdf6
Compare
Signed-off-by: Robin Appelman <robin@icewind.nl>
icewind1991
force-pushed
the
activity-settings-cleanup
branch
from
7a7cdf6 to
a4e15e2
Compare
rullzer
approved these changes
Aug 13, 2020
Comment on lines
155
to
+177
| if ($this->currentUser->getUserIdentifier() !== '') { | ||
| $this->addNotificationsForFileAction($path, Files::TYPE_SHARE_CREATED, 'created_self', 'created_by'); | ||
| $this->addNotificationsForFileAction($path, 'created_self', 'created_by'); | ||
| } else { | ||
| $this->addNotificationsForFileAction($path, Files::TYPE_SHARE_CREATED, '', 'created_public'); | ||
| $this->addNotificationsForFileAction($path, '', 'created_public'); | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * Store the update hook events | ||
| * | ||
| * @param string $path Path of the file that has been modified | ||
| */ | ||
| public function fileUpdate($path) { | ||
| $this->addNotificationsForFileAction($path, Files::TYPE_SHARE_CHANGED, 'changed_self', 'changed_by'); | ||
| $this->addNotificationsForFileAction($path, 'changed_self', 'changed_by'); | ||
| } | ||
|
|
||
| /** | ||
| * Store the delete hook events | ||
| * | ||
| * @param string $path Path of the file that has been deleted | ||
| */ | ||
| public function fileDelete($path) { | ||
| $this->addNotificationsForFileAction($path, Files::TYPE_SHARE_DELETED, 'deleted_self', 'deleted_by'); | ||
| $this->addNotificationsForFileAction($path, 'deleted_self', 'deleted_by'); |
Member
There was a problem hiding this comment.
this breaks the non-monochrome activity icon handling across all clients, which is why I had pushed a revert on that in previous PRs.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
see nextcloud/server#22205