Merge remote-tracking branch 'origin/appview-v2' into appview-v2-testing

bluesky-social · Feb 5, 2024 · 092779a · 092779a
2 parents ca14897 + 5cd08e4
commit 092779a
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/packages/bsky/src/config.ts b/packages/bsky/src/config.ts
@@ -1,5 +1,4 @@
 import assert from 'node:assert'
-import { envList } from '@atproto/common'
 
 export interface ServerConfigValues {
   // service
@@ -78,7 +77,7 @@ export class ServerConfig {
       process.env.BSKY_COURIER_IGNORE_BAD_TLS === 'true'
     assert(courierHttpVersion === '1.1' || courierHttpVersion === '2')
     const adminPasswords = envList(
-      process.env.BSKY_ADMIN_PASSWORDS || process.env.BSKY_ADMIN_PASSWORD || '',
+      process.env.BSKY_ADMIN_PASSWORDS || process.env.BSKY_ADMIN_PASSWORD,
     )
     const modServiceDid = process.env.MOD_SERVICE_DID
     assert(modServiceDid)
@@ -234,3 +233,8 @@ function stripUndefineds(
   })
   return result
 }
+
+function envList(str: string | undefined): string[] {
+  if (str === undefined || str.length === 0) return []
+  return str.split(',')
+}