Skip to content

feat(rss): add filter to rss feed, allowing share only feed #2445

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
miaulalala merged 2 commits into from
Sep 15, 2026
Merged

feat(rss): add filter to rss feed, allowing share only feed #2445

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
49946f6
feat(rss): add filter to rss feed, allowing share only feed
miaulalala Mar 10, 2026
2da0686
chore: Type method validateFilter and mock it properly
come-nc Sep 15, 2026
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
5 changes: 3 additions & 2 deletions lib/Controller/FeedController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ public function __construct(
#[PublicPage]
#[NoCSRFRequired]
#[BruteForceProtection('activityRssFeed')]
public function show(): TemplateResponse {
public function show(string $filter = 'all'): TemplateResponse {
$response = new TemplateResponse('activity', 'rss', [], '');
try {
$user = $this->activityManager->getCurrentUserId();
Expand All @@ -57,8 +57,9 @@ public function show(): TemplateResponse {
$this->l = $this->l10nFactory->get('activity', $userLang);
$this->helper->setL10n($this->l);

$filter = $this->data->validateFilter($filter);
$description = $this->l->t('Personal activity feed for %s', $user);
$data = $this->data->get($this->helper, $this->settings, $user, 0, self::DEFAULT_PAGE_SIZE, 'desc', 'all');
$data = $this->data->get($this->helper, $this->settings, $user, 0, self::DEFAULT_PAGE_SIZE, 'desc', $filter);
$activities = $data['data'];
} catch (\UnexpectedValueException $e) {
$this->l = $this->l10nFactory->get('activity');
Expand Down
9 changes: 1 addition & 8 deletions lib/Data.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -615,15 +615,8 @@ public function countDownloads(string $user, int $objectId, ?int $since = null):

/**
* Verify that the filter is valid
*
* @param string $filterValue
* @return string
*/
public function validateFilter($filterValue) {
if (!isset($filterValue)) {
return 'all';
}

public function validateFilter(string $filterValue): string {
switch ($filterValue) {
case 'filter':
return $filterValue;
Expand Down
51 changes: 51 additions & 0 deletions tests/Controller/FeedControllerTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,9 @@ public function testShow(?string $acceptHeader, string $expectedHeader): void {
$this->data
->method('get')
->willReturn(['data' => []]);
$this->data
->method('validateFilter')
->willReturn('all');
if ($acceptHeader !== null) {
$this->request
->method('getHeader')
Expand Down Expand Up @@ -143,6 +146,54 @@ public function testShowNoToken(?string $acceptHeader, string $expectedHeader):
$this->assertStringContainsString($description, $renderedResponse);
}

public function testShowWithFilter(): void {
$this->mockUserSession('test');
$this->data
->method('validateFilter')
->with('files')
->willReturn('files');
$this->data
->expects($this->once())
->method('get')
->with($this->helper, $this->userSettings, 'test', 0, FeedController::DEFAULT_PAGE_SIZE, 'desc', 'files')
->willReturn(['data' => []]);

$templateResponse = $this->controller->show('files');
$this->assertInstanceOf(TemplateResponse::class, $templateResponse);
}

public function testShowWithInvalidFilter(): void {
$this->mockUserSession('test');
$this->data
->method('validateFilter')
->with('invalid_filter')
->willReturn('all');
$this->data
->expects($this->once())
->method('get')
->with($this->helper, $this->userSettings, 'test', 0, FeedController::DEFAULT_PAGE_SIZE, 'desc', 'all')
->willReturn(['data' => []]);

$templateResponse = $this->controller->show('invalid_filter');
$this->assertInstanceOf(TemplateResponse::class, $templateResponse);
}

public function testShowDefaultsToAllFilter(): void {
$this->mockUserSession('test');
$this->data
->method('validateFilter')
->with('all')
->willReturn('all');
$this->data
->expects($this->once())
->method('get')
->with($this->helper, $this->userSettings, 'test', 0, FeedController::DEFAULT_PAGE_SIZE, 'desc', 'all')
->willReturn(['data' => []]);

$templateResponse = $this->controller->show();
$this->assertInstanceOf(TemplateResponse::class, $templateResponse);
}

protected function mockUserSession(string $user): void {
$mockUser = $this->createMock(IUser::class);
$mockUser
Expand Down
Loading