aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeLines
...
| * Merge remote-tracking branch 'origin/jake/helpdm' into jake/helpdmGravatar Slushs2021-06-12-3/+3
| |\
| | * Merge branch 'main' into jake/helpdmGravatar ChrisJL2021-06-10-3/+3
| | |\ | |_|/ |/| |
* | | Merge pull request #1633 from python-discord/infraction-dm-utcGravatar Matteo Bertucci2021-06-10-3/+3
|\ \ \ | | | | | | | | Infraction: DM mention that the expiration is in UTC time
| * | | Tests: update infraction DM to mention UTCGravatar Matteo Bertucci2021-06-10-2/+2
| | | |
| * | | Infraction: DM mention that the expiration is in UTC timeGravatar Matteo Bertucci2021-06-10-1/+1
|/ / / | | | | | | We have a few users DMing ModMail to ask why they haven't been unmuted and their mute should have expired. Most of the time it is simply that they forgot to convert their local time to UTC time. This can hopefully avoid some of those instances.
| * / Add bool converter to allow a variety of inputsGravatar Slushs2021-06-12-11/+10
| |/
| * Edit ignore close messages if statementGravatar Slushs2021-06-10-1/+1
| |
| * Change discord.py colour to constants colourGravatar Slushs2021-06-08-1/+1
| |
| * Fix reverted changeGravatar Slushs2021-06-08-1/+1
| |
| * Make helpdm command more conciseGravatar Slushs2021-06-08-27/+10
| |
| * Cleanup indentation and participant dmGravatar Slushs2021-06-08-8/+6
| |
| * Make toggle command one command instead of 2Gravatar Slushs2021-06-08-25/+27
| |
| * Change mention formatGravatar Jake2021-06-08-1/+1
| | | | | | Co-authored-by: ToxicKidz <[email protected]>
| * Remove useless else and if statementGravatar Slushs2021-06-07-17/+12
| |
| * Fix failed lintingGravatar Slushs2021-06-07-6/+8
| |
| * Add docstring to commandsGravatar Slushs2021-06-07-5/+11
| |
| * Remove embed testGravatar Slushs2021-06-07-14/+0
| |
| * Add helpdm participating embedGravatar Slushs2021-06-07-1/+12
| |
| * Merge pull request #1 from JakeM0001/griff/helpdmGravatar Jake2021-06-07-0/+100
|/| | | | | Griff/helpdm
| * Add help dm featureGravatar GDWR2021-06-07-4/+35
| |
| * Add caches required for help-dmGravatar GDWR2021-06-07-0/+9
| |
| * nothing to see hereGravatar Slushs2021-06-07-0/+60
|/
* Merge pull request #1623 from python-discord/new_zapped_formatsGravatar Kieran Siek2021-06-07-18/+38
|\ | | | | Allow text format warning to remove multiple formats.
| * Merge branch 'main' into new_zapped_formatsGravatar Kieran Siek2021-06-07-1/+1
| |\ | |/ |/|
* | Merge pull request #1625 from python-discord/docker-compose-restart-policyGravatar ChrisJL2021-06-06-1/+1
|\ \ | | | | | | Change to unless-stopped restart policy
| * | Change to unless-stopped restart policyGravatar Chris2021-06-06-1/+1
|/ / | | | | | | | | | | Since we use the same port for redis on all out projects, having this always restart causes conflicts for people starting up docker and wanting to use redis for anyother project.
| * Renamed blocked_extension_str to blocked_extension.Gravatar Xithrius2021-06-06-3/+3
| |
| * Added new formats to unittest docstrings.Gravatar Xithrius2021-06-06-2/+2
| |
| * Added subtests for `.txt`, `.json`, and `.csv` files.Gravatar Xithrius2021-06-06-16/+28
| |
| * Added .txt file extension to antimalware test.Gravatar Xithrius2021-06-06-1/+4
| |
| * Allowed text format warning to have multiple formats.Gravatar Xithrius2021-06-05-3/+8
|/
* Merge pull request #1587 from RohanJnr/voice_ver_dmGravatar Kieran Siek2021-06-05-12/+29
|\ | | | | Prioritize DM over channel message for voice verification ping.
| * Merge branch 'main' into voice_ver_dmGravatar Kieran Siek2021-06-05-143/+212
| |\ | |/ |/|
* | Merge pull request #1609 from bast0006/bast0006-infraction-scheduler-fixGravatar Xithrius2021-06-04-5/+26
|\ \ | | | | | | Fix infraction rescheduler breaking with more than 100 in flight reactions
| * \ Merge branch 'main' into bast0006-infraction-scheduler-fixGravatar Xithrius2021-06-04-138/+186
| |\ \ | |/ / |/| |
* | | feat: add async-await tag (#1594)Gravatar vcokltfre2021-06-04-0/+28
| | | | | | | | | | | | | | | | | | * feat: add async-await tag Co-authored-by: ToxicKidz <[email protected]> Co-authored-by: Xithrius <[email protected]>
* | | Merge pull request #1619 from ↵Gravatar Xithrius2021-06-04-9/+0
|\ \ \ | | | | | | | | | | | | | | | | python-discord/vcokltfre/chore/star-imports-smallening chore: ensmallen the star-imports tag
| * | | chore: ensmallen the star-imports tagGravatar vcokltfre2021-06-04-9/+0
|/ / /
* | | Add discord.li to invite filter (#1616)Gravatar Joe Banks2021-06-02-0/+1
| | | | | | | | | Discord.li is an alias for discord.io, a domain already on the denylist.
* | | Merge #1608 - enforce one help channel per userGravatar Mark2021-05-31-109/+23
|\ \ \
| * | | Role lookup takes place only in `_handle_role_change`.Gravatar swfarnsworth2021-05-31-7/+4
| | | |
| * | | Merge branch 'main' of https://github.com/python-discord/bot into ↵Gravatar swfarnsworth2021-05-31-16/+21
| |\ \ \ | |/ / / |/| | | | | | | swfarnsworth/one_help_channel
* | | | Merge pull request #1606 from Numerlor/doc-force-prefix-priorityGravatar Xithrius2021-05-30-16/+21
|\ \ \ \ | | | | | | | | | | Improve doc symbol name conflict resolution
| * \ \ \ Merge branch 'main' into doc-force-prefix-priorityGravatar Xithrius2021-05-30-4/+113
| |\ \ \ \ | |/ / / / |/| | | |
| * | | | Add the doc group to FORCE_PREFIX_GROUPSGravatar Numerlor2021-05-21-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Symbols with the doc group refer to the pages themselves without pointing at a specific element in the HTML. In most cases we can't properly parse those so this change will move them out of the way for other symbols to take priority.
| * | | | Prioritize symbols depending on their group's pos in FORCE_PREFIX_GROUPSGravatar Numerlor2021-05-21-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When both symbols are in FORCE_PREFIX_GROUPS, instead of relying on which symbol comes later and always renaming the latter one, the symbols with a lower priority group are moved out of the way instead of forcing the new symbol to be moved. This will help make relevant symbols be more likely to come up when searching the docs. The constant was reordered by the priority of the groups to work with this change
| * | | | Prefer using the package name as a prefix when handling symbol conflictsGravatar Numerlor2021-05-21-13/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When renaming, having label.symbol etc. in the list of the renamed symbol in the embed doesn't really provide much context on what that symbol may be to the user. Prioritizing the package name instead should makes it clearer that it's from an another package. Conflicts within a package are still resolved using the previous logic
| | * | | Re-introduced static method for role change exception handling.Gravatar swfarnsworth2021-05-29-2/+21
| | | | | | | | | | | | | | | | | | | | A function that did the same thing previously existed in `_cooldown.py`.
| | * | | Merge branch 'main' of https://github.com/python-discord/bot into ↵Gravatar swfarnsworth2021-05-29-3/+112
| | |\ \ \ | |_|/ / / |/| | | | | | | | | swfarnsworth/one_help_channel
* | | | | Merge pull request #1615 from python-discord/reviews-revert-orderGravatar ChrisJL2021-05-27-1/+2
|\ \ \ \ \ | | | | | | | | | | | | Recruitment: reverse nomination order