Revert "Turn off polling of non-priority feeds (#2167)" (#2170)

This reverts commit 2a2ffe1.
proofcarryingdata · Nov 13, 2024 · de3bd2e · de3bd2e
1 parent 06dd129
commit de3bd2e
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 44 deletions.
diff --git a/apps/passport-client/.env.example b/apps/passport-client/.env.example
@@ -55,9 +55,3 @@ DISABLE_CONSOLE_LOG=
 
 # Some origins are allowed to query Devcon tickets directly. Origins not in this list cannot do so:
 DEVCON_TICKET_QUERY_ORIGINS='["http://example.com", "http://localhost:3200"]'
-
-# If IGNORE_NON_PRIORITY_FEEDS=true, then non-priority feeds will be ignored.
-IGNORE_NON_PRIORITY_FEEDS=false
-
-# URLs of feed providers that are priority feeds.
-PRIORITY_FEED_PROVIDER_URLS='[]'
diff --git a/apps/passport-client/build.ts b/apps/passport-client/build.ts
@@ -87,20 +87,6 @@ const define = {
           process.env.DEVCON_TICKET_QUERY_ORIGINS
         )
       }
-    : {}),
-  ...(process.env.IGNORE_NON_PRIORITY_FEEDS !== undefined
-    ? {
-        "process.env.IGNORE_NON_PRIORITY_FEEDS": JSON.stringify(
-          process.env.IGNORE_NON_PRIORITY_FEEDS
-        )
-      }
-    : {}),
-  ...(process.env.PRIORITY_FEED_PROVIDER_URLS !== undefined
-    ? {
-        "process.env.PRIORITY_FEED_PROVIDER_URLS": JSON.stringify(
-          process.env.PRIORITY_FEED_PROVIDER_URLS
-        )
-      }
     : {})
 };
 

diff --git a/apps/passport-client/src/appConfig.ts b/apps/passport-client/src/appConfig.ts
@@ -21,10 +21,6 @@ interface AppConfig {
   embeddedZapps: Record<string, string>;
   // origins that are allowed to query Devcon tickets directly
   devconTicketQueryOrigins: string[];
-  // If IGNORE_NON_PRIORITY_FEEDS=true, then non-priority feeds will be ignored.
-  ignoreNonPriorityFeeds: boolean;
-  // URLs of feed providers that are priority feeds.
-  priorityFeedProviderUrls: string[];
 }
 
 if (
@@ -88,11 +84,7 @@ export const appConfig: AppConfig = {
   zappRestrictOrigins: process.env.ZAPP_RESTRICT_ORIGINS === "true",
   zappAllowedSignerOrigins: zappAllowedSignerOrigins,
   embeddedZapps: embeddedZapps,
-  devconTicketQueryOrigins: devconTicketQueryOrigins,
-  ignoreNonPriorityFeeds: process.env.IGNORE_NON_PRIORITY_FEEDS === "true",
-  priorityFeedProviderUrls: process.env.PRIORITY_FEED_PROVIDER_URLS
-    ? JSON.parse(process.env.PRIORITY_FEED_PROVIDER_URLS)
-    : []
+  devconTicketQueryOrigins: devconTicketQueryOrigins
 };
 
 console.log("App Config: " + JSON.stringify(appConfig));
diff --git a/apps/passport-client/src/dispatch.ts b/apps/passport-client/src/dispatch.ts
@@ -1160,23 +1160,14 @@ async function doSync(
         onSubscriptionResult,
         state.subscriptions
           .getActiveSubscriptions()
-          .filter((s) => {
-            if (
-              s.id ===
+          .filter(
+            (s) =>
+              s.id !==
               state.subscriptions.findSubscription(
                 ZUPASS_FEED_URL,
                 ZupassFeedIds.Email
               )?.id
-            ) {
-              return false;
-            }
-
-            if (appConfig.ignoreNonPriorityFeeds) {
-              return appConfig.priorityFeedProviderUrls.includes(s.providerUrl);
-            }
-
-            return true;
-          })
+          )
           .map((s) => s.id)
       );
 

diff --git a/turbo.json b/turbo.json
@@ -120,8 +120,6 @@
     "DEVCON_TICKET_QUERY_ORIGINS",
     "GENERATED_CHUNKS",
     "TELEGRAM_CHAT_TO_PRODUCT_IDS",
-    "IGNORE_NON_PRIORITY_FEEDS",
-    "PRIORITY_FEED_PROVIDER_URLS",
     "//// add env vars above this line ////"
   ],
   "globalEnv": [