Merge pull request #73 from GalvinPython/dev

Author: GalvinPython

.env.example

@@ -8,6 +8,7 @@ DISCORD_DEV_TOKEN='YOUR_DISCORD_DEV_TOKEN'
 
 # YouTube API Key
 YOUTUBE_API_KEY='YOUR_YOUTUBE_API_KEY'
+YOUTUBE_INNERTUBE_PROXY_URL='YOUR_OPTIONAL_YOUTUBE_INNERTUBE_PROXY_URL'
 
 # Twitch
 TWITCH_CLIENT_ID='YOUR_TWITCH_CLIENT_ID'
@@ -17,3 +18,15 @@ TWITCH_CLIENT_SECRET='YOUR_TWITCH_CLIENT_SECRET'
 CONFIG_UPDATE_INTERVAL_YOUTUBE='10'
 CONFIG_UPDATE_INTERVAL_TWITCH='2'
 CONFIG_DISCORD_LOGS_CHANNEL='YOUR_DISCORD_LOGS_CHANNEL'
+
+## The following values are recommened to be at the default values.
+## If you want to change them, please make sure you know what you are doing.
+## Times are in seconds.
+CONFIG_DISCORD_WAIT_FOR_GUILD_CACHE_TIME='10'
+CONFIG_DISCORD_COLLECTOR_TIMEOUT='60'
+CONFIG_DISCORD_COMPONENTS_PAGE_SIZE='10' # The number of channels to display per page in the components (ex. https://github.com/GalvinPython/feedr/pull/154)
+
+# Postgres URLs
+POSTGRES_URL='postgresql://user:password@server:port/database'
+POSTGRES_DEV_URL='postgresql://user:password@server:port/database'
+POSTGRES_STAGING_URL='postgresql://user:password@server:port/database'

.eslintrc.json

@@ -1,7 +1,7 @@
 {
     "$schema": "https://json.schemastore.org/eslintrc.json",
     "env": {
-        "browser": false,
+        "browser": true,
         "es2021": true,
         "node": true
     },

.gitattributes

@@ -1,2 +1 @@
 * text=auto eol=lf
-*.lockb binary diff=lockb

.github/dependabot.yml

@@ -1,9 +1,21 @@
+# TODO: Labels on package updates after project restructure
+
 version: 2
 updates:
-  - package-ecosystem: "npm"
+  - package-ecosystem: "bun"
     directory: "/"
     schedule:
       interval: "weekly"
-    assignees:
-      - "GalvinPython"
+    target-branch: "dev"
+
+  - package-ecosystem: "bun"
+    directory: "/web"
+    schedule:
+      interval: "weekly"
+    target-branch: "dev"
+
+  - package-ecosystem: "cargo"
+    directory: "/api"
+    schedule:
+      interval: "weekly"
     target-branch: "dev"

.github/workflows/lockb.yml renamed to .github/workflows/dependabot_bun.yml

@@ -1,16 +1,17 @@
-name: Update bun.lockb
+name: Update bun.lock
 
 on:
-  push:
+  pull_request:
     branches: [main, dev]
 
 permissions:
   contents: write
 
 jobs:
-  update-bun-lockb:
-    name: "Update bun.lockb"
+  update-bun-lock:
+    name: "Update bun.lock"
     runs-on: ubuntu-latest
+    if: github.actor == 'dependabot[bot]'
     steps:
       - name: Set up Bun
         uses: oven-sh/setup-bun@v2
@@ -24,20 +25,20 @@ jobs:
       - name: Check for changes
         id: git_status
         run: |
-          git add bun.lockb
+          git add bun.lock
           if [ -z "$(git status --porcelain)" ]; then
-            echo "No changes to bun.lockb"
-            echo "::set-output name=changes_detected::false"
+            echo "No changes to bun.lock"
+            echo "changes_detected=false" >> "$GITHUB_OUTPUT"
           else
-            echo "Changes detected to bun.lockb"
-            echo "::set-output name=changes_detected::true"
+            echo "Changes detected to bun.lock"
+            echo "changes_detected=true" >> "$GITHUB_OUTPUT"
           fi
 
-      - name: Commit and push changes to bun.lockb
+      - name: Commit and push changes to bun.lock
         if: steps.git_status.outputs.changes_detected == 'true'
         run: |
           git config --global user.name 'github-actions[bot]'
           git config --global user.email 'github-actions[bot]@users.noreply.github.com'
-          git commit -m "Update bun.lockb (via GitHub Actions)"
-          git pull --rebase origin ${{ github.ref_name }}
-          git push origin ${{ github.ref_name }}
+          git commit -m "Update bun.lock (via GitHub Actions)"
+          git pull --rebase origin ${{ github.head_ref }}
+          git push origin ${{ github.head_ref }}

.github/workflows/site_build.yml

@@ -0,0 +1,44 @@
+name: Site Build
+
+on:
+  push:
+    branches:
+      - "*"
+    paths:
+      - "./web/**/*.js"
+      - "./web/**/*.jsx"
+      - "./web/**/*.ts"
+      - "./web/**/*.tsx"
+      - "./web/**/*.mjs"
+      - "./web/**/*.css"
+      - "./web/**/*.cjs"
+      - "./web/**/*.astro"
+  pull_request:
+    types: [opened, reopened, synchronize]
+    paths:
+      - "./web/**/*.js"
+      - "./web/**/*.jsx"
+      - "./web/**/*.ts"
+      - "./web/**/*.tsx"
+      - "./web/**/*.mjs"
+      - "./web/**/*.css"
+      - "./web/**/*.cjs"
+      - "./web/**/*.astro"
+
+jobs:
+  lint:
+    name: Build Site
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+
+      - name: Setup Bun
+        uses: oven-sh/setup-bun@v2
+
+      - name: Install dependencies
+        run: bun install
+
+      - name: Build Site
+        run: bun run web:build

.gitignore

@@ -1,9 +1,15 @@
 node_modules/
 .env
+.astro/
+dist/
+target/
 
 # Database stuff
-/backups
 *.db
 *.sqlite
-*.sqlite3
-*.sql
+*.sqlite3*
+*.sql
+dbtests.ts
+perftesting.ts
+drizzle/
+fetchTest.ts