aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeLines
...
| * | | | | | | | | | | | | | | | Do not await self.schedule_taskGravatar ItsDrike2020-06-06-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - self.schedule_task shouldn't be awaited as it isn't a coroutine
| * | | | | | | | | | | | | | | | Remove unnecessary schedule_unsilenceGravatar ItsDrike2020-06-06-7/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - As suggested, this function is not necessary - Also fixed no longer valid`stop`in SilencedChannel NamedTuple
| * | | | | | | | | | | | | | | | Fix import orderGravatar ItsDrike2020-06-06-1/+1
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Apply suggestions from reviewGravatar ItsDrike2020-06-06-15/+10
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Use Scheduler inside the cogGravatar ItsDrike2020-06-04-30/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - There shouldn't be another class only for Scheduler instead, we can implement it directly into Silence class
| * | | | | | | | | | | | | | | | Optimize ImportsGravatar ItsDrike2020-06-01-4/+4
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Fix Formatting/StylingGravatar ItsDrike2020-06-01-8/+5
| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Use Scheduler instead of asyncio.sleep on silence cogGravatar ItsDrike2020-06-01-10/+56
| | |_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `asyncio.sleep` doesn't provide us with the ability to stop that timer, while in most of the cases, this is fine, there is a possibility that channel will be unsilenced manually and silenced again, but this sleep from the first silence will cancel the second (new) silence. This will replace this `asyncio.sleep` with Scheduler which provides the ability to cancel the unsilencing task when aborted manually. That means we also have the ability to send a response if the channel is not silenced and someone tries to unsilence it.
* | | | | | | | | | | | | | | | Merge pull request #997 from python-discord/bug/frontend/996/charinfo-md-escapeGravatar Joseph Banks2020-06-13-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | | | Escape markdown in charinfo embed
| * | | | | | | | | | | | | | | Escape markdown in charinfo embedGravatar MarkKoz2020-06-12-2/+2
|/ / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The embed displays the original character. If it's a markdown char, it would interfere with the embed's actual markdown. The backtick was especially troublesome. Fixes #996
* | | | | | | | | | | | | | | 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.
| * | | | | | | | | | | | | | | | 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
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / / / / / / | | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Move counting of channels to a separate methodGravatar MarkKoz2020-05-30-10/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This de-clutters the main `server_info` function and improves its readability.
| * | | | | | | | | | | | | | | | Simplify counting of staff channels and improve efficiencyGravatar MarkKoz2020-05-30-49/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Simplification comes from being able to access permissions as attributes on the overwrite object. This removes the need to iterate all permissions. Efficiency comes from checking all roles within a single iteration of all channels. This also removes the need to flatten and filter the channels afterwards, which required additional iterations.
| * | | | | | | | | | | | | | | | Merge branch 'master' into staff_count_serverGravatar Leon Sandøy2020-05-30-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | Don't membership check in an itertools.chain.Gravatar Leon Sandøy2020-05-30-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We're using the set comprehension to prevent duplicates anyway, so flipping these back makes more sense. Also added a missing ctx and tested ok.
| * | | | | | | | | | | | | | | | | Prevent duplicates, and break into function.Gravatar Leon Sandøy2020-05-30-27/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - We're using a set comprehension and flipping the order for counting the number of channels that are both staff allow and @everyone deny. - We're breaking the staff channel count stuff into a separate helper function so it doesn't crowd the server_info() scope. These fixes are both to address the code review from @MarkKoz, thanks Mark.
| * | | | | | | | | | | | | | | | | Fix busted test_information test.Gravatar Leon Sandøy2020-05-30-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I wish this test didn't exist.
| * | | | | | | | | | | | | | | | | More precise staff-channel check.Gravatar Leon Sandøy2020-05-30-13/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We now check: - Does the @everyone role have explicit read deny permissions? - Do staff roles have explicit read allow permissions? If the answer to both of these are yes, it's a staff channel. By 'staff roles', I mean Helpers, Moderators or Admins.
| * | | | | | | | | | | | | | | | | Merge branch 'master' into staff_count_serverGravatar Leon Sandøy2020-05-30-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | Adding staff member count to !server.Gravatar Leon Sandøy2020-05-30-4/+10
| | | | | | | | | | | | | | | | | | |