From 30c538b53004e57bbdb6359ad389fafb54b5b32b Mon Sep 17 00:00:00 2001
From: b1ek <me@blek.codes>
Date: Mon, 29 Jul 2024 11:46:52 +1000
Subject: [PATCH] refactor: rename GetOperationReturn to GetOperationResult and
 use it in all situations when it is used

---
 src/keys/providers/abstract.provider.ts | 4 ++--
 src/keys/providers/all.provider.ts      | 3 ++-
 src/keys/providers/openpgp.provider.ts  | 4 ++--
 src/keys/providers/ubuntu.provider.ts   | 4 ++--
 src/keys/providers/utils.ts             | 4 ++--
 5 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/keys/providers/abstract.provider.ts b/src/keys/providers/abstract.provider.ts
index b981707..e3ce394 100644
--- a/src/keys/providers/abstract.provider.ts
+++ b/src/keys/providers/abstract.provider.ts
@@ -4,7 +4,7 @@ import { Address4, Address6 } from 'ip-address'
 
 export type AdditionalData = { ip: Address4 | Address6 }
 export type HKPOperation = keyof AbstractKeysProvider
-export type GetOperationReturn = string | 404
+export type GetOperationResult = string | 404
 
 export const VALID_OPS: readonly HKPOperation[] = Object.freeze([
     'get',
@@ -29,7 +29,7 @@ export abstract class AbstractKeysProvider {
     async get(
         search: string,
         data: AdditionalData
-    ): Promise<GetOperationReturn> {
+    ): Promise<GetOperationResult> {
         return 404
     }
 
diff --git a/src/keys/providers/all.provider.ts b/src/keys/providers/all.provider.ts
index 815c3e3..38669fb 100644
--- a/src/keys/providers/all.provider.ts
+++ b/src/keys/providers/all.provider.ts
@@ -1,6 +1,7 @@
 import { Get, Injectable } from '@nestjs/common'
 import {
     AbstractKeysProvider,
+    GetOperationResult,
     type AdditionalData,
 } from './abstract.provider.js'
 import { Indexes, InfoLine } from '../indexes.js'
@@ -24,7 +25,7 @@ export class AllKeysProvider implements AbstractKeysProvider {
     }
 
     @Get()
-    async get(search: string, data: AdditionalData): Promise<string | 404> {
+    async get(search: string, data: AdditionalData): Promise<GetOperationResult> {
         const all = this.getAll()
         const promises = await Promise.all(all.map((x) => x.get(search, data)))
 
diff --git a/src/keys/providers/openpgp.provider.ts b/src/keys/providers/openpgp.provider.ts
index a44ef05..3018a4f 100644
--- a/src/keys/providers/openpgp.provider.ts
+++ b/src/keys/providers/openpgp.provider.ts
@@ -1,7 +1,7 @@
 import { Get, Injectable } from '@nestjs/common'
 
 import { AbstractKeysProvider } from './abstract.provider.js'
-import type { AdditionalData } from './abstract.provider.js'
+import type { AdditionalData, GetOperationResult } from './abstract.provider.js'
 import { proxyGetOp, proxyIndexOp } from './utils.js'
 import { Indexes } from '../indexes.js'
 
@@ -10,7 +10,7 @@ export class OpenPGPKeysProvider implements AbstractKeysProvider {
     readonly url = Object.freeze('https://keys.openpgp.org')
 
     @Get()
-    async get(search: string, data: AdditionalData): Promise<string | 404> {
+    async get(search: string, data: AdditionalData): Promise<GetOperationResult> {
         return proxyGetOp(this.url + '/pks/lookup', search, data)
     }
 
diff --git a/src/keys/providers/ubuntu.provider.ts b/src/keys/providers/ubuntu.provider.ts
index 3be15d8..4371dd1 100644
--- a/src/keys/providers/ubuntu.provider.ts
+++ b/src/keys/providers/ubuntu.provider.ts
@@ -1,7 +1,7 @@
 import { Get, Injectable } from '@nestjs/common'
 
 import { AbstractKeysProvider } from './abstract.provider.js'
-import type { AdditionalData } from './abstract.provider.js'
+import type { AdditionalData, GetOperationResult } from './abstract.provider.js'
 import { proxyGetOp, proxyIndexOp } from './utils.js'
 import { Indexes } from '../indexes.js'
 
@@ -10,7 +10,7 @@ export class UbuntuKeysProvider implements AbstractKeysProvider {
     readonly url = Object.freeze('https://keyserver.ubuntu.com')
 
     @Get()
-    async get(search: string, data: AdditionalData): Promise<string | 404> {
+    async get(search: string, data: AdditionalData): Promise<GetOperationResult> {
         return proxyGetOp(this.url + '/pks/lookup', search, data)
     }
 
diff --git a/src/keys/providers/utils.ts b/src/keys/providers/utils.ts
index 6b25213..68eb8d6 100644
--- a/src/keys/providers/utils.ts
+++ b/src/keys/providers/utils.ts
@@ -2,7 +2,7 @@ import type { KyResponse, ResponsePromise } from 'ky'
 import ky from 'ky'
 import type {
     AdditionalData,
-    GetOperationReturn,
+    GetOperationResult,
     HKPOperation,
 } from './abstract.provider.js'
 import type { Indexes } from '../indexes.js'
@@ -42,7 +42,7 @@ export async function proxyGetOp(
     url: string,
     search: string,
     data: AdditionalData
-): Promise<GetOperationReturn> {
+): Promise<GetOperationResult> {
     let httpRes: KyResponse
     try {
         httpRes = await proxyRequest(url, 'get', search, data)