remove edgedb

Author: NelsonDane

Dockerfile.bot

@@ -6,12 +6,8 @@ WORKDIR /app
 COPY requirements.txt requirements.txt
 RUN pip install -r requirements.txt
 
-# DB
-COPY db.py db.py
-ADD dbschema dbschema
-COPY edgedb.toml edgedb.toml
-
 # Bot
+COPY db.py db.py
 COPY main.py main.py
 COPY gh.py gh.py
 COPY web.py web.py

README.md

@@ -2,4 +2,4 @@
 
 A Discord Bot that allows users to verify their GitHub Sponsors status and get access to sponsor-only roles/channels. It can also detect contributors to a GitHub repository and assign them a contributor role.
 
-It works by prompting the user in a private thread to connect their GitHub account in Discord connection settings (even if it's not publicly visible on their Discord profile). The bot will then check if the user is a sponsor of the specified GitHub user and if so, assign the appropriate roles. It then stores this information in an EdgeDB database.
+It works by prompting the user in a private thread to connect their GitHub account in Discord connection settings (even if it's not publicly visible on their Discord profile). The bot will then check if the user is a sponsor of the specified GitHub user and if so, assign the appropriate roles. It then stores this information in an PostgreSQL database.

config.py

@@ -22,3 +22,9 @@ def get_config():
 CLIENT_SECRET = CONFIG["DISCORD_BOT"]["CLIENT_SECRET"]
 # Discord Roles
 DISCORD_ROLES_LIST = CONFIG["DISCORD_ROLES"]
+# DB
+DB_HOST = CONFIG["DB"]["DB_HOST"]
+DB_PORT = CONFIG["DB"]["DB_PORT"]
+DB_USER = CONFIG["DB"]["DB_USER"]
+DB_PASS = CONFIG["DB"]["DB_PASS"]
+DB_NAME = CONFIG["DB"]["DB_NAME"]

config.yaml

@@ -1,155 +1,96 @@
-import edgedb
+import psycopg2
+from config import DB_HOST, DB_PORT, DB_USER, DB_PASS, DB_NAME
 
-class EdgeDB:
+class PostgresDB:
     def __init__(self):
-        self.client = edgedb.create_client()
+        self.conn = psycopg2.connect(
+            dbname=DB_NAME,
+            host=DB_HOST,
+            port=DB_PORT,
+            user=DB_USER,
+            password=DB_PASS,
+        )
+        self.cursor = self.conn.cursor()
 
     def create_sponsor(self, gh_id, gh_username, discord_id=0, discord_name='', discord_code='', contributed_to_repos=None, is_currently_sponsoring=False):
         if self.get_sponsor_by_gh_id(gh_id):
             return
         if contributed_to_repos is None:
             contributed_to_repos = []
-        self.client.execute('''
-            INSERT Sponsor {
-                gh_id := <int32>$gh_id,
-                discord_id := <int64>$discord_id,
-                gh_username := <str>$gh_username,
-                discord_name := <str>$discord_name,
-                discord_code := <str>$discord_code,
-                contributed_to_repos := <array<str>>$contributed_to_repos,
-                is_currently_sponsoring := <bool>$is_currently_sponsoring
-            };
-        ''', gh_id=int(gh_id), discord_id=int(discord_id), gh_username=gh_username, discord_name=discord_name, discord_code=discord_code, contributed_to_repos=contributed_to_repos, is_currently_sponsoring=is_currently_sponsoring)
+        self.cursor.execute('''
+            INSERT INTO Sponsor (
+                gh_id, discord_id, gh_username, discord_name, discord_code,
+                contributed_to_repos, is_currently_sponsoring
+            ) VALUES (%s, %s, %s, %s, %s, %s, %s)
+        ''', (gh_id, discord_id, gh_username, discord_name, discord_code, contributed_to_repos, is_currently_sponsoring))
+        self.conn.commit()
 
     def get_sponsor_by_gh_id(self, gh_id):
-        return self.client.query_single('''
-            SELECT DISTINCT Sponsor {
-                gh_id,
-                gh_username,
-                gh_url,
-                discord_name,
-                discord_id,
-                discord_code,
-                contributed_to_repos,
-                is_contributor,
-                is_currently_sponsoring
-            }
-            FILTER .gh_id = <int32>$gh_id
-            LIMIT 1;
-        ''', gh_id=int(gh_id))
+        self.cursor.execute('''
+            SELECT * FROM Sponsor WHERE gh_id = %s LIMIT 1
+        ''', (gh_id,))
+        return self.cursor.fetchone()
 
     def get_sponsor_by_gh_username(self, gh_username):
-        return self.client.query_single('''
-            SELECT Sponsor {
-                gh_id,
-                gh_username,
-                gh_url,
-                discord_name,
-                discord_id,
-                discord_code,
-                contributed_to_repos,
-                is_contributor,
-                is_currently_sponsoring
-            }
-           FILTER str_lower(.gh_username) = str_lower(<str>$gh_username)
-            LIMIT 1;
-        ''', gh_username=gh_username)
+        self.cursor.execute('''
+            SELECT * FROM Sponsor WHERE LOWER(gh_username) = LOWER(%s) LIMIT 1
+        ''', (gh_username,))
+        return self.cursor.fetchone()
 
     def get_sponsor_by_discord_id(self, discord_id):
-        return self.client.query_single('''
-            SELECT Sponsor {
-                gh_id,
-                gh_username,
-                gh_url,
-                is_contributor,
-                contributed_to_repos,
-                discord_name,
-                discord_id,
-                discord_code,
-                is_currently_sponsoring
-            }
-            FILTER .discord_id = <int64>$discord_id
-            LIMIT 1;
-        ''', discord_id=int(discord_id))
-    
+        self.cursor.execute('''
+            SELECT * FROM Sponsor WHERE discord_id = %s LIMIT 1
+        ''', (discord_id,))
+        return self.cursor.fetchone()
+
     def update_sponsor_gh_username(self, gh_id, gh_username):
-        sponsor = self.get_sponsor_by_gh_id(gh_id)
-        if not sponsor:
+        if not self.get_sponsor_by_gh_id(gh_id):
             return
-        self.client.execute('''
-            UPDATE Sponsor
-            FILTER .gh_id = <int32>$gh_id
-            SET {
-                gh_username := <str>$gh_username
-            };
-        ''', gh_id=int(gh_id), gh_username=gh_username)
+        self.cursor.execute('''
+            UPDATE Sponsor SET gh_username = %s WHERE gh_id = %s
+        ''', (gh_username, gh_id))
+        self.conn.commit()
 
     def update_sponsor_discord_id(self, gh_id, discord_id):
         if not self.get_sponsor_by_gh_id(gh_id):
             return
-        self.client.execute('''
-            UPDATE Sponsor
-            FILTER .gh_id = <int32>$gh_id
-            SET {
-                discord_id := <int64>$discord_id
-            };
-        ''', gh_id=int(gh_id), discord_id=int(discord_id))
+        self.cursor.execute('''
+            UPDATE Sponsor SET discord_id = %s WHERE gh_id = %s
+        ''', (discord_id, gh_id))
+        self.conn.commit()
 
     def update_sponsor_discord_name(self, gh_id, discord_name):
         if not self.get_sponsor_by_gh_id(gh_id):
             return
-        self.client.execute('''
-            UPDATE Sponsor
-            FILTER .gh_id = <int32>$gh_id
-            SET {
-                discord_name := <str>$discord_name
-            };
-        ''', gh_id=int(gh_id), discord_name=discord_name)
+        self.cursor.execute('''
+            UPDATE Sponsor SET discord_name = %s WHERE gh_id = %s
+        ''', (discord_name, gh_id))
+        self.conn.commit()
 
     def update_sponsor_discord_code(self, gh_id, discord_code):
         if not self.get_sponsor_by_gh_id(gh_id):
             return
-        self.client.execute('''
-            UPDATE Sponsor
-            FILTER .gh_id = <int32>$gh_id
-            SET {
-                discord_code := <str>$discord_code
-            };
-        ''', gh_id=int(gh_id), discord_code=discord_code)
+        self.cursor.execute('''
+            UPDATE Sponsor SET discord_code = %s WHERE gh_id = %s
+        ''', (discord_code, gh_id))
+        self.conn.commit()
 
     def update_sponsor_contributed_to_repos(self, gh_id, contributed_to_repos):
         if not self.get_sponsor_by_gh_id(gh_id):
             return
-        self.client.execute('''
-            UPDATE Sponsor
-            FILTER .gh_id = <int32>$gh_id
-            SET {
-                contributed_to_repos := <array<str>>$contributed_to_repos
-            };
-        ''', gh_id=int(gh_id), contributed_to_repos=contributed_to_repos)
+        self.cursor.execute('''
+            UPDATE Sponsor SET contributed_to_repos = %s WHERE gh_id = %s
+        ''', (contributed_to_repos, gh_id))
+        self.conn.commit()
 
     def update_sponsor_is_currently_sponsoring(self, gh_id, is_currently_sponsoring):
         if not self.get_sponsor_by_gh_id(gh_id):
             return
-        self.client.execute('''
-            UPDATE Sponsor
-            FILTER .gh_id = <int32>$gh_id
-            SET {
-                is_currently_sponsoring := <bool>$is_currently_sponsoring
-            };
-        ''', gh_id=int(gh_id), is_currently_sponsoring=is_currently_sponsoring)
+        self.cursor.execute('''
+            UPDATE Sponsor SET is_currently_sponsoring = %s WHERE gh_id = %s
+        ''', (is_currently_sponsoring, gh_id))
+        self.conn.commit()
 
     def get_sponsors(self):
-        return self.client.query('''
-            SELECT Sponsor {
-                gh_id,
-                gh_username,
-                gh_url,
-                is_contributor,
-                contributed_to_repos,
-                discord_name,
-                discord_id,
-                discord_code,
-                is_currently_sponsoring
-            };
-        ''')
+        self.cursor.execute('SELECT * FROM Sponsor')
+        return self.cursor.fetchall()

db.py

@@ -1,16 +1,18 @@
 services:
   web:
     image: ghcr.io/nelsondane/sponsors-bot-web:latest
+    # build:
+    #   context: .
+    #   dockerfile: Dockerfile.web
     container_name: web
     restart: always
     volumes:
       - ./config.yaml:/app/config.yaml
-    environment:
-      - EDGEDB_DSN=edgedb://edgedb:5656?tls_security=insecure
     ports:
       - 8080:8080
     depends_on:
-      - edgedb
+      - db
+      - bot
 
   cloudflare:
     image: cloudflare/cloudflared:latest
@@ -20,28 +22,29 @@ services:
 
   bot:
     image: ghcr.io/nelsondane/sponsors-bot:latest
+    # build:
+    #   context: .
+    #   dockerfile: Dockerfile.bot
+    # platform: linux/amd64
     container_name: bot
     restart: always
     volumes:
       - ./config.yaml:/app/config.yaml
-    environment:
-      - EDGEDB_DSN=edgedb://edgedb:5656?tls_security=insecure
     depends_on:
-      - edgedb
+      - db
 
-  edgedb:
-    image: edgedb/edgedb:latest
-    container_name: edgedb
+  db:
+    image: postgres:17
+    container_name: db
     restart: always
     environment:
-      - EDGEDB_SERVER_SECURITY=insecure_dev_mode
-      - EDGEDB_SERVER_ADMIN_UI=enabled
-      - EDGEDB_SERVER_BIND_ADDRESS=0.0.0.0
+      - POSTGRES_USER=${POSTGRES_USER}
+      - POSTGRES_PASSWORD=${POSTGRES_PASSWORD}
+      - POSTGRES_DB=sponsors
     volumes:
-      - ./config/edgedb:/var/lib/edgedb/data
-      - ./dbschema:/dbschema
+      - ./db:/var/lib/postgresql/data
     ports:
-      - 5656:5656
+      - 5432:5432
 
   watchtower:
     image: containrrr/watchtower
@@ -52,7 +55,6 @@ services:
       - WATCHTOWER_INCLUDE_STOPPED=true
       - WATCHTOWER_POLL_INTERVAL=3600
     command:
-      - edgedb
       - bot
       - web
     volumes:

docker-compose.yml

@@ -1,5 +1,5 @@
 import requests
-from db import EdgeDB
+from db import PostgresDB
 from config import GH_TOKEN, GH_SPONSORS_TIER_ID, GH_REPOS
 
 def get_sponsors():
@@ -28,7 +28,7 @@ def get_sponsors():
         raise Exception(f"Query failed to run by returning code {request.status_code}. {request.text}")
     return request.json()["data"]["viewer"]["sponsors"]["edges"]
 
-def update_sponsors(db: EdgeDB):
+def update_sponsors(db: PostgresDB):
     users = db.get_sponsors()
     gh_sponsors = get_sponsors()
     for user in users:
@@ -68,7 +68,7 @@ def get_contributors():
         contributors += users
     return users
 
-def update_contributors(db: EdgeDB):
+def update_contributors(db: PostgresDB):
     contributors = get_contributors()
     for contributor in contributors:
         if db.get_sponsor_by_gh_id(contributor["id"]):

gh.py

@@ -5,14 +5,14 @@
 from config import GUILD_ID, GH_SPONSORS_ROLE_ID, BOT_TOKEN, GH_REPOS, GH_SPONSORS_URL, DISCORD_ROLES_LIST
 import emoji
 
-from db import EdgeDB
+from db import PostgresDB
 from gh import update_sponsors, update_contributors
 from web import generate_uri
 
 EMOJIS = emoji.EMOJI_DATA
 
 def update_db():
-    db = EdgeDB()
+    db = PostgresDB()
     update_sponsors(db)
     update_contributors(db)
 
@@ -140,7 +140,7 @@ async def give_old_reaction_roles():
 
 async def update_sponsors_and_contributors():
     # If Sponsor or Contributor status changes in DB, update roles
-    db = EdgeDB()
+    db = PostgresDB()
     users = [member async for member in client.get_guild(GUILD_ID).fetch_members()]
     for user in users:
         sponsor_remove = True
@@ -220,7 +220,7 @@ async def whois_command(interaction: discord.Interaction, discord_user: discord.
             return
         await interaction.response.send_message("Searching for user...", ephemeral=True)
         print(f"{interaction.user.display_name} searched for Discord user: {discord_user.display_name}")
-        db = EdgeDB()
+        db = PostgresDB()
         user = db.get_sponsor_by_discord_id(discord_user.id)
         if user:
             # User found
@@ -241,7 +241,7 @@ async def ishere_command(interaction: discord.Interaction, gh_username: str):
             return
         await interaction.response.send_message("Searching for user...", ephemeral=True)
         print(f"{interaction.user.display_name} searched for GitHub user: {gh_username}")
-        db = EdgeDB()
+        db = PostgresDB()
         user = db.get_sponsor_by_gh_username(gh_username)
         if user and user.discord_id:
             # User found
@@ -263,7 +263,7 @@ async def verify_command(interaction: discord.Interaction):
             return
         await interaction.response.send_message("Starting the verification...", ephemeral=True)
         update_db()
-        db = EdgeDB()
+        db = PostgresDB()
         user = db.get_sponsor_by_discord_id(interaction.user.id)
         discord_display_name = interaction.user.display_name
         if user: