ehi

.gitignore

@@ -7,3 +7,4 @@ test.py
 school_time.xlsx
 venv
 screenshot.png
+Dockerfile

src/bot/telegram/main.py

@@ -6,7 +6,6 @@ import datetime
 import schedule
 import pymongo
 import urllib
-import time
 import os
 
 load_dotenv()
@@ -38,10 +37,6 @@ def subscribe(message):
     )
     bot.send_message(message.chat.id, "You are subscribed")
 
-def recheck():
-    time.sleep(60)
-    send_notification()
-
 def send_notification():
     today = datetime.datetime.today().strftime('%A')
     tomorrow = (datetime.datetime.today() + datetime.timedelta(days=1)).strftime('%A')
@@ -59,32 +54,26 @@ def send_notification():
             for i in find_document:
                 for b in array_username:
                     bot.send_message(b, str(i['School Subject'][today][0]['Room']) + ", " + i['School Subject'][today][0]['Teacher'] + ", " + i['School Subject'][today][0]['Subject'] + "\n" + "Successiva: " + str(i['School Subject'][today][1]['Room']) + ", " + i['School Subject'][today][1]['Teacher'] + ", " + i['School Subject'][today][1]['Subject'])            
-            recheck()
         elif now.strftime("%H:%M") == "08:50":
             for i in find_document:
                 for b in array_username:
                     bot.send_message(b, str(i['School Subject'][today][1]['Room']) + ", " + i['School Subject'][today][1]['Teacher'] + ", " + str(i['School Subject'][today][1]['Subject']) + "\n" + "Successiva: " + str(i['School Subject'][today][2]['Room']) + ", " + i['School Subject'][today][2]['Teacher'] + ", " + i['School Subject'][today][2]['Subject'])            
-            recheck()
         elif now.strftime("%H:%M") == "09:50":
             for i in find_document:
                 for b in array_username:
                     bot.send_message(b, str(i['School Subject'][today][2]['Room']) + ", " + i['School Subject'][today][2]['Teacher'] + ", " + str(i['School Subject'][today][2]['Subject']) + "\n" + "Successiva: " + str(i['School Subject'][today][3]['Room']) + ", " + i['School Subject'][today][3]['Teacher'] + ", " + i['School Subject'][today][3]['Subject'])            
-            recheck()
         elif now.strftime("%H:%M") == "11:05":
             for i in find_document:
                 for b in array_username:
                     bot.send_message(b, str(i['School Subject'][today][3]['Room']) + ", " + i['School Subject'][today][3]['Teacher'] + ", " + str(i['School Subject'][today][3]['Subject']) + "\n" + "Successiva: " + str(i['School Subject'][today][4]['Room']) + ", " + i['School Subject'][today][4]['Teacher'] + ", " + i['School Subject'][today][4]['Subject'])
-            recheck()
         elif now.strftime("%H:%M") == "12:05":
             for i in find_document:
                 for b in array_username:
                     bot.send_message(b, str(i['School Subject'][today][4]['Room']) + ", " + i['School Subject'][today][4]['Teacher'] + ", " + str(i['School Subject'][today][4]['Subject']) + "\n" + "Successiva: " + str(i['School Subject'][today][5]['Room']) + ", " + i['School Subject'][today][5]['Teacher'] + ", " + i['School Subject'][today][5]['Subject'])
-            recheck()
         elif now.strftime("%H:%M") == "13:05":
             for i in find_document:
                 for b in array_username:
                     bot.send_message(b, str(i['School Subject'][today][5]['Room']) + ", " + i['School Subject'][today][5]['Teacher'] + ", " + str(i['School Subject'][today][5]['Subject']))
-            recheck()
         elif now.strftime("%H:%M") == "21:00":
             if tomorrow == "Sunday" or tomorrow == "Saturday":
                 print("Nope")
@@ -92,10 +81,14 @@ def send_notification():
                 for i in find_document:
                     for b in array_username:
                         bot.send_message(b, i['School Subject'][tomorrow][0]['Subject'] + ", " + i['School Subject'][tomorrow][0]['Teacher'] + "\n" + i['School Subject'][tomorrow][1]['Subject'] + ", " + i['School Subject'][tomorrow][1]['Teacher'] + "\n" + i['School Subject'][tomorrow][2]['Subject'] + ", " + i['School Subject'][tomorrow][2]['Teacher'] + "\n" + i['School Subject'][tomorrow][3]['Subject'] + ", " + i['School Subject'][tomorrow][3]['Teacher'] + "\n" + i['School Subject'][tomorrow][4]['Subject'] + ", " + i['School Subject'][tomorrow][4]['Teacher'] + "\n" + i['School Subject'][tomorrow][5]['Subject'] + ", " + i['School Subject'][tomorrow][5]['Teacher'])
-        else:
-            recheck()
 
 schedule.every().day.at("07:50").do(send_notification)
+schedule.every().day.at("08:50").do(send_notification)
+schedule.every().day.at("09:50").do(send_notification)
+schedule.every().day.at("11:05").do(send_notification)
+schedule.every().day.at("12:05").do(send_notification)
+schedule.every().day.at("13:05").do(send_notification)
+schedule.every().day.at("21:00").do(send_notification)
 now = datetime.datetime.now()
 t1 = threading.Thread(target=bot.polling).start()
 

src/bot/telegram/requirements.txt

@@ -1,3 +1,9 @@
+pymongo==4.3.3
+urllib3==1.26.13
+python-dotenv==0.21.0
+schedule==1.1.0
+telebot==0.0.5
+pybson==0.5.9
 pybson==0.5.9
 python-dotenv==0.21.0
 telebot==0.0.5