Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/server.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2018-11-30 12:23:23 +0300
committerGitHub <noreply@github.com>2018-11-30 12:23:23 +0300
commite15f18b100fb2005ee2e9484a83cc49369e3f6b3 (patch)
tree3c2e71c4b0500e827275a2cf7f1cc9482ead0c26
parent44acc9db88795e2ec20c9e885baecc93016a6192 (diff)
parent9a1d936bbfe353bb8e64f1b7a27a52df99ddcbfa (diff)
Merge pull request #12756 from nextcloud/backport/12628/stable15
[stable15] Parse activity when a user self-unshares a file
-rw-r--r--apps/files_sharing/lib/Activity/Providers/Users.php12
1 files changed, 12 insertions, 0 deletions
diff --git a/apps/files_sharing/lib/Activity/Providers/Users.php b/apps/files_sharing/lib/Activity/Providers/Users.php
index 2de7e23621e..61f169fd092 100644
--- a/apps/files_sharing/lib/Activity/Providers/Users.php
+++ b/apps/files_sharing/lib/Activity/Providers/Users.php
@@ -35,6 +35,8 @@ class Users extends Base {
const SUBJECT_SHARED_WITH_BY = 'shared_with_by';
const SUBJECT_UNSHARED_BY = 'unshared_by';
+ const SUBJECT_SELF_UNSHARED = 'self_unshared';
+ const SUBJECT_SELF_UNSHARED_BY = 'self_unshared_by';
/**
* @param IEvent $event
@@ -49,6 +51,10 @@ class Users extends Base {
$subject = $this->l->t('Shared with {user}');
} else if ($event->getSubject() === self::SUBJECT_UNSHARED_USER_SELF) {
$subject = $this->l->t('Removed share for {user}');
+ } else if ($event->getSubject() === self::SUBJECT_SELF_UNSHARED) {
+ $subject = $this->l->t('You removed yourself');
+ } else if ($event->getSubject() === self::SUBJECT_SELF_UNSHARED_BY) {
+ $subject = $this->l->t('{actor} removed themselves');
} else if ($event->getSubject() === self::SUBJECT_RESHARED_USER_BY) {
$subject = $this->l->t('{actor} shared with {user}');
} else if ($event->getSubject() === self::SUBJECT_UNSHARED_USER_BY) {
@@ -85,6 +91,10 @@ class Users extends Base {
$subject = $this->l->t('You shared {file} with {user}');
} else if ($event->getSubject() === self::SUBJECT_UNSHARED_USER_SELF) {
$subject = $this->l->t('You removed {user} from {file}');
+ } else if ($event->getSubject() === self::SUBJECT_SELF_UNSHARED) {
+ $subject = $this->l->t('You removed yourself from {file}');
+ } else if ($event->getSubject() === self::SUBJECT_SELF_UNSHARED_BY) {
+ $subject = $this->l->t('{actor} removed themselves from {file}');
} else if ($event->getSubject() === self::SUBJECT_RESHARED_USER_BY) {
$subject = $this->l->t('{actor} shared {file} with {user}');
} else if ($event->getSubject() === self::SUBJECT_UNSHARED_USER_BY) {
@@ -121,6 +131,8 @@ class Users extends Base {
];
case self::SUBJECT_SHARED_WITH_BY:
case self::SUBJECT_UNSHARED_BY:
+ case self::SUBJECT_SELF_UNSHARED:
+ case self::SUBJECT_SELF_UNSHARED_BY:
return [
'file' => $this->getFile($parameters[0], $event),
'actor' => $this->getUser($parameters[1]),