Skip to content

[stable15] Parse activity when a user self-unshares a file #12756

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MorrisJobke merged 1 commit into from
Nov 30, 2018
Merged

[stable15] Parse activity when a user self-unshares a file #12756

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Parse activity when a user self-unshares a file 
Signed-off-by: Joas Schilling <[email protected]>
  • Loading branch information
@nickvergessen
nickvergessen authored and Backportbot committed Nov 30, 2018
commit 9a1d936bbfe353bb8e64f1b7a27a52df99ddcbfa
12 changes: 12 additions & 0 deletions apps/files_sharing/lib/Activity/Providers/Users.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -49,6 +51,10 @@ public function parseShortVersion(IEvent $event) {
$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) {
Expand Down Expand Up @@ -85,6 +91,10 @@ public function parseLongVersion(IEvent $event) {
$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) {
Expand Down Expand Up @@ -121,6 +131,8 @@ protected function getParsedParameters(IEvent $event) {
];
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]),
Expand Down