v2

.env.example

@@ -17,3 +17,17 @@ 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'
+
+# Postgres
+POSTGRES_HOST='YOUR_POSTGRES_HOST'
+POSTGRES_PORT='YOUR_POSTGRES_PORT'
+POSTGRES_USER='YOUR_POSTGRES_USER'
+POSTGRES_PASSWORD='YOUR_POSTGRES_PASSWORD'
+POSTGRES_DB='YOUR_POSTGRES_DB'
+
+# Postgres Dev
+POSTGRES_DEV_HOST='YOUR_POSTGRES_DEV_HOST'
+POSTGRES_DEV_PORT='YOUR_POSTGRES_DEV_PORT'
+POSTGRES_DEV_USER='YOUR_POSTGRES_DEV_USER'
+POSTGRES_DEV_PASSWORD='YOUR_POSTGRES_DEV_PASSWORD'
+POSTGRES_DEV_DB='YOUR_POSTGRES_DEV_DB'

.gitattributes

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

.github/dependabot.yml

@@ -1,6 +1,6 @@
 version: 2
 updates:
-  - package-ecosystem: "npm"
+  - package-ecosystem: "bun"
     directory: "/"
     schedule:
       interval: "weekly"

.gitignore

@@ -5,5 +5,6 @@ node_modules/
 /backups
 *.db
 *.sqlite
-*.sqlite3
-*.sql
+*.sqlite3*
+*.sql
+dbtests.ts

new.dbml

@@ -0,0 +1,99 @@
+-- the database schema for feedr 2.0, just here temporarily during development
+
+Table discord {
+  guild_id string [pk, not null, note: "Discord guild ID"]
+  is_dm string [default: false, not null]
+  allowed_public_sharing boolean [default: false, not null, note: "False by default due to privacy stuff"]
+}
+
+Table guild_bluesky_subscriptions {
+  id int [pk, not null, increment]
+  guild_id string [not null, ref: > discord.guild_id]
+  bluesky_user_id string [not null, ref: > bluesky.bluesky_user_id]
+  notification_channel_id string [not null]
+  notification_role_id string
+  is_dm boolean [not null, default: false]
+  check_for_replies boolean [not null, default: false]
+}
+
+Table guild_youtube_subscriptions {
+  id int [pk, not null, increment]
+  guild_id string [not null, ref: > discord.guild_id]
+  youtube_channel_id string [not null, ref: > youtube.youtube_channel_id]
+  notification_channel_id string [not null]
+  notification_role_id string
+  is_dm boolean [not null, default: false]
+  track_videos boolean [default: false, not null]
+  track_shorts boolean [default: false, not null]
+  track_streams boolean [default: false, not null]
+}
+
+Table guild_twitch_subscriptions {
+  id int [pk, not null, increment]
+  guild_id string [not null, ref: > discord.guild_id]
+  twitch_channel_id string [not null, ref: > twitch.twitch_channel_id]
+  notification_channel_id string [not null]
+  notification_role_id string
+  is_dm boolean [not null, default: false]
+}
+
+Table bluesky {
+  bluesky_user_id string [pk, not null]
+  latest_post_id string
+  latest_reply_id string
+}
+
+Table youtube {
+  youtube_channel_id string [pk, not null]
+  latest_video_id string
+  latest_video_id_updated datetime
+  latest_short_id string
+  latest_short_id_updated datetime
+  latest_stream_id string
+  latest_stream_id_updated datetime
+  youtube_channel_is_live boolean
+}
+
+Table twitch {
+  twitch_channel_id string [pk, not null]
+  twitch_channel_is_live boolean [not null]
+}
+
+Table bot_info {
+  guilds_total int [not null, default: 0]
+  channels_tracked int [not null, default: 0]
+  total_members int [not null, default: 0]
+  updated_at datetime [not null, default: `now()`]
+  extended_info_updated_at datetime [not null, default: `now()`]
+}
+
+Table bot_info_notifications {
+  date date [not null]
+  total_youtube int [not null, default: 0]
+  total_twitch int [not null, default: 0]
+}
+
+Table bot_info_notifications_timings {
+  time datetime [not null]
+  channel_id string [not null, ref: > youtube.youtube_channel_id]
+  time_ms int [not null, default: 0]
+}
+
+Table bot_info_top_channels {
+  youtube_channel_id string [not null, pk, ref: > youtube.youtube_channel_id]
+  guilds_tracking int [not null, default: 0]
+}
+
+Table bot_info_top_guilds {
+  guild_id int [pk, not null, ref: > discord.guild_id]
+  members int [not null, default: 0]
+}
+
+Table audit_logs {
+  id int [pk, not null, increment]
+  event_type string [not null, note: "e.g., subscribe_youtube, unsubscribe_twitch"]
+  guild_id string [not null, ref: > discord.guild_id]
+  related_id string [not null, note: "Related YouTube or Twitch channel ID"]
+  note string
+  occurred_at datetime [default: `now()`]
+}

package.json

@@ -1,12 +1,16 @@
 {
-  "name": "videonotifier",
+  "name": "feedr",
   "module": "src/index.ts",
   "type": "module",
-  "version": "1.3.0",
+  "version": "2.0.0-dev",
   "devDependencies": {
-    "@types/bun": "1.1.14",
+    "@types/bun": "1.2.10",
+    "@types/cors": "^2.8.17",
+    "@types/express": "^5.0.1",
+    "@types/pg": "^8.11.14",
     "@typescript-eslint/eslint-plugin": "8.11.0",
     "@typescript-eslint/parser": "8.11.0",
+    "concurrently": "^9.1.2",
     "eslint": "^8.57.0",
     "eslint-config-prettier": "9.1.0",
     "eslint-plugin-import": "^2.26.0",
@@ -19,12 +23,16 @@
   },
   "scripts": {
     "dev": "bun --watch . --dev",
+    "test:site": "bun --watch src/web/web.ts",
     "test:jetstream": "bun --watch src/utils/bluesky/jetstream.ts",
     "lint": "eslint . --ext .ts -c .eslintrc.json",
     "lint:fix": "eslint . --ext .ts -c .eslintrc.json --fix"
   },
   "dependencies": {
-    "cron": "^3.2.1",
-    "discord.js": "^14.16.3"
+    "cors": "^2.8.5",
+    "cron": "^4.3.0",
+    "discord.js": "^14.19.1",
+    "express": "^5.1.0",
+    "pg": "^8.15.6"
   }
 }