aboutsummaryrefslogtreecommitdiffstats
path: root/apps/files/lib
diff options
context:
space:
mode:
authorRoeland Jago Douma <roeland@famdouma.nl>2021-03-04 13:14:52 +0100
committerRoeland Jago Douma <roeland@famdouma.nl>2021-03-04 13:14:52 +0100
commit997259d1cdd762e0033317b4e92bcf5792a21ab4 (patch)
tree2a51829fb8442b701a8c8148a128be530d640df3 /apps/files/lib
parent3bbacb2f541a513f47e0744ab8a629b936a091d8 (diff)
downloadnextcloud-server-997259d1cdd762e0033317b4e92bcf5792a21ab4.tar.gz
nextcloud-server-997259d1cdd762e0033317b4e92bcf5792a21ab4.zip
Activity: show if files are hidden or not
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
Diffstat (limited to 'apps/files/lib')
-rw-r--r--apps/files/lib/Activity/Provider.php40
1 files changed, 38 insertions, 2 deletions
diff --git a/apps/files/lib/Activity/Provider.php b/apps/files/lib/Activity/Provider.php
index e401fdce09c..53ee48ab550 100644
--- a/apps/files/lib/Activity/Provider.php
+++ b/apps/files/lib/Activity/Provider.php
@@ -230,10 +230,42 @@ class Provider implements IProvider {
$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}');
@@ -270,6 +302,10 @@ class Provider implements IProvider {
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) {