@@ -20,8 +20,10 @@ export class AbuseReportService {
2020 constructor (
2121 @Inject ( DI . abuseUserReportsRepository )
2222 private abuseUserReportsRepository : AbuseUserReportsRepository ,
23+
2324 @Inject ( DI . usersRepository )
2425 private usersRepository : UsersRepository ,
26+
2527 private idService : IdService ,
2628 private abuseReportNotificationService : AbuseReportNotificationService ,
2729 private queueService : QueueService ,
@@ -77,16 +79,16 @@ export class AbuseReportService {
7779 * - SystemWebhook
7880 *
7981 * @param params 通報内容. もし複数件の通報に対応した時のために、あらかじめ複数件を処理できる前提で考える
80- * @param operator 通報を処理したユーザ
82+ * @param moderator 通報を処理したユーザ
8183 * @see AbuseReportNotificationService.notify
8284 */
8385 @bindThis
8486 public async resolve (
8587 params : {
8688 reportId : string ;
87- forward : boolean ;
89+ resolvedAs : MiAbuseUserReport [ 'resolvedAs' ] ;
8890 } [ ] ,
89- operator : MiUser ,
91+ moderator : MiUser ,
9092 ) {
9193 const paramsMap = new Map ( params . map ( it => [ it . reportId , it ] ) ) ;
9294 const reports = await this . abuseUserReportsRepository . findBy ( {
@@ -99,30 +101,74 @@ export class AbuseReportService {
99101
100102 await this . abuseUserReportsRepository . update ( report . id , {
101103 resolved : true ,
102- assigneeId : operator . id ,
103- forwarded : ps . forward && report . targetUserHost !== null ,
104+ assigneeId : moderator . id ,
105+ resolvedAs : ps . resolvedAs ,
104106 } ) ;
105107
106- if ( ps . forward && report . targetUserHost != null ) {
107- const actor = await this . instanceActorService . getInstanceActor ( ) ;
108- const targetUser = await this . usersRepository . findOneByOrFail ( { id : report . targetUserId } ) ;
109-
110- // eslint-disable-next-line
111- const flag = this . apRendererService . renderFlag ( actor , targetUser . uri ! , report . comment ) ;
112- const contextAssignedFlag = this . apRendererService . addContext ( flag ) ;
113- this . queueService . deliver ( actor , contextAssignedFlag , targetUser . inbox , false ) ;
114- }
115-
116108 this . moderationLogService
117- . log ( operator , 'resolveAbuseReport' , {
109+ . log ( moderator , 'resolveAbuseReport' , {
118110 reportId : report . id ,
119111 report : report ,
120- forwarded : ps . forward && report . targetUserHost !== null ,
112+ resolvedAs : ps . resolvedAs ,
121113 } )
122114 . then ( ) ;
123115 }
124116
125117 return this . abuseUserReportsRepository . findBy ( { id : In ( reports . map ( it => it . id ) ) } )
126118 . then ( reports => this . abuseReportNotificationService . notifySystemWebhook ( reports , 'abuseReportResolved' ) ) ;
127119 }
120+
121+ @bindThis
122+ public async forward (
123+ reportId : MiAbuseUserReport [ 'id' ] ,
124+ moderator : MiUser ,
125+ ) {
126+ const report = await this . abuseUserReportsRepository . findOneByOrFail ( { id : reportId } ) ;
127+
128+ if ( report . targetUserHost == null ) {
129+ throw new Error ( 'The target user host is null.' ) ;
130+ }
131+
132+ await this . abuseUserReportsRepository . update ( report . id , {
133+ forwarded : true ,
134+ } ) ;
135+
136+ const actor = await this . instanceActorService . getInstanceActor ( ) ;
137+ const targetUser = await this . usersRepository . findOneByOrFail ( { id : report . targetUserId } ) ;
138+
139+ const flag = this . apRendererService . renderFlag ( actor , targetUser . uri ! , report . comment ) ;
140+ const contextAssignedFlag = this . apRendererService . addContext ( flag ) ;
141+ this . queueService . deliver ( actor , contextAssignedFlag , targetUser . inbox , false ) ;
142+
143+ this . moderationLogService
144+ . log ( moderator , 'forwardAbuseReport' , {
145+ reportId : report . id ,
146+ report : report ,
147+ } )
148+ . then ( ) ;
149+ }
150+
151+ @bindThis
152+ public async update (
153+ reportId : MiAbuseUserReport [ 'id' ] ,
154+ params : {
155+ moderationNote ?: MiAbuseUserReport [ 'moderationNote' ] ;
156+ } ,
157+ moderator : MiUser ,
158+ ) {
159+ const report = await this . abuseUserReportsRepository . findOneByOrFail ( { id : reportId } ) ;
160+
161+ await this . abuseUserReportsRepository . update ( report . id , {
162+ moderationNote : params . moderationNote ,
163+ } ) ;
164+
165+ if ( params . moderationNote != null && report . moderationNote !== params . moderationNote ) {
166+ this . moderationLogService . log ( moderator , 'updateAbuseReportNote' , {
167+ reportId : report . id ,
168+ report : report ,
169+ before : report . moderationNote ,
170+ after : params . moderationNote ,
171+ } ) ;
172+ }
173+ }
128174}
0 commit comments