aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeLines
* Replace mention of Flask with DjangoGravatar Mark2020-06-11-1/+1
| | | | The site's description still stated that it was built with Flask, which is no longer accurate due to the move to Django.
* Merge pull request #964 from ks129/bad-words-nickGravatar Joseph Banks2020-06-11-21/+61
|\ | | | | Filtering: Implement bad words detection in nicknames
| * Merge branch 'master' into bad-words-nickGravatar Joseph Banks2020-06-11-1/+35
| |\ | |/ |/|
* | Merge pull request #995 from python-discord/add-cooldown-channelGravatar Mark2020-06-11-1/+3
|\ \ | | | | | | Add cooldown channel to config-default.yml
| * | Add cooldown to Channels in constants.pyGravatar Joseph Banks2020-06-11-0/+1
| | |
| * | Add cooldown channel to EXCLUDED_CHANNELS tupleGravatar Joseph Banks2020-06-11-1/+1
| | |
| * | Add cooldown channel to config-default.ymlGravatar Joseph Banks2020-06-11-0/+1
|/ /
* | Fix trailing whitespace in Action fileGravatar Joseph Banks2020-06-11-1/+1
| |
* | Create codeql-analysis.ymlGravatar Joseph Banks2020-06-11-0/+32
| |
| * Merge branch 'master' into bad-words-nickGravatar ks1292020-06-11-239/+552
| |\ | |/ |/|
* | Merge pull request #910 from python-discord/bug/backend/906/converter-year-rangeGravatar Joseph Banks2020-06-10-52/+66
|\ \ | | | | | | Converters: handle ValueError when year for duration is out of range
| * \ Merge branch 'master' into bug/backend/906/converter-year-rangeGravatar Joseph Banks2020-06-10-1194/+2938
| |\ \ | |/ / |/| |
* | | Merge pull request #988 from python-discord/snekbox-composeGravatar Joseph Banks2020-06-10-0/+9
|\ \ \ | | | | | | | | Add snekbox to the Docker compose file
| * \ \ Merge branch 'master' into snekbox-composeGravatar Joseph Banks2020-06-10-2/+14
| |\ \ \ | |/ / / |/| | |
* | | | Merge pull request #935 from python-discord/bug/mod/932/modlog-ignore-dmsGravatar Joseph Banks2020-06-10-0/+4
|\ \ \ \ | | | | | | | | | | ModLog: ignore DMs in the message delete listener
| * \ \ \ Merge branch 'master' into bug/mod/932/modlog-ignore-dmsGravatar Joseph Banks2020-06-10-1061/+2576
| |\ \ \ \ | |/ / / / |/| | | |
* | | | | Add Python Atlanta to guild whitelistsGravatar Joseph Banks2020-06-09-0/+1
| | | | |
* | | | | Merge pull request #983 from python-discord/bug/backend/stats-category-checkGravatar Dennis Pham2020-06-07-1/+2
|\ \ \ \ \ | | | | | | | | | | | | Fix AttributeError for category check
| * \ \ \ \ Merge branch 'master' into bug/backend/stats-category-checkGravatar Dennis Pham2020-06-07-33/+96
| |\ \ \ \ \ | |/ / / / / |/| | | | |
* | | | | | Enable the 'redis' / 'aiohttp' Sentry integrationsGravatar Leon Sandøy2020-06-06-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will provide breadcrumbs for these systems in all our Sentry events, if applicable. Closes #989.
| * | | | | Fix AttributeError for category checkGravatar MarkKoz2020-06-04-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Not all channels will have a category attribute. This may be fine in production, but it does cause periodic errors when testing locally.
| | * | | | ModLog: ignore DMs in the message delete listenerGravatar MarkKoz2020-05-10-0/+4
| | | | | |
| | | * | | Add snekbox to the Docker compose fileGravatar MarkKoz2020-06-05-0/+9
| |_|/ / / |/| | | |
* | | | | Merge pull request #985 from ks129/rules-statsGravatar kwzrd2020-06-06-0/+3
|\ \ \ \ \ | | | | | | | | | | | | Stats: Implement rules stats
| * \ \ \ \ Merge branch 'master' into rules-statsGravatar kwzrd2020-06-06-185/+460
| |\ \ \ \ \ | |/ / / / / |/| | | | |
* | | | | | Merge pull request #970 from python-discord/staff_count_serverGravatar kwzrd2020-06-05-12/+65
|\ \ \ \ \ \ | | | | | | | | | | | | | | Add staff counts to !server
| * \ \ \ \ \ Merge branch 'master' into staff_count_serverGravatar kwzrd2020-06-05-72/+66
| |\ \ \ \ \ \ | |/ / / / / / |/| | | | | |
* | | | | | | Merge pull request #984 from ↵Gravatar Joseph Banks2020-06-05-20/+21
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | python-discord/sebastiaan/issues/982-infraction-dm-order Send infraction DM before applying infraction
| * | | | | | Send infraction DM before applying infractionGravatar Sebastiaan Zeeff2020-06-05-20/+21
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I've "reverted" the change that reversed the order of DM'ing a user about their infraction and applying the actual infraction. A recent PR reversed the order to stop us from sending DMs when applying the infraction failed. However, in order to DM a user, the bot has to share a guild with the recipient and kicking them off of our server first does not help with that. That's why I reverted the change and reverted some other minor changes made in relation to this change. Note: I did not change the code sending the DM itself; I merely moved it back to where it belongs and added a comment about the necessity of doing the DM'ing first. I couldn't cleanly revert a commit to do this, as changes were spread out over and included in multiple commits that also contained changes not related to the `DM->apply infraction` order.
* | | | | | Merge pull request #979 from neonsea/modmail-tagGravatar Dennis Pham2020-06-02-0/+9
|\ \ \ \ \ \ | | | | | | | | | | | | | | Add the !modmail tag
| * | | | | | add modmail tagGravatar Rasmus Moorats2020-06-02-0/+9
|/ / / / / /
* | | | | | Merge pull request #962 from python-discord/stop_sending_avatar_hashGravatar Sebastiaan Zeeff2020-06-02-11/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | Remove all sending of avatar_hash
| * \ \ \ \ \ Merge branch 'master' into stop_sending_avatar_hashGravatar Sebastiaan Zeeff2020-06-02-41/+34
| |\ \ \ \ \ \ | |/ / / / / / |/| | | | | |
* | | | | | | Merge pull request #974 from python-discord/multichannel_purgeGravatar Dennis Pham2020-05-31-41/+34
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Add multichannel !purge
| * | | | | | | Use the messages returned by `purge` to upload message logsGravatar MarkKoz2020-05-31-7/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This ensures that only what was actually deleted will be uploaded. I managed to get a 400 response from our API when purging twice in quick succession. Searching the history manually for these messages is unreliable cause of some sort of race condition.
| * | | | | | | Revert message ignore approach.Gravatar Leon Sandøy2020-05-31-10/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We're removing the context manager due to async concerns, so we'll go back to the old approach again of ignoring specific messages and iterating history.
| * | | | | | | Revert "Add a mod_log.ignore_all context manager."Gravatar Leon Sandøy2020-05-31-35/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 0737b1a6 This isn't gonna work, because async is a thing.
| * | | | | | | Merge branch 'master' into multichannel_purgeGravatar Leon Sandøy2020-05-31-44/+3
| |\ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Fix a bug with invocation deletion.Gravatar Leon Sandøy2020-05-31-21/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This command was written to support only a single channel, and with the move to multi-channel purges, we need to rethink the way the invocation deletion happens. We may be invoking this command from a completely different channel, so we can't necessarily look inside the channels we're targeting for the invocation. So, we're solving this by just deleting the invocation by using ctx.message. We do this before we start iterating message history, and then we only need to iterate the number of messages that was passed into the command. A much cleaner approach, which solves the bug reported and identified by @MarkKoz.
| * | | | | | | Add a mod_log.ignore_all context manager.Gravatar Leon Sandøy2020-05-31-0/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This new context manager makes it easier to make the mod_log ignore actions like message deletions. The only existing method is the `ignore()` method, which requires that you pass all the messages you want to ignore into it. This one just ignores everything inside its scope. This isn't the DRYest approach, but it's low-cost and improves the readability of clean.py quite a bit. Ideally we should go through and give modlog a proper cleanup, because it's kinda ugly right now.
| * | | | | | | Remove unnecessary conditional.Gravatar Leon Sandøy2020-05-31-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Thanks @MarkKoz!
| * | | | | | | Better channel mentionsGravatar Leon Sandøy2020-05-31-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Co-authored-by: Mark <[email protected]>
| * | | | | | | Remove a completely unacceptable newline.Gravatar Leon Sandøy2020-05-30-1/+0
| | | | | | | |
| * | | | | | | Add multichannel !purge via commands.GreedyGravatar Leon Sandøy2020-05-30-31/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We can now pass in as many channel mentions as we want after any !purge command - for example `!purge all 5 #python-general #python-language`
| | * | | | | | Merge branch 'master' into stop_sending_avatar_hashGravatar Leon Sandøy2020-05-31-408/+1588
| | |\ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| | * | | | | | Fix failing tests related to avatar_hashGravatar Leon Sandøy2020-05-27-5/+0
| | | | | | | |
| | * | | | | | Remove all sending of avatar_hash.Gravatar Leon Sandøy2020-05-27-6/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a companion commit to this PR: https://github.com/python-discord/site/pull/356 This PR must be merged before this commit.
| | | * | | | | Fix a bad check in get_staff_channel_count.Gravatar Leon Sandøy2020-05-31-7/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This also changes a few aesthetic problems pointed out in review by @MarkKoz and @kwzrd.
| | | * | | | | Merge branch 'master' into staff_count_serverGravatar Leon Sandøy2020-05-31-106/+356
| | | |\ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
* | | | | | | | Merge pull request #973 from python-discord/kwzrd/improve-freeGravatar kwzrd2020-05-31-2/+2
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Link #how-to-get-help in !free tag