Revert "Added optional custom message and optional keyword filtering (#…

…20)"

This reverts commit e28e9b8.

app.json

@@ -40,14 +40,6 @@
     "INCLUDE_USER_REPLY": {
       "description": "Include replies FROM your tracked twitter user to other twitter users",
       "value": "True"
-    },
-    "CUSTOM_MESSAGE": {
-      "description": "OPTIONAL: Custom message. Useful for pinging @everyone, a role or individual discord members (syntax: <@ROLE_OR_MEMBER_ID>)",
-      "required": false
-    },
-    "KEYWORDS": {
-      "description": "OPTIONAL: Will only post tweets with certain keywords. Comma separate keyword sets. Separate a keyword set with +. Example: world+hello, dota--> hello guys! ✘, what in the world ✘, my first tweet: hello world ✔, let's play some dota! ✔",
-      "required": false
     }
   }
 }

config.py

@@ -1,13 +1,13 @@
 from dataIO import fileIO
 import os
 
-false_strings = ["false", "False", "f", "F", "0", "", "n", "N", "no", "No", "NO", "FALSE"]
+# todo: add mongoDB support
+
+false_strings = ["false", "False", "f", "F", "0", ""]
 
 if fileIO("data.json", "check"):
     data_json = fileIO("data.json", "load")
 else:
-    keyword_sets = [keyword_set.split("+") for keyword_set in os.environ.get("KEYWORDS", []).replace(" ", "").split(",")]
-
     data_json = {
         "Twitter": {
             "consumer_key": os.environ["CONSUMER_KEY"],
@@ -20,10 +20,8 @@
                 "IncludeReplyToUser": False if os.environ["INCLUDE_REPLY_TO_USER"] in false_strings else True,
                 "IncludeRetweet": False if os.environ["INCLUDE_RETWEET"] in false_strings else True,
                 "IncludeUserReply": False if os.environ["INCLUDE_USER_REPLY"] in false_strings else True,
-                "webhook_urls": os.environ["WEBHOOK_URL"].replace(" ", "").split(","),
-                "twitter_ids": os.environ["TWITTER_ID"].replace(" ", "").split(","),
-                "custom_message": os.environ.get("CUSTOM_MESSAGE", None),
-                "keyword_sets": keyword_sets
+                "webhook_urls": os.environ.get("WEBHOOK_URL", []).replace(" ", "").split(","),
+                "twitter_ids": os.environ.get("TWITTER_ID", []).replace(" ", "").split(",")
             }
         ],
         "twitter_ids": []

main.py

@@ -60,15 +60,6 @@ def _on_status(self, status):
                 else:
                     text = data['text']
 
-                if "keyword_sets" in data_discord:
-                    for keyword_set in data_discord["keyword_sets"]:
-                        keyword_present = [keyword.lower() in text.lower() for keyword in keyword_set]
-                        keyword_set_present = all(keyword_present)
-                        if keyword_set_present:
-                            break
-                    if not keyword_set_present:
-                        break
-
                 for url in data['entities']['urls']:
                     if url['expanded_url'] is None:
                         continue
@@ -168,10 +159,7 @@ def _on_status(self, status):
                 if match:
                     webhook = Webhook.partial(match.group("id"), match.group("token"), adapter=RequestsWebhookAdapter())
                     try:
-                        if "custom_message" in data_discord and data_discord["custom_message"] is not None:
-                            webhook.send(embed=embed, content=data_discord["custom_message"])
-                        else:
-                            webhook.send(embed=embed)
+                        webhook.send(embed=embed)
                     except discord.errors.HTTPException as error:
                         print('---------Error---------')
                         print('discord.errors.HTTPException')