aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeLines
* Merge pull request #991 from crazygmr101/feature/cooldown-tagGravatar Mark2020-06-17-0/+20
|\ | | | | Create cooldown.md
| * Update bot/resources/tags/customcooldown.mdGravatar Daniel Nash2020-06-15-3/+1
| | | | | | Co-authored-by: Mark <[email protected]>
| * Merge branch 'master' into feature/cooldown-tagGravatar Joseph Banks2020-06-12-76/+179
| |\
| * | Add scheme to URLGravatar Daniel Nash2020-06-12-1/+1
| | |
| * | Update customcooldown.mdGravatar Daniel Nash2020-06-12-0/+2
| | |
| * | Make title more specificGravatar Daniel Nash2020-06-12-1/+1
| | | | | | | | | Co-authored-by: Mark <[email protected]>
| * | Update bot/resources/tags/customcooldown.mdGravatar Daniel Nash2020-06-10-3/+1
| | | | | | | | | Co-authored-by: Joseph Banks <[email protected]>
| * | change _cd to message_cooldown Gravatar Daniel Nash2020-06-10-2/+2
| | | | | | | | | | | | | | | Apply suggestions from code review Co-authored-by: Joseph Banks <[email protected]>
| * | Move the not rate-limited message into elseGravatar Daniel Nash2020-06-10-1/+3
| | |
| * | Update example to not be in a cogGravatar Daniel Nash2020-06-10-12/+10
| | |
| * | Rename to customcooldown.mdGravatar Daniel Nash2020-06-10-0/+0
| | |
| * | Update cooldown.mdGravatar Daniel Nash2020-06-07-1/+1
| | |
| * | Create cooldown.mdGravatar Daniel Nash2020-06-07-0/+22
| | |
* | | Merge pull request #1001 from python-discord/bug/mod/bot-68/ban-strips-noneGravatar Mark2020-06-17-22/+38
|\ \ \ | | | | | | | | Check infraction reason isn't None before shortening it
| * | | Format parameters with a more consistent styleGravatar MarkKoz2020-06-16-19/+19
| | | |
| * | | Add optional type annotations to reason in pardon funcsGravatar MarkKoz2020-06-16-2/+2
| | | |
| * | | Revise inaccurate typehint for Optional reasonGravatar kosayoda2020-06-16-18/+31
| | | |
| * | | Fix check for bot actor in infractionsGravatar MarkKoz2020-06-14-4/+4
| | | | | | | | | | | | | | | | | | | | The reason None check should be nested to avoid affecting the else/elif statements that follow.
| * | | Check infraction reason isn't None before shortening itGravatar MarkKoz2020-06-14-5/+8
| | | |
* | | | Add LMGTFY to domain blacklistGravatar Joseph Banks2020-06-17-0/+1
| | | |
* | | | Merge pull request #987 from python-discord/help_channel_rediscacheGravatar Kieran Siek2020-06-16-53/+98
|\ \ \ \ | | | | | | | | | | Add persistence to the help channel system
| * \ \ \ Merge branch 'master' into help_channel_rediscacheGravatar Kieran Siek2020-06-16-243/+585
| |\ \ \ \ | |/ / / / |/| | | |
* | | | | Log exception info for failed attachment uploadsGravatar MarkKoz2020-06-15-1/+1
| |/ / / |/| | |
* | | | Add the C# guild to the whitelistGravatar Dennis Pham2020-06-15-0/+1
| | | |
* | | | Merge pull request #937 from python-discord/bug/filters/928/non-ascii-tokenGravatar Mark2020-06-12-154/+357
|\ \ \ \ | | | | | | | | | | Make token detection more robust and completely rewrite its tests
| * \ \ \ Merge remote-tracking branch 'origin/master' into ↵Gravatar MarkKoz2020-06-02-1044/+2456
| |\ \ \ \ | | | | | | | | | | | | | | | | | | bug/filters/928/non-ascii-token
| * | | | | Token remover: remove the `delete_message` functionGravatar MarkKoz2020-06-02-19/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's redundant; there's no benefit here in abstracting two lines of code into a function.
| * | | | | Test find_token_in_message returns None for invalid matchesGravatar MarkKoz2020-05-28-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This covers the case when a token is matched, but its user ID and timestamp turn out to be invalid.
| * | | | | Adjust find_token_in_message tests for the recent cog changesGravatar MarkKoz2020-05-28-19/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It now supports the changes that switched to finditer, added match groups, and added the Token NamedTuple. It also accounts for the is_maybe_token function being removed. For the sake of simplicity, call assertions on is_valid_user_id and is_valid_timestamp were not made.
| * | | | | Remove is_maybe_token testsGravatar MarkKoz2020-05-28-33/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The function was removed due to redundancy. Therefore, its tests are obsolete.
| * | | | | Add more thorough and realistic inputs for token ID and timestamp testsGravatar MarkKoz2020-05-27-18/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The tests for valid inputs and invalid inputs were split to make them more readable.
| * | | | | Adjust token remover tests to use the Token NamedTupleGravatar MarkKoz2020-05-27-6/+8
| | | | | |
| * | | | | Switch findall to finditer in assertionsGravatar MarkKoz2020-05-27-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `find_token_in_message` now uses the latter so the tests should adjust accordingly.
| * | | | | Use real token values for testing multiple matches in regexGravatar MarkKoz2020-05-25-3/+4
| | | | | |
| * | | | | Fix multiple match text for token regexGravatar MarkKoz2020-05-25-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It has to account for the addition of groups. It's easiest to compare the entire string so `finditer` is used to return re.Match objects; the tuples of `findall` would be cumbersome. Also threw in a change to use `assertCountEqual` cause the order doesn't really matter.
| * | | | | Fix valid token regex testGravatar MarkKoz2020-05-25-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It was broken due to the addition of groups. Rather than returning the full match, `findall` returns groups if any exist. The test was comparing a tuple of groups to the token string, which was of course failing. Now `fullmatch` is used cause it's simpler - just check for `None` and don't worry about iterating matches to search.
| * | | | | Add more valid tokens to test the regex withGravatar MarkKoz2020-05-25-3/+5
| | | | | |
| * | | | | Test token regex won't match non-base64 charactersGravatar MarkKoz2020-05-25-4/+3
| | | | | |
| * | | | | Token remover: specify Discord epoch in secondsGravatar MarkKoz2020-05-25-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The timestamp in the token is in seconds and is being compared against the epoch. To make life easier, they should use the same unit. Previously, the epoch was in milliseconds.
| * | | | | Token remover: use finditer instead of findallGravatar MarkKoz2020-05-25-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It makes more sense to use the lazy function when the loop is already short-circuiting on the first valid token it finds.
| * | | | | Token remover: use regex groups and pass the token as a NamedTupleGravatar MarkKoz2020-05-25-27/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It felt redundant to be splitting the token in two different functions when regex could take care of this from the outset. ' A NamedTuple was created to house the token. This is nicer than passing an re.Match object, because it's clearer which attributes are available. Even if the regex used named groups, it wouldn't be as obvious which group names exist. Without the split, `is_maybe_token` is dwindled down to a redundant function. Therefore, it's been removed.
| * | | | | Token remover: escape dashes in regexGravatar MarkKoz2020-05-23-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | They need to be escaped when they're in a character set. By default, they are interpreted as part of the character range syntax.
| * | | | | Token remover: match only base64 in regexGravatar MarkKoz2020-05-21-7/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Making the regex more accurate reduces false positives at an earlier stage. There's no benefit to matching non-base64 as that would just be weeded out as invalid at a later stage anyway when it tries to decode it.
| * | | | | Token remover: decode ID using URL-safe base64Gravatar MarkKoz2020-05-21-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Though I've not seen an ID with neither + and \ nor - and _, given that the timestamp uses URL-safe encoding, the ID probably does too.
| * | | | | Add a utility function to pad base64 dataGravatar MarkKoz2020-05-16-2/+8
| | | | | |
| * | | | | Token remover: use strict check for digits in token IDGravatar MarkKoz2020-05-15-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `isnumeric` would be true for a wide range of characters in Unicode, but the ID must only consist of the characters 0-9 (ASCII digits). In fact, `isdigit` on its own would also match other Unicode characters too.
| * | | | | Token remover: fix timestamp checkGravatar MarkKoz2020-05-14-10/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The timestamp calculation was incorrect. The bytes need to be interpreted as big-endian and the result is just a timestamp rather than a snowflake.
| * | | | | Token remover: add logs to clarify why token is invalidGravatar MarkKoz2020-05-13-2/+4
| | | | | |
| * | | | | Add missing comma to token remover log messageGravatar MarkKoz2020-05-13-1/+1
| | | | | |
| * | | | | Fix a test needlessly being a coroutineGravatar MarkKoz2020-05-13-1/+1
| | | | | |