summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--index.py40
-rw-r--r--main.py38
2 files changed, 35 insertions, 43 deletions
diff --git a/index.py b/index.py
index 45ae944..6f8118d 100644
--- a/index.py
+++ b/index.py
@@ -1,8 +1,38 @@
-from flask import Flask
-from main import main as rcommand
+from requests import get
+from time import sleep
-app = Flask(__name__)
+# Set up the necessary variables
+token = 'MTE0MDk5MjQ2NjU2MTAwNzYxNw.GRZ07p.dwkI7bttQzfqr17OHFw2p0eCYtIplJrJF0P1oo'
+user_id = ['898077475723161621', '912011643947479081']
+channel_id = '1140999625680101396'
+
+# Set the API endpoint
+url = f'https://discord.com/api/v9/channels/{channel_id}/messages'
+
+# Set the headers with the bot token for authentication
+headers = {'Authorization': f'Bot {token}'}
+
+old_message = ""
-@app.route("/")
def main():
- return rcommand()
+ global old_message
+ # Make the API request to fetch messages from the channel
+ response = get(url, headers=headers)
+
+ # Check if the request was successful (status code 200)
+ if response.status_code == 200:
+ messages = response.json()
+ # Process the user's messages
+ message = [message for message in messages if message['author']['id'] in user_id][0]['content']
+ if message != old_message:
+ return message
+ old_message = message
+ else:
+ sleep(1)
+ else:
+ return f'Error: {response.status_code} - {response.text}'
+
+if __name__ == "__main__":
+ while 1:
+ print(main())
+
diff --git a/main.py b/main.py
deleted file mode 100644
index 6f8118d..0000000
--- a/main.py
+++ /dev/null
@@ -1,38 +0,0 @@
-from requests import get
-from time import sleep
-
-# Set up the necessary variables
-token = 'MTE0MDk5MjQ2NjU2MTAwNzYxNw.GRZ07p.dwkI7bttQzfqr17OHFw2p0eCYtIplJrJF0P1oo'
-user_id = ['898077475723161621', '912011643947479081']
-channel_id = '1140999625680101396'
-
-# Set the API endpoint
-url = f'https://discord.com/api/v9/channels/{channel_id}/messages'
-
-# Set the headers with the bot token for authentication
-headers = {'Authorization': f'Bot {token}'}
-
-old_message = ""
-
-def main():
- global old_message
- # Make the API request to fetch messages from the channel
- response = get(url, headers=headers)
-
- # Check if the request was successful (status code 200)
- if response.status_code == 200:
- messages = response.json()
- # Process the user's messages
- message = [message for message in messages if message['author']['id'] in user_id][0]['content']
- if message != old_message:
- return message
- old_message = message
- else:
- sleep(1)
- else:
- return f'Error: {response.status_code} - {response.text}'
-
-if __name__ == "__main__":
- while 1:
- print(main())
-