aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeLines
* Merge branch 'master' into unittest-helpers-improvementsGravatar scragly2019-11-14-36/+167
|\
| * Merge pull request #656 from python-discord/checkpoint-changesGravatar Mark2019-11-10-22/+53
| |\ | | | | | | Forward pings in checkpoint to mod-alerts and reword periodic checkpoint ping
| | * Merge branch 'master' into checkpoint-changesGravatar Mark2019-11-10-540/+677
| | |\ | | |/ | |/|
| * | Merge pull request #641 from kwzrd/unittest-linksGravatar Mark2019-11-08-0/+101
| |\ \ | | | | | | | | Add unit test for links antispam rule
| | * \ Merge branch 'master' into unittest-linksGravatar Mark2019-11-08-608/+1193
| | |\ \ | | |/ / | |/| |
| * | | Merge pull request #653 from python-discord/talent-poolingGravatar Sebastiaan Zeeff2019-11-08-14/+13
| |\ \ \ | | | | | | | | | | Allow helpers to nominate people
| | * | | Refactor bigbrother to use constantsGravatar kosayoda2019-11-08-5/+5
| | | | |
| | * | | Allow helpers to nominate peopleGravatar kosayoda2019-11-08-9/+8
| |/ / /
| | * | Update docstring to use asterisks when referring to argument namesGravatar kwzrd2019-11-08-1/+1
| | | | | | | | | | | | Co-Authored-By: Kyle Stanley <[email protected]>
| | * | Add whitespace for readability, consistency & allureGravatar kwzrd2019-11-08-0/+1
| | | |
| | * | Adjust case to only test a single aspectGravatar kwzrd2019-11-02-1/+1
| | | |
| | * | Annotate unclear test cases with inline commentsGravatar kwzrd2019-11-02-2/+2
| | | |
| | * | Add two more test cases for links rule unit testGravatar kwzrd2019-11-01-0/+7
| | | |
| | * | Add unit test for links antispam ruleGravatar kwzrd2019-11-01-0/+93
| | | |
| | | * [kaizen] Remove now duplicate channel checkGravatar Derek2019-11-09-19/+18
| | | | | | | | | | | | | | | | Unindent subsequent lines after check
| | | * Forward user/role pings in checkpoint to mod-alertsGravatar Derek2019-11-09-2/+34
| | | | | | | | | | | | | | | | [kaizen] limit on_message listener to verification channel
| | | * Reword periodic #checkpoint messageGravatar Derek2019-11-04-1/+1
| | | |
* | | | Prevent await warnings for MockBot's create_taskGravatar Sebastiaan Zeeff2019-11-13-1/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, the coroutine object passed to `MockBot.loop.create_task` would trigger a `RuntimeWarning` for not being awaited as we do not actually create a task for it. To prevent these warnings, coroutine objects passed will now automatically be closed.
* | | | Prevent setting unknown attributes on d.py mocksGravatar Sebastiaan Zeeff2019-11-13-158/+101
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Our custom `discord.py` now follow the specifications of the object they are mocking more strictly by using the `spec_set` instead of the `spec` kwarg to initialize the specifications. This means that trying to set an attribute that does not follow the specifications will now also result in an `AttributeError`. To make sure we are not trying to set illegal attributes during the default initialization of the mock objects, I've changed the way we handle default values of parameters. This does introduce a breaking change: Instead of passing a `suffix_id`, the `id` attribute should now be passed using the exact name. `id`. This commit also makes sure existing tests follow this change.
* | | | Allow `name` attribute to be set during Mock initGravatar Sebastiaan Zeeff2019-11-13-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `name` keyword argument has a special meaning for the default mockobjects provided by `unittest.mock`. This means that by default, the common d.py `name` attribute can't be set during initalization of one of our custom Mock-objects by passing it to the constructor. Since it's unlikely for us to make use of the special `name` feature of mocks and more likely to want to set the d.py `name` attribute, I added special handling of the `name` kwarg.
* | | | Prevent unwanted logging while running testsGravatar Sebastiaan Zeeff2019-11-13-1/+14
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, logging messages would output to std.out. when running individual test files (instead of running the entire suite). To prevent this, I've added a `for`-loop to `tests.helpers` that sets the level of all registered loggers to `CRITICAL`. The reason for adding this to `tests.helpers` is simple: It's the most common file to be imported in individual tests, increasing the chance of the code being run for individual test files. A small downside of this way of handling logging is that when we are trying to assert logging messages are being emitted, we need to set the logger explicitly in the `self.assertLogs` context manager. This is a small downside, though, and probably good practice anyway. There was one test in `tests.bot.test_api` that did not do this, so I have changed this to make the test compatible with the new set-up.
* | | Merge pull request #618 from python-discord/schedule-superstarifyGravatar S. Co12019-11-04-526/+563
|\ \ \ | |_|/ |/| | Schedule superstarify infractions for expiration
| * | Merge branch 'master' into schedule-superstarifyGravatar S. Co12019-11-04-260/+838
| |\ \ | |/ / |/| |
* | | User command enhancements (#637)Gravatar scragly2019-11-04-62/+552
|\ \ \ | | | | | | | | | | | | | | | | User command enhancements Co-authored-by: null <[email protected]>
| * \ \ Merge branch 'master' into user-command-enhancementsGravatar scragly2019-11-04-7/+66
| |\ \ \ | |/ / / |/| | |
* | | | Change invite filter message to accurately reflect the new rulesGravatar kosayoda2019-11-04-1/+1
| | | |
* | | | Merge pull request #648 from python-discord/user-status-summaryGravatar Mark2019-11-03-1/+9
|\ \ \ \ | | | | | | | | | | Show custom statuses in !user output
| * \ \ \ Merge branch 'master' into user-status-summaryGravatar Mark2019-11-03-3/+53
| |\ \ \ \ | |/ / / / |/| | | |
* | | | | Merge pull request #640 from python-discord/bot-utils-init-testsGravatar S. Co12019-11-03-0/+52
|\ \ \ \ \ | | | | | | | | | | | | Write tests for `bot.utils`.
| * \ \ \ \ Merge branch 'master' into bot-utils-init-testsGravatar S. Co12019-11-03-5/+4
| |\ \ \ \ \ | |/ / / / / |/| | | | |
* | | | | | Merge pull request #631 from manusaurio/masterGravatar S. Co12019-11-03-3/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Remove redirection on rules command
| * \ \ \ \ \ Merge branch 'master' into masterGravatar S. Co12019-11-03-194/+224
| |\ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Remove redirection on rules commandGravatar Manuel Ignacio Pérez Alcolea2019-10-28-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously restricted for the staff. This change was suggested due its possible usefulness for regular users.
| | * | | | | Use `casefold` in some cases.Gravatar Johannes Christ2019-11-02-1/+4
| | | | | | |
| | * | | | | Write tests for `bot.utils`.Gravatar Johannes Christ2019-11-01-0/+49
| | | |_|_|/ | | |/| | | | | | | | | | | | | | | Closes #604.
| | | * | | Show custom statuses in !user outputGravatar Jeremiah Boby2019-11-03-1/+9
| |_|/ / / |/| | | | | | | | | | | | | | Resolves #647
* | | | | Merge pull request #638 from loksonarius/fix-reddit-cog-sleepGravatar Mark2019-11-02-2/+3
|\ \ \ \ \ | |_|/ / / |/| | | | Use timedelta to correctly calculate next midnight
| * | | | Use timedelta to correctly calculate next midnightGravatar Dan Herrera2019-10-31-2/+3
|/ / / /
| | * / Enhance the output of the user commandGravatar Sebastiaan Zeeff2019-10-31-62/+552
| |/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://github.com/python-discord/bot/issues/628 https://github.com/python-discord/bot/issues/339 This commit introduces several changes to the output of the `!user` command for moderation staff. The output for regular users has not changed. Changes: - When issued in a moderation channel, the infraction count of the user will now be broken down by type as described in #339. This allows moderators to get a quicker overview of someone's history by providing more information. The command will display the total number of infractions per type, with the number of active infractions in parentheses behind it if there are any. This change also means that there no longer a need for the `hidden` parameter: When issued in a moderation channel, hidden infractions are included by default; when issued outside of a mod channel, the command will be equal to what a regular user would get. In addition to broken-down infraction info, the command now also shows information about the nominations of a user when it's issued inside of a moderation channel. - The code has been refactored to smaller units that take care of a single action to make unit testing easier. I have included tests that cover the command and all of the new helper methods. Tests for the other methods/commands in the cog will be added in the specific issue calling for tests for this cog (#581) This commit closes #628 and closes #339
* | | Merge pull request #629 from python-discord/unittest-helpers-proper-child-mockGravatar Mark2019-10-31-179/+204
|\ \ \ | | | | | | | | Enhancements and a bug fix for our test helpers
| * \ \ Merge branch 'master' into unittest-helpers-proper-child-mockGravatar Mark2019-10-31-13/+17
| |\ \ \ | |/ / / |/| | |
* | | | Merge pull request #626 from python-discord/otn-a-fixGravatar Mark2019-10-30-10/+6
|\ \ \ \ | | | | | | | | | | Chain words before length check for OffTopicName conversion
| * \ \ \ Merge branch 'master' into otn-a-fixGravatar Mark2019-10-30-3/+11
| |\ \ \ \ | |/ / / / |/| | | |
* | | | | Use 'local' emojis for reddit webhook embedGravatar Sebastiaan Zeeff2019-10-29-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Apparently, webhooks cannot use external emojis. For now, I have added the emojis to the guild directly and updated the IDs in this commit. I don't really like having "utility" emojis on the main guild, but the alternative would be to not use webhooks, which is a change we will need to discuss before we apply it. (I don't see anything against it now we just send a daily digest, although, in principle, this is precisely what a webhook is meant for.)
* | | | | Merge pull request #635 from python-discord/reddit-webhook-embed-enhancementsGravatar Kieran Siek2019-10-29-3/+11
|\ \ \ \ \ | |_|_|/ / |/| | | | Enhance Reddit webhook embeds
| * | | | Enhance Reddit webhook embedsGravatar Sebastiaan Zeeff2019-10-29-3/+11
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://github.com/python-discord/bot/issues/634 I have changes the appearance of the embed generated for the reddit webhook. The changes: - Bold markdown around the links to prevent it breaking on android. - Stylized the meta-data line with newly created emoji-based icons. - Removed redundant mentions of the subreddit from the embed itself. The emojis were uploaded to the `Emojis II` guild and the IDs have been added to the constants files. In addition, I've set the reddit logo as the default avatar for the webhook in the guild. This commit closes #634
| * / / Chain words before length checkGravatar kosayoda2019-10-28-10/+6
|/ / /
| * | Update docstring and remove redundant attributeGravatar Sebastiaan Zeeff2019-10-30-4/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I accidentally forgot to update the docstring of `CustomMockMixin`, which changed quite dramatically in scope with the last commit. This commit remedies that. In addition, I inadvertently forgot to remove the `child_mock_type` class attribute from `MockRole`. Since it uses the default value, it is no longer necessary to specify it in the child class as well.
| * | Enhance custom mock helpersGravatar Sebastiaan Zeeff2019-10-30-161/+150
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I have enhanced the custom mocks defined in `tests/helpers.py` in a couple of important ways. 1. Automatically create AsyncMock attributes using `inspect` Our previous approach, hard-coding AsynckMock attributes for all the coroutine function methods defined for the class we are trying to mock is prone to human error and not resilient against changes introduced in updates of the library we are using. Instead, I have now created a helper method in our `CustomMockMixin` (formerly `GetChildMockMixin`) that automatically inspects the spec instance we've passed for `coroutine functions` using the `inspect` module. It then sets the according attributes with instances of the AsyncMock class. There is one caveat: `discord.py` very rarely defines regular methods that return a coroutine object. Since the returned coroutine should still be awaited, these regular methods should also be mocked with an AsyncMock. However, since they are regular methods, `inspect` does not detect them and they have to be added manually. (The only case of this I've found so far is `Client.wait_for`.) 2. Properly set special attributes using `kwargs.get` As we want attributes that point to other discord.py objects to use our custom mocks (.e.g, `Message.author` should use `MockMember`), the `__init__` method of our custom mocks make sure to correctly instantiate these attributes. However, the way we previously did that means we can't instantiate the custom mock with a mock instance we provide, since this special instantiation would overwrite the custom object we'd passed. I've solved this by using `kwargs.get`, with a new mock as the default value. This makes sure we only create a new mock if we didn't pass a custom one: ```py class MockMesseage: def __init__(self, **kwargs): self.author = kwargs.get('author', MockMember()) ``` As you can see, we will only create a new MockMember if we did not pass an `author` argument. 3. Factoring out duplicate lines Since our `CustomMockMixin` is a parent to all of our custom mock types, it makes sense to use it to factor out common code of all of our custom mocks. I've made the following changes: - Set a default child mock type in the mixin. - Create an `__init__` that takes care of the `inspect` of point 1 This means we won't have to repeat this in all of the child classes. 4. Three new Mock types: Emoji, PartialEmoji, and Reaction I have added three more custom mocks: - MockEmoji - MockPartialEmoji - MockReaction
| * | Change generation of child mocksGravatar Sebastiaan Zeeff2019-10-28-36/+67
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - https://docs.python.org/3/library/unittest.mock.html We previously used an override of the `__new__` method to prevent our custom mock types from instantiating their children with their own type instead of a general mock type like `MagicMock` or `Mock`. As it turns out, the Python documentation suggests another method of doing this that does not involve overriding `__new__`. This commit implements this new method to make sure we're using the idiomatic way of handling this. The suggested method is overriding the `_get_child_mock` method in the subclass. To make our code DRY, I've created a mixin that should come BEFORE the mock type we're subclassing in the MRO. --- In addition, I have also added this new mixin to our `AsyncMock` class to make sure that its `__call__` method returns a proper mock object after it has been awaited. This makes sure that subsequent attribute access on the returned object is mocked as expected.