aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeLines
* Test is_maybe_tokenGravatar MarkKoz2020-05-11-7/+24
|
* Token remover: fix `is_maybe_token` returning None instead of FalseGravatar MarkKoz2020-05-11-0/+2
| | | | | It's annotated as returning a bool and when the split fails it already returns False. To be consistent, it should always return a bool.
* Test `is_maybe_token` returns False for missing partsGravatar MarkKoz2020-05-11-0/+10
| | | | | | | In practice, this won't ever happen since the regex wouldn't match strings with missing parts. However, the function does check it so may as well test it. It's not necessarily bound to always use inputs from the regex either I suppose.
* Fix autospec decorator when used with multiple attributesGravatar MarkKoz2020-05-11-16/+12
| | | | | | | | The original approach of messing with the `attribute_name` didn't work for reasons I won't discuss here (would require knowledge of patcher internals). The new approach doesn't use patch.multiple but mimics it by applying multiple patch decorators to the function. As a consequence, this can no longer be used as a context manager.
* Test token regex doesn't match invalid tokensGravatar MarkKoz2020-05-11-7/+25
|
* Test `find_token_in_message` returns the found tokenGravatar MarkKoz2020-05-11-0/+24
|
* Test `find_token_in_message` returns None if no matches foundGravatar MarkKoz2020-05-11-0/+14
|
* Fix test for token remover ignoring bot messagesGravatar MarkKoz2020-05-11-4/+9
| | | | | | It's not possible to test this via asserting the return value of `on_message` since it never returns anything. Instead, the actual relevant unit, `find_token_in_message,` should be tested.
* Allow using arbitrary parameter names with the autospec decoratorGravatar MarkKoz2020-05-11-2/+15
| | | | | This gives the caller more flexibility. Sometimes attribute names are too long or they don't follow a naming scheme accepted by the linter.
* Test token remover skips messages without tokensGravatar MarkKoz2020-05-11-0/+11
|
* Test token remover takes action if a token is foundGravatar MarkKoz2020-05-11-1/+13
|
* Add a test helper function to patch multiple attributes with autospecsGravatar MarkKoz2020-05-11-0/+9
| | | | | | This helper reduces redundancy/boilerplate by setting default values. It also has the consequence of shortening the length of the invocation, which makes it faster to use and easier to read.
* Test on_message_edit of token remover uses on_messageGravatar MarkKoz2020-05-11-2/+10
|
* Token remover: reduce duplicated code in `on_message_edit`Gravatar MarkKoz2020-05-11-3/+1
|
* Token remover: catch ValueError when non-ASCII chars are presentGravatar MarkKoz2020-05-11-2/+2
| | | | | | | | | | The token uses base64 and base64 only allows ASCII characters. Thus, if a match has non-ASCII characters, it's not a valid token. Catching the ValueError is simpler than trying to adjust the regex to only match valid base64. Fixes #928 Fixes BOT-3X
* Merge pull request #924 from ↵Gravatar Daniel Brown2020-05-11-20/+58
|\ | | | | | | | | python-discord/feature/hemlock/perma-ban-override-temp Perma Bans now Overwrite Temp Bans
| * Merge branch 'master' into feature/hemlock/perma-ban-override-tempGravatar Daniel Brown2020-05-11-58/+34
| |\ | |/ |/|
* | Merge pull request #938 from Suhail6inkling/remind_aliasGravatar Leon Sandøy2020-05-11-1/+1
|\ \ | | | | | | Add remindme alias for the remind command
| * | Add remindme alias for the remind commandGravatar Suhail2020-05-10-1/+1
|/ /
* | Merge pull request #923 from python-discord/feat/util/remove-mention-cmdGravatar Daniel Brown2020-05-08-56/+2
|\ \ | | | | | | Remove the mention command and configuration settings for it
| * \ Merge branch 'master' into feat/util/remove-mention-cmdGravatar Daniel Brown2020-05-08-1/+31
| |\ \ | |/ / |/| |
* | | Merge pull request #903 from python-discord/bug/backend/894/win-selector-loopGravatar Daniel Brown2020-05-07-1/+7
|\ \ \ | | | | | | | | Use selector event loop on Windows
| * \ \ Merge branch 'master' into bug/backend/894/win-selector-loopGravatar Daniel Brown2020-05-07-136/+405
| |\ \ \ | |/ / / |/| | |
* | | | Merge pull request #919 from ↵Gravatar Sebastiaan Zeeff2020-05-05-0/+12
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | python-discord/bug/backend/911/log-listener-exceptions Log unhandled errors from event listeners
| * \ \ \ Merge branch 'master' into bug/backend/911/log-listener-exceptionsGravatar Sebastiaan Zeeff2020-05-05-3/+16
| |\ \ \ \ | |/ / / / |/| | | |
* | | | | Merge pull request #925 from Savant-Dev/antimalwareGravatar Daniel Brown2020-05-05-0/+12
|\ \ \ \ \ | | | | | | | | | | | | Update to Antimalware Filter (.txt uploads)
| * \ \ \ \ Merge branch 'master' into antimalwareGravatar Daniel Brown2020-05-05-2/+2
| |\ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Update antimalware to filter txt files in cases where messages were longer ↵Gravatar Savant-Dev2020-05-04-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | than 2000 chars
| * | | | | Update extension filter to distinguish .txt in cases where messages are ↵Gravatar Savant-Dev2020-05-01-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | longer than 2000 characters
| * | | | | Update extension filter to distinguish .txt in cases where messages are ↵Gravatar Savant-Dev2020-05-01-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | longer than 2000 characters
| | * | | | Log unhandled errors from event listenersGravatar MarkKoz2020-04-29-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By default, discord.py prints them to stderr. To better help detect such errors in production, they should instead be logged with an appropriate log level. Some sentry metadata has also been included. `on_error` doesn't work as a listener in a cog so it's been put in the Bot subclass. Fixes #911
| | | * | | Fix awaiting non-coroutine when closing the statsd transportGravatar MarkKoz2020-04-24-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `BaseTransport.close()` is not a coroutine and therefore should not be awaited.
| | | * | | Use selector event loop on WindowsGravatar MarkKoz2020-04-22-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | aiodns requires the selector event loop for asyncio. In Python 3.8, the default event loop for Windows was changed to proactor. To fix this, the event loop is explicitly set to selector.
| | | | * | Remove mention command constantsGravatar MarkKoz2020-05-02-10/+0
| | | | | |
| | | | * | Remove the mention commandGravatar MarkKoz2020-05-01-46/+2
| |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | It was made obsolete by a new Discord feature. Users can be granted a permission to mention a role despite the role being set as non-mentionable.
| | | | * Restructure `apply_ban()` logic Gravatar Daniel Brown2020-05-11-12/+7
| | | | | | | | | | | | | | | | | | | | | | | | | Another refactor/cleaning to make the logic clearer and easier to understand. Also cleaned up the trace logs to be shorter and more concise. Thanks, @scragly! Co-authored-by: scragly <[email protected]>
| | | | * apply_ban() logic refinedGravatar Daniel Brown2020-05-07-15/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Refined the logic for `apply_ban()` even further to be cleaner. (Thanks, @MarkKoz!) Signed-off-by: Daniel Brown <[email protected]>
| | | | * Addressing Review ChangesGravatar Daniel Brown2020-05-07-25/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Changed docstring explanation and function name of `get_active_infractions` to `get_active_infraction()` to better convey that only one infraction is returned. Also changed all relevant uses to reflect that change. - Added explanation of parameter `send_msg` to the doc strings of `pardon_infraction()` and `get_active_infraction()` - Adjusted placement of `log.trace()` in `pardon_infraction()` - Adjusted logic in `apply_ban()` to remove redundant check. - Adjusted logic in `apply_ban()` to be consistent with other checks. Signed-off-by: Daniel Brown <[email protected]>
| | | | * Merge branch 'master' into feature/hemlock/perma-ban-override-tempGravatar Daniel Brown2020-05-04-2/+2
| | | | |\ | |_|_|_|/ |/| | | |
* | | | | Merge pull request #922 from python-discord/bug/info/914/user-animated-avatarGravatar kwzrd2020-05-01-2/+2
|\ \ \ \ \ | |/ / / / |/| | | | Display animated avatars in the user info command
| * | | | Tests: change avatar_url_as assertion to use static_formatGravatar MarkKoz2020-04-30-1/+1
| | | | |
| * | | | Display animated avatars in the user info commandGravatar MarkKoz2020-04-30-1/+1
|/ / / / | | | | | | | | | | | | Fixes #914
| | | * Perma Bans now Overwrite Temp BansGravatar Daniel Brown2020-05-04-18/+55
| |_|/ |/| | | | | | | | | | | | | | | | | | | | - Changed `has_active_infraction` to `get_active_infractions` in order to add additional logic in `apply_ban`. - Added `send_msg` parameters to `pardon_infraction` and `get_active_infractions` so that multi-step checks and actions don't need to send additional messages unless told to do so. Signed-off-by: Daniel Brown <[email protected]>
* | | Run a category check before logging that we are checking for an answered ↵Gravatar Joseph Banks2020-04-30-1/+2
|/ / | | | | | | help channel
* | Merge pull request #913 from python-discord/add-bottom-sorting-to-help-channelsGravatar Sebastiaan Zeeff2020-04-28-12/+63
|\ \ | | | | | | Sort help channels and add support for `how-to-get-help` channel
| * | Log ID of member who claimed a help channelGravatar Sebastiaan Zeeff2020-04-28-0/+1
| | |
| * | Add option to ingore channels in help categoriesGravatar Sebastiaan Zeeff2020-04-28-3/+14
| | | | | | | | | | | | | | | | | | As we want to add an "informational" channel to the `Python Help: Available` category, we need to make sure that the Help Channel System ignores that channel. To do that, I've added an `is_excluded_channel` staticmethod that returns `True` if a channel is not a TextChannel or if it's in a special EXCLUDED_CHANNELS constant. This method is then used in the method that yields help channels from a category and in the `on_message` event listener that determines if a channel should be moved from `Available` to `Occupied`.
| * | Insert help channels at the bottom of the categoryGravatar Sebastiaan Zeeff2020-04-28-9/+48
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit reintroduces bottom sorting for help channels during a category move, but in a more reliable way that also causes far fewer "channel list glitches". This is accomplished by using the "bulk channels update" endpoint of the Discord API. ----------- The Problem ----------- Discord's positioning system is not that easy to work with for developers: Instead of having separate pools of position integers for each category, all text channels are considered to be part of the same "position pool" (or "bucket" in discord.py terms). This also means that changing the position integer of one channel may cause the position integer of another to change, regardless of if the channels share a category or even of if they are close to each other in the guild. As clients receive the position update for each channel as separate CHANNEL UPDATE events, this means that moving one channel may cause other channels to (temporarily) jump around as the client receives the EVENTS from the API. As some position changes affect all the channels in the guild, this will also trigger a nice "channel wave" rolling down the channel list from time to time. For our use case, this was exacerbated by the way `discord.py` handles position changes: It will enumerate the entire, sorted channel list whenever a position change occurs and send a "bulk request" with updated position integers for the entire guild to Discord. This was the reason that all of the sorting methods we've tried resulted in a lot of those "wave" glitches as clients would get a lot of CHANNEL UPDATE events. In addition, the way `discord.py` inserted channels into the payload also meant that our "high integer" methods did not work reliably. ------------ The Solution ------------ Fortunately, there is a solution that will work well most of the time: Making a `bulk channels update` request with only channels of the category we're currently interested in. By providing the current position of the channels that are already in the category, combined with the correct position of the channel moving into the category, we effectively "lock in" the existing channels at the location they already have. The new channel is simply moved into the right position in relation to the existing channels. This means that effectively, we only communicate one channel position change to Discord, making sure that as few channels as possible actually change their formal "position int". From there on, there are two options: 1. Keep the existing channels in place, add the new channel at the bottom (new highest int) 2. Keep the existing channels in place, add the new channel at the top (new lowest int) Both methods work, but option two has a flaw: The position int will get smaller and smaller, until it reaches `0`. Since negative position integers are not allowed, the entire category now has to be shifted upwards to make room for new top channels. This comes at the cost of a "wave" glitch within the category. My initial instinct was to solve this by giving the channels in the category a "really high" straight of position ints, but as Discord recalculates the ints from time to time anyway, this does not work. That's why I opted for the `bottom sort` option, which does not suffer from that issue. I've also asked the question of `top` vs `bottom` in #admins, without the context above, and the preferred method seemed to be `bottom` in any case. ----------- Limitations ----------- While Discord doesn't care that much about duplicates or neatly ascending integers, some channel move actions will inevitably result in a recalculation of the positions ints. This means that "wave" glitches may still happen from time to time, but they should be infrequent. (They also happen if you drag channels in your client; it seems to be a fundamental part of how positioning works.) I think this is something we'll have to live with. Another thing that I suspect may happen is that during times of API lag in the middle of help channel rush hour, some CHANNEL UPDATE events belonging to previous channel moves will not be received/processed yet by the time we make the next move. As we rely on cached position integers, this could mean that from time to time a channel is inserted near the bottom but not at the bottom. As Discord sends these CHANNEL UPDATE replies as individual events in an asynchronous manner instead of as a single response to our `bulk channels update` request, there's nothing much we can do about this. However, I have yet to observe this, so maybe it will never happen.
* | Merge pull request #895 from python-discord/broadening-eval-whitelistGravatar Mark2020-04-27-52/+249
|\ \ | | | | | | Allowing `!eval` in help channels
| * \ Merge branch 'master' into broadening-eval-whitelistGravatar Sebastiaan Zeeff2020-04-27-69/+60
| |\ \ | |/ / |/| |