Skip to content

Commit 586b30b

Browse files
authored
Update stable to 4.1.0 (#6)
* A few optimizations - Reduce Docker image size - Migrate requirements.txt to Pipfile - Remove unused dependencies - Add a few unnecessary files in .dockerignore * Pull modmail-dev#3281 * Pull modmail-dev#3279 * Pull modmail-dev#3278 * Pull modmail-dev#3277 & proper indentation * Squashed commit of the following: commit 2e32d6e Merge: 51a023c b21037c Author: Martin <box152535@gmail.com> Date: Sun Apr 9 21:22:08 2023 +0200 Merge branch 'modmail-dev:master' into master commit 51a023c Author: Martin <box152535@gmail.com> Date: Mon Apr 3 13:35:56 2023 +0200 Changelog+Small fixes commit f5f25b5 Author: Martin <box152535@gmail.com> Date: Mon Apr 3 13:10:35 2023 +0200 confirm_thread_creation Buttons instead of reactions commit 11e094c Merge: ebd38d3 e919304 Author: Taku <45324516+Taaku18@users.noreply.github.com> Date: Tue Mar 14 05:19:54 2023 -0700 Merge branch 'master' into master commit ebd38d3 Author: Taku <45324516+Taaku18@users.noreply.github.com> Date: Tue Mar 14 05:18:17 2023 -0700 Fix indentations commit b77e435 Author: Martin <box152535@gmail.com> Date: Sun Mar 12 17:22:42 2023 +0100 Reminder Plugin Created a reminder plugin * Pull modmail-dev/modmail#modmail-dev#3271 * Squashed commit of the following: commit 13437cd Author: baptiste0928 <22115890+baptiste0928@users.noreply.github.com> Date: Tue Mar 21 22:29:24 2023 +0100 Format with black commit 8a6ecd6 Merge: d9e364e 02250e8 Author: Taku <45324516+Taaku18@users.noreply.github.com> Date: Tue Mar 21 13:30:40 2023 -0700 Merge branch 'development' into feat/guild-icon-size Signed-off-by: Taku <45324516+Taaku18@users.noreply.github.com> commit d9e364e Author: baptiste0928 <22115890+baptiste0928@users.noreply.github.com> Date: Sun Mar 19 20:17:35 2023 +0100 Update changelog commit d0bfeb4 Author: baptiste0928 <22115890+baptiste0928@users.noreply.github.com> Date: Sun Mar 19 20:06:20 2023 +0100 Set size for guild icons on embeds * Format with black * Pull modmail-dev/modmail#modmail-dev#3233 * Squashed commit of the following: commit cf3444a Author: Khakers <22665282+khakers@users.noreply.github.com> Date: Tue Jan 24 14:13:15 2023 -0800 Add dm_channel_id field to log entry * Update changelog, workflow & remove bandit * Pull modmail-dev#3272 + lock dependencies * Add docs boilerplate + bumppython version * Dpy bump, add versions for ?about * Format with black * Update README.md * Fix permission error when installing plugin * Add new mention_message config, black + ruff * Switch from root to app user for Docker * Add support for trailing space in prefix * Add logviewer as built-in plugin * logviewer plugin enhancements * Minor logviewer changes * Update changelog + logviewer pomelo change * add pomelo for logbase * Change logviewer favicon * Refactor loglist object with proper serialization * Remove favicon to untrack later * fix log entry key error * Replace local favicon with remote avatar * Add markdown header support * Switch repo link and branch * Change more repo links * Handle properly when loglist is the index page * toggle off internal message checkbox on load * Remove trailing slash, fix broken log url on index * Fix broken default avatar url * Fix pathing issue on displaying log list in index * Add placeholder for not logged in user * Fix blockquote parsing emote ending * Whoops, remove comment * Fix blockquote parsing + oauth navbar indicator * Update docs * config and docs change * Update FUNDING.yml * Update docs * Update ignores + workflow * Tweak loadcheck * tweak loadcheck (2) * blegh * ✨ * Attempt to fix invalid guild_id on test * Docs update * Terminate process more gracefully * Update dependencies for Python 3.11 * Refactor logviewer pomelo changes * Minify docker image size * Remove unused files * bump black to fix checks * Update dev requirements * Update workflow * More pomelo changes * Replace avatar with local asset * Fix broken author avatar on `logs` command * Implement pomelo on channel name * Format with black * Add pre-commit hook * Update requirements * Overhaul block functionality * Add plugin uninstall alias * Update python badge * Update README.md * Update README.md * Fix block datetime not being timezone aware * Remove cairosvg * Fix copy paste mistake * Another copy paste issue sigh * Fix NoneType on parse * Improve block check and add message cooldown * bump dpy * Update internal dpy version * Update ?info command for pomelo * Bump version * Fix missing package error * Fix index compile error
1 parent 82eebab commit 586b30b

File tree

125 files changed

+17010
-3098
lines changed

Some content is hidden

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

125 files changed

+17010
-3098
lines changed

.bandit_baseline.json

-342
This file was deleted.

.dockerignore

+11-4
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ coverage.xml
4949
*.cover
5050
.hypothesis/
5151
.pytest_cache/
52+
.ruff_cache/
5253

5354
# Translations
5455
*.mo
@@ -140,11 +141,17 @@ test.py
140141
# Other stuff
141142
.env.example
142143
.gitignore
144+
.dockerignore
143145
.github/
144146
app.json
145-
CHANGELOG.md
146147
Procfile
147148
pyproject.toml
148-
README.md
149-
Pipfile
150-
Pipfile.lock
149+
*.md
150+
.*.json
151+
Dockerfile
152+
docker-compose.yml
153+
LICENSE
154+
PRIVACY.md
155+
156+
# Docs
157+
docs/

.env.example

-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
TOKEN=MyBotToken
22
LOG_URL=https://logviewername.herokuapp.com/
33
GUILD_ID=1234567890
4-
MODMAIL_GUILD_ID=1234567890
54
OWNERS=Owner1ID,Owner2ID,Owner3ID
65
CONNECTION_URI=mongodb+srv://mongodburi

.github/CONTRIBUTING.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,11 @@ Pull requests are the best way to propose changes to the codebase. We actively w
3030
## Any contributions you make will be under the GNU Affero General Public License v3.0
3131
In short, when you submit code changes, your submissions are understood to be under the same [GNU Affero General Public License v3.0](https://www.gnu.org/licenses/agpl-3.0.en.html) that covers the project. Feel free to contact the maintainers if that's a concern.
3232

33-
## Report bugs using [Github Issues](https://github.com/modmail-dev/modmail/issues)
34-
We use GitHub issues to track public bugs. Report a bug by [opening a new Issue](https://github.com/modmail-dev/modmail/issues/new); it's that easy!
33+
## Report bugs using [Github Issues](https://github.com/raidensakura/modmail/issues)
34+
We use GitHub issues to track public bugs. Report a bug by [opening a new Issue](https://github.com/raidensakura/modmail/issues/new); it's that easy!
3535

3636
## Find pre-existing issues to tackle
37-
Check out our [unstaged issue tracker](https://github.com/modmail-dev/modmail/issues?q=is%3Aissue+is%3Aopen+-label%3Astaged) and start helping out!
37+
Check out our [unstaged issue tracker](https://github.com/raidensakura/modmail/issues?q=is%3Aissue+is%3Aopen+-label%3Astaged) and start helping out!
3838

3939
Ways to help out:
4040
- Help out new members

.github/FUNDING.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
patreon: kyber
1+
ko_fi: raidensakura

0 commit comments

Comments
 (0)