Skip to content

Commit b7019a4

Browse files
authored
Merge pull request #4262 from nextcloud/fix/activities-again
Some Activity fixes
2 parents d1884de + bcd9515 commit b7019a4

File tree

4 files changed

+4
-3
lines changed

4 files changed

+4
-3
lines changed

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ All notable changes to this project will be documented in this file.
77

88
## [unpublished]
99
### Fixed
10+
- Fixed some activity bugs
1011
- Fixed nullish user settings
1112

1213
## [8.4.2] - 2025-08-31

lib/Filter/ActivityFilter.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
use OCA\Polls\Event\OptionEvent;
1414
use OCA\Polls\Event\PollEvent;
1515
use OCA\Polls\Event\ShareEvent;
16+
use OCA\Polls\Event\VoteEvent;
1617
use OCP\IL10N;
1718
use OCP\IURLGenerator;
1819

@@ -49,6 +50,7 @@ class ActivityFilter implements \OCP\Activity\IFilter {
4950
OptionEvent::UNCONFIRM,
5051
OptionEvent::DELETE,
5152
CommentEvent::DELETE,
53+
VoteEvent::SET,
5254
];
5355

5456
public function __construct(

lib/Model/UserBase.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -160,8 +160,6 @@ public function getIsGuest(): bool {
160160
public function getSimpleType(): string {
161161
if (in_array($this->type, [User::TYPE, Admin::TYPE])) {
162162
return self::TYPE_USER;
163-
} elseif ($this->type === Ghost::TYPE) {
164-
return self::TYPE_GHOST;
165163
}
166164

167165
return self::TYPE_GUEST;

src/stores/activity.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ export const useActivityStore = defineStore('activity', {
4141
return state.activities.filter(
4242
(activity: Activity) =>
4343
activity.object_type === 'poll'
44-
&& activity.object_id - sessionStore.currentPollId === 0,
44+
&& activity.object_id === Number(sessionStore.currentPollId),
4545
)
4646
},
4747
},

0 commit comments

Comments
 (0)