refactor: move isValidTopic to utils/topic

xmtp · Nov 29, 2023 · 9e6bbff · 9e6bbff
1 parent 9c2552c
commit 9e6bbff
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 15 deletions.
diff --git a/src/conversations/Conversations.ts b/src/conversations/Conversations.ts
@@ -12,6 +12,7 @@ import {
   buildUserIntroTopic,
   buildUserInviteTopic,
   dateToNs,
+  isValidTopic,
   nsToDate,
 } from '../utils'
 import { PublicKeyBundle } from '../crypto'
@@ -25,21 +26,6 @@ const messageHasHeaders = (msg: MessageV1): boolean => {
   return Boolean(msg.recipientAddress && msg.senderAddress)
 }
 
-// validate that a topic only contains ASCII characters
-const isValidTopic = (topic: string): boolean => {
-  // eslint-disable-next-line no-control-regex
-  const regex = /^[\x00-\x7F]+$/
-  const index = topic.indexOf('0/')
-  if (index !== -1) {
-    const unwrappedTopic = topic.substring(
-      index + 2,
-      topic.lastIndexOf('/proto')
-    )
-    return regex.test(unwrappedTopic)
-  }
-  return false
-}
-
 /**
  * Conversations allows you to view ongoing 1:1 messaging sessions with another wallet
  */

diff --git a/src/utils/topic.ts b/src/utils/topic.ts
@@ -35,3 +35,18 @@ export const buildUserPrivateStoreTopic = (addrPrefixedKey: string): string => {
   // e.g. "0x1111111111222222222233333333334444444444/key_bundle"
   return buildContentTopic(`privatestore-${addrPrefixedKey}`)
 }
+
+// validate that a topic only contains ASCII characters
+export const isValidTopic = (topic: string): boolean => {
+  // eslint-disable-next-line no-control-regex
+  const regex = /^[\x00-\x7F]+$/
+  const index = topic.indexOf('0/')
+  if (index !== -1) {
+    const unwrappedTopic = topic.substring(
+      index + 2,
+      topic.lastIndexOf('/proto')
+    )
+    return regex.test(unwrappedTopic)
+  }
+  return false
+}