aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeLines
* Merge branch 'master' into source-commandGravatar Senjan212020-07-20-952/+3504
|\
| * Merge pull request #993 from python-discord/kwzrd/incidentsGravatar kwzrd2020-07-17-12/+1203
| |\ | | | | | | Implement #incidents channel automation
| | * Merge branch 'master' into kwzrd/incidentsGravatar kwzrd2020-07-17-1/+1
| | |\ | | |/ | |/|
| * | Bugfix: Show ID for embed DM relays, too.Gravatar Leon Sandøy2020-07-16-1/+1
| | |
| | * Incidents: reduce log level of 403 exceptionGravatar kwzrd2020-07-16-2/+3
| | | | | | | | | | | | | | | | | | In addition to 404, this shouldn't send Sentry notifs. Co-authored-by: MarkKoz <[email protected]>
| | * Merge 'master' into 'kwzrd/incidents'; resolve config conflictsGravatar kwzrd2020-07-16-351/+626
| | |\ | | |/ | |/| | | | | | | | | | | | | | | | | | | Add upstream changes & resolve config conflicts introduced by #1041. In the conflicting parts of the diff, this commit also re-sorts constants which were added upstream to lexicographical order. This does **not** re-sort all constants added upstream.
| * | Merge pull request #1046 from ItsCinnabar/patch-1Gravatar Sebastiaan Zeeff2020-07-16-1/+1
| |\ \ | | | | | | | | Update or-gotcha.md
| | * \ Merge branch 'master' into patch-1Gravatar Sebastiaan Zeeff2020-07-16-1/+8
| | |\ \ | | |/ / | |/| |
| * | | Merge pull request #1045 from python-discord/bug/980/fuzzy-processingGravatar Dennis Pham2020-07-15-1/+8
| |\ \ \ | | | | | | | | | | Invoke fuzzywuzzy's processor before matching
| | * \ \ Merge branch 'master' into bug/980/fuzzy-processingGravatar Dennis Pham2020-07-15-177/+427
| | |\ \ \ | | |/ / / | |/| | |
| | * | | Pass processed string to `extractBests`Gravatar kosayoda2020-07-15-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | Fixes a regression where the string to be matched was not processed beforehand.
| | * | | Invoke fuzzywuzzy's processor before matchingGravatar kosayoda2020-07-14-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Trying to match a string with only non-alphanumeric characters results in a warning by fuzzywuzzy. Processing the string before matching lets us avoid the warning, which which uses the root logger and thus isn't supressible.
| | | * | Merge branch 'master' into patch-1Gravatar Dennis Pham2020-07-15-175/+425
| | | |\ \ | | |_|/ / | |/| | |
| * | | | Merge pull request #1054 from python-discord/dm_relayGravatar Leon Sandøy2020-07-15-6/+43
| |\ \ \ \ | | | | | | | | | | | | DM relay - minor fixes
| | * \ \ \ Merge branch 'master' into dm_relayGravatar Leon Sandøy2020-07-15-70/+202
| | |\ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge pull request #1041 from python-discord/dm_relayGravatar Kieran Siek2020-07-15-107/+198
| |\ \ \ \ \ | | | | | | | | | | | | | | Relay all DMs sent to the bot to #dm_log
| | * \ \ \ \ Merge branch 'master' into dm_relayGravatar Kieran Siek2020-07-15-15/+49
| | |\ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge pull request #1044 from python-discord/talentpool-oldestGravatar Kieran Siek2020-07-15-5/+43
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Allow ordering talentpool/bigbrother watched users by oldest added
| | * \ \ \ \ \ Merge branch 'master' into talentpool-oldestGravatar kosayoda2020-07-15-10/+6
| | |\ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Merge pull request #1051 from ↵Gravatar Dennis Pham2020-07-14-7/+6
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | python-discord/bug/info/1050/remove-help-reactions-404 Suppress NotFound when removing help command reactions
| | * \ \ \ \ \ \ Merge branch 'master' into bug/info/1050/remove-help-reactions-404Gravatar Dennis Pham2020-07-14-3/+0
| | |\ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | HelpChannels: remove cooldown info from available messageGravatar MarkKoz2020-07-14-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Users can no longer see available channels if they're on cooldown. They will instead see a special "cooldown" channel which will explain what's going on.
| | * | | | | | | Suppress NotFound when removing help cmd reactionsGravatar MarkKoz2020-07-14-7/+6
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The message may be deleted somehow before the wait_for times out. Fixes #1050 Fixes BOT-6X
| | * | | | | | Document new kwarg in docstringGravatar kosayoda2020-07-15-0/+2
| | | | | | | |
| | * | | | | | Merge branch 'master' into talentpool-oldestGravatar Dennis Pham2020-07-14-55/+143
| | |\ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| | * | | | | | Achieve feature parity with talentpoolGravatar kosayoda2020-07-14-2/+17
| | | | | | | |
| | * | | | | | Add command to list nominees by oldest firstGravatar kosayoda2020-07-14-0/+11
| | | | | | | |
| | * | | | | | Accept argument to order nominees by oldest firstGravatar kosayoda2020-07-14-2/+6
| | | | | | | |
| | * | | | | | Pass argument as kwarg to preserve functionalityGravatar kosayoda2020-07-14-1/+1
| | | | | | | |
| | * | | | | | Allow ordering watched users by oldest firstGravatar kosayoda2020-07-14-1/+7
| | | |_|/ / / | | |/| | | |
| | | * | | | Merge branch 'master' into dm_relayGravatar Leon Sandøy2020-07-15-55/+153
| | | |\ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | Merge pull request #1032 from slushiegoose/sanitize-bot-outputGravatar Mark2020-07-14-53/+141
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Sanitize bot output
| | * | | | | | fix misaligned indentationGravatar Slushie2020-07-14-37/+37
| | | | | | | |
| | * | | | | | edit snekbox tests to work with filteringGravatar Slushie2020-07-13-0/+12
| | | | | | | |
| | * | | | | | check for the filter_cog in case it is unloadedGravatar Slushie2020-07-13-1/+3
| | | | | | | |
| | * | | | | | rename the `_filter_eval` function to be a public functionGravatar Slushie2020-07-13-2/+2
| | | | | | | |
| | * | | | | | Add missing variable assignment to stop NameErrors occurringGravatar Slushie2020-07-09-0/+1
| | | | | | | |
| | * | | | | | Fix missing hypenGravatar slushiegoose2020-07-09-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Co-authored-by: Leon Sandøy <[email protected]>
| | * | | | | | Call the filter eval command after receiving an eval resultGravatar Slushie2020-07-08-1/+6
| | | | | | | |
| | * | | | | | Create a filtering function to filter eval resultsGravatar Slushie2020-07-08-52/+120
| | | | | | | |
| | * | | | | | Edit BadArgument error messageGravatar Slushie2020-07-08-1/+1
| | | | | | | |
| | | | | * | | Oops, these prints shouldn't be here.Gravatar Leon Sandøy2020-07-15-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://github.com/python-discord/bot/issues/1041
| | | | | * | | How did that except except block get in?Gravatar Leon Sandøy2020-07-15-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Weird. https://github.com/python-discord/bot/issues/1041
| | | | | * | | Create a UserMentionOrID converter.Gravatar Leon Sandøy2020-07-15-1/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When we're using the !reply command, using a regular UserConverter is somewhat problematic. For example, if I wanted to send the message "lemon loves you", then I'd try to write `!reply lemon loves you` - however, the optional User converter would then try to convert `lemon` into a User, which it would successfully do since there's like 60 lemons on our server. As a result, the message "loves you" would be sent to a user called lemon.. god knows which one. To solve this bit of ambiguity, I introduce a new converter which only converts user mentions or user IDs into User, not strings that may be intended as part of the message you are sending. https://github.com/python-discord/bot/issues/1041
| | | | | * | | Ves' refactorGravatar Leon Sandøy2020-07-15-15/+16
| | | | | | | | | | | | | | | | | | | | | | | | Co-authored-by: Sebastiaan Zeeff <[email protected]>
| | | | | * | | Add some stats for DMs sent and received.Gravatar Leon Sandøy2020-07-15-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://github.com/python-discord/bot/issues/1041
| | | | | * | | Add the user ID to the username in dm relays.Gravatar Leon Sandøy2020-07-15-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Without this, it is difficult to know precisely who the user that is DMing us is, which might be useful to us. https://github.com/python-discord/bot/issues/1041
| | | | | * | | Restore DM user caching.Gravatar Leon Sandøy2020-07-15-6/+22
| | | | |/ / / | | | | | | | | | | | | | | | | | | | | | This reverts commit 042f472a
| | | | * | | Remove caching of last_dm_user.Gravatar Leon Sandøy2020-07-15-25/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If you're typing up a reply and the bot gets another DM while you're typing, you might accidentally send your reply to the wrong person. This could happen even if you're very attentive, because it might be a matter of milliseconds. The complexity to prevent this isn't worth the convenience of the feature, and it's nice to get rid of the caching as well, so I've decided to just make .reply require a user for every reply. https://github.com/python-discord/bot/issues/1041
| | | | * | | Merge branch 'master' into dm_relayGravatar Leon Sandøy2020-07-13-173/+169
| | | | |\ \ \
generated by cgit v1.2.3 (git 2.39.1) at 2025-10-28 20:55:28 +0000