aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeLines
...
* | | | | | | | | | | | | Merge pull request #811 from python-discord/feat/deps/o138/pre-commit-hooksGravatar scragly2020-03-04-128/+85
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add more pre-commit hooks and run them in CI
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into feat/deps/o138/pre-commit-hooksGravatar scragly2020-03-04-33/+102
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Update code for pep8-naming complianceGravatar S. Co12020-03-03-6/+6
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Remove CaseInsensitiveDictGravatar S. Co12020-03-03-94/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was added by the now-removed Snake cog & is not used elsewhere on bot.
| * | | | | | | | | | | | | Add pep8-naming & relockGravatar S. Co12020-03-03-14/+28
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | CI: mock the pipenv binaryGravatar MarkKoz2020-03-03-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The mock gets used by the flake8 pre-commit hook, which invokes flake8 via `pipenv run flake8`. It's normally useful to use pipenv here cause it ensures flake8 is invoked within the context of the venv. However, in CI, there is no venv - dependencies are installed directly to the system site-packages. `pipenv run` does not work in such case because it tries to create a new venv if one doesn't exist (it doesn't consider the system interpreter to be a venv). This workaround (okay, it's a hack) creates an executable shell script which replaces the original pipenv binary. The shell script simply ignores the first argument (i.e. ignores `run` in `pipenv run`) and executes the rest of the arguments as a command. It essentially makes `pipenv run flake8` equivalent to just having ran `flake8`. When pre-commit executes pipenv, the aforementioned script is what will run.
| * | | | | | | | | | | | | CI: add a restore key for the pre-commit cacheGravatar MarkKoz2020-03-03-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A cache for an outdated pre-commit environment may still be useful. It may be the case that only some hooks need to be updated rather than all.
| * | | | | | | | | | | | | Use pre-commit in pipenv lint scriptGravatar MarkKoz2020-03-03-4/+12
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Add more pre-commit hooksGravatar MarkKoz2020-03-02-10/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Remove trailing whitespaces * Specify error code for a noqa in the free command
| | * | | | | | | | | | | | Use raw strings for docstrings with forward slashesGravatar Sebastiaan Zeeff2020-03-04-3/+3
| |/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A few docstrings in `bot.cogs.extensions` have forward slashed in them to escape Markdown rendering when our help feature uses these docstring in a Discord message. However, the use of forward slashes with an invalid escape sequence in docstrings now raises a DeprecationWarning in Python: /home/sebastiaan/pydis/repositories/bot/bot/cogs/extensions.py:72: DeprecationWarning: invalid escape sequence \* PEP 257 (Docstring Conventions, https://www.python.org/dev/peps/pep-0257/) states that raw strings should be used for docstrings that use forward slashes, so I've added the `r`-prefix to the docstrings that use forward slashes.
* | | | | | | | | | | | | Merge pull request #815 from python-discord/watchchannel-dmGravatar scragly2020-03-04-2/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | Prevent exception if a watched user sends a DM to the bot
| * | | | | | | | | | | | Prevent exception if a watched user sends a DM to the botGravatar S. Co12020-03-03-2/+9
|/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | The previous embed assumed that the messages would be sent on the server, where the channel would have a name and the message would have a jump URL. For a DM, neither of these are present and an exception will be raised when attempting to construct the embed for the webhook to send.
| | * | | | | | | | | | Merge branch 'master' into antimalware-loggingGravatar S. Co12020-03-03-1076/+1451
| | |\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / |/| | | | | | | | | | |
* | | | | | | | | | | | Merge pull request #750 from python-discord/bug/backend/b748/resolver-in-coroGravatar Mark2020-03-03-31/+93
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | | Create AsyncResolver inside a coroutine to avoid DeprecationWarning
| * | | | | | | | | | | Merge branch 'master' into bug/backend/b748/resolver-in-coroGravatar Mark2020-03-03-1048/+1367
| |\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |
* | | | | | | | | | | | Adding helpers to the Filtering whitelistGravatar Leon Sandøy2020-03-02-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolves an issue mentioned in https://github.com/python-discord/bot/issues/767, giving Helpers access to post invites and other things caught by the Filtering cog.
| * | | | | | | | | | | Fix typo in commentGravatar Mark2020-03-03-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Co-Authored-By: Leon Sandøy <[email protected]>
| * | | | | | | | | | | Merge remote-tracking branch 'origin/master' into ↵Gravatar MarkKoz2020-02-25-1156/+2657
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug/backend/b748/resolver-in-coro
| * | | | | | | | | | | | API: close existing open session before recreating itGravatar MarkKoz2020-02-15-3/+4
| | | | | | | | | | | | |
| * | | | | | | | | | | | API: add argument to force recreation of the sessionGravatar MarkKoz2020-02-15-4/+10
| | | | | | | | | | | | |
| * | | | | | | | | | | | Bot: send not-closed warnings as log messagesGravatar MarkKoz2020-02-15-12/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "Real" warnings weren't showing up for some reason.
| * | | | | | | | | | | | Bot: warn when connector/session not closed when recreatingGravatar MarkKoz2020-02-15-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | aiohttp does warn too, but these warnings will provide more immediate feedback.
| * | | | | | | | | | | | Bot: call _recreate() in clear()Gravatar MarkKoz2020-02-15-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Because discord.py recreates the HTTPClient session, may as well follow suite and recreate our own stuff here too.
| * | | | | | | | | | | | Bot: move connector/session recreation to a separate functionGravatar MarkKoz2020-02-15-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The function itself doesn't need to be a coroutine. It just has to be called in a coroutine (or, more indirectly, in an async context?).
| * | | | | | | | | | | | Bot: override login() instead of start()Gravatar MarkKoz2020-02-15-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The client can be used without running a bot so it makes more sense for the connector to be created when logging in, which is done in both cases, rather than in start(), which is only used when running a bot.
| * | | | | | | | | | | | Bot: fix error trying to close a None sessionGravatar MarkKoz2020-02-14-1/+3
| | | | | | | | | | | | |
| * | | | | | | | | | | | Bot: add warning for when connector is a specified kwargGravatar MarkKoz2020-02-13-0/+6
| | | | | | | | | | | | |
| * | | | | | | | | | | | Bot: avoid DeprecationWarning for aiohttp.AsyncResolver (fix #748)Gravatar MarkKoz2020-02-13-15/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AsyncResolver has to be created inside a coroutine so it's moved inside start(). Consequently, the APIClient session is also recreated inside start() now. When using clear(), the default connector is used for the session it recreates because clear() is not a coroutine. This should only affect requests made to the Discord API via the Client when not using it to run a bot; starting the bot will re-create the session with the custom connector. * Close connector and resolver when bot closes
| * | | | | | | | | | | | API: accept additional session kwargs for recreate()Gravatar MarkKoz2020-02-13-7/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These kwargs are merged with the kwargs given when the APIClient was created. This is useful for facilitating changing the session's connector with a new instance when the session needs to be recreated. * Rename _session_args attribute to _default_session_kwargs
| | | * | | | | | | | | | Add logging to antimalware cog & expand user feedbackGravatar S. Co12020-03-01-17/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add generic handling for multi-file uploads * Log user, id, and blocked extensions * Provide the full list of attachment filenames as a logging extra * Provide feedback on all blacklisted file types uploaded
| | | | | | | * | | | | | Convert "get_tags()" and "_get_tag()" to sync functionsGravatar RohanJnr2020-03-04-10/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "get_tags()" and "_get_tag()" functions need not be async as we are no longer doing any API call but instead reading from local files.
| | | | | | | * | | | | | Use "pathlib" instead of "os" module and context managerGravatar RohanJnr2020-03-04-11/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The pathlib module simplifies opening and reading files, hence the os module and the context manager are no longer used.
| | | | | | | * | | | | | Merge branch 'tags_overhaul' of https://github.com/RohanJnr/bot into ↵Gravatar RohanJnr2020-02-29-895/+2636
| | | | | | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | tags_overhaul
| | | | | | | | * \ \ \ \ \ Merge branch 'master' into tags_overhaulGravatar Rohan2020-02-29-895/+2636
| | | | | | | | |\ \ \ \ \ \
| | | | | | | * | | | | | | | Caching all the tags when the bot has loaded(caching only once) insted of ↵Gravatar RohanJnr2020-02-29-21/+18
| | | | | | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | caching it after the tags command is used.
| | | | | | | * | | | | | | Re-corrected the lines which I had changed by mistakeGravatar RohanJnr2020-02-29-1/+2
| | | | | | | | | | | | | |
| | | | | | | * | | | | | | added white spaces on statements before bullet points for proper rendering ↵Gravatar RohanJnr2020-02-29-75/+75
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | of points on github
| | | | | | | * | | | | | | Added all the tag files in resources and modified cogs/tags.py file to ↵Gravatar RohanJnr2020-02-29-84/+919
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | access the static tag files rather than sending an API get request. Removed all methods calling the API so the tags cannot be edited, added nor deleted.
| | | | | | | | | | | | | * Add tests for `HushDurationConverter`.Gravatar Numerlor2020-03-17-0/+30
| | | | | | | | | | | | | |
| | | | | | | | | | | | | * Add tests ensuring permissions get preserved.Gravatar Numerlor2020-03-17-0/+31
| | | | | | | | | | | | | |
| | | | | | | | | | | | | * Use set `discard` instead of `remove`.Gravatar Numerlor2020-03-17-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Discard ignores non present values, allowing us to skip the KeyError suppress.
| | | | | | | | | | | | | * Add docstring to test.Gravatar Numerlor2020-03-17-0/+1
| | | | | | | | | | | | | |
| | | | | | | | | | | | | * Fix test name.Gravatar Numerlor2020-03-17-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `removed` was describing the opposite behaviour.
| | | | | | | | | | | | | * Remove `alert_channel` mention from docstring.Gravatar Numerlor2020-03-17-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After removing the optional channel arg and changing output message channels we're only testing `ctx`'s `send`.
| | | | | | | | | | | | | * Remove one indentation level.Gravatar Numerlor2020-03-17-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Co-authored-by: MarkKoz <[email protected]>
| | | | | | | | | | | | | * Reword `unsilence` docstring.Gravatar Numerlor2020-03-17-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Co-authored-by: MarkKoz <[email protected]>
| | | | | | | | | | | | | * Remove `channel` mentions from command docstrings.Gravatar Numerlor2020-03-17-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With the new behaviour of not accepting channels and muting the current one, it's no longer neccessary to keep the channel param in the docstring. Co-authored-by: MarkKoz <[email protected]>
| | | | | | | | | | | | | * Rename `cog_unload` tests.Gravatar Numerlor2020-03-17-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previous names were undescriptive from testing phases.
| | | | | | | | | | | | | * Fix `test_cog_unload` passing tests with invalid values.Gravatar Numerlor2020-03-17-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The first assert - `asyncio_mock.create_task.assert_called_once_with` called `alert_channel`'s send resulting in an extra call. `send` on `alert_channel` was not tested properly because of a typo and a missing assert in the method call.
| | | | | | | | | | | | | * Handle and log `CommandErrors` on `.can_run`.Gravatar Numerlor2020-03-16-1/+6
| | | | | | | | | | | | | |