Skip to content

v2 #73

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 43 commits into
base: main
Choose a base branch
from
Draft

v2 #73

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
28f6201
hai im doing something
GalvinPython Jan 26, 2025
5b553c3
chore: lint + update dependabot flow for bun
GalvinPython Feb 3, 2025
dcea4b7
chore: replace phemeral: true with lags: MessageFlags.Ephemeral in …
GalvinPython Feb 3, 2025
5a404fe
chore: replace ` ephemeral: true` with ` flags: MessageFlags.Ephemer…
GalvinPython Feb 3, 2025
59bd0a7
Merge branch 'dev' of https://github.com/GalvinPython/feedr into dev
GalvinPython Feb 3, 2025
f4fdf2e
welcome back pg
GalvinPython Apr 25, 2025
1c47b7c
added new env stuff
GalvinPython Apr 26, 2025
fc0b5d3
added pg pool
GalvinPython Apr 27, 2025
1238937
deps: update discord.js
GalvinPython Apr 27, 2025
d5ed05b
more changes
GalvinPython Apr 27, 2025
232f94c
build(deps): bump cron from 3.5.0 to 4.3.0
dependabot[bot] Apr 28, 2025
3c7839f
update package data
GalvinPython Apr 28, 2025
e0ab312
Merge pull request #105 from GalvinPython/dependabot/npm_and_yarn/dev…
GalvinPython Apr 28, 2025
84d90c7
chore: update bun.lock
GalvinPython Apr 28, 2025
ba95662
chore(database): migrate initTables to seperate file
GalvinPython Apr 28, 2025
7c68c4c
migrate db
GalvinPython Apr 29, 2025
bb1feb7
start of site
GalvinPython May 5, 2025
8bac0d0
Update web/src/components/ScrollUpButton.tsx
GalvinPython May 5, 2025
599f364
Update web/src/components/Hero.tsx
GalvinPython May 5, 2025
c777cc3
feat: api
GalvinPython May 6, 2025
b33d985
chore(deps): remove express
GalvinPython May 6, 2025
16ccb02
update .gitignore to be on par with "feat/site"
GalvinPython May 6, 2025
4b19414
db: migrate bot_info to new system
GalvinPython May 6, 2025
fc26d22
chore(web): change favicon
GalvinPython May 9, 2025
e1348be
feat(web): add tos page
GalvinPython May 9, 2025
6458eb5
feat(web): add privacy and 404 page
GalvinPython May 18, 2025
540625f
chore(bot): continue db migration
GalvinPython May 18, 2025
6db12aa
i forgot what my code does
GalvinPython Jun 23, 2025
c7b0597
ref: code clean up + comments
GalvinPython Jun 23, 2025
b4980b0
feat(latest-uploads): split update function
ToastedDev Jun 23, 2025
8a73bf5
chore: cleanup
ToastedDev Jun 23, 2025
8ca3c5e
Merge branch 'GalvinPython:dev' into dev
ToastedDev Jun 23, 2025
397508e
Update src/utils/youtube/sendLatestUploads.ts
GalvinPython Jun 23, 2025
411c998
Merge pull request #134 from ToastedDev/dev
GalvinPython Jun 23, 2025
522c316
feat(commands): better errors for `/track`
ToastedDev Jun 23, 2025
c77de3c
feat(/track): add same errors for twitch
ToastedDev Jun 23, 2025
b3783bc
Merge pull request #135 from ToastedDev/dev
GalvinPython Jun 23, 2025
8dd8d61
fix: broken functions + #119
GalvinPython Jun 29, 2025
a14ca30
push before merging site into dev
GalvinPython Jun 29, 2025
0f4da00
resolve conflicts (hopefully)
GalvinPython Jun 29, 2025
05bb4ca
Merge branch 'dev' into feat/site
GalvinPython Jun 29, 2025
029059e
Merge pull request #111 from GalvinPython/feat/site
GalvinPython Jun 29, 2025
7f40bd6
chore: slight cleanup
GalvinPython Jun 30, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions .env.example
Original file line number Diff line number Diff line change
Expand Up @@ -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'
2 changes: 1 addition & 1 deletion .eslintrc.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"$schema": "https://json.schemastore.org/eslintrc.json",
"env": {
"browser": false,
"browser": true,
"es2021": true,
"node": true
},
Expand Down
1 change: 0 additions & 1 deletion .gitattributes
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
* text=auto eol=lf
*.lockb binary diff=lockb
16 changes: 15 additions & 1 deletion .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,23 @@
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"
assignees:
- "GalvinPython"
target-branch: "dev"
labels: ["dependencies", "javascript", "component: web"]

- package-ecosystem: "cargo"
directory: "/api"
schedule:
interval: "weekly"
43 changes: 0 additions & 43 deletions .github/workflows/lockb.yml

This file was deleted.

44 changes: 44 additions & 0 deletions .github/workflows/site_build.yml
Original file line number Diff line number Diff line change
@@ -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
9 changes: 7 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,9 +1,14 @@
node_modules/
.env
.astro/
dist/
target/

# Database stuff
/backups
*.db
*.sqlite
*.sqlite3
*.sql
*.sqlite3*
*.sql
dbtests.ts
perftesting.ts
Loading