Skip to content

Comments

[pull] master from kyb3r:master#2

Open
pull[bot] wants to merge 100 commits intoXJevIndo:masterfrom
modmail-dev:master
Open

[pull] master from kyb3r:master#2
pull[bot] wants to merge 100 commits intoXJevIndo:masterfrom
modmail-dev:master

Conversation

@pull
Copy link

@pull pull bot commented Mar 9, 2023

See Commits and Changes for more details.


Created by pull[bot]

Can you help keep this open source service alive? 💖 Please sponsor : )

StephenDaDev and others added 5 commits December 19, 2022 23:14
We already have all the information we need to mention a user (their
id) and fetching the information from discord will lead to rate
limiting and extremely poor performance on large block lists for
no gain.
* Added the option for secure_plugins_only

* Change config name

* Forgot to update app.json

* Forgot a period. Thanks taku :(
@vercel
Copy link

vercel bot commented Mar 9, 2023

Someone is attempting to deploy a commit to a Personal Account owned by @XJevIndo on Vercel.

@XJevIndo first needs to authorize it.

@pull pull bot added the ⤵️ pull label Mar 9, 2023
Taaku18 and others added 23 commits March 13, 2023 02:17
* Update lints.yml

* Update lints.yml

---------

Co-authored-by: Spencer Comfort <109806759+GiddyGoatGaming@users.noreply.github.com>
Co-authored-by: Taku <45324516+Taaku18@users.noreply.github.com>
Signed-off-by: Taku <45324516+Taaku18@users.noreply.github.com>
* Fix replies not being sent

* Use a list instead of a set

---------

Co-authored-by: Taku <45324516+Taaku18@users.noreply.github.com>
* Reminder Plugin

Created a reminder plugin

* Fix indentations

---------

Co-authored-by: Taku <45324516+Taaku18@users.noreply.github.com>
* Update .env.example

The removal of `modmail_guild_id` since its causing more confusion to people then it helps them. Features relying on this never were made.

Signed-off-by: lorenzo132 <50767078+lorenzo132@users.noreply.github.com>

* Update app.json

---------

Signed-off-by: lorenzo132 <50767078+lorenzo132@users.noreply.github.com>
- Rename the user from 'app' to 'modmail', and made it a system user instead.
- Moved user creation to a higher layer in the Dockerfile.


Signed-off-by: Taku <45324516+Taaku18@users.noreply.github.com>
Removed LICENSE, PRIVACY.md, and SPONSORS.json from .dockerignore. Although they don't affect the functionalities of the bot, we prefer to include them due to their respective purposes.

Signed-off-by: Taku <45324516+Taaku18@users.noreply.github.com>
* Set size for guild icons on embeds

* Update changelog

* Format with black

* Fixed incorrect function return type

---------

Signed-off-by: Taku <45324516+Taaku18@users.noreply.github.com>
Co-authored-by: Taku <45324516+Taaku18@users.noreply.github.com>
* Update modmail.py

* Update clients.py

* Formatting

* Change log id to log key, added id as an alias

* Print the log even if it is closed and fix bug

* Update modmail.py

* Added a missing period

* Updated changelog

---------

Co-authored-by: Taku <45324516+Taaku18@users.noreply.github.com>
* Enable `discord.py` logger by default.

* Revert:

- Restore import orders
- Logging stuff is now completely handled in `core.models.configure_logging`

* Update logging configurations

* Updated changelog

* Fix overflow characters in logs when using `?debug` command.

* Update changelog

---------

Co-authored-by: Taku <45324516+Taaku18@users.noreply.github.com>
* Cleanup after unloading extension, resolve #3223.

* Remove leftover modules loaded from `plugins` path when purging.

---------

Co-authored-by: Taku <45324516+Taaku18@users.noreply.github.com>
* Fix typo

* Rephrase the silently close messsage

* Update changelog

---------

Co-authored-by: Taku <45324516+Taaku18@users.noreply.github.com>
* strip help command title

* Update changelog

---------

Co-authored-by: Taku <45324516+Taaku18@users.noreply.github.com>
* Reminder Plugin

Created a reminder plugin

* Fix indentations

* confirm_thread_creation Buttons instead of reactions

* Changelog+Small fixes

* Updated the react to confirm message, and removed changelog entry

* Code linting with black

* Update changelog

---------

Co-authored-by: Taku <45324516+Taaku18@users.noreply.github.com>
…ste errors (#3277)

* Added the option for secure_plugins_only

* Change config name

* Forgot to update app.json

* Forgot a period. Thanks taku :(

* Fixed some copy-paste errors in descriptions

* Update changelog

---------

Co-authored-by: Taku <45324516+Taaku18@users.noreply.github.com>
sebkuip and others added 9 commits October 27, 2024 13:24
* msglink command now scans all recipients

* Run black formatting
* Fix registry loading errors

* Fix black formatting

* Repo consistency

* Change code cleanness as requested by taku

---------

Co-authored-by: Taku <45324516+Taaku18@users.noreply.github.com>
This fixes persistent note not sending on thread creation.

Co-authored-by: Taku <45324516+Taaku18@users.noreply.github.com>
Removal of Advertise Your Server. Company has been closed.

Signed-off-by: andy <andy@ondrya.com>
Signed-off-by: Taku <45324516+Taaku18@users.noreply.github.com>
@netlify
Copy link

netlify bot commented Jan 14, 2025

Deploy Preview for eloquent-macaron-e2050c failed.

Name Link
🔨 Latest commit 7322e99
🔍 Latest deploy log https://app.netlify.com/projects/eloquent-macaron-e2050c/deploys/6938dec62f9f74000834b247

Taaku18 and others added 20 commits January 16, 2025 00:13
Signed-off-by: Taku <45324516+Taaku18@users.noreply.github.com>
Update sponsors

Signed-off-by: Taku <45324516+Taaku18@users.noreply.github.com>
* Update README.md

Signed-off-by: Taku <45324516+Taaku18@users.noreply.github.com>

* Update README.md

Update sponsors

Signed-off-by: Taku <45324516+Taaku18@users.noreply.github.com>

* Escape hyphen in regex string

Unescaped this was permitting any character between $ (index 36) and _ (index 95), which aren't all valid in urls.

* Get or fetch member when trying to reply

This fixes an issue where the member may not be in the cache

---------

Signed-off-by: Taku <45324516+Taaku18@users.noreply.github.com>
Co-authored-by: Taku <45324516+Taaku18@users.noreply.github.com>
Co-authored-by: Chris Lovering <chris.lovering.95@gmail.com>
* Add (truncated) preview to snippets command (#3342)

* Add (truncated) preview to snippets command

* Add old view as option with "compact"

* Fix black formatting

* Fix: Image url regex in thread send method (#3378)

* feat minimum character requirement for thread creation. (#3380)

* update: dpy, snoozing.

This pull request updated discord.py to 2.5.2.

This also brings a new few features.
- snooze
- snoozed
- unsnooze
- clearsnoozed

Aswell as a few new config options.
- max_snooze_time
- snooze_title
- snooze_text
- unsnooze_tex
- unsnooze_notify_channel


Signed-off-by: lorenzo132 <50767078+lorenzo132@users.noreply.github.com>

* remove: unneeded import

Signed-off-by: lorenzo132 <50767078+lorenzo132@users.noreply.github.com>

* Formatting black

Signed-off-by: lorenzo132 <50767078+lorenzo132@users.noreply.github.com>

* fix?: internal messages on restoration

Signed-off-by: lorenzo132 <50767078+lorenzo132@users.noreply.github.com>

* formatting

Signed-off-by: lorenzo132 <50767078+lorenzo132@users.noreply.github.com>

* fix: internal messages.

Signed-off-by: lorenzo132 <50767078+lorenzo132@users.noreply.github.com>

* fix: internals

Signed-off-by: lorenzo132 <50767078+lorenzo132@users.noreply.github.com>

* Update thread.py

Signed-off-by: lorenzo132 <50767078+lorenzo132@users.noreply.github.com>

* fix: use same logkey after restoration

Signed-off-by: lorenzo132 <50767078+lorenzo132@users.noreply.github.com>

* Add files via upload

Signed-off-by: lorenzo132 <50767078+lorenzo132@users.noreply.github.com>

* Update thread.py

Signed-off-by: lorenzo132 <50767078+lorenzo132@users.noreply.github.com>

* Update thread.py

Signed-off-by: lorenzo132 <50767078+lorenzo132@users.noreply.github.com>

* Update thread.py

Signed-off-by: lorenzo132 <50767078+lorenzo132@users.noreply.github.com>

* fix: show who send which internal message.

* Black formatting.

* Update Pipfile

Signed-off-by: lorenzo132 <50767078+lorenzo132@users.noreply.github.com>

* Update Pipfile.lock

Signed-off-by: lorenzo132 <50767078+lorenzo132@users.noreply.github.com>

* fix: unsnooze bug

* feat: CV2

* update: black

* fix: duplicates in logs, notes.

* feat: dpy 2.6.3, forwarded messages, bug fixes.

* Fix jump_url not being displayed

* Update pipfile for new dpy version

* fix: bug in note title/color

* Update snooze arg

* Update Pipfile to include tomli package

Signed-off-by: lorenzo132 <50767078+lorenzo132@users.noreply.github.com>

* auto detect dpy version

Signed-off-by: lorenzo132 <50767078+lorenzo132@users.noreply.github.com>

* Remove crlf terminators

* fix: ignore typing failures (#3389)

* fix: ignore typing failures

Make Modmail keep working when typing is disabled/outage

* fix: only surpress failures

* chore: sync local edits before push

* Lock pipenv

* Fix: closing with timed words/ command in reply. (#3391)

* fix: ignore typing failures

Make Modmail keep working when typing is disabled/outage

* fix: only surpress failures

* chore: sync local edits before push

* Fix: closing with timed words/ command in reply.

* Fix: typing in changelog command.

* Fix: closing with timed words (additional))

* Fix changelog entry for command reply issue

Corrected wording in the changelog entry regarding command inclusion in replies.

Signed-off-by: lorenzo132 <50767078+lorenzo132@users.noreply.github.com>

* Update CHANGELOG for v4.2.0 enhancements

Forwarded messages now display correctly in threads.

Signed-off-by: lorenzo132 <50767078+lorenzo132@users.noreply.github.com>

---------

Signed-off-by: lorenzo132 <50767078+lorenzo132@users.noreply.github.com>

* Remove disutil, undo lowercasing escape seq

* Add back uvloop

* Add config help for snooze configs

Signed-off-by: Taku <45324516+Taaku18@users.noreply.github.com>

* Update sponsors and bmac links

---------

Signed-off-by: lorenzo132 <50767078+lorenzo132@users.noreply.github.com>
Signed-off-by: Taku <45324516+Taaku18@users.noreply.github.com>
Co-authored-by: Sebastian <61157793+sebkuip@users.noreply.github.com>
Co-authored-by: Zallom <Yg75nWkHX7jBHcqRPUbb783c54xSa9+github63384893@gmail.com>
Co-authored-by: lorenzo132 <50767078+lorenzo132@users.noreply.github.com>
Co-authored-by: “lorenzo132” <lhoorn4@gmail.com>
Co-authored-by: Martin <box152535@gmail.com>
The logs command can be used anywhere again.

Signed-off-by: lorenzo132 <50767078+lorenzo132@users.noreply.github.com>
* Add (truncated) preview to snippets command (#3342)

* Add (truncated) preview to snippets command

* Add old view as option with "compact"

* Fix black formatting

* Fix: Image url regex in thread send method (#3378)

* feat minimum character requirement for thread creation. (#3380)

* update: dpy, snoozing.

This pull request updated discord.py to 2.5.2.

This also brings a new few features.
- snooze
- snoozed
- unsnooze
- clearsnoozed

Aswell as a few new config options.
- max_snooze_time
- snooze_title
- snooze_text
- unsnooze_tex
- unsnooze_notify_channel


Signed-off-by: lorenzo132 <50767078+lorenzo132@users.noreply.github.com>

* remove: unneeded import

Signed-off-by: lorenzo132 <50767078+lorenzo132@users.noreply.github.com>

* Formatting black

Signed-off-by: lorenzo132 <50767078+lorenzo132@users.noreply.github.com>

* fix?: internal messages on restoration

Signed-off-by: lorenzo132 <50767078+lorenzo132@users.noreply.github.com>

* formatting

Signed-off-by: lorenzo132 <50767078+lorenzo132@users.noreply.github.com>

* fix: internal messages.

Signed-off-by: lorenzo132 <50767078+lorenzo132@users.noreply.github.com>

* fix: internals

Signed-off-by: lorenzo132 <50767078+lorenzo132@users.noreply.github.com>

* Update thread.py

Signed-off-by: lorenzo132 <50767078+lorenzo132@users.noreply.github.com>

* fix: use same logkey after restoration

Signed-off-by: lorenzo132 <50767078+lorenzo132@users.noreply.github.com>

* Add files via upload

Signed-off-by: lorenzo132 <50767078+lorenzo132@users.noreply.github.com>

* Update thread.py

Signed-off-by: lorenzo132 <50767078+lorenzo132@users.noreply.github.com>

* Update thread.py

Signed-off-by: lorenzo132 <50767078+lorenzo132@users.noreply.github.com>

* Update thread.py

Signed-off-by: lorenzo132 <50767078+lorenzo132@users.noreply.github.com>

* fix: show who send which internal message.

* Black formatting.

* Update Pipfile

Signed-off-by: lorenzo132 <50767078+lorenzo132@users.noreply.github.com>

* Update Pipfile.lock

Signed-off-by: lorenzo132 <50767078+lorenzo132@users.noreply.github.com>

* fix: unsnooze bug

* feat: CV2

* update: black

* fix: duplicates in logs, notes.

* feat: dpy 2.6.3, forwarded messages, bug fixes.

* Fix jump_url not being displayed

* Update pipfile for new dpy version

* fix: bug in note title/color

* Update snooze arg

* Update Pipfile to include tomli package

Signed-off-by: lorenzo132 <50767078+lorenzo132@users.noreply.github.com>

* auto detect dpy version

Signed-off-by: lorenzo132 <50767078+lorenzo132@users.noreply.github.com>

* Remove crlf terminators

* fix: ignore typing failures

Make Modmail keep working when typing is disabled/outage

* fix: only surpress failures

* chore: sync local edits before push

* fix: ignore typing failures (#3389)

* fix: ignore typing failures

Make Modmail keep working when typing is disabled/outage

* fix: only surpress failures

* chore: sync local edits before push

* Lock pipenv

* Fix: closing with timed words/ command in reply.

* Fix: typing in changelog command.

* Fix: closing with timed words (additional))

* Fix changelog entry for command reply issue

Corrected wording in the changelog entry regarding command inclusion in replies.

Signed-off-by: lorenzo132 <50767078+lorenzo132@users.noreply.github.com>

* Update CHANGELOG for v4.2.0 enhancements

Forwarded messages now display correctly in threads.

Signed-off-by: lorenzo132 <50767078+lorenzo132@users.noreply.github.com>

* Fix: closing with timed words/ command in reply. (#3391)

* fix: ignore typing failures

Make Modmail keep working when typing is disabled/outage

* fix: only surpress failures

* chore: sync local edits before push

* Fix: closing with timed words/ command in reply.

* Fix: typing in changelog command.

* Fix: closing with timed words (additional))

* Fix changelog entry for command reply issue

Corrected wording in the changelog entry regarding command inclusion in replies.

Signed-off-by: lorenzo132 <50767078+lorenzo132@users.noreply.github.com>

* Update CHANGELOG for v4.2.0 enhancements

Forwarded messages now display correctly in threads.

Signed-off-by: lorenzo132 <50767078+lorenzo132@users.noreply.github.com>

---------

Signed-off-by: lorenzo132 <50767078+lorenzo132@users.noreply.github.com>

* Remove disutil, undo lowercasing escape seq

* Add back uvloop

* Add config help for snooze configs

Signed-off-by: Taku <45324516+Taaku18@users.noreply.github.com>

* fix; raceconditions, thread duplication on unsnooze, message queue for accurasy on high load

* Update package versions in requirements.txt

Signed-off-by: lorenzo132 <50767078+lorenzo132@users.noreply.github.com>

* snooze(move): auto-unsnooze on reply/any mod message; enforce hidden permissions on auto-created Snoozed Threads and sync perms on move; restore original overwrites on unsnooze; add capacity guard and config docs

* unsnooze: suppress mentions during restore (AllowedMentions.none on replay and notifications)

* Remove base64 snooze/unsnooze logic, fix notification crash, clean up replay logic

* fix: escape mentions on unsnooze

* Fix: Only create log URL button if valid, and robust channel restore for snooze

* black formatting

* Unsnooze: prefix username (user_id) for plain-text replay messages

* feat: command queue during unsnooze process.

feat(config): `unsnooze_history_limit`: Limits the number of messages replayed when unsnoozing (genesis message and notes are always shown).

* fix: contact while snooze returned as invalid channel

* Update thread.py

* fix: snooze timing

* change: rename default snooze time config

* fix: parsing

* fix: cache for snooze timer

* fix: Properly accessing nested data

* rename: default_snooze_time -> snooze_default_duration

* improve unsnooze notify

* fix: id extraction for clean database.

* improve: support for user-friendly time input for snooze_default_duration

* reflect config help snooze_default_duration for userfriendly time

* fix: anonreply showing None

This fixes a bug where, if no `anon_username` is set and the moderator has no roles, the `anon_username` is not showing as `None` anymore, and will show as intended.

The logic now works as follows:
- If a config anon_username is set → use it
- Else, if a mod_tag is set → use it
- Else, if the moderator has a top role → use that
- Else → use "Anonymous"

* black formatting

* feat: thread creation menu

Credits to Sebkuip(https://github.com/sebkuip) for the original idea and populair plugin.(advanced-menu)

This now is a core feature.

* Update requirements.txt

* fixes

This solves:
- `config get`: invalid form body
- restores functionality after menu timeout.

* feat: thread_creation_menu_precreate_channel

adds a new: thread_creation_menu_precreate_channel

to create the threads, even when nothing is selected yet.

* core

Fully merged `threadmenu config` into the main bot’s config system.

Added threadmenu embed customization capability.

* Change thread_creation_menu config

Moves thread_creation_menu_options, thread_creation_menu_submenus and thread_creation_menu_enabled to the private config keys to avoid changes via ?config set as they can be changed via ?threadmenu

* Change Option Description/Emoji

Changes the description and emoji making it possible to be None (optional)

* fix: disable menu after closure

* feats/fixes

configs added:
thread_creation_send_dm_embed

fix:
snooze while no option was selected, after snoozing selecting option first errored. This is now solved

* forgot to add help

* rely on config for precreating. fix error with unknown channels

* feat: large images in threadmenu embed

* feat: threadmenu reset

* cleanup

* codereviews response. Formatting (ruff)

* log instead of pass on exception

* format

* higher delays

* black formatting, smoothen menu closure

* smoothen which selecetion was made

* solves the command from showing in the replies in rare cases

* Update CHANGELOG.md

* Update sponsors and bmac links

* fix: typeerror

* fix: Remove thread-only restriction from logs command

The logs command can be used anywhere again.

* Remove commands from being saved in DB.

* fix: correct guildpfp with sepserver setup - made by martin

This PR fixes displaying the wrong guild icon in the thread_creation_response embed.
When servers having a seperate server setup, the guild icon from the main guild should be displayed instead of the inbox guild.

* fix: robust channel deletion handling, skip audit log attribution if permission is missing

* update: use current reqs.txt as masterbranch

* sync: pip&pip lock with master

* Patch Thread Menu Editing Crash

* bump version

* Missing a newline

Signed-off-by: Taku <45324516+Taaku18@users.noreply.github.com>

* Missing a newline

Signed-off-by: Taku <45324516+Taaku18@users.noreply.github.com>

* Apply suggestion from @Copilot

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
Signed-off-by: Taku <45324516+Taaku18@users.noreply.github.com>

* Apply suggestion from @Copilot

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
Signed-off-by: Taku <45324516+Taaku18@users.noreply.github.com>

---------

Signed-off-by: lorenzo132 <50767078+lorenzo132@users.noreply.github.com>
Signed-off-by: Taku <45324516+Taaku18@users.noreply.github.com>
Co-authored-by: Sebastian <61157793+sebkuip@users.noreply.github.com>
Co-authored-by: Zallom <Yg75nWkHX7jBHcqRPUbb783c54xSa9+github63384893@gmail.com>
Co-authored-by: Martin <box152535@gmail.com>
Co-authored-by: Taku <45324516+Taaku18@users.noreply.github.com>
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.