aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeLines
* Merge branch 'master' into feat/deps/o138/pre-commit-hooksGravatar scragly2020-03-04-33/+102
|\
| * 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 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
| | |\ | | |/ | |/|
| | * 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
* | | | 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
* | | 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.
* | | Merge pull request #783 from python-discord/python38-migrationGravatar S. Co12020-03-01-661/+301
|\ \ \ | | | | | | | | Migrate bot to Python 3.8
| * \ \ Merge branch 'master' into python38-migrationGravatar Leon Sandøy2020-03-01-2/+29
| |\ \ \ | |/ / / |/| | |
* | | | Merge pull request #809 from python-discord/ban-grabify-urlsGravatar kwzrd2020-03-01-0/+24
|\ \ \ \ | | | | | | | | | | Add grabify (IP logger) domains to banned domains
| * | | | Add grabify (IP logger) domains to banned domainsGravatar Joseph2020-03-01-0/+24
|/ / / /
* | | | Merge pull request #808 from spyoungtech/masterGravatar scragly2020-03-02-2/+5
|\ \ \ \ | | | | | | | | | | Optimize Dockerfile for faster rebuilds
| * \ \ \ Merge branch 'master' into masterGravatar scragly2020-03-02-0/+0
| |\ \ \ \ | |/ / / / |/| | | |
| * | | | Optimize DockerfileGravatar Spencer Young2020-03-01-2/+5
| | | | |
| | * | | Modify log test regex to be non-os-specificGravatar S. Co12020-03-01-1/+1
| | | | | | | | | | | | | | | Previous regex utilized a `/`, which doesn't work for comparing against Windows paths, which use `\`
| | * | | Move syncer confirmation reaction check out of finally clauseGravatar S. Co12020-03-01-11/+11
| | | | | | | | | | | | | | | Returning directly out of a `finally` clause can cause any exceptions raised in the clause to be discarded, so we can remove the finally clause entirely and shift the control statements into the body of the function
| | * | | Bump Dependencies & RelockGravatar S. Co12020-03-01-78/+76
| | | | | | | | | | | | | | | * Remove explicit urllib3 pinning, CVE that caused its pinning has been resolved by 1.25+. This is a child dependency of requests.
| | * | | Merge branch 'master' into python38-migrationGravatar Sebastiaan Zeeff2020-03-01-29/+71
| | |\ \ \ | |_|/ / / |/| | | | | | | | | I have resolved a merge conflict in Pipfile.lock by relocking with the newly added dependencies of `coloredlogs` and `colorama`.
* | | | | Merge pull request #806 from python-discord/feat/frontend/b000/coloured-logsGravatar Eivind Teig2020-03-01-47/+89
|\| | | | | | | | | | | | | | Coloured log output
| * | | | Make logs coloured!Gravatar MarkKoz2020-02-29-7/+23
| | | | |
| * | | | Install the coloredlogs packageGravatar MarkKoz2020-02-29-40/+66
|/ / / / | | | | | | | | | | | | | | | | This makes it easy to add colour to the logs. Colorama is also installed if on a Windows system.
| * | | Migrate snekbox tests to Python 3.8's unittestGravatar Sebastiaan Zeeff2020-02-29-41/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I've migrated the `tests/test_snekbox.py` file to use the new Python 3.8-style unittests instead of our old style using our custom Async mocks. In particular, I had to make a few changes: - Mocking the async post() context manager correctly Since `ClientSession.post` returns an async context manager when called, we need to make sure to assign the return value to the __aenter__ method of whatever `post()` returns, not of `post` itself (i.e.. when it's not called). - Use the new AsyncMock assert methods `assert_awaited_once` and `assert_awaited_once_with` Objects of the new `unittest.mock.AsyncMock` class have special methods to assert what they were called with that also assert that specific coroutine object was awaited. This means we test two things in one: Whether or not it was called with the right arguments and whether or not the returned coroutine object was then awaited. - Patch `functools.partial` as `partial` objects are compared by identity When you create two partial functions of the same function, you'll end up with two different `partial` objects. Since `partial` objects are compared by identity, you can't compare a `partial` created in a test method to that created in the callable you're trying to test. They will always compare as `False`. Since we're not interested in actually creating `partial` objects, I've just patched `functools.partial` in the namespace of the module we're testing to make sure we can compare them.
| * | | Merge branch 'master' into python38-migrationGravatar Sebastiaan Zeeff2020-02-29-403/+1005
| |\ \ \ | |/ / / |/| | | | | | | I've resolved the merge conflict by confirming the deleted part of tests/helpers.py
* | | | Merge pull request #755 from ↵Gravatar Sebastiaan Zeeff2020-02-29-44/+70
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | python-discord/bug/backend/b754/scheduler-suppresses-errors Don't suppress all errors in scheduler
| * \ \ \ Merge branch 'master' into bug/backend/b754/scheduler-suppresses-errorsGravatar Sebastiaan Zeeff2020-02-29-353/+936
| |\ \ \ \ | |/ / / / |/| | | |
* | | | | Merge pull request #797 from Numerlor/fuzzy_zero_divGravatar Shirayuki Nekomata2020-02-29-26/+17
|\ \ \ \ \ | | | | | | | | | | | | Fix invalid tag names being passed to the tag cog.
| * \ \ \ \ Merge branch 'master' into fuzzy_zero_divGravatar Shirayuki Nekomata2020-02-29-32/+479
| |\ \ \ \ \ | |/ / / / / |/| | | | |
* | | | | | Merge pull request #710 from python-discord/eval-enhancementsGravatar Mark2020-02-28-32/+479
|\ \ \ \ \ \ | | | | | | | | | | | | | | Eval cog improvements
| * | | | | | Snekbox: mention re-evaluation feature in the command's docstringGravatar MarkKoz2020-02-28-1/+4
| | | | | | |
| * | | | | | Merge remote-tracking branch 'origin/master' into eval-enhancementsGravatar MarkKoz2020-02-28-1440/+3084
| |\ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Ignore NotFound errors inside continue_evalGravatar Matteo2020-02-28-24/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | It could have caused some errors if the user delete his own message