usbharu
/
misskey
mirror of https://github.com/misskey-dev/misskey.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix: Productionビルドで通報の即時解決の一覧が見えない問題を修正 (#129)

This commit is contained in:
まっちゃとーにゅ 2023-07-30 03:35:16 +09:00 committed by GitHub
parent d08ea708fe
commit 99232ed417
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/backend/src/queue/processors/ReportAbuseProcessorService.ts
View File

@ -71,14 +71,14 @@ export class ReportAbuseProcessorService {
const isReportContentPatternMatched = resolver.reportContentPattern ? new RE2(resolver.reportContentPattern).test(job.data.comment) : true; const isReportContentPatternMatched = resolver.reportContentPattern ? new RE2(resolver.reportContentPattern).test(job.data.comment) : true;
if (isTargetUserPatternMatched && isReporterPatternMatched && isReportContentPatternMatched) { if (isTargetUserPatternMatched && isReporterPatternMatched && isReportContentPatternMatched) {
if (resolver.forward && job.data.targetUserHost !== null) { if (resolver.forward && job.data.targetUserHost !== null && job.data.reporterHost === null) {
this.queueService.deliver(actor, this.apRendererService.addContext(this.apRendererService.renderFlag(actor, targetUser.uri!, job.data.comment)), targetUser.inbox, false); this.queueService.deliver(actor, this.apRendererService.addContext(this.apRendererService.renderFlag(actor, targetUser.uri!, job.data.comment)), targetUser.inbox, false);
} }
await this.abuseUserReportsRepository.update(job.data.id, { await this.abuseUserReportsRepository.update(job.data.id, {
resolved: true, resolved: true,
assigneeId: actor.id, assigneeId: actor.id,
forwarded: resolver.forward && job.data.targetUserHost !== null, forwarded: resolver.forward && job.data.targetUserHost !== null && job.data.reporterHost === null,
}); });
return; return;

2
packages/frontend/src/pages/admin/abuses.vue
View File

@ -57,7 +57,7 @@
<MkAbuseReportResolver v-model="editingResolver" :data="(resolver as any)" :editable="editableResolver === resolver.id"> <MkAbuseReportResolver v-model="editingResolver" :data="(resolver as any)" :editable="editableResolver === resolver.id">
<template #button> <template #button>
<div v-if="editableResolver !== resolver.id"> <div v-if="editableResolver !== resolver.id">
<MkButton primary inline :class="$style['button-margin']" @click="edit(resolver.id)"><i class="ti ti-pencil"></i> {{ i18n.ts.edit }}</MkButton> <MkButton primary inline :class="$style.button-margin" @click="edit(resolver.id)"><i class="ti ti-pencil"></i> {{ i18n.ts.edit }}</MkButton>
<MkButton danger inline @click="deleteResolver(resolver.id)"><i class="ti ti-trash"></i> {{ i18n.ts.remove }}</MkButton> <MkButton danger inline @click="deleteResolver(resolver.id)"><i class="ti ti-trash"></i> {{ i18n.ts.remove }}</MkButton>
</div> </div>
<div v-else> <div v-else>