Discord Event Announcements Finished

apps/db_data/models.py

@@ -169,7 +169,7 @@ class Event(models.Model):
     name = models.CharField(max_length=70)
     location = models.CharField(max_length=70)
     date = models.DateField(null=True)
-    time = models.CharField(max_length=70)
+    time = models.TimeField(null=True)
     description = models.TextField()
     link = models.URLField(blank=True)
     category = models.ForeignKey(
@@ -187,6 +187,9 @@ def __str__(self):
     def is_passed(self):
         return self.date < datetime.date.today()
 
+    def get_time_string(self):
+        return self.time.strftime("%I:%M %p PST")
+
 
 class EventCategory(models.Model):
     id = models.CharField(max_length=16, primary_key=True)

apps/discordbot/annoucements.py

@@ -0,0 +1,30 @@
+import datetime
+from apps.db_data.models import Event
+
+def event_checker(requested_tdelta):
+    """
+    Checks events in db to see if any match the day
+    """
+    today = datetime.date.today()
+    now = datetime.datetime.now()
+    upcoming_events = Event.objects.filter(date__gte=today).filter(time__gte=now)
+    days = {
+            "week": today + datetime.timedelta(weeks=1),
+            "tomorrow": today + datetime.timedelta(days=1),
+            "today": today,
+        }
+    times = {
+            "hour": now + datetime.timedelta(hours=1),
+            "now": now + datetime.timedelta(minutes=1)
+        }
+    if requested_tdelta in times:
+        events = Event.objects \
+                    .filter(date=today, time__lte=times[requested_tdelta]) \
+                    .filter(time__gte=now) \
+                    .order_by("time")
+    elif requested_tdelta == "week":
+        events = Event.objects.filter(
+            date__lte=days[requested_tdelta]).filter(date__gte=today).order_by("time")
+    else:
+        events = Event.objects.filter(date=days[requested_tdelta]).order_by("time")
+    return events

apps/discordbot/bot.py

@@ -2,16 +2,19 @@
 import logging
 import threading
 import unicodedata
-
-import discord
+from functools import partial
+import datetime, schedule, time
 from decouple import config
+import discord
+from discord.embeds import Embed
 from discord.utils import get
 from django.core.exceptions import ValidationError
 from django.core.validators import validate_email
 from pyfiglet import figlet_format
 
 from . import connect4, cowsay, xkcd
 from .utils import send_verify_mail
+from .annoucements import event_checker
 
 intents = discord.Intents.all()
 intents.presences = False
@@ -21,6 +24,7 @@
 CSUA_PHILBOT_CLIENT_ID = config("BOT_ID", default=737930184837300274, cast=int)
 HOSER_ROLE_ID = config("TEST_ROLE", default=785418569412116513, cast=int)  # Verified
 DEBUG_CHANNEL_ID = config("DEBUG_CHANNEL", default=788989977794707456, cast=int)
+ANNOUNCEMENTS_CHANNEL_ID = config("ANNOUNCEMENTS_CHANNEL", default=784902200102354989, cast=int) # set to chatter for testing
 TIMEOUT_SECS = 10
 
 logger = logging.getLogger(__name__)
@@ -30,6 +34,8 @@ class CSUAClient(discord.Client):
     async def on_ready(self):
         print(f"{self.user} has connected to Discord")
         self.is_phillip = self.user.id == CSUA_PHILBOT_CLIENT_ID
+        csua_bot.announcements_thread = threading.Thread(target=csua_bot.event_announcement, daemon=True)
+        csua_bot.announcements_thread.start()
         if self.is_phillip:
             self.csua_guild = get(self.guilds, id=CSUA_GUILD_ID)
             self.test_channel = get(self.csua_guild.channels, id=DEBUG_CHANNEL_ID)
@@ -141,6 +147,8 @@ def check_thumb(react, _):
         if self.is_phillip:
             await self.test_channel.send(f"{member} was sent registration email")
 
+
+
 
 def emoji_letters(chars):
     return [unicodedata.lookup(f"REGIONAL INDICATOR SYMBOL LETTER {c}") for c in chars]
@@ -162,11 +170,12 @@ class CSUABot:
     def __init__(self):
         self.loop = asyncio.new_event_loop()
         self.thread = threading.Thread(target=self._start, daemon=True)
+        self.running = True
+        self.thread.start()
 
     def _start(self):
         asyncio.set_event_loop(self.loop)
         self.client = CSUAClient(intents=intents)
-
         try:
             self.loop.run_until_complete(self.client.start(TOKEN))
         finally:
@@ -188,6 +197,63 @@ def promote_user_to_hoser(self, tag):
             return True
         return False
 
+    def event_announcement(self):
+        print('Announcements Thread started...')
+
+        times_msg = {
+            "week": "NEXT WEEK",
+            "today": "TODAY",
+            "tomorrow": "TOMORROW",
+            "hour": "IN 1 HOUR",
+            "now": "NOW",
+        }
+
+        def announcer(time_before):
+
+            events = event_checker(time_before)
+
+            if events:
+                msg = f"**What's happening {times_msg[time_before]}**"
+                asyncio.run_coroutine_threadsafe(
+                        self.client.get_channel(ANNOUNCEMENTS_CHANNEL_ID).send(msg), self.loop
+                    ).result(TIMEOUT_SECS)
+                print('hey hey hey time to check') # debugging
+
+                send_embed(events)
+
+        def send_embed(events):
+            for event in events:
+                embed = discord.Embed(
+                    title=event.name,
+                    description=event.description,
+                    colour=discord.Colour.red()
+                )
+                embed.add_field(name='Date', value=event.date, inline=True)
+                embed.add_field(name='Time', value=event.get_time_string())
+                embed.add_field(name='Link', value=event.link)
+                asyncio.run_coroutine_threadsafe(
+                    self.client.get_channel(ANNOUNCEMENTS_CHANNEL_ID).send(embed=embed), self.loop
+                ).result(TIMEOUT_SECS)
+
+
+        schedule.every().sunday.at("17:00").do(partial(announcer, "week"))
+        schedule.every().day.at("08:00").do(partial(announcer, "tomorrow"))
+        schedule.every().day.at("08:00").do(partial(announcer, "today"))
+        schedule.every().hour.do(partial(announcer, "hour"))
+        schedule.every(30).minutes.do(partial(announcer, "now"))
+
+        # For debugging
+        # schedule.every(10).seconds.do(partial(announcer, "week"))
+        # schedule.every(10).seconds.do(partial(announcer, "tomorrow"))
+        # schedule.every(10).seconds.do(partial(announcer, "today"))
+        # schedule.every(10).seconds.do(partial(announcer, "hour"))
+        # schedule.every(10).seconds.do(partial(announcer, "now"))
+
+        while True:
+            schedule.run_pending()
+            time.sleep(5)
+
+
 
 if TOKEN:
     csua_bot = CSUABot()

requirements.txt

@@ -14,6 +14,7 @@ slack_bolt
 
 # apps.discordbot
 discord.py
+schedule
 pyfiglet
 cowpy