bot - A mirrored copy of the python-discord/bot repository.

	Commit message (Collapse)	Author	Age	Lines
...
\| * \| \| \| \|	Change generation of child mocks	Sebastiaan Zeeff	2019-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.
* \| \| \| \|	Merge pull request #527 from kraktus/compact_free	Mark	2019-10-25	-14/+11
\|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \|	Reduce `!free` output
\| * \ \ \ \	Merge branch 'master' into compact_free	Mark	2019-10-25	-1642/+2983
\| \|\ \ \ \ \ \| \|/ / / / / \|/\| \| \| \| \|
* \| \| \| \| \|	Merge pull request #501 from mathsman5133/reddit-makeover	Sebastiaan Zeeff	2019-10-25	-148/+85
\|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Utilise `tasks.loop` and webhooks for reddit postings.
\| * \ \ \ \ \	Merge branch 'master' into reddit-makeover	Sebastiaan Zeeff	2019-10-25	-1447/+2668
\| \|\ \ \ \ \ \ \| \|/ / / / / / \|/\| \| \| \| \| \|
* \| \| \| \| \| \|	Merge pull request #466 from Akarys42/reminder-up	Sebastiaan Zeeff	2019-10-25	-3/+10
\|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	New reminder features
\| * \ \ \ \ \ \	Merge branch 'master' into reminder-up	Sebastiaan Zeeff	2019-10-25	-1394/+2592
\| \|\ \ \ \ \ \ \ \| \|/ / / / / / / \|/\| \| \| \| \| \| \|
* \| \| \| \| \| \| \|	Merge pull request #543 from atmishra/moderator-channel-check	S. Co1	2019-10-25	-7/+22
\|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Restrict ModManagement commands to moderation channels
\| * \ \ \ \ \ \ \	Merge branch 'master' into moderator-channel-check	S. Co1	2019-10-25	-17/+37
\| \|\ \ \ \ \ \ \ \ \| \|/ / / / / / / / \|/\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge pull request #550 from python-discord/###-filtering-devtest	S. Co1	2019-10-25	-5/+1
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Use standard filter conditions even if DEBUG_MODE is on.
\| * \ \ \ \ \ \ \ \	Merge branch 'master' into ###-filtering-devtest	S. Co1	2019-10-25	-15/+54
\| \|\ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / \|/\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge pull request #529 from python-discord/show-trigger-word	S. Co1	2019-10-25	-11/+24
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Display word triggered by watchlist in #mod-alerts
\| * \ \ \ \ \ \ \ \ \	Merge branch 'master' into show-trigger-word	S. Co1	2019-10-25	-1469/+2842
\| \|\ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Prepend emoji indicative of success of !eval (#552)	scragly	2019-10-24	-1/+12
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Prepend emoji indicative of success of !eval Co-authored-by: null <[email protected]>
\| * \ \ \ \ \ \ \ \ \ \	Merge branch 'master' into eval-emojis	scragly	2019-10-24	-1468/+2830
\| \|\ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Prepend emoji indicative of success of !eval	kosayoda	2019-10-24	-1/+12
\| \| \|_\|_\|_\|_\|_\|/ / / / \| \|/\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \|	Fix incorrect type hint for return value	kosayoda	2019-10-24	-2/+2
\| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \|	Rename `triggered` to `match`	kosayoda	2019-10-15	-8/+6
\| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \|	Show matched word and location in watchlist embed	kosayoda	2019-10-13	-5/+20
\| \|/ / / / / / / / /
\| \| * \| \| \| \| \| \| \|	Use standart filter conditions even if DEBUG_MODE is on.	Akarys42	2019-10-23	-5/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The old method filtered only in #dev-test but this channel no longer exists
\| \| \| * \| \| \| \| \| \|	Merge branch 'master' into moderator-channel-check	Atul Mishra	2019-10-22	-8/+17
\| \| \| \|\ \ \ \ \ \ \ \| \|_\|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge pull request #547 from python-discord/#540-dont-show-infraction-total	Daniel Brown	2019-10-22	-3/+18
\|\ \ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / / \|/\| \| \| \| \| \| \| \| \|	Don't show infraction total outside staff channels.
\| * \| \| \| \| \| \| \| \|	Show total infraction count only in staff channels	Akarys42	2019-10-21	-1/+3
\| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Create STAFF_CHANNELS constant	Akarys42	2019-10-21	-2/+15
\|/ / / / / / / / /
\| \| * \| \| \| \| \| \|	Add test cases for in_channel_check	Atul Mishra	2019-10-22	-0/+8
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Merge branch 'master' into moderator-channel-check	Atul Mishra	2019-10-22	-1374/+2522
\| \| \|\ \ \ \ \ \ \ \| \|_\|/ / / / / / / \|/\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \|	Merge pull request #541 from ikuyarihS/master	S. Co1	2019-10-21	-98/+54
\|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix defcon having wrong text when disabling.
\| * \ \ \ \ \ \ \ \	Merge branch 'master' into master	S. Co1	2019-10-21	-1276/+2468
\| \|\ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / \|/\| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \|	Merge pull request #517 from python-discord/unittest-migration	Leon Sandøy	2019-10-20	-1268/+2366
\|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Migrating the test suite to the `unittest` framework
\| * \ \ \ \ \ \ \ \ \	Merge branch 'master' into unittest-migration	Leon Sandøy	2019-10-20	-53/+163
\| \|\ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \|	Merge pull request #528 from bendiller/antimalware-cog	Chris G	2019-10-19	-0/+86
\|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Antimalware cog
\| * \ \ \ \ \ \ \ \ \ \	Merge branch 'master' into antimalware-cog	Chris G	2019-10-19	-107/+428
\| \|\ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Pluralize "infractions" as necessary. (#545)	scragly	2019-10-20	-2/+10
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Pluralize "infractions" as necessary.
\| * \| \| \| \| \| \| \| \| \| \| \|	Do not display an expiry for notes or warnings.	Johannes Christ	2019-10-19	-1/+7
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Pluralize "infractions" as necessary.	Johannes Christ	2019-10-19	-1/+3
\|/ / / / / / / / / / / /
\| * \| \| \| \| \| \| \| \| \| \|	Bugfix - ensure .py attachment is prioritized over other non-whitelisted	bendiller	2019-10-17	-1/+0
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Address reviewer request	bendiller	2019-10-17	-3/+4
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Improve code readability and provide early exit from loop	bendiller	2019-10-16	-8/+13
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Improve code readability and docstring	bendiller	2019-10-14	-13/+33
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Fix Constants.AntiMalware.whitelist type	bendiller	2019-10-12	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Implement message deletion	bendiller	2019-10-12	-6/+12
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Create barebones Antimalware cog and config - detects bad file extensions	bendiller	2019-10-12	-0/+55
\| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \|	Merge branch 'master' into unittest-migration	Sebastiaan Zeeff	2019-10-15	-407/+699
\| \| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Resolving merge conflicts from master in `.gitignore` and `tests/helpers.py`.
\| \| * \| \| \| \| \| \| \| \| \| \|	Remove empty tests.cogs folder	Sebastiaan Zeeff	2019-10-14	-0/+0
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \|	Merge branch 'cogs-tokenremover-unittest' into unittest-migration	Sebastiaan Zeeff	2019-10-14	-0/+136
\| \| \|\ \ \ \ \ \ \ \ \ \ \
\| \| \| * \| \| \| \| \| \| \| \| \| \|	Make test_token_remover use our discord Mocks	Sebastiaan Zeeff	2019-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`.	Johannes Christ	2019-10-14	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \| \| \| \| \| \|	Move the `token_remover` cog tests to `unittest`.	Johannes Christ	2019-10-14	-0/+139
\| \| \|/ / / / / / / / / / /
\| \| * \| \| \| \| \| \| \| \| \| \|	Merge branch 'unittest-migration' of github.com:python-discord/bot into ↵	Sebastiaan Zeeff	2019-10-14	-0/+26
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	unittest-migration
\| \| \| * \ \ \ \ \ \ \ \ \ \	Merge pull request #531 from python-discord/unittest-bot-constants	Johannes Christ	2019-10-14	-0/+26
\| \| \| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Migrate `test_constants` to unittest