Merge commit from fork

* Fix poll update spoofing

* fix: Disallow negative poll counts

---------

Co-authored-by: syuilo <4439005+syuilo@users.noreply.github.com>
(cherry picked from commit b9cb949eb1f8c57eaa98fc5446d902cf8a5ea85c)
This commit is contained in:
Julia 2024-11-20 18:24:50 -05:00 committed by あわわわとーにゅ
parent 85096e58b9
commit f1b5708971
No known key found for this signature in database
GPG key ID: 6AFBBF529601C1DB
3 changed files with 25 additions and 10 deletions

View file

@ -200,7 +200,7 @@ export class InboxProcessorService implements OnApplicationShutdown {
// アクティビティを処理
try {
const result = await this.apInboxService.performActivity(authUser.user, activity, job.data.user?.id);
const result = await this.apInboxService.performActivity(authUser.user, activity, undefined, job.data.user?.id);
if (result && !result.startsWith('ok')) {
this.logger.warn(`inbox activity ignored (maybe): id=${activity.id} reason=${result}`);
return result;