Skip to content

Commit

Permalink
Merge pull request #25935 from nextcloud/backport/25926/stable21
Browse files Browse the repository at this point in the history
[stable21] Activity: show if files are hidden or not
  • Loading branch information
rullzer authored Mar 5, 2021
2 parents 3aba094 + 5e2a9de commit d81954f
Showing 1 changed file with 38 additions and 2 deletions.
40 changes: 38 additions & 2 deletions apps/files/lib/Activity/Provider.php
Original file line number Diff line number Diff line change
Expand Up @@ -230,10 +230,42 @@ public function parseLongVersion(IEvent $event, IEvent $previousEvent = null) {
$subject = $this->l->t('{user} restored {file}');
$this->setIcon($event, 'actions/history', 'core');
} elseif ($event->getSubject() === 'renamed_self') {
$subject = $this->l->t('You renamed {oldfile} to {newfile}');
$oldFileName = $parsedParameters['oldfile']['name'];
$newFileName = $parsedParameters['newfile']['name'];

if ($this->isHiddenFile($oldFileName)) {
if ($this->isHiddenFile($newFileName)) {
$subject = $this->l->t('You renamed {oldfile} (hidden) to {newfile} (hidden)');
} else {
$subject = $this->l->t('You renamed {oldfile} (hidden) to {newfile}');
}
} else {
if ($this->isHiddenFile($newFileName)) {
$subject = $this->l->t('You renamed {oldfile} to {newfile} (hidden)');
} else {
$subject = $this->l->t('You renamed {oldfile} to {newfile}');
}
}

$this->setIcon($event, 'change');
} elseif ($event->getSubject() === 'renamed_by') {
$subject = $this->l->t('{user} renamed {oldfile} to {newfile}');
$oldFileName = $parsedParameters['oldfile']['name'];
$newFileName = $parsedParameters['newfile']['name'];

if ($this->isHiddenFile($oldFileName)) {
if ($this->isHiddenFile($newFileName)) {
$subject = $this->l->t('{user} renamed {oldfile} (hidden) to {newfile} (hidden)');
} else {
$subject = $this->l->t('{user} renamed {oldfile} (hidden) to {newfile}');
}
} else {
if ($this->isHiddenFile($newFileName)) {
$subject = $this->l->t('{user} renamed {oldfile} to {newfile} (hidden)');
} else {
$subject = $this->l->t('{user} renamed {oldfile} to {newfile}');
}
}

$this->setIcon($event, 'change');
} elseif ($event->getSubject() === 'moved_self') {
$subject = $this->l->t('You moved {oldfile} to {newfile}');
Expand Down Expand Up @@ -270,6 +302,10 @@ public function parseLongVersion(IEvent $event, IEvent $previousEvent = null) {
return $event;
}

private function isHiddenFile(string $filename): bool {
return strlen($filename) > 0 && $filename[0] === '.';
}

protected function setSubjects(IEvent $event, $subject, array $parameters) {
$placeholders = $replacements = [];
foreach ($parameters as $placeholder => $parameter) {
Expand Down

0 comments on commit d81954f

Please sign in to comment.