Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions appinfo/info.xml
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@
<activity>
<filters>
<filter>OCA\Activity\Filter\AllFilter</filter>
<filter>OCA\Activity\Filter\FocusedFilter</filter>
<filter>OCA\Activity\Filter\SelfFilter</filter>
<filter>OCA\Activity\Filter\ByFilter</filter>
</filters>
Expand Down
32 changes: 31 additions & 1 deletion lib/Data.php
Original file line number Diff line number Diff line change
Expand Up @@ -284,7 +284,7 @@

$query = $this->connection->getQueryBuilder();
$query->select('*')
->from('activity');
->from('activity', 'a');

$query->where($query->expr()->eq('affecteduser', $query->createNamedParameter($user)));

Expand All @@ -303,6 +303,36 @@
} elseif ($filter === 'filter') {
$query->andWhere($query->expr()->eq('object_type', $query->createNamedParameter($objectType)));
$query->andWhere($query->expr()->eq('object_id', $query->createNamedParameter($objectId)));
} elseif ($filter === 'focused') {
// Only activity related to files owned by the user
$query->leftJoin('a', 'filecache', 'f',
$query->expr()->andX(
$query->expr()->eq('a.object_type', $query->createNamedParameter('files')),
$query->expr()->eq('a.object_id', 'f.fileid'),
));
$query->leftJoin('f', 'mounts', 'm',
$query->expr()->andX(
$query->expr()->eq('a.object_type', $query->createNamedParameter('files')),
$query->expr()->eq('f.storage', 'm.storage_id'),
));
// Filter out our own activity
$query->andWhere($query->expr()->neq('user', $query->createNamedParameter($user)));
$conditions = [
// Affected object is one of our files
$query->expr()->eq('m.mount_point', $query->createNamedParameter('/'.$user.'/')),
// There is no affected object, so the activity affects our user directly
$query->expr()->eq('object_type', $query->createNamedParameter('')),
// Show all sharing related events
$query->expr()->eq('app', $query->createNamedParameter('files_sharing')),
];
$activityFocusedSelectors = $this->activityManager->getActivityFocusedSelectors();

Check failure on line 328 in lib/Data.php

View workflow job for this annotation

GitHub Actions / static-psalm-analysis

UndefinedInterfaceMethod

lib/Data.php:328:56: UndefinedInterfaceMethod: Method OCP\Activity\IManager::getActivityFocusedSelectors does not exist (see https://psalm.dev/181)
foreach ($activityFocusedSelectors as $activityFocusedSelector) {
array_push(
$conditions,
...$activityFocusedSelector->extendQuery($query, $user)
);
}
$query->andWhere($query->expr()->orX(...$conditions));
}

if ($activeFilter instanceof IFilter) {
Expand Down
59 changes: 59 additions & 0 deletions lib/Filter/FocusedFilter.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
<?php

declare(strict_types=1);

/**
* SPDX-FileCopyrightText: 2016 Nextcloud GmbH and Nextcloud contributors
* SPDX-License-Identifier: AGPL-3.0-or-later
*/

namespace OCA\Activity\Filter;

use OCP\Activity\IFilter;
use OCP\IL10N;
use OCP\IURLGenerator;

class FocusedFilter implements IFilter {
public function __construct(

Check failure on line 17 in lib/Filter/FocusedFilter.php

View workflow job for this annotation

GitHub Actions / static-psalm-analysis

MissingPureAnnotation

lib/Filter/FocusedFilter.php:17:18: MissingPureAnnotation: __construct must be marked @psalm-mutation-free to aid security analysis, run with --alter --issues=MissingPureAnnotation to fix this (see https://psalm.dev/363)
protected IL10N $l,
protected IURLGenerator $url
) {
}

#[\Override]
public function getIdentifier(): string {

Check failure on line 24 in lib/Filter/FocusedFilter.php

View workflow job for this annotation

GitHub Actions / static-psalm-analysis

MissingPureAnnotation

lib/Filter/FocusedFilter.php:24:18: MissingPureAnnotation: getIdentifier must be marked @psalm-pure to aid security analysis, run with --alter --issues=MissingPureAnnotation to fix this (see https://psalm.dev/363)
return 'focused';
}

#[\Override]
public function getName(): string {
return $this->l->t('Focused');
}

#[\Override]
public function getPriority(): int {

Check failure on line 34 in lib/Filter/FocusedFilter.php

View workflow job for this annotation

GitHub Actions / static-psalm-analysis

MissingPureAnnotation

lib/Filter/FocusedFilter.php:34:18: MissingPureAnnotation: getPriority must be marked @psalm-pure to aid security analysis, run with --alter --issues=MissingPureAnnotation to fix this (see https://psalm.dev/363)
return 1;
}

#[\Override]
public function getIcon(): string {
return $this->url->getAbsoluteURL($this->url->imagePath('activity', 'activity-dark.svg'));
}

/**
* @param string[] $types
* @return string[] An array of allowed apps from which activities should be displayed
*/
#[\Override]
public function filterTypes(array $types): array {

Check failure on line 48 in lib/Filter/FocusedFilter.php

View workflow job for this annotation

GitHub Actions / static-psalm-analysis

MissingPureAnnotation

lib/Filter/FocusedFilter.php:48:18: MissingPureAnnotation: filterTypes must be marked @psalm-pure to aid security analysis, run with --alter --issues=MissingPureAnnotation to fix this (see https://psalm.dev/363)
return $types;
}

/**
* @return string[] An array of allowed apps from which activities should be displayed
*/
#[\Override]
public function allowedApps(): array {

Check failure on line 56 in lib/Filter/FocusedFilter.php

View workflow job for this annotation

GitHub Actions / static-psalm-analysis

MissingPureAnnotation

lib/Filter/FocusedFilter.php:56:18: MissingPureAnnotation: allowedApps must be marked @psalm-pure to aid security analysis, run with --alter --issues=MissingPureAnnotation to fix this (see https://psalm.dev/363)
return [];
}
}
Loading