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

[pull] main from hackthebox:main #18

Open
wants to merge 146 commits into
base: main
Choose a base branch
from
Open
Changes from 2 commits
Commits
Show all changes
146 commits
Select commit Hold shift + click to select a range
bfa8a53
update github workflows to latest versions
dimoschi Apr 3, 2024
6903721
update poetry.lock
dimoschi Apr 5, 2024
61eeeef
fix syntax error
dimoschi Apr 5, 2024
a792e90
Revert "update poetry.lock"
dimoschi Apr 5, 2024
c534ff6
fix poetry.lock
dimoschi Apr 5, 2024
32a3ff1
fix imports
dimoschi Apr 5, 2024
aef3a39
fix poetry version
dimoschi Apr 5, 2024
76ce1b1
Merge pull request #91 from hackthebox/hotfix
dimoschi Apr 5, 2024
fef9b43
Merge branch 'main' into update-workflows
dimoschi Apr 8, 2024
91b449c
Merge pull request #89 from hackthebox/update-workflows
dimoschi Apr 8, 2024
960a887
Bump idna from 3.4 to 3.7 in the pip group across 1 directory
dependabot[bot] Apr 12, 2024
e2c9b49
Fix naming
0xEmma Apr 24, 2024
c9baf2f
Update .test.env
0xEmma Apr 24, 2024
ab370a6
Merge pull request #93 from 0xEmma/patch-2
dimoschi Apr 24, 2024
5060aed
Update Sentry to 1.45.0
dimoschi Apr 24, 2024
85f9af7
Merge pull request #94 from hackthebox/update-project-deps
dimoschi Apr 24, 2024
a135e04
Fix tests
dimoschi Apr 24, 2024
cf465de
Hotfix
dimoschi Apr 24, 2024
1a7ba53
Another hotfix
dimoschi Apr 24, 2024
b4ed9c5
Update other.py
0xEmma Apr 24, 2024
ed98acd
Merge pull request #95 from 0xEmma/main
dimoschi Apr 24, 2024
cbc6b72
Merge branch 'main' of github.com:hackthebox/Hackster
dimoschi Apr 24, 2024
ea6b58d
Format
dimoschi Apr 24, 2024
4c0918d
Bump version to 1.2.8
dimoschi Apr 24, 2024
032713f
Minor Updates to Feedback
0xEmma Apr 24, 2024
af2228b
Merge pull request #96 from 0xEmma/patch-3
dimoschi Apr 24, 2024
37f111c
Sanatize Title Aswell
0xEmma Apr 25, 2024
965db28
Update other.py
0xEmma Apr 26, 2024
27f4105
Req. Changes
0xEmma Apr 26, 2024
7367529
Merge pull request #97 from 0xEmma/patch-4
dimoschi Apr 26, 2024
3609504
Fix Command Logging in DM results in error
0xEmma Apr 29, 2024
3cdf525
Update bot.py
dimoschi May 1, 2024
4d783de
Update other.py
0xEmma May 30, 2024
f15f4dc
Bump the pip group across 1 directory with 3 updates
dependabot[bot] Jul 6, 2024
96f8baa
Merge pull request #103 from hackthebox/dependabot/pip/pip-4aeb63eca5
dimoschi Sep 12, 2024
072db3c
Merge pull request #98 from 0xEmma/patch-5
dimoschi Sep 12, 2024
8276983
Merge pull request #92 from hackthebox/dependabot/pip/pip-a98e789dc2
dimoschi Sep 12, 2024
5cbe114
Merge pull request #101 from 0xEmma/patch-7
dimoschi Sep 12, 2024
90c05ff
🚑️ (src/helpers/verification.py): Add SEASON_ID to settings
dimoschi Sep 16, 2024
f0fc907
Merge pull request #105 from hackthebox/hotfix-season-id
dimoschi Sep 16, 2024
d9ec701
Update the user.py to link to the correct profile
janssensjelle Oct 31, 2024
f89b3d0
Merge pull request #107 from janssensjelle/profile-url-update-patch-1
makelarisjr Oct 31, 2024
7d3d4f7
Issue #54 - Change the log to DisplayName (username)
janssensjelle Nov 4, 2024
ea97e8d
Issue #51 - ban buttons
janssensjelle Nov 4, 2024
db900cf
Updated helpers/ban.py with FLAKE8 recommendations
janssensjelle Nov 4, 2024
d0aae21
Updated .pre-commit-config.yaml
janssensjelle Nov 4, 2024
2dde221
Updated class description of src/views/bandecisionview.py
janssensjelle Nov 4, 2024
9c75f35
Enhance the instructions provided by the /verify command to make them…
janssensjelle Nov 5, 2024
bb0539c
Improve the phrasing
janssensjelle Nov 5, 2024
db2ce5f
Added missing direct link to the identifier
janssensjelle Nov 5, 2024
aa36db3
Added space
janssensjelle Nov 5, 2024
c246869
Undo change to .pre-commit-config.yaml
janssensjelle Nov 5, 2024
4846589
Send Leaks report to Slack & Fix Lint
ToxicBiohazard Nov 8, 2024
392fc6a
Unmute command / removing a mute after X time won't actually do the t…
janssensjelle Nov 8, 2024
ba4204e
Merge pull request #108 from janssensjelle/feature/issue-54-user-disp…
makelarisjr Nov 9, 2024
e853739
Merge pull request #111 from janssensjelle/bugfix/unmute-command
makelarisjr Nov 9, 2024
72acd98
Merge pull request #110 from janssensjelle/feature/improve-verify-com…
makelarisjr Nov 9, 2024
ca5ba91
Do not set Left to True unconditionally
janssensjelle Nov 12, 2024
127d45e
Refactor join date check
janssensjelle Nov 12, 2024
cee92a9
Merge pull request #113 from janssensjelle/bugfix/join-date-left-unco…
makelarisjr Nov 12, 2024
93c8362
Added evidence option for ban and tempban
janssensjelle Nov 12, 2024
8b1afe7
Added myself to contributors
janssensjelle Nov 13, 2024
584b4ff
Merge pull request #109 from janssensjelle/feature/issue-51-buttons-f…
dimoschi Nov 13, 2024
4b3bfff
Merge pull request #114 from janssensjelle/feature/evidence-for-bans
dimoschi Nov 13, 2024
fe982b3
Add requests library to dependencies
ToxicBiohazard Nov 14, 2024
9a6fd12
Add SpoilerModal for reporting spoilers and update feedback webhook
ToxicBiohazard Nov 14, 2024
20a9bcd
Update webhook configuration for spoilers and replace leaks webhook
ToxicBiohazard Nov 14, 2024
62ad9eb
Remove requests library from dependencies in pyproject.toml
ToxicBiohazard Nov 14, 2024
eeb3c90
Refactor webhook handling to use aiohttp for asynchronous requests an…
ToxicBiohazard Nov 14, 2024
c1d5805
Moved the add_evidence_note to helper function. Corrected ban + added…
janssensjelle Nov 15, 2024
95ddce9
Request for change: admins asked to keep the buttons active after an …
janssensjelle Nov 16, 2024
a14e1bc
[FEATURE] - Add slash command for Academy support link
janssensjelle Nov 21, 2024
937dd7e
Merge pull request #112 from ToxicBiohazard/main
dimoschi Nov 21, 2024
d9f6d5c
Merge pull request #116 from janssensjelle/feature/keep-buttons-active
dimoschi Nov 21, 2024
24b2b86
Update test_user.py according feedback
janssensjelle Nov 21, 2024
96ba3a7
Revert "Send Leaks report to Jira & Fix Lint"
dimoschi Nov 21, 2024
5e3e326
Merge pull request #119 from hackthebox/revert-112-main
dimoschi Nov 21, 2024
29d2806
Bump the pip group across 1 directory with 3 updates
dependabot[bot] Nov 21, 2024
d6e242a
🐛 (src/bot.py): Defer creation of ClientSession to on_ready
dimoschi Nov 21, 2024
4eb0e5b
🧪 (tests/src/cmds/core/test_ban.py): Skip test_tempban_failed_with_wr…
dimoschi Nov 21, 2024
2fa9e6b
Merge pull request #118 from hackthebox/dependabot/pip/pip-e4c74ab98f
dimoschi Nov 21, 2024
9e7d1b0
Merge pull request #115 from janssensjelle/feature/add-evidence-to-kick
dimoschi Nov 21, 2024
1fdc2c6
Fix failing test due to missing parenthesis
janssensjelle Nov 22, 2024
055d31d
Merge pull request #121 from janssensjelle/bugfix/fix-test-user
dimoschi Nov 22, 2024
4e4e31b
🐛 (src/helpers/ban.py): Fix issue with Guild.ban() arguments
dimoschi Nov 22, 2024
0762fbf
🎨 (src): Typos, data types, etc.
dimoschi Nov 22, 2024
ab2ce3a
👷 (.github/workflows/test.yaml): Enable test workflow on PR
dimoschi Nov 22, 2024
3178f52
✅ (tests/src/cmds/core/test_user.py): Fix tests patch DB call
dimoschi Nov 22, 2024
6ab17f3
Removed new slash command and added option list to support command. L…
janssensjelle Nov 22, 2024
d6f88d0
Add evidence to ban view for admins
janssensjelle Nov 22, 2024
4e5ef86
Merge branch 'fix-ban-and-more' into feature/ban-view-add-evidence
janssensjelle Nov 22, 2024
ec91b2e
Merge pull request #122 from hackthebox/fix-ban-and-more
dimoschi Nov 22, 2024
a6ae450
Merge branch 'hackthebox:main' into feature/ban-view-add-evidence
janssensjelle Nov 22, 2024
74ae3e0
Merge pull request #123 from janssensjelle/feature/ban-view-add-evidence
dimoschi Nov 22, 2024
501274e
⚡️ (src/cmds/automation/scheduled_tasks.py): Reverse for-loops in sch…
dimoschi Nov 22, 2024
ad8772c
✅ (tests/src/cmds/core/test_ban.py): Fix a test that was previously s…
dimoschi Nov 22, 2024
967c0d9
The URL must match
janssensjelle Nov 22, 2024
af88953
Make sure that the URL from labs and platform are different from each…
janssensjelle Nov 22, 2024
4a529b8
Merge pull request #124 from hackthebox/hotfix-check
dimoschi Nov 22, 2024
4e0fec2
Merge pull request #117 from janssensjelle/feature/academy-support-co…
dimoschi Nov 22, 2024
e86a873
Spoilers are directed to the Jira
ToxicBiohazard Nov 27, 2024
6e644d6
👷 (.coveragerc): Add .coveragerc file and exclude tests folder
dimoschi Nov 27, 2024
0bc9e81
👷 (codecov.yml): Ignore tests folders for Codecov
dimoschi Nov 27, 2024
9916b05
Merge pull request #126 from hackthebox/code-coverage-improvements
dimoschi Nov 27, 2024
b898189
Re-Added SLACK_FEEDBACK_WEBHOOK to .test.env
ToxicBiohazard Nov 27, 2024
f914e1d
Renamed to SLACK_FEEDBACK_WEBHOOK in .test.env
ToxicBiohazard Nov 27, 2024
c8b9568
Merge pull request #125 from ToxicBiohazard/main
dimoschi Nov 27, 2024
a3a4a56
Added macro functionality and testing
janssensjelle Dec 3, 2024
1bb849c
Added option to send macro remotely to a channel + added more testing…
janssensjelle Dec 3, 2024
5f3e67f
Altered permission requirements a bit so that sending to a different …
janssensjelle Dec 3, 2024
2af5093
Bumped version of pyproject.toml to the new to be released version
janssensjelle Dec 3, 2024
a425a02
Made the name unique in the database, throw error if already exists. …
janssensjelle Dec 9, 2024
9545ec2
Added await in test_macro_model.py to prevent warning and improve tes…
janssensjelle Dec 9, 2024
d9f76ad
Merge pull request #128 from janssensjelle/feature/macro
dimoschi Dec 10, 2024
d50237b
Allow ALL_MODS to use
janssensjelle Dec 11, 2024
46b2e0a
Merge pull request #129 from janssensjelle/feature/macro
dimoschi Dec 11, 2024
f319aba
Changed the error message when adding an infraction from ban to infra…
janssensjelle Dec 18, 2024
06bb2e2
Added CAPE cert role
janssensjelle Dec 18, 2024
55f0157
Added role from Discord
janssensjelle Dec 18, 2024
d0a28ff
Semantics
janssensjelle Dec 18, 2024
7088d37
Merge pull request #132 from janssensjelle/feature/CAPE-certification
makelarisjr Dec 19, 2024
20a9e4e
Added cheater command with a helper for the webhook call. Refactored …
janssensjelle Dec 27, 2024
09e3030
Added webhook helper
janssensjelle Dec 27, 2024
b5f7a0a
Added CAPE cert role
janssensjelle Dec 18, 2024
b785876
Added role from Discord
janssensjelle Dec 18, 2024
e5f78ea
Semantics
janssensjelle Dec 18, 2024
2219b17
[BUGFIX] - Added more arbitrary measures of time options
janssensjelle Jan 12, 2025
58a29bc
Fixed duplicate years
janssensjelle Jan 12, 2025
ece81ec
Moved the evidence to the infraction so no duplicate data is added (n…
janssensjelle Jan 13, 2025
3f228f9
Merged the code from #134 to prevent merge conflics
janssensjelle Jan 19, 2025
c0685f2
[FEATURE] - Improve ban buttons - Approve can only be clicked once (w…
janssensjelle Jan 19, 2025
07fceb7
Merge pull request #133 from janssensjelle/feature/cheater-command
dimoschi Jan 20, 2025
2f6a4cf
Merge pull request #135 from janssensjelle/bugfix/duration
dimoschi Jan 20, 2025
4228075
Merge pull request #136 from janssensjelle/feature/improve-ban-button…
dimoschi Jan 20, 2025
9ca8642
Improved testing for the add_infraction function and not the warn cog
janssensjelle Jan 24, 2025
58d145b
Improved tests to use fixtures according to comments from @dimoschi
janssensjelle Jan 24, 2025
b0ab674
Merge pull request #131 from janssensjelle/improvement/add-infraction…
dimoschi Jan 24, 2025
7c02d90
Added an error message in case the user already left with testing
janssensjelle Jan 25, 2025
65b3fc8
Changed infraction message to be more like the ban message
janssensjelle Jan 25, 2025
71d383f
Improved infraction message
janssensjelle Jan 25, 2025
3024606
Added : after for
janssensjelle Jan 25, 2025
55f046d
Merge pull request #138 from janssensjelle/improvement/kick-error-use…
dimoschi Jan 28, 2025
a55e25f
Merge pull request #139 from janssensjelle/feature/ban-improvement
makelarisjr Feb 7, 2025
50a9853
Added warning in placeholder for spoilers
janssensjelle Feb 9, 2025
a232dbb
Added warning before submitting a spoiler with ephermal message
janssensjelle Feb 11, 2025
e7c9105
Merge pull request #140 from janssensjelle/improvement/add-warning-sp…
dimoschi Feb 17, 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
2,347 changes: 1,147 additions & 1,200 deletions poetry.lock

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
@@ -21,7 +21,7 @@ sqlalchemy = { extras = ["asyncio"], version = "^2.0.9" }
bcrypt = "^4.0.1"
asyncmy = "^0.2.7"
fastapi = "^0.109.1"
sentry-sdk = { extras = ["sqlalchemy"], version = "^1.20.0" }
sentry-sdk = { extras = ["sqlalchemy"], version = "^1.45.0" }
uvicorn = "^0.21.1"
alembic = "^1.10.3"
pymysql = "^1.0.3"