Merge pull request #20 from jcsalterego/13-feature-denylist

render-configs.py renders denyList

Author: jcsalterego

CONFIG.md

@@ -32,6 +32,13 @@ Cute animals feed
 - red pandas
 - quokkas
 
+# denyList
+
+> Deny list will exclude any results from a given user. You can provide the username or DID.
+>
+> - did:plc:1234
+> - @spamspamspam.bsky.social
+
 # safeMode
 
 > Safe mode limits the total number of API calls coming from Cloudflare.

cloudflare-worker/bsky-feedgen.js

@@ -280,6 +280,11 @@ export async function getFeedSkeleton(request, env) {
     console.warn(`Feed ID ${feedId} has no safeMode`);
     config.safeMode = true;
   }
+  if (config.denyList === undefined) {
+    config.denyList = new Set();
+  } else {
+    config.denyList = new Set(config.denyList);
+  }
   resetFetchCount(); // for long-lived processes (local)
   setSafeMode(config.safeMode);
 
@@ -343,6 +348,13 @@ export async function getFeedSkeleton(request, env) {
     a.timestamp === b.timestamp ? 0 : a.timestamp < b.timestamp ? -1 : 1
   );
 
+  if (config.denyList.size > 0) {
+    items = items.filter((item) => {
+      let did = item.atURL.split("/")[2];
+      return !config.denyList.has(did);
+    });
+  }
+
   items = items.slice(0, limit);
 
   let feed = [];

cloudflare-worker/configs.js

@@ -11,6 +11,7 @@ export const CONFIGS = {
       "red pandas",
       "quokkas"
     ],
+    "denyList": [],
     "safeMode": true,
     "avatar": "avatar.png",
     "isEnabled": true

feed-generator/configs.json

@@ -11,6 +11,7 @@
       "red pandas",
       "quokkas"
     ],
+    "denyList": [],
     "safeMode": true,
     "avatar": "avatar.png",
     "isEnabled": true

render-configs.py

@@ -11,6 +11,11 @@
 POST_REGEX = re.compile(r"^.*[\./]bsky\.app/profile/(.+?)/post/([a-z0-9]+)")
 PROFILE_REGEX = re.compile(r"^.*[\./]bsky\.app/profile/([^/ ]+)( .+)?$")
 
+LIST_KEYS = [
+    "searchTerms",
+    "denyList",
+]
+
 
 def resolve_handles(handles):
     dids = {}
@@ -98,6 +103,25 @@ def render_search_terms(search_terms):
     return rendered_terms
 
 
+def render_dids_list(user_list):
+    dids = set()
+    handles = set()
+    dids_or_users = [
+        re.compile(LIST_ITEM_REGEX).sub("", term)
+        for term in user_list
+    ]
+    for did_or_user in dids_or_users:
+        if did_or_user.startswith("did:"):
+            dids.add(did_or_user)
+        else:
+            if did_or_user.startswith("@"):
+                did_or_user = did_or_user[1:]
+            handles.add(did_or_user)
+    if len(handles) > 0:
+        handle_lookup = resolve_handles(handles)
+        dids.update(handle_lookup.values())
+    return list(dids)
+
 def parse_config(dirname, markdown_contents):
     config = {}
     sections = markdown_contents.split("\n# ")
@@ -115,7 +139,7 @@ def parse_config(dirname, markdown_contents):
 
         config[section] = lines
 
-    flat_keys = [key for key in config.keys() if key != "searchTerms"]
+    flat_keys = [key for key in config.keys() if key not in LIST_KEYS]
     for key in flat_keys:
         config[key] = " ".join(config[key])
     if "searchTerms" in config:
@@ -145,6 +169,8 @@ def parse_config(dirname, markdown_contents):
     else:
         # for legacy support, if the section is missing, set to True
         config["safeMode"] = True
+    if "denyList" in config:
+        config["denyList"] = render_dids_list(config["denyList"])
 
     return config