Skip to content
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

Cracktunes v0.3.11 #296

Merged
merged 95 commits into from
Aug 25, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
95 commits
Select commit Hold shift + click to select a range
51574e7
deps and comments
cycle-five Jul 29, 2024
33958f5
move send_now_playing
cycle-five Jul 30, 2024
030cdcf
refactor get_track_metadata
cycle-five Jul 31, 2024
dd8d46c
update opentelemetry
cycle-five Jul 31, 2024
cf7f3fc
callgraphs
cycle-five Jul 31, 2024
e3ffccc
cleanup send now playing
cycle-five Aug 1, 2024
6e11746
put send_reply_embed into context extension
cycle-five Aug 2, 2024
02959c7
comments
cycle-five Aug 2, 2024
0e5de0d
Remove commented out code.
cycle-five Aug 2, 2024
f046a7b
try to fix emoji
cycle-five Aug 3, 2024
3dccf4e
fallback to ytdl and idle handler debugging prints
cycle-five Aug 3, 2024
bea9825
random disconnects...
cycle-five Aug 3, 2024
7b29da6
wtf...
cycle-five Aug 3, 2024
71c00f4
cargo update
cycle-five Aug 3, 2024
457e01e
try removing the 5 second timeout on the connect...
cycle-five Aug 3, 2024
3426037
Asdf
cycle-five Aug 3, 2024
4216950
simplify some stuff
cycle-five Aug 3, 2024
0d628f4
cargo update
cycle-five Aug 3, 2024
a0b3c40
fuck it use both version of reqwest
cycle-five Aug 4, 2024
021c5e6
try it this way...
cycle-five Aug 4, 2024
9c3c52f
update for changes from dbj
cycle-five Aug 5, 2024
75681eb
asdf:
cycle-five Aug 5, 2024
6af22ca
patch for DCs
cycle-five Aug 5, 2024
f8fb04d
Refactor the crack-voting module
cycle-five Aug 6, 2024
710c966
asdf
cycle-five Aug 6, 2024
3069b00
fix query in crack-voting
cycle-five Aug 7, 2024
9d60a61
asdf
cycle-five Aug 7, 2024
4398b9f
cleanup and linting
cycle-five Aug 7, 2024
bb832bf
cleanup
cycle-five Aug 8, 2024
d3d333c
logging functionality
cycle-five Aug 8, 2024
ee26790
try using warp's own logging feature
cycle-five Aug 8, 2024
45ac68c
clean up crack-voting
cycle-five Aug 8, 2024
f04b71b
docker stuff
cycle-five Aug 9, 2024
1008960
build stuff
cycle-five Aug 10, 2024
d1197dd
cleanup and build stuff
cycle-five Aug 10, 2024
cb666f1
cargo update and fix tests
cycle-five Aug 11, 2024
a08cf49
stop tracks when removing them
cycle-five Aug 11, 2024
e4a1c5e
build stuff, need to fix my steam compose thing
cycle-five Aug 11, 2024
f40a051
Remove redunded abstractions
cycle-five Aug 12, 2024
5eeb7a7
update rusty_ytdl and cargo update
cycle-five Aug 13, 2024
8cd848b
rusty ytdl connector works again, fuck yeah.
cycle-five Aug 13, 2024
dfdfbc5
cleanup queuing
cycle-five Aug 13, 2024
393d342
asdf
cycle-five Aug 13, 2024
290ad71
using rusty again..
cycle-five Aug 13, 2024
988a224
cleanup
cycle-five Aug 13, 2024
fac1dad
crack-activity
cycle-five Aug 13, 2024
66bbcdb
crack-activity
cycle-five Aug 13, 2024
6ab5a47
asdf
cycle-five Aug 13, 2024
cf52104
asdf:
cycle-five Aug 13, 2024
0fe754d
aasdf
cycle-five Aug 13, 2024
b52f880
asdf
cycle-five Aug 13, 2024
b956f7a
asdf
cycle-five Aug 13, 2024
f5754c0
REMOVED all intents other than unprivildged and guild members
cycle-five Aug 14, 2024
d793e14
cargo update
cycle-five Aug 15, 2024
2eff5c5
update code coverage job
cycle-five Aug 15, 2024
81383dd
asdf
cycle-five Aug 15, 2024
4eb851a
cargo fmty
cycle-five Aug 15, 2024
a65ecb4
malingering tests
cycle-five Aug 15, 2024
f3ae36f
asdf
cycle-five Aug 15, 2024
9c6d9c3
asdf
cycle-five Aug 15, 2024
88c0623
Trim vergen dep
cycle-five Aug 15, 2024
0a060e4
update builds
cycle-five Aug 15, 2024
c28bedb
asdf
cycle-five Aug 15, 2024
fb2332b
asdf
cycle-five Aug 15, 2024
f58c863
chore: dist update
cycle-five Aug 15, 2024
d213a22
refactor: move the module for the front end of cracktunes server
cycle-five Aug 16, 2024
0a0ab23
updating, yacc shearing
cycle-five Aug 17, 2024
e47c00e
not doing cargo dist for now
cycle-five Aug 17, 2024
0271220
chore: cargo update
cycle-five Aug 17, 2024
9859311
tests
cycle-five Aug 17, 2024
47e642f
roll back ringbuf
cycle-five Aug 17, 2024
9659f83
cleanup cargo toml
cycle-five Aug 17, 2024
f9abaa7
asdf
cycle-five Aug 17, 2024
c790473
asdf
cycle-five Aug 17, 2024
bac7da7
asdf
cycle-five Aug 17, 2024
1573b87
asdfqwer
cycle-five Aug 18, 2024
dfb75f7
asdf
cycle-five Aug 18, 2024
4fdb7a9
asdf
cycle-five Aug 18, 2024
ac891bd
asdf
cycle-five Aug 18, 2024
cf063ea
cleanup and fix tests
cycle-five Aug 19, 2024
6351c8d
remove some unused code
cycle-five Aug 19, 2024
2851bfe
cleanup and add error message to seek
cycle-five Aug 19, 2024
0d35f2c
game commands and settings
cycle-five Aug 22, 2024
41f94ad
we don't want these registered at the top level
cycle-five Aug 22, 2024
280378e
asdf
cycle-five Aug 22, 2024
54f958c
Asdf
cycle-five Aug 22, 2024
14e2a5a
Asdf
cycle-five Aug 22, 2024
589635f
docker stuff
cycle-five Aug 23, 2024
052b964
mute all others in vc admin command
cycle-five Aug 24, 2024
280980a
make mute_others a tlc also
cycle-five Aug 24, 2024
024af0a
add unmute option
cycle-five Aug 24, 2024
655188e
register the register command
cycle-five Aug 24, 2024
002d847
.gitignore
cycle-five Aug 24, 2024
2305ae5
cargo update
cycle-five Aug 24, 2024
1f3a929
code coverage
cycle-five Aug 25, 2024
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
13 changes: 12 additions & 1 deletion .env.example
Original file line number Diff line number Diff line change
@@ -1,19 +1,23 @@
#
# [REQUIRED] To authenticate with Discord, you must create a Discord app.
# See more: https://discord.com/developers/applications
export DISCORD_TOKEN=XXXXXX
export DISCORD_APP_ID=XXXXXX

#
# [REQUIRED] Postgres database URL for the bot to use.
#
export DATABASE_URL=postgresql://postgres:mysecretpassword@localhost:5432/postgres
export PG_USER=postgres
export PG_PASSWORD=mysecretpassword

#
# [Optional] To support Spotify links, you must create a Spotify app.
# See more: https://developer.spotify.com/dashboard/applications
export SPOTIFY_CLIENT_ID=XXXXXX
export SPOTIFY_CLIENT_SECRET=XXXXXX

#
# [Optional] OpenAI API key for the chatgpt feature.
#
export OPENAI_API_KEY=XXXXXX
Expand All @@ -27,4 +31,11 @@ export PGADMIN_PW=XXXXXX
#
# [Optional] VirusTotal API key for the url scanning.
#
export VIRUSTOTAL_API_KEY=XXXXXX
export VIRUSTOTAL_API_KEY=XXXXXX

#
# [Optional] top.gg and discordbotlist.com integration.
#
export TOPGG_TOKEN=XXXXXX
export DBL_TOKEN=XXXXXX
export WEBHOOK_SECRET=XXXXXX
41 changes: 41 additions & 0 deletions .env.example.fish
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
#
# [REQUIRED] To authenticate with Discord, you must create a Discord app.
# See more: https://discord.com/developers/applications
set -x DISCORD_TOKEN XXXXXX
set -x DISCORD_APP_ID XXXXXX

#
# [REQUIRED] Postgres database URL for the bot to use.
#
set -x DATABASE_URL postgresql://postgres:mysecretpassword@localhost:5432/postgres
set -x PG_USER postgres
set -x PG_PASSWORD mysecretpassword

#
# [Optional] To support Spotify links, you must create a Spotify app.
# See more: https://developer.spotify.com/dashboard/applications
set -x SPOTIFY_CLIENT_ID XXXXXX
set -x SPOTIFY_CLIENT_SECRET XXXXXX

#
# [Optional] OpenAI API key for the chatgpt feature.
#
set -x OPENAI_API_KEY XXXXXX

#
# [Optional] pgadmin support
#
set -x PGADMIN_MAIL XXXXXX
set -x PGADMIN_PW XXXXXX

#
# [Optional] VirusTotal API key for the url scanning.
#
set -x VIRUSTOTAL_API_KEY XXXXXX

#
# [Optional] top.gg and discordbotlist.com integration.
#
set -x TOPGG_TOKEN XXXXXX
set -x DBL_TOKEN XXXXXX
set -x WEBHOOK_SECRET XXXXXX
1 change: 1 addition & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
*.zip filter=lfs diff=lfs merge=lfs -text
data/** filter=lfs diff=lfs merge=lfs -text
8 changes: 5 additions & 3 deletions .github/workflows/coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:

- name: "Install yt-dlp"
run: |
curl -sSL --output /usr/local/bin/yt-dlp https://github.com/yt-dlp/yt-dlp/releases/download/2024.04.09/yt-dlp_linux
curl -sSL --output /usr/local/bin/yt-dlp https://github.com/yt-dlp/yt-dlp/releases/download/latest/yt-dlp_linux
chmod +x /usr/local/bin/yt-dlp
shell: bash

Expand Down Expand Up @@ -56,6 +56,7 @@ jobs:
PG_USER: postgres
PG_PASSWORD: mysecretpassword
VIRUSTOTAL_API_KEY: ${{secrets.VIRUSTOTAL_API_KEY}}
WEBHOOK_SECRET: ${{secrets.WEBHOOK_SECRET}}
run: |
sqlx database create
sqlx migrate run --source migrations/
Expand All @@ -67,11 +68,12 @@ jobs:
PG_USER: postgres
PG_PASSWORD: mysecretpassword
VIRUSTOTAL_API_KEY: ${{secrets.VIRUSTOTAL_API_KEY}}
WEBHOOK_SECRET: ${{secrets.WEBHOOK_SECRET}}
run: |
cargo tarpaulin --verbose --all --timeout 120 --out xml
cargo tarpaulin --ignore-tests --verbose --all --timeout 120 --out xml

- name: Upload to codecov.io
uses: codecov/codecov-action@v4
with:
token: ${{secrets.CODECOV_TOKEN}} # not required for public repos
fail_ci_if_error: true
fail_ci_if_error: false
2 changes: 1 addition & 1 deletion .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ jobs:
PG_USER: postgres
PG_PASSWORD: mysecretpassword
VIRUSTOTAL_API_KEY: ${{secrets.VIRUSTOTAL_API_KEY}}
run: cargo +nightly fmt --all -- --check
run: cargo fmt --all -- --check

- name: Run clippy
env:
Expand Down
9 changes: 2 additions & 7 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,8 @@
# title/body based on your changelogs.

name: Release

permissions:
contents: write
"contents": "write"

# This task will run whenever you push a git tag that looks like a version
# like "1.0.0", "v0.1.0-prerelease.1", "my-app/0.1.0", "releases/v1.0.0", etc.
Expand Down Expand Up @@ -62,7 +61,7 @@ jobs:
# we specify bash to get pipefail; it guards against the `curl` command
# failing. otherwise `sh` won't catch that `curl` returned non-0
shell: bash
run: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/v0.17.0/cargo-dist-installer.sh | sh"
run: "curl --proto '=https' --tlsv1.2 -LsSf https://github.com/axodotdev/cargo-dist/releases/download/v0.21.0/cargo-dist-installer.sh | sh"
- name: Cache cargo-dist
uses: actions/upload-artifact@v4
with:
Expand Down Expand Up @@ -116,10 +115,6 @@ jobs:
- uses: actions/checkout@v4
with:
submodules: recursive
- uses: swatinem/rust-cache@v2
with:
key: ${{ join(matrix.targets, '-') }}
cache-provider: ${{ matrix.cache_provider }}
- name: Install cargo-dist
run: ${{ matrix.install_dist }}
# Get the dist-manifest
Expand Down
4 changes: 2 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
/*/target/

# data generated during runtime
/data/
/*/data/
data/
crack-core/data/
/logs/
scratch

Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
"crack-gpt",
"crack-osint",
"crack-bf",
"crack-activity",
],
"rust-analyzer.linkedProjects": [
"./crack-core/Cargo.toml",
Expand Down
4 changes: 3 additions & 1 deletion .vscode/tasks.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,9 @@
"--profile=release",
"--",
"--exact",
"--show-output"
"--show-output",
"--threads",
"1"
],
"problemMatcher": [
"$rustc"
Expand Down
Loading