aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeLines
...
| * | | | | | | | | 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.
| * | | | | | | | Superstarify: return None in _pardon_action for supported typesGravatar MarkKoz2019-10-25-1/+4
| | | | | | | | |
| * | | | | | | | Moderation: make infraction notification embed title lowercaseGravatar MarkKoz2019-10-25-1/+1
| | | | | | | | |
| * | | | | | | | Moderation: remove full stops from pardon embed titlesGravatar MarkKoz2019-10-25-2/+2
| | | | | | | | |
| * | | | | | | | Superstarify: make mod log title lowercase for consistencyGravatar MarkKoz2019-10-25-1/+1
| | | | | | | | |
| * | | | | | | | Superstarify: make the apply embed colour goldGravatar MarkKoz2019-10-25-9/+11
| | | | | | | | |
| * | | | | | | | Superstarify: fix incorrect infraction type check in _pardon_actionGravatar MarkKoz2019-10-25-1/+1
| | | | | | | | |
| * | | | | | | | InfractionScheduler: remove redundant loggingGravatar MarkKoz2019-10-25-3/+0
| | | | | | | | |
| * | | | | | | | Superstarify: save the old nickname before editing itGravatar MarkKoz2019-10-25-2/+3
| | | | | | | | |
| * | | | | | | | Superstarify: negate active infractions check in on_member_updateGravatar MarkKoz2019-10-25-1/+1
| | | | | | | | |
| * | | | | | | | Superstarify: fix mod log mentionGravatar MarkKoz2019-10-25-1/+1
| | | | | | | | |
| * | | | | | | | Superstarify: fit within 100 columns & use double quotesGravatar MarkKoz2019-10-25-7/+13
| | | | | | | | |
| * | | | | | | | Superstarify: refactor on_member_update eventGravatar MarkKoz2019-10-25-39/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Use notify_infraction to be more consistent * Add an audit log reason to the member edit * Simplify docstring * Simplify log message
| * | | | | | | | Superstarify: ignore member update event when applyingGravatar MarkKoz2019-10-25-0/+1
| | | | | | | | |
| * | | | | | | | InfractionScheduler: prevent duplicate rescheduling of infractionsGravatar MarkKoz2019-10-25-6/+9
| | | | | | | | |
| * | | | | | | | InfractionScheduler: create generic function for reapplying infractionsGravatar MarkKoz2019-10-25-68/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | reapply_infraction() is a generic function which reapplies a given infraction if it is still active or deactivates it if less than 60 seconds remain. Most of the code from Infractions.on_member_joined now lives in this new function. This simplifies the "fancier" DM and mod log that were previously sent for superstar in on_member_join.
| * | | | | | | | Superstarify: refactor superstarify commandGravatar MarkKoz2019-10-25-29/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Edit the nickname and schedule the infraction before sending messages * Reformat mod log description to be consistent with other infractions * Use INFRACTION_ICONS constant
| * | | | | | | | Superstarify: schedule infractions by subclassing InfractionSchedulerGravatar MarkKoz2019-10-25-42/+25
| | | | | | | | |
| * | | | | | | | InfractionScheduler: use fetched user for notify_infractionGravatar MarkKoz2019-10-25-1/+1
| | | | | | | | |
| * | | | | | | | Superstarify: add icons to constants and configGravatar MarkKoz2019-10-25-3/+10
| | | | | | | | |
| * | | | | | | | InfractionScheduler: delegate type-specific pardon code to subclassesGravatar MarkKoz2019-10-25-35/+77
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Create an abstract method for performing type-specific infraction deactivation * Move infraction-specific pardon code to separate functions
| * | | | | | | | Moderation: create a class to handle scheduling of infractionsGravatar MarkKoz2019-10-25-353/+372
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The class handles application, pardoning, and expiration of infractions. This will allow other cogs, such as superstarify, to later subclass it to receive the same functionality that the infractions cog had.
* | | | | | | | Merge pull request #527 from kraktus/compact_freeGravatar Mark2019-10-25-14/+11
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Reduce `!free` output
| * \ \ \ \ \ \ \ Merge branch 'master' into compact_freeGravatar Mark2019-10-25-1642/+2983
| |\ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
* | | | | | | | | Merge pull request #501 from mathsman5133/reddit-makeoverGravatar Sebastiaan Zeeff2019-10-25-148/+85
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Utilise `tasks.loop` and webhooks for reddit postings.
| * \ \ \ \ \ \ \ \ Merge branch 'master' into reddit-makeoverGravatar Sebastiaan Zeeff2019-10-25-1447/+2668
| |\ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
* | | | | | | | | | Merge pull request #466 from Akarys42/reminder-upGravatar Sebastiaan Zeeff2019-10-25-3/+10
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | New reminder features
| * \ \ \ \ \ \ \ \ \ Merge branch 'master' into reminder-upGravatar Sebastiaan Zeeff2019-10-25-1394/+2592
| |\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
* | | | | | | | | | | Merge pull request #543 from atmishra/moderator-channel-checkGravatar S. Co12019-10-25-7/+22
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Restrict ModManagement commands to moderation channels
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into moderator-channel-checkGravatar S. Co12019-10-25-17/+37
| |\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |
* | | | | | | | | | | | Merge pull request #550 from python-discord/###-filtering-devtestGravatar S. Co12019-10-25-5/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | Use standard filter conditions even if DEBUG_MODE is on.
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into ###-filtering-devtestGravatar S. Co12019-10-25-15/+54
| |\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #529 from python-discord/show-trigger-wordGravatar S. Co12019-10-25-11/+24
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Display word triggered by watchlist in #mod-alerts
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into show-trigger-wordGravatar S. Co12019-10-25-1469/+2842
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | 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
| | | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | 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
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / | | |/| | | | | | | | | | |
| | | * | | | | | | | | | | Modify in_channel_check to accept list of channelsGravatar Atul Mishra2019-10-22-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Update test cases for in_channel_check
| | | * | | | | | | | | | | Fix typo in channel nameGravatar Atul Mishra2019-10-21-1/+1
| | | | | | | | | | | | | |
| | | * | | | | | | | | | | Add #admin-spam channel to moderation channels listGravatar Atul Mishra2019-10-21-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Change doc string for cog_check method
| | | * | | | | | | | | | | Add missing channels to the configGravatar Atul Mishra2019-10-19-0/+2
| | | | | | | | | | | | | |
| | | * | | | | | | | | | | Add moderation channels check to cog_checkGravatar Atul Mishra2019-10-19-2/+11
| | | | |_|_|_|_|_|_|/ / / | | | |/| | | | | | | | |
| | | | | * | | | | | | | Substract one to now calculationGravatar Akarys422019-10-23-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoid aving `Your reminder will arrive in 59 minutes and 59 seconds!` instead of `Your reminder will arrive in 1 hour!`
| | | | | * | | | | | | | Update send_reminder message creationGravatar Akarys422019-10-21-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is now truly backward compatible and use a more DRY method
| | | | | * | | | | | | | Merge branch 'master' of https://github.com/python-discord/bot into reminder-upGravatar Akarys422019-10-19-1998/+2072
| | | | | |\ \ \ \ \ \ \ \
generated by cgit v1.2.3 (git 2.39.1) at 2025-11-01 05:31:52 +0000