From 3b0d5f55e7bc1b7a55a2d08570fe788d79784813 Mon Sep 17 00:00:00 2001
From: William Grant <willmgrant@gmail.com>
Date: Fri, 22 Sep 2023 17:05:28 +1000
Subject: [PATCH] feat: added get_expiries typings

---
 ts/models/message.ts                           |  2 +-
 ts/session/apis/snode_api/SnodeRequestTypes.ts | 16 +++++++++++++++-
 ts/session/apis/snode_api/expireRequest.ts     |  3 +--
 ts/session/apis/snode_api/types.ts             |  5 +++++
 4 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/ts/models/message.ts b/ts/models/message.ts
index 815ce02cf..d29727bbe 100644
--- a/ts/models/message.ts
+++ b/ts/models/message.ts
@@ -42,7 +42,7 @@ import { Data } from '../data/data';
 import { OpenGroupData } from '../data/opengroups';
 import { SettingsKey } from '../data/settings-key';
 import { isUsAnySogsFromCache } from '../session/apis/open_group_api/sogsv3/knownBlindedkeys';
-import { expireMessageOnSnode } from '../session/apis/snode_api/expire';
+import { expireMessageOnSnode } from '../session/apis/snode_api/expireRequest';
 import { GetNetworkTime } from '../session/apis/snode_api/getNetworkTime';
 import { SnodeNamespaces } from '../session/apis/snode_api/namespaces';
 import { DURATION } from '../session/constants';
diff --git a/ts/session/apis/snode_api/SnodeRequestTypes.ts b/ts/session/apis/snode_api/SnodeRequestTypes.ts
index 67025418e..4bc403bd3 100644
--- a/ts/session/apis/snode_api/SnodeRequestTypes.ts
+++ b/ts/session/apis/snode_api/SnodeRequestTypes.ts
@@ -146,6 +146,19 @@ export type UpdateExpiryOnNodeSubRequest = {
   params: UpdateExpireNodeParams;
 };
 
+export type GetExpiriesNodeParams = {
+  pubkey: string;
+  pubkey_ed25519: string;
+  messages: Array<string>;
+  timestamp: number;
+  signature: string;
+};
+
+export type GetExpiriesFromNodeSubRequest = {
+  method: 'get_expiries';
+  params: GetExpiriesNodeParams;
+};
+
 export type OxendSubRequest = OnsResolveSubRequest | GetServiceNodesSubRequest;
 
 export type SnodeApiSubRequests =
@@ -156,7 +169,8 @@ export type SnodeApiSubRequests =
   | NetworkTimeSubRequest
   | DeleteFromNodeSubRequest
   | DeleteAllFromNodeSubRequest
-  | UpdateExpiryOnNodeSubRequest;
+  | UpdateExpiryOnNodeSubRequest
+  | GetExpiriesFromNodeSubRequest;
 
 // eslint-disable-next-line @typescript-eslint/array-type
 export type NonEmptyArray<T> = [T, ...T[]];
diff --git a/ts/session/apis/snode_api/expireRequest.ts b/ts/session/apis/snode_api/expireRequest.ts
index 1357440c2..6503e96c4 100644
--- a/ts/session/apis/snode_api/expireRequest.ts
+++ b/ts/session/apis/snode_api/expireRequest.ts
@@ -146,7 +146,7 @@ async function expireOnNodes(
     const firstResult = result[0];
 
     if (firstResult.code !== 200) {
-      window?.log?.warn(`WIP: [expireOnNods] result is not 200 but ${firstResult.code}`);
+      window?.log?.warn(`WIP: [expireOnNodes] result is not 200 but ${firstResult.code}`);
       return null;
     }
 
@@ -243,7 +243,6 @@ async function buildExpireRequest(
     params: {
       pubkey: ourPubKey,
       pubkey_ed25519: signResult.pubkey_ed25519.toUpperCase(),
-      // TODO better testing for failed case
       messages: [messageHash],
       expiry,
       extend: extend || undefined,
diff --git a/ts/session/apis/snode_api/types.ts b/ts/session/apis/snode_api/types.ts
index 8acd38170..3650251af 100644
--- a/ts/session/apis/snode_api/types.ts
+++ b/ts/session/apis/snode_api/types.ts
@@ -42,3 +42,8 @@ export type ExpireMessageResultItem = {
 
 /** <pubkey, ExpireMessageResultItem> */
 export type ExpireMessagesResultsContent = Record<string, ExpireMessageResultItem>;
+
+/** <messageHash, expiry (milliseconds since unix epoch)>
+ *
+ * NOTE Only messages that exist on the server are included */
+export type GetExpiriesResultsContent = Record<string, number>;