Cleanup

We must not expose private actor objects to clients
Just make 2 GET requests on channel/accounts instead

3 files changed, 2 insertions, 19 deletions

diff --git a/shared/extra-utils/actors/actors.ts b/shared/extra-utils/actors/actors.ts
deleted file mode 100644
index 4a4aba775..000000000
--- a/shared/extra-utils/actors/actors.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-/* eslint-disable @typescript-eslint/no-unused-expressions,@typescript-eslint/require-await */
-
-import { makeGetRequest } from '../requests/requests'
-import { HttpStatusCode } from '../../../shared/core-utils/miscs/http-error-codes'
-
-function getActor (url: string, actorName: string, statusCodeExpected = HttpStatusCode.OK_200) {
-  const path = '/api/v1/actors/' + actorName
-
-  return makeGetRequest({
-    url,
-    path,
-    statusCodeExpected
-  })
-}
-
-export {
-  getActor
-}
diff --git a/shared/extra-utils/index.ts b/shared/extra-utils/index.ts
index 9f5b5bb28..3bc09ead5 100644
--- a/shared/extra-utils/index.ts
+++ b/shared/extra-utils/index.ts
@@ -1,4 +1,3 @@
-export * from './actors/actors'
 export * from './bulk/bulk'
 
 export * from './cli/cli'
diff --git a/shared/extra-utils/requests/requests.ts b/shared/extra-utils/requests/requests.ts
index 8b5cddf4a..38e24d897 100644
--- a/shared/extra-utils/requests/requests.ts
+++ b/shared/extra-utils/requests/requests.ts
@@ -26,6 +26,7 @@ function makeGetRequest (options: {
   contentType?: string
   range?: string
   redirects?: number
+  accept?: string
 }) {
   if (!options.statusCodeExpected) options.statusCodeExpected = HttpStatusCode.BAD_REQUEST_400
   if (options.contentType === undefined) options.contentType = 'application/json'
@@ -36,6 +37,7 @@ function makeGetRequest (options: {
   if (options.token) req.set('Authorization', 'Bearer ' + options.token)
   if (options.query) req.query(options.query)
   if (options.range) req.set('Range', options.range)
+  if (options.accept) req.set('Accept', options.accept)
   if (options.redirects) req.redirects(options.redirects)
 
   return req.expect(options.statusCodeExpected)