From 442c20ed674e06cb454c99b564fa3ab7af14c4e8 Mon Sep 17 00:00:00 2001
From: Jonathan Barrow <jonbarrow1998@gmail.com>
Date: Sat, 22 Apr 2023 17:09:21 -0400
Subject: [PATCH] Fixed build failures

---
 src/config-manager.ts                      | 1 -
 src/services/miiverse-api/routes/topics.ts | 2 +-
 src/types/memoize.d.ts                     | 3 ---
 src/types/memoizee.d.ts                    | 3 +++
 src/util.ts                                | 7 ++++---
 5 files changed, 8 insertions(+), 8 deletions(-)
 delete mode 100644 src/types/memoize.d.ts
 create mode 100644 src/types/memoizee.d.ts

diff --git a/src/config-manager.ts b/src/config-manager.ts
index d93ea08..f148c82 100644
--- a/src/config-manager.ts
+++ b/src/config-manager.ts
@@ -24,7 +24,6 @@ if (process.env.PN_MIIVERSE_API_CONFIG_MONGOOSE_ACCOUNT_SERVER_CONNECT_OPTIONS_P
 	LOG_WARN('No Mongoose connection options found for main connection. To add connection options, set PN_MIIVERSE_API_CONFIG_MONGOOSE_ACCOUNT_SERVER_CONNECT_OPTIONS_PATH to the path of your options JSON file');
 }
 
-
 export const config: Config = {
 	http: {
 		port: Number(process.env.PN_MIIVERSE_API_CONFIG_HTTP_PORT || '')
diff --git a/src/services/miiverse-api/routes/topics.ts b/src/services/miiverse-api/routes/topics.ts
index 8a94450..f9d8a6a 100644
--- a/src/services/miiverse-api/routes/topics.ts
+++ b/src/services/miiverse-api/routes/topics.ts
@@ -1,5 +1,5 @@
 import express from 'express';
-import memoize from 'memoize';
+import memoize from 'memoizee';
 import { getPNID, getEndPoint } from '@/database';
 import { Post } from '@/models/post';
 import { Community } from '@/models/community';
diff --git a/src/types/memoize.d.ts b/src/types/memoize.d.ts
deleted file mode 100644
index 203bfc9..0000000
--- a/src/types/memoize.d.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-declare module 'memoize';
-
-// TODO - Add proper types
\ No newline at end of file
diff --git a/src/types/memoizee.d.ts b/src/types/memoizee.d.ts
new file mode 100644
index 0000000..bd926c1
--- /dev/null
+++ b/src/types/memoizee.d.ts
@@ -0,0 +1,3 @@
+declare module 'memoizee';
+
+// TODO - Add proper types
\ No newline at end of file
diff --git a/src/util.ts b/src/util.ts
index f1ae0c7..1dbf35c 100644
--- a/src/util.ts
+++ b/src/util.ts
@@ -8,7 +8,7 @@ import { PNG } from 'pngjs';
 import bmp from 'bmp-js';
 import aws from 'aws-sdk';
 import { createChannel, createClient, Metadata } from 'nice-grpc';
-import { FriendsDefinition } from 'pretendo-grpc-ts/src/friends/friends_service';
+import { friends } from 'pretendo-grpc-ts';
 import { ParsedQs } from 'qs';
 import { getPNID } from '@/database';
 import { LOG_ERROR } from '@/logger';
@@ -16,12 +16,13 @@ import { Settings } from '@/models/settings';
 import { Content } from '@/models/content';
 import { SafeQs } from '@/types/common/safe-qs';
 import { ParamPack } from '@/types/common/param-pack';
-
 import { config } from '@/config-manager';
 
+const { FriendsService } = friends;
 const { ip, port, api_key } = config.grpc.friends;
+
 const channel = createChannel(`${ip}:${port}`);
-const client = createClient(FriendsDefinition, channel);
+const client = createClient(FriendsService.FriendsDefinition, channel);
 
 const s3 = new aws.S3({
 	endpoint: new aws.Endpoint(config.s3.endpoint),