Skip to content

Commit 447155f

Browse files
authored
Merge pull request #73 from GalvinPython/dev
2 parents d76e655 + b97edb1 commit 447155f

File tree

101 files changed

+10357
-1065
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

101 files changed

+10357
-1065
lines changed

.env.example

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ DISCORD_DEV_TOKEN='YOUR_DISCORD_DEV_TOKEN'
88

99
# YouTube API Key
1010
YOUTUBE_API_KEY='YOUR_YOUTUBE_API_KEY'
11+
YOUTUBE_INNERTUBE_PROXY_URL='YOUR_OPTIONAL_YOUTUBE_INNERTUBE_PROXY_URL'
1112

1213
# Twitch
1314
TWITCH_CLIENT_ID='YOUR_TWITCH_CLIENT_ID'
@@ -17,3 +18,15 @@ TWITCH_CLIENT_SECRET='YOUR_TWITCH_CLIENT_SECRET'
1718
CONFIG_UPDATE_INTERVAL_YOUTUBE='10'
1819
CONFIG_UPDATE_INTERVAL_TWITCH='2'
1920
CONFIG_DISCORD_LOGS_CHANNEL='YOUR_DISCORD_LOGS_CHANNEL'
21+
22+
## The following values are recommened to be at the default values.
23+
## If you want to change them, please make sure you know what you are doing.
24+
## Times are in seconds.
25+
CONFIG_DISCORD_WAIT_FOR_GUILD_CACHE_TIME='10'
26+
CONFIG_DISCORD_COLLECTOR_TIMEOUT='60'
27+
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)
28+
29+
# Postgres URLs
30+
POSTGRES_URL='postgresql://user:password@server:port/database'
31+
POSTGRES_DEV_URL='postgresql://user:password@server:port/database'
32+
POSTGRES_STAGING_URL='postgresql://user:password@server:port/database'

.eslintrc.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"$schema": "https://json.schemastore.org/eslintrc.json",
33
"env": {
4-
"browser": false,
4+
"browser": true,
55
"es2021": true,
66
"node": true
77
},

.gitattributes

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
11
* text=auto eol=lf
2-
*.lockb binary diff=lockb

.github/dependabot.yml

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,21 @@
1+
# TODO: Labels on package updates after project restructure
2+
13
version: 2
24
updates:
3-
- package-ecosystem: "npm"
5+
- package-ecosystem: "bun"
46
directory: "/"
57
schedule:
68
interval: "weekly"
7-
assignees:
8-
- "GalvinPython"
9+
target-branch: "dev"
10+
11+
- package-ecosystem: "bun"
12+
directory: "/web"
13+
schedule:
14+
interval: "weekly"
15+
target-branch: "dev"
16+
17+
- package-ecosystem: "cargo"
18+
directory: "/api"
19+
schedule:
20+
interval: "weekly"
921
target-branch: "dev"
Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
1-
name: Update bun.lockb
1+
name: Update bun.lock
22

33
on:
4-
push:
4+
pull_request:
55
branches: [main, dev]
66

77
permissions:
88
contents: write
99

1010
jobs:
11-
update-bun-lockb:
12-
name: "Update bun.lockb"
11+
update-bun-lock:
12+
name: "Update bun.lock"
1313
runs-on: ubuntu-latest
14+
if: github.actor == 'dependabot[bot]'
1415
steps:
1516
- name: Set up Bun
1617
uses: oven-sh/setup-bun@v2
@@ -24,20 +25,20 @@ jobs:
2425
- name: Check for changes
2526
id: git_status
2627
run: |
27-
git add bun.lockb
28+
git add bun.lock
2829
if [ -z "$(git status --porcelain)" ]; then
29-
echo "No changes to bun.lockb"
30-
echo "::set-output name=changes_detected::false"
30+
echo "No changes to bun.lock"
31+
echo "changes_detected=false" >> "$GITHUB_OUTPUT"
3132
else
32-
echo "Changes detected to bun.lockb"
33-
echo "::set-output name=changes_detected::true"
33+
echo "Changes detected to bun.lock"
34+
echo "changes_detected=true" >> "$GITHUB_OUTPUT"
3435
fi
3536
36-
- name: Commit and push changes to bun.lockb
37+
- name: Commit and push changes to bun.lock
3738
if: steps.git_status.outputs.changes_detected == 'true'
3839
run: |
3940
git config --global user.name 'github-actions[bot]'
4041
git config --global user.email 'github-actions[bot]@users.noreply.github.com'
41-
git commit -m "Update bun.lockb (via GitHub Actions)"
42-
git pull --rebase origin ${{ github.ref_name }}
43-
git push origin ${{ github.ref_name }}
42+
git commit -m "Update bun.lock (via GitHub Actions)"
43+
git pull --rebase origin ${{ github.head_ref }}
44+
git push origin ${{ github.head_ref }}

.github/workflows/site_build.yml

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
name: Site Build
2+
3+
on:
4+
push:
5+
branches:
6+
- "*"
7+
paths:
8+
- "./web/**/*.js"
9+
- "./web/**/*.jsx"
10+
- "./web/**/*.ts"
11+
- "./web/**/*.tsx"
12+
- "./web/**/*.mjs"
13+
- "./web/**/*.css"
14+
- "./web/**/*.cjs"
15+
- "./web/**/*.astro"
16+
pull_request:
17+
types: [opened, reopened, synchronize]
18+
paths:
19+
- "./web/**/*.js"
20+
- "./web/**/*.jsx"
21+
- "./web/**/*.ts"
22+
- "./web/**/*.tsx"
23+
- "./web/**/*.mjs"
24+
- "./web/**/*.css"
25+
- "./web/**/*.cjs"
26+
- "./web/**/*.astro"
27+
28+
jobs:
29+
lint:
30+
name: Build Site
31+
runs-on: ubuntu-latest
32+
33+
steps:
34+
- name: Checkout code
35+
uses: actions/checkout@v2
36+
37+
- name: Setup Bun
38+
uses: oven-sh/setup-bun@v2
39+
40+
- name: Install dependencies
41+
run: bun install
42+
43+
- name: Build Site
44+
run: bun run web:build

.gitignore

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,15 @@
11
node_modules/
22
.env
3+
.astro/
4+
dist/
5+
target/
36

47
# Database stuff
5-
/backups
68
*.db
79
*.sqlite
8-
*.sqlite3
9-
*.sql
10+
*.sqlite3*
11+
*.sql
12+
dbtests.ts
13+
perftesting.ts
14+
drizzle/
15+
fetchTest.ts

0 commit comments

Comments
 (0)