aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeLines
...
| * | | | | | | | | | | Merge branch 'master' into show-trigger-wordGravatar S. Co12019-10-25-1469/+2842
| |\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |
* | | | | | | | | | | | Prepend emoji indicative of success of !eval (#552)Gravatar scragly2019-10-24-1/+12
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prepend emoji indicative of success of !eval Co-authored-by: null <[email protected]>
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into eval-emojisGravatar scragly2019-10-24-1468/+2830
| |\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Prepend emoji indicative of success of !evalGravatar kosayoda2019-10-24-1/+12
| | |_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | |
| | * | | | | | | | | | Fix incorrect type hint for return valueGravatar kosayoda2019-10-24-2/+2
| | | | | | | | | | | |
| | * | | | | | | | | | Rename `triggered` to `match`Gravatar kosayoda2019-10-15-8/+6
| | | | | | | | | | | |
| | * | | | | | | | | | Show matched word and location in watchlist embedGravatar kosayoda2019-10-13-5/+20
| |/ / / / / / / / / /
| | * | | | | | | | | Use standart filter conditions even if DEBUG_MODE is on.Gravatar Akarys422019-10-23-5/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The old method filtered only in #dev-test but this channel no longer exists
| | | * | | | | | | | Merge branch 'master' into moderator-channel-checkGravatar Atul Mishra2019-10-22-8/+17
| | | |\ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | | | | | | | |
* | | | | | | | | | | Merge pull request #547 from python-discord/#540-dont-show-infraction-totalGravatar Daniel Brown2019-10-22-3/+18
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | | Don't show infraction total outside staff channels.
| * | | | | | | | | | Show total infraction count only in staff channelsGravatar Akarys422019-10-21-1/+3
| | | | | | | | | | |
| * | | | | | | | | | Create STAFF_CHANNELS constantGravatar Akarys422019-10-21-2/+15
|/ / / / / / / / / /
| | * | | | | | | | Add test cases for in_channel_checkGravatar Atul Mishra2019-10-22-0/+8
| | | | | | | | | |
| | * | | | | | | | Merge branch 'master' into moderator-channel-checkGravatar Atul Mishra2019-10-22-1374/+2522
| | |\ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | |
* | | | | | | | | | Merge pull request #541 from ikuyarihS/masterGravatar S. Co12019-10-21-98/+54
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Fix defcon having wrong text when disabling.
| * \ \ \ \ \ \ \ \ \ Merge branch 'master' into masterGravatar S. Co12019-10-21-1276/+2468
| |\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
* | | | | | | | | | | Merge pull request #517 from python-discord/unittest-migrationGravatar Leon Sandøy2019-10-20-1268/+2366
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Migrating the test suite to the `unittest` framework
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into unittest-migrationGravatar Leon Sandøy2019-10-20-53/+163
| |\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |
* | | | | | | | | | | | Merge pull request #528 from bendiller/antimalware-cogGravatar Chris G2019-10-19-0/+86
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Antimalware cog
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into antimalware-cogGravatar Chris G2019-10-19-107/+428
| |\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | |
* | | | | | | | | | | | | Pluralize "infractions" as necessary. (#545)Gravatar scragly2019-10-20-2/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pluralize "infractions" as necessary.
| * | | | | | | | | | | | | Do not display an expiry for notes or warnings.Gravatar Johannes Christ2019-10-19-1/+7
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Pluralize "infractions" as necessary.Gravatar Johannes Christ2019-10-19-1/+3
|/ / / / / / / / / / / / /
| * | | | | | | | | | | | Bugfix - ensure .py attachment is prioritized over other non-whitelistedGravatar bendiller2019-10-17-1/+0
| | | | | | | | | | | | |
| * | | | | | | | | | | | Address reviewer requestGravatar bendiller2019-10-17-3/+4
| | | | | | | | | | | | |
| * | | | | | | | | | | | Improve code readability and provide early exit from loopGravatar bendiller2019-10-16-8/+13
| | | | | | | | | | | | |
| * | | | | | | | | | | | Improve code readability and docstringGravatar bendiller2019-10-14-13/+33
| | | | | | | | | | | | |
| * | | | | | | | | | | | Fix Constants.AntiMalware.whitelist typeGravatar bendiller2019-10-12-1/+1
| | | | | | | | | | | | |
| * | | | | | | | | | | | Implement message deletionGravatar bendiller2019-10-12-6/+12
| | | | | | | | | | | | |
| * | | | | | | | | | | | Create barebones Antimalware cog and config - detects bad file extensionsGravatar bendiller2019-10-12-0/+55
| | | | | | | | | | | | |
| | * | | | | | | | | | | Merge branch 'master' into unittest-migrationGravatar Sebastiaan Zeeff2019-10-15-407/+699
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolving merge conflicts from master in `.gitignore` and `tests/helpers.py`.
| | * | | | | | | | | | | | Remove empty tests.cogs folderGravatar Sebastiaan Zeeff2019-10-14-0/+0
| | | | | | | | | | | | | |
| | * | | | | | | | | | | | Merge branch 'cogs-tokenremover-unittest' into unittest-migrationGravatar Sebastiaan Zeeff2019-10-14-0/+136
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | Make test_token_remover use our discord MocksGravatar Sebastiaan Zeeff2019-10-14-8/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit replaces the standard MagicMocks by our specialized mocks for discord.py objects. It also adds the missing `channel` attribute to the `tests.helpers.MockMessage` mock and moves the file to the correct folder.
| | | * | | | | | | | | | | | Use `MockBot`.Gravatar Johannes Christ2019-10-14-3/+3
| | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | Move the `token_remover` cog tests to `unittest`.Gravatar Johannes Christ2019-10-14-0/+139
| | |/ / / / / / / / / / / /
| | * | | | | | | | | | | | Merge branch 'unittest-migration' of github.com:python-discord/bot into ↵Gravatar Sebastiaan Zeeff2019-10-14-0/+26
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | unittest-migration
| | | * \ \ \ \ \ \ \ \ \ \ \ Merge pull request #531 from python-discord/unittest-bot-constantsGravatar Johannes Christ2019-10-14-0/+26
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Migrate `test_constants` to unittest
| | | | * | | | | | | | | | | | Migrate test_constants to unittestGravatar Sebastiaan Zeeff2019-10-14-0/+26
| | | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Migrates the `test_constants.py` file to unittest. As with the pytest version, there is not yet support to test container types.
| | * / / / / / / / / / / / / Add more specialized Mocks to tests.helpersGravatar Sebastiaan Zeeff2019-10-14-181/+383
| | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit introduces some new Mock-types to the already existing Mock-types for discord.py objects. The total list is now: - MockGuild - MockRole - MockMember - MockBot - MockContext - MockTextChannel - MockMessage In addition, I've added all coroutines in the documentation for these discord.py objects as `AsyncMock` attributes to ease testing. Tests ensure that the attributes set for the Mocks exist for the actual discord.py objects as well.
| | * | | | | | | | | | | | Remove empty tests.cogs folderGravatar Sebastiaan Zeeff2019-10-14-0/+0
| | | | | | | | | | | | | |
| | * | | | | | | | | | | | Merge branch 'cogs-security-unittest' into unittest-migrationGravatar Sebastiaan Zeeff2019-10-14-0/+59
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | Move test_security to tests.bot.cogsGravatar Sebastiaan Zeeff2019-10-14-0/+0
| | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | Use `MockBot` and `MockContext`.Gravatar Johannes Christ2019-10-13-3/+3
| | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | Move the `security` cog tests to `unittest`.Gravatar Johannes Christ2019-10-12-0/+59
| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | Merge branch 'pagination-tests-to-unittest' into unittest-migrationGravatar Sebastiaan Zeeff2019-10-14-0/+36
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | Move test_pagination to tests.bot subdirGravatar Sebastiaan Zeeff2019-10-14-0/+0
| | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | Move `tests.test_pagination` to `unittest`.Gravatar Johannes Christ2019-10-12-0/+36
| | | |/ / / / / / / / / / / /
| | * | | | | | | | | | | | | Move sync tests to tests.bot.cogs.syncGravatar Sebastiaan Zeeff2019-10-13-0/+0
| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | Merge branch 'cogs-antispam-unittest' into unittest-migrationGravatar Sebastiaan Zeeff2019-10-13-0/+35
| | |\ \ \ \ \ \ \ \ \ \ \ \ \