From 869854eae736cf5c910f533191ea0d1f7c9755dd Mon Sep 17 00:00:00 2001
From: syuilo <Syuilotan@yahoo.co.jp>
Date: Tue, 24 Jan 2023 08:32:17 +0900
Subject: [PATCH] =?UTF-8?q?=E3=82=B3=E3=83=9F=E3=83=83=E3=83=88=E6=BC=8F?=
 =?UTF-8?q?=E3=82=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/backend/src/core/DownloadService.ts           |  1 -
 .../backend/src/core/activitypub/ApRequestService.ts   | 10 +++++-----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/packages/backend/src/core/DownloadService.ts b/packages/backend/src/core/DownloadService.ts
index e4632f857a..c5b2bcaef4 100644
--- a/packages/backend/src/core/DownloadService.ts
+++ b/packages/backend/src/core/DownloadService.ts
@@ -4,7 +4,6 @@ import * as util from 'node:util';
 import { Inject, Injectable } from '@nestjs/common';
 import IPCIDR from 'ip-cidr';
 import PrivateIp from 'private-ip';
-import got, * as Got from 'got';
 import chalk from 'chalk';
 import { buildConnector } from 'undici';
 import { DI } from '@/di-symbols.js';
diff --git a/packages/backend/src/core/activitypub/ApRequestService.ts b/packages/backend/src/core/activitypub/ApRequestService.ts
index ab22a0c411..fd7319702e 100644
--- a/packages/backend/src/core/activitypub/ApRequestService.ts
+++ b/packages/backend/src/core/activitypub/ApRequestService.ts
@@ -41,10 +41,10 @@ export class ApRequestService {
 		private httpRequestService: HttpRequestService,
 		private loggerService: LoggerService,
 	) {
-		this.logger = this.loggerService?.getLogger('ap-request'); // なぜか TypeError: Cannot read properties of undefined (reading 'getLogger') と言われる
-		this.undiciFetcher = new UndiciFetcher(this.httpRequestService.getStandardUndiciFetcherOption({
+		this.logger = this.loggerService.getLogger('ap-request'); // なぜか TypeError: Cannot read properties of undefined (reading 'getLogger') と言われる
+		this.undiciFetcher = this.httpRequestService.createFetcher({
 			maxRedirections: 0,
-		}), this.logger );
+		}, {}, this.logger);
 	}
 
 	@bindThis
@@ -169,7 +169,7 @@ export class ApRequestService {
 				method: req.request.method,
 				headers: req.request.headers,
 				body,
-			}
+			},
 		);
 	}
 
@@ -197,7 +197,7 @@ export class ApRequestService {
 			{
 				method: req.request.method,
 				headers: req.request.headers,
-			}
+			},
 		);
 
 		return await res.json();