Changed for a better hierarchy, added "Upcoming Event" & "Member Count" channel logic, and made a better pagination system for issue listing command

micro/API.py

@@ -3,7 +3,8 @@
 from pydantic import BaseModel
 from datetime import datetime
 
-from classes.colored_embed import CEmbed
+from classes import CEmbed
+from static.constants import EVENTS_ROLE_ID
 
 import os, aiohttp
 
@@ -16,13 +17,16 @@ class Event(BaseModel):
     event_link: str
     event_location: str
     seats: int
+    mentions: list[int]
 
 
 app = FastAPI()
 
 
 def get_embed(event: Event):
-    date = datetime.strptime(event.date_time, "%Y-%m-%d")
+    date_time = event.date_time.split()
+    date = datetime.strptime(date_time[0], "%Y-%m-%d")
+    time = datetime.strptime(date_time[1], "%H:%M")
     return CEmbed.from_dict(
         {
             "title": event.title,
@@ -40,7 +44,7 @@ def get_embed(event: Event):
                 },
                 {
                     "name": "Time",
-                    "value": date.strftime("%H-%M"),
+                    "value": time.strftime("%H:%M"),
                     "inline": True
                 },
                 {
@@ -73,5 +77,6 @@ async def publish_event(event: Event):
     WB_URL = os.getenv("WEBHOOK_URL")
 
     async with aiohttp.ClientSession() as session:
+        mentions = " ".join([f"<@&{id}>" for id in event.mentions])
         webhook = Webhook.from_url(WB_URL, session=session)
-        await webhook.send(embed=get_embed(event))
+        await webhook.send(content=f"<@&{EVENTS_ROLE_ID}>{mentions}", embed=get_embed(event))

micro/__main__.py

@@ -2,12 +2,19 @@
 load_dotenv()
 
 import discord
-from discord.ext import commands
-
-from classes.views import ModerationView, ResourcesView, RoleView, IssueListView
-from classes.database import Database
+import datetime
+from discord.ext import commands, tasks
+
+from views import (
+    ModerationView, 
+    ResourcesView, 
+    RoleView, 
+    IssueListView
+)
+from classes import Database
 from logger import logger
 from static.paths import COGS_DIR
+from static.constants import EVENTS_CHANNEL, NEXT_EVENT_CHANNEL, MEMBERCOUNT_CHANNEL
 from API import app
 
 from logging import Logger
@@ -58,6 +65,9 @@ async def create_pool(self, dsn):
 
         return msg
 
+    async def on_ready(self):
+        members_ch = self.get_channel(MEMBERCOUNT_CHANNEL)
+        await members_ch.edit(name=f"Member Count: {len(self.users)}")
 
 # Init logger
 logger = logger()

micro/classes/__init__.py

@@ -0,0 +1,7 @@
+from .database import Database
+from .bad_words import BadWords
+from .github import GitHub
+from .question_query import QuestionQuery
+from .resources import Resources
+from .colored_embed import CEmbed
+from .paginator import Paginator

micro/classes/badWords.py → micro/classes/bad_words.py

@@ -6,7 +6,7 @@ def __init__(self,logger):
         self.logger = logger
         self.insults = get_insult_list()
 
-    def isItInsult(self, msg_lst):
+    def is_it_insult(self, msg_lst):
         try:
             msg = ' '.join(msg_lst)
 

micro/classes/github.py

@@ -1,8 +1,8 @@
-import os, requests, discord
+import os, requests
 
 from typing import Iterable
 from math import ceil
-from github import Github, Issue, PaginatedList
+from github import Github, Issue
 from github.GithubException import UnknownObjectException, BadCredentialsException
 
 
@@ -78,14 +78,12 @@ def get_issue(self, num: int) -> Issue.Issue | None:
         return issue
 
     def list_issues(
-        self, paginate: bool
-    ) -> PaginatedList.PaginatedList | list[list] | None:
+        self
+    ) -> list[Issue.Issue] | None:
         """Returns the list of issues of the repo, or the paginated list of issue"""
         if not self.repo:
             return
-        issues = self.repo.get_issues()
-        if paginate:
-            return self.prepare_pagination(issues)
+        issues = list(self.repo.get_issues()) # Convert a PaginatedList into a normal list of the issues
         return issues
 
     def create_issue(

micro/classes/paginator.py

@@ -0,0 +1,34 @@
+class Paginator:
+    def __init__(self, items: list, page_size: int):
+        self.items = items
+        self.page_size = page_size
+        self.curr_page = 1 # For user-end
+        self.curr_index = 0 # For back-end
+        self.total_pages = len(self.items) // self.page_size + 1 # For user-end as well
+
+    def get_page(self) -> list:
+        """
+        Returns the items of the current page
+        """
+        return self.items[self.curr_index:self.curr_index+self.page_size]
+
+    def next_page(self) -> list | None:
+        """
+        Returns the items of the next page (None if there is no next page)
+        """
+        if self.curr_index + self.page_size < len(self.items):
+            self.curr_index += self.page_size
+            self.curr_page += 1
+            return self.get_page()
+        # No next page
+        return None
+
+    def prev_page(self) -> list | None:
+        """
+        Returns the items of the previous page (None if there is no previous page)
+        """
+        if self.curr_index - self.page_size >= 0:
+            self.curr_index -= self.page_size
+            self.curr_page -= 1
+            return self.get_page()
+        return None

micro/classes/QuestionQuery.py → micro/classes/question_query.py

@@ -20,9 +20,9 @@ def question(self, command):
         title, msg = self.data['Title']['who'], self.data['Answer']['who']
         if command in self.data['Answer'].keys():
             title, msg = self.data['Title'][command], self.data['Answer'][command]
-        return self._toEmbed(title, msg)
+        return self._toembed(title, msg)
 
-    def _toEmbed(self, title, msg):
+    def _toembed(self, title, msg):
         try:
             return embeds.Embed.from_dict(
                 {