Skip to content

Commit 9da935c

Browse files
authored
Merge pull request #25926 from nextcloud/enh/activity/hidden_files
Activity: show if files are hidden or not
2 parents 7b73588 + 997259d commit 9da935c

1 file changed

Lines changed: 38 additions & 2 deletions

File tree

apps/files/lib/Activity/Provider.php

Lines changed: 38 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -230,10 +230,42 @@ public function parseLongVersion(IEvent $event, IEvent $previousEvent = null) {
230230
$subject = $this->l->t('{user} restored {file}');
231231
$this->setIcon($event, 'actions/history', 'core');
232232
} elseif ($event->getSubject() === 'renamed_self') {
233-
$subject = $this->l->t('You renamed {oldfile} to {newfile}');
233+
$oldFileName = $parsedParameters['oldfile']['name'];
234+
$newFileName = $parsedParameters['newfile']['name'];
235+
236+
if ($this->isHiddenFile($oldFileName)) {
237+
if ($this->isHiddenFile($newFileName)) {
238+
$subject = $this->l->t('You renamed {oldfile} (hidden) to {newfile} (hidden)');
239+
} else {
240+
$subject = $this->l->t('You renamed {oldfile} (hidden) to {newfile}');
241+
}
242+
} else {
243+
if ($this->isHiddenFile($newFileName)) {
244+
$subject = $this->l->t('You renamed {oldfile} to {newfile} (hidden)');
245+
} else {
246+
$subject = $this->l->t('You renamed {oldfile} to {newfile}');
247+
}
248+
}
249+
234250
$this->setIcon($event, 'change');
235251
} elseif ($event->getSubject() === 'renamed_by') {
236-
$subject = $this->l->t('{user} renamed {oldfile} to {newfile}');
252+
$oldFileName = $parsedParameters['oldfile']['name'];
253+
$newFileName = $parsedParameters['newfile']['name'];
254+
255+
if ($this->isHiddenFile($oldFileName)) {
256+
if ($this->isHiddenFile($newFileName)) {
257+
$subject = $this->l->t('{user} renamed {oldfile} (hidden) to {newfile} (hidden)');
258+
} else {
259+
$subject = $this->l->t('{user} renamed {oldfile} (hidden) to {newfile}');
260+
}
261+
} else {
262+
if ($this->isHiddenFile($newFileName)) {
263+
$subject = $this->l->t('{user} renamed {oldfile} to {newfile} (hidden)');
264+
} else {
265+
$subject = $this->l->t('{user} renamed {oldfile} to {newfile}');
266+
}
267+
}
268+
237269
$this->setIcon($event, 'change');
238270
} elseif ($event->getSubject() === 'moved_self') {
239271
$subject = $this->l->t('You moved {oldfile} to {newfile}');
@@ -270,6 +302,10 @@ public function parseLongVersion(IEvent $event, IEvent $previousEvent = null) {
270302
return $event;
271303
}
272304

305+
private function isHiddenFile(string $filename): bool {
306+
return strlen($filename) > 0 && $filename[0] === '.';
307+
}
308+
273309
protected function setSubjects(IEvent $event, $subject, array $parameters) {
274310
$placeholders = $replacements = [];
275311
foreach ($parameters as $placeholder => $parameter) {

0 commit comments

Comments
 (0)