Skip to content

Merge main into Alpha #51

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

Merged
merged 110 commits into from
Jan 8, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
110 commits
Select commit Hold shift + click to select a range
2b31ba4
[Feature][Untested] Basic EventHandler Implementation
jwe66 Dec 12, 2023
67de34a
[merge] docker-compose.yml from main
jwe66 Dec 13, 2023
8eef1a0
[Reorg][Docs] Reorganized code and added comments to the EventHandler
jwe66 Dec 13, 2023
bf08273
[Tested][Fail] EventHandler test failure
jwe66 Dec 13, 2023
f387ed5
[Cleanup] Cleaned up the event_handler.py code
jwe66 Dec 13, 2023
03cea3a
[Cleanup] Cleaned up the event_handler.py code
jwe66 Dec 13, 2023
e2031a8
Merge branch 'main' of github.com:allthingslinux/tux into User-Count-…
scottc943 Dec 13, 2023
677016a
[Fix] Adjusted docker-compose.yml to use .env and removed docker_secrets
scottc943 Dec 13, 2023
3a68c4f
XMerge branch 'User-Count-Roles' of github.com:allthingslinux/tux int…
scottc943 Dec 13, 2023
7aa6161
[Tested][Feat] Working EventHandler with template event file.
jwe66 Dec 13, 2023
4efb712
[Tested][Feat] Working EventHandler with template event file.
jwe66 Dec 13, 2023
f177523
Update main.py
jwe66 Dec 13, 2023
8a4302a
Update __event_template__.py
jwe66 Dec 13, 2023
4dd8412
[Fix] Forgot to push minor changes to this file
jwe66 Dec 13, 2023
69bbc8f
[Fix][Feat] Removed discord.py debugging in debug mode
jwe66 Dec 13, 2023
5a53c3f
[Feat][Tested] added EventHandler ignore array
jwe66 Dec 13, 2023
81b33d8
[Feat][Tested] Bans.py and merged event_logger
jwe66 Dec 26, 2023
b3a5579
[Docs] Minor comment changes across the board
jwe66 Dec 26, 2023
1d2c210
[Fix] Adjusted the source to include everything in the tux folder
scottc943 Dec 26, 2023
a54bb22
Merge branch 'EventBranch' of github.com:allthingslinux/tux into Even…
scottc943 Dec 26, 2023
804b1ac
Update README.md
kzndotsh Dec 27, 2023
a36e348
Create dependency-review.yml
kzndotsh Dec 27, 2023
485e015
[Fix][Reorg] Fixing some yml/toml files to add in support for poetry …
scottc943 Dec 27, 2023
cf801a1
Merge branch 'main' into EventBranch
scottc943 Dec 27, 2023
e6cf2f6
Merge pull request #13 from allthingslinux/EventBranch
scottc943 Dec 27, 2023
ab42027
Update dependency-review.yml
scottc943 Dec 27, 2023
7fce9e8
Merge pull request #19 from allthingslinux/scottc943-patch-2
scottc943 Dec 27, 2023
fa703a9
[Fix] added a line return to get a commit to test github action
scottc943 Dec 27, 2023
f0b611e
Merge pull request #20 from allthingslinux/EventBranch
scottc943 Dec 28, 2023
02b0ec1
Update dependency-review.yml
scottc943 Dec 28, 2023
38b92c9
Update dependency-review.yml
scottc943 Dec 28, 2023
fb5261d
removed the extra line return
scottc943 Dec 28, 2023
51b21a5
Merge branch 'EventBranch' of github.com:allthingslinux/tux into Even…
scottc943 Dec 28, 2023
6077dfa
Merge pull request #21 from allthingslinux/EventBranch
scottc943 Dec 28, 2023
0a21d14
Merge pull request #22 from allthingslinux/main
scottc943 Dec 28, 2023
304900e
Update dependency-review.yml
scottc943 Dec 28, 2023
dab3093
Update dependency-review.yml
scottc943 Dec 28, 2023
d0b3988
another test for github actions
scottc943 Dec 28, 2023
91ada26
Merge pull request #23 from allthingslinux/main
scottc943 Dec 28, 2023
e572926
Update dependency-review.yml
scottc943 Dec 28, 2023
0399979
Update dependency-review.yml
scottc943 Dec 28, 2023
6336ef5
removed the extra line return
scottc943 Dec 28, 2023
1e69370
Merge pull request #24 from allthingslinux/EventBranch
scottc943 Dec 28, 2023
a8cd1f1
Update dependency-review.yml
scottc943 Dec 28, 2023
de89c55
Merge pull request #25 from allthingslinux/EventBranch
scottc943 Dec 28, 2023
dbb36ad
Update dependency-review.yml
scottc943 Dec 28, 2023
e951134
Merge pull request #26 from allthingslinux/EventBranch
scottc943 Dec 28, 2023
ba3d41c
Update Python packages
scottc943 Dec 28, 2023
06e89e5
Merge pull request #27 from allthingslinux/automated/package-updates-…
kzndotsh Dec 28, 2023
96f9753
Merge pull request #32 from allthingslinux/main
scottc943 Dec 29, 2023
f234c72
[Feature] Adding ruff linting via github actions
scottc943 Dec 29, 2023
136c5b6
[Fix] readjusting the action's arguments
scottc943 Dec 29, 2023
22c69b8
[Update] Fixing arg issues on gh action
scottc943 Dec 29, 2023
e57b93e
[Update] attempting to fix the ruff config
scottc943 Dec 29, 2023
9d3f805
[Update] adding --check before --fix
scottc943 Dec 29, 2023
92f2ed9
[Update] removing --check since it is not needed since I was thinking…
scottc943 Dec 29, 2023
a65467f
[Fix] Updating ruff rules
scottc943 Dec 29, 2023
ae3fe44
[Fix] Removed line length rule since it is not supported
scottc943 Dec 29, 2023
7362102
[Fix] reverted back to original and added some more rules
scottc943 Dec 29, 2023
fd36975
[Reorg] Ran ruff format manually
scottc943 Dec 29, 2023
748b172
[Fix] adding formatting for ruff
scottc943 Dec 29, 2023
1ad50b1
[Fix] removed --fix for --check
scottc943 Dec 29, 2023
1c19f25
manually formatted with ruff
scottc943 Dec 29, 2023
107bb69
manually formatted with ruff
scottc943 Dec 29, 2023
8657674
[Reorg] Removed docstrings and put relevant info into the tux_logger.…
scottc943 Dec 29, 2023
7de425d
[Reorg] manually reran rust check and format
scottc943 Dec 29, 2023
8f97025
Merge pull request #33 from allthingslinux/EventBranch
scottc943 Dec 29, 2023
9801759
[Fix] Manual merge of revise branch into main
kzndotsh Dec 29, 2023
0cc2987
[Lint] Fix linting errors
kzndotsh Dec 29, 2023
b1cc698
[Docs] Fix README
kzndotsh Dec 29, 2023
2b47382
[Fix] Ruff formatting errors
kzndotsh Dec 29, 2023
8d1ca05
[Fix/Add] Events directory, examples directory, event template
kzndotsh Dec 30, 2023
7ed07b7
[CI/CD][Fix] Ruff pre-commit hook
kzndotsh Dec 30, 2023
7dc718a
[Fix] Event example linting error
kzndotsh Dec 30, 2023
b59c739
[Fix] Event template linting error retry
kzndotsh Dec 30, 2023
f036db4
Add vscode to gitignore
kzndotsh Jan 1, 2024
9eae811
Edit README.md
kzndotsh Jan 1, 2024
44427b6
Clean up docstrings and minor linting adjustments
kzndotsh Jan 1, 2024
4c8983c
[FIX] Rename on_join -> on_member_join & bot prefix
kzndotsh Jan 1, 2024
c77208f
Add basic event handlers for member ban, join, remove, unban, update,…
kzndotsh Jan 2, 2024
b291b11
Add on_message_delete base event
kzndotsh Jan 2, 2024
3b37448
Add on_bulk_message_delete base event
kzndotsh Jan 2, 2024
8b727a1
Add on_guild_role_create, guild_role_delete, guild_role_update base e…
kzndotsh Jan 2, 2024
aa1324f
Add on_guild_channel_create, delete, pins_update, update base event
kzndotsh Jan 2, 2024
d505de2
Initial base branch commit
kzndotsh Jan 2, 2024
ad219c8
Update Python packages
kzndotsh Jan 2, 2024
d8c4351
Merge pull request #38 from allthingslinux/BaseEvents
kzndotsh Jan 3, 2024
ffe05c0
Merge pull request #39 from allthingslinux/automated/package-updates-…
kzndotsh Jan 3, 2024
397f0ab
[Refactor] _tux_logger.py
kzndotsh Jan 3, 2024
c17fdac
Merge pull request #40 from allthingslinux/LoggerRefactor
jwe66 Jan 8, 2024
855bf47
removed double underscores and make sure os.makedirs is preserved. lo…
coleleavitt Jan 8, 2024
a4bbe99
removed double underscores and make sure os.makedirs is preserved. lo…
coleleavitt Jan 8, 2024
6f94e51
removed double underscores and make sure os.makedirs is preserved. lo…
coleleavitt Jan 8, 2024
dc84c5b
ruff reformat
coleleavitt Jan 8, 2024
c93f0d9
fixed linting.yml
coleleavitt Jan 8, 2024
a1ac4d4
wowp
coleleavitt Jan 8, 2024
900679c
fix>
coleleavitt Jan 8, 2024
483e317
changes
coleleavitt Jan 8, 2024
6785e09
Update Python packages
Jan 8, 2024
78a659b
Merge pull request #42 from allthingslinux/refractor_pri
coleleavitt Jan 8, 2024
8638fb0
Merge pull request #48 from allthingslinux/automated/package-updates-…
kzndotsh Jan 8, 2024
5ab77ea
broke out error handling
coleleavitt Jan 8, 2024
23c9b40
updated workflow
coleleavitt Jan 8, 2024
f011125
[Fix] pyproject.toml pyright not using venv
kzndotsh Jan 8, 2024
d6a0e85
Merge pull request #49 from allthingslinux/dev
kzndotsh Jan 8, 2024
2558344
added in-line comments
coleleavitt Jan 8, 2024
f93bb1a
Add exception message printing in ErrorHandler
coleleavitt Jan 8, 2024
38d6908
wrapped main within a try and except clause
coleleavitt Jan 8, 2024
bed4cec
Merge pull request #50 from allthingslinux/dev
jwe66 Jan 8, 2024
2352f80
Merge branch 'Alpha' into main
kzndotsh Jan 8, 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
5 changes: 5 additions & 0 deletions .env.example
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
TOKEN=
POSTGRES_DB=mydatabase
POSTGRES_USER=myuser
POSTGRES_PASSWORD=pgpass
TZ=UTC
50 changes: 50 additions & 0 deletions .github/workflows/dependency-review.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
name: 'Dependency Review'

# Trigger on pull requests and a scheduled weekly run
on:
pull_request:
schedule:
- cron: '0 0 * * 0' # Runs every week at midnight on Sunday

permissions:
contents: write
issues: write
pull-requests: write

jobs:
# Job for pull request event
dependency-review-pr:
if: github.event_name == 'pull_request'
runs-on: ubuntu-latest
steps:
- name: 'Checkout Repository'
uses: actions/checkout@v3

# Install Python
- name: Setup Python
uses: actions/[email protected]
with:
python-version: 3.11

# Install Poetry
- name: Poetry Install
uses: knowsuchagency/poetry-install@v2

# Run Poetry commands
- name: Update Python Poetry package
uses: dishapatel010/[email protected]

# Export requirements.txt from pyproject.toml
- name: Export requirements.txt
uses: Divkix/[email protected]

# Job for scheduled event
dependency-review-scheduled:
if: github.event_name == 'schedule'
runs-on: ubuntu-latest
steps:
- name: 'Checkout Repository'
uses: actions/checkout@v4

- name: Dependency Review
uses: actions/dependency-review-action@v3
44 changes: 44 additions & 0 deletions .github/workflows/linting.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
name: 'Linting'
on: [push, pull_request]

permissions:
contents: write
issues: write
pull-requests: write

jobs:
Linting:
runs-on: ubuntu-latest
steps:
- name: 'Checkout Repository'
uses: actions/checkout@v4

# Install Python
- name: Setup Python
uses: actions/setup-python@v4
with:
python-version: 3.11

# Install Poetry
- name: Poetry Install
uses: snok/[email protected]

# Cache dependencies
- name: Cache dependencies
uses: actions/cache@v3
with:
path: ~/.cache/pypoetry
key: ${{ runner.os }}-poetry-${{ hashFiles('**/poetry.lock') }}
restore-keys: |
${{ runner.os }}-poetry-

# Use Lint Action for linting and formatting
- name: Run linters
uses: wearerequired/[email protected]
with:
github_token: ${{ secrets.github_token }}
auto_fix: true

- uses: stefanzweifel/git-auto-commit-action@v4
with:
commit_message: 'style fixes by linter'
10 changes: 9 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -152,9 +152,17 @@ dmypy.json
# Cython debug symbols
cython_debug/

# logs
logs/
tux/logs/

# PyCharm
# JetBrains specific template is maintained in a separate JetBrains.gitignore that can
# be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore
# and can be added to the global gitignore or merged into this file. For a more nuclear
# option (not recommended) you can uncomment the following to ignore the entire idea folder.
#.idea/
# .idea/

# vscode
.vscode/
.idea/
15 changes: 8 additions & 7 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
repos:
- repo: 'https://github.com/psf/black'
rev: stable
- repo: https://github.com/charliermarsh/ruff-pre-commit
rev: v0.1.9
hooks:
- id: black
language_version: python3.11
- repo: 'https://github.com/RobertCraigie/pyright-python'
rev: main
- id: ruff
args: [ --fix ]
- id: ruff-format
- repo: https://github.com/RobertCraigie/pyright-python
rev: v1.1.343
hooks:
- id: pyright
- id: pyright
Loading