From 0d6120c1bbc836bf0bc4ec93df545ca4886bb2c4 Mon Sep 17 00:00:00 2001
From: bertybuttface <110790513+bertybuttface@users.noreply.github.com>
Date: Sun, 8 Jan 2023 00:15:03 +0000
Subject: [PATCH] Allow blank MATRIX_BLACKLIST and MATRIX_WHITELIST

---
 README.md       | 1 +
 src/handlers.ts | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 6d90617..74372ac 100644
--- a/README.md
+++ b/README.md
@@ -57,6 +57,7 @@ MATRIX_DEFAULT_PREFIX_REPLY=false
 # Matrix Access Control (optional)
 # Can be set to user:homeserver or a wildcard like :anotherhomeserver.example
 MATRIX_BLACKLIST=
+# `MATRIX_WHITELIST` is overriden by `MATRIX_BLACKLIST`
 MATRIX_WHITELIST=
 
 # Matrix Feature Flags (optional)
diff --git a/src/handlers.ts b/src/handlers.ts
index 185a3ef..eed04eb 100644
--- a/src/handlers.ts
+++ b/src/handlers.ts
@@ -40,10 +40,10 @@ export default class CommandHandler {
       if (Date.now() - event.origin_server_ts > 10000) return;                          // Ignore old messages
       const relatesTo: RelatesTo | undefined = event.content["m.relates_to"];
       if ((relatesTo !== undefined) && (relatesTo["rel_type"] === "m.replace")) return; // Ignore edits
-      if (MATRIX_BLACKLIST !== undefined){
+      if ((MATRIX_BLACKLIST !== undefined) && MATRIX_BLACKLIST){
         if (MATRIX_BLACKLIST.split(" ").find(b => event.sender.endsWith(b))) return;    // Ignore if on blacklist if set
       }
-      if (MATRIX_WHITELIST !== undefined){
+      if ((MATRIX_WHITELIST !== undefined) && MATRIX_WHITELIST){
         if (!MATRIX_WHITELIST.split(" ").find(w => event.sender.endsWith(w))) return; // Ignore if not on whitelist if set
       }
       const rootEventId: string = (relatesTo !== undefined && relatesTo.event_id !== undefined) ? relatesTo.event_id : event.event_id;