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

	Commit message (Collapse)	Author	Age	Lines
...
\| \| \| * \| \| \| \| \| \| \| \|	Remove tests from moved function.	Numerlor	2020-05-07	-15/+0
\| \| \| \| \|_\|_\|_\|_\|/ / / \| \| \| \|/\| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \|	Resolve conflicts in filtering.py	MarkKoz	2020-08-10	-9/+15
\| \| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \|_\|_\|/ / / / / \| \| \| \|/\| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \|	Use format_user in token remover test	MarkKoz	2020-08-10	-1/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The point of format_user is to have a consistent format across the code base. That should apply to tests too.
\| \| * \| \| \| \| \| \| \| \|	Fix conflict with disabling filter ping for DMs	MarkKoz	2020-08-02	-0/+173
\| \| \|\ \ \ \ \ \ \ \ \
\| \| * \| \| \| \| \| \| \| \| \|	Fix test for token remover log message	MarkKoz	2020-07-21	-2/+1
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Fix user command tests	MarkKoz	2020-08-26	-13/+7
\| \| \|_\|_\|_\|_\|_\|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Mocking the bot commands channel constant no longer worked after switching to `in_whitelist_check`.
\| * \| \| \| \| \| \| \| \| \|	Update tests for user commands	Joseph Banks	2020-08-14	-32/+55
\| \| \|_\|/ / / / / / / \| \|/\| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \|	Merge branch 'master' into whitelist_system	Leon Sandøy	2020-08-03	-3/+946
\| \|\ \ \ \ \ \ \ \ \ \| \| \| \|/ / / / / / / \| \| \|/\| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Jam tests: use the MAX_CHANNELS constant more	MarkKoz	2020-07-22	-4/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	It's clearer to write MAX_CHANNELS - 2 than a literal 48.
\| \| * \| \| \| \| \| \| \|	Jam tests: assert equality of new category	MarkKoz	2020-07-22	-1/+2
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Jam tests: add subtests to non-existent category test	MarkKoz	2020-07-22	-7/+18
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The test has to account for not only the name not matching, but also a lack of available spaces for new channels.
\| \| * \| \| \| \| \| \| \|	Jam tests: fix category test	MarkKoz	2020-07-22	-14/+24
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Merge branch 'master' into jam-test	Mark	2020-07-22	-185/+1384
\| \| \|\\| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \| \|	Edited tests to reflect changes (removed py formatting)	wookie184	2020-07-20	-3/+3
\| \| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \| \|	Merge 'master' into 'kwzrd/incidents'; resolve config conflicts	kwzrd	2020-07-16	-39/+24
\| \| \| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Add upstream changes & resolve config conflicts introduced by #1041. In the conflicting parts of the diff, this commit also re-sorts constants which were added upstream to lexicographical order. This does not re-sort all constants added upstream.
\| \| \| * \| \| \| \| \| \| \|	Incidents: reduce log level of 404 exception	kwzrd	2020-07-16	-2/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Co-authored-by: MarkKoz <[email protected]>
\| \| \| * \| \| \| \| \| \| \|	Incidents: link `proxy_url` if attachment fails to download	kwzrd	2020-07-14	-37/+36
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Suggested by Mark during review. If the download fails, we fallback on showing an informative message, which will link the attachment cdn link. The attachment-handling logic was moved from the `archive` coroutine into `make_embed`, which now also returns the file, if available. In the end, this appears to be the smoothest approach. Co-authored-by: MarkKoz <[email protected]>
\| \| \| * \| \| \| \| \| \| \|	Incidents: add `download_file` helper & tests	kwzrd	2020-07-13	-0/+20
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Co-authored-by: MarkKoz <[email protected]>
\| \| \| * \| \| \| \| \| \| \|	Incidents tests: improve in-line comment wording	kwzrd	2020-07-09	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Co-authored-by: MarkKoz <[email protected]>
\| \| \| * \| \| \| \| \| \| \|	Merge 'master' into 'kwzrd/incidents'; resolve mod pkg init conflict	kwzrd	2020-07-08	-24/+242
\| \| \| \|\ \ \ \ \ \ \ \
\| \| \| * \| \| \| \| \| \| \| \|	Incidents: archive incident attachments	kwzrd	2020-07-03	-0/+30
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	There is no handling of file types as explained in the `archive` docstring. Testing indicates that relaying incidents with e.g. a text file attachment is simply a noop in the Discord GUI. If there is at least one attachment, we always only relay the one at index 0, as it is believed the user-sent messages can only contain one attachment at maximum. This also adds an extra test asserting the behaviour when an incident with an attachment is archived. The existing test for `archive` is adjusted to assume no attachments. Joe helped me conceive & test this. Co-authored-by: Joseph Banks <[email protected]>
\| \| \| * \| \| \| \| \| \| \| \|	Incidents: relay incidents as embeds rather than raw content	kwzrd	2020-07-01	-21/+11
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This applies the previously defined `make_embed` function. As the `archive` function is now simpler, I decided to reduce the amount of whitespace ~ it's a lot more compact now. Tests are adjusted as appropriate.
\| \| \| * \| \| \| \| \| \| \| \|	Incidents: implement `make_embed` helper & tests	kwzrd	2020-07-01	-0/+26
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	See `make_embed` docstring for further information. The tests are fairly loose and should be easily adjustable in the future should changes be made.
\| \| \| * \| \| \| \| \| \| \| \|	Incidents: pass `actioned_by` to `archive`	kwzrd	2020-06-30	-3/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This is an important piece of information that shall be relayed.
\| \| \| * \| \| \| \| \| \| \| \|	Incidents: revert latest 2 commits	kwzrd	2020-06-30	-46/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Decision was made to use embeds to archive incidents instead of webhooking the raw message. As such, we're reverting the branch to a state from which the adjustments will be easier to make. Reverted commits: * a8d179d9b04f54b20c5e870bcfa85c78c42c8dca * 6fa8caed037b247a7c194f58a4635de7dae21fd2
\| \| \| * \| \| \| \| \| \| \| \|	Incidents: append `actioned_by` to webhook username	kwzrd	2020-06-21	-6/+17
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Incident author and the moderator who actioned report are now passed through `make_username` to create the webhook username. Tests adjusted as appropriate.
\| \| \| * \| \| \| \| \| \| \| \|	Incidents: implement `make_username` helper	kwzrd	2020-06-21	-0/+29
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The justification is to incorporate the `actioned_by` name into the username in some way, and so the logical thing to do is to abstract this process into a helper so that it can easily be adjusted in the future. For now, I've chosen to separate the names by a pipe. Discord webhook username cannot exceed 80 characters in length, and so we cap it at this length by default. This is seen as more of an edge-case, but it should be accounted for, as we're not joining two names. The `max_length` param is configurable primarily for testing purposes, it probably should never be passed explicitly. This commit also provides two tests for the function.
\| \| \| * \| \| \| \| \| \| \| \|	Incidents tests: assert webhook username is de-clyded	kwzrd	2020-06-20	-0/+19
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	See: a8b4e394d9da57287cd9497cd9bb0a97fa467e84
\| \| \| * \| \| \| \| \| \| \| \|	Merge branch 'origin/master' into kwzrd/incidents	kwzrd	2020-06-20	-9/+50
\| \| \| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \|_\|_\|_\|/ / / / \| \| \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Adds the `sub_clyde` function, which we'll apply to our webhook.
\| \| \| * \| \| \| \| \| \| \| \|	Incidents tests: remove unnecessary patch	kwzrd	2020-06-20	-1/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This is already being patched at class-level.
\| \| \| * \| \| \| \| \| \| \| \|	Incidents: try-except Signal creation	kwzrd	2020-06-20	-4/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Suggested by Mark during review. This follows the "ask for forgiveness rather than permission" paradigm, ends up being less code to read, and may be seen as more logical / safer. The `ALLOWED_EMOJI` set was renamed to `ALL_SIGNALS` as this now better communicates the set's purpose. Tests adjusted as appropriate. Co-authored-by: MarkKoz <[email protected]>
\| \| \| * \| \| \| \| \| \| \| \|	Incidents tests: write tests for `on_raw_reaction_add`	kwzrd	2020-06-19	-0/+128
\| \| \| \| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \| \| \| \|	Incidents tests: write tests for `crawl_incidents`	kwzrd	2020-06-19	-0/+58
\| \| \| \| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \| \| \| \|	Incidents tests: add helper for mocking async for-loops	kwzrd	2020-06-19	-0/+37
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	See the docstring. This does not make the ambition to be powerful enough to be included in `tests.helpers`, and is only intended for local purposes.
\| \| \| * \| \| \| \| \| \| \| \|	Merge branch 'origin/master' into kwzrd/incidents	kwzrd	2020-06-19	-107/+302
\| \| \| \|\ \ \ \ \ \ \ \ \
\| \| \| * \| \| \| \| \| \| \| \| \|	Incidents tests: write tests for `process_event`	kwzrd	2020-06-18	-1/+101
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This also breaks the helpers import statement into a vertical list, as the amount of imports has grown too much. I still believe that this is a preferred alternative to accessing the helpers via module namespace, as we use them a lot, and the added visual noise would be annoying to read - their names are already descriptive enough.
\| \| \| * \| \| \| \| \| \| \| \| \|	Incidents tests: write tests for `make_confirmation_task`	kwzrd	2020-06-13	-0/+35
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \| \| \| \| \|	Incidents tests: write tests for `on_message`	kwzrd	2020-06-13	-0/+27
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \| \| \| \| \|	Incidents tests: test non-404 error response	kwzrd	2020-06-13	-0/+20
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \| \| \| \| \|	Incidents tests: write tests for `resolve_message`	kwzrd	2020-06-13	-0/+56
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \| \| \| \| \|	Incidents tests: move `mock_404` into module namespace	kwzrd	2020-06-13	-5/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This will be useful for others tests as well.
\| \| \| * \| \| \| \| \| \| \| \| \|	Incidents tests: write tests for `archive`	kwzrd	2020-06-13	-2/+63
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \| \| \| \| \|	Incidents tests: set up base class for `Incidents`	kwzrd	2020-06-13	-2/+21
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	For cleanliness, I've decided to make a separate class for each method. Since most tests will want to have an `Incident` instance ready, they can inherit the `setUp` from `TestIncidents`, which does not make any assertions on its own.
\| \| \| * \| \| \| \| \| \| \| \| \|	Incidents tests: improve mock `Signal` name & move def	kwzrd	2020-06-13	-6/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Let's make it clear that this is our own mock. We also move the definition to the top of the module.
\| \| \| * \| \| \| \| \| \| \| \| \|	Incidents tests: use our own helper mocks	kwzrd	2020-06-13	-16/+14
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	No reason to build own MagicMocks as we already have helpers that more accurately mimic the mocked behaviour.
\| \| \| * \| \| \| \| \| \| \| \| \|	Incidents tests: write tests for module-level helpers	kwzrd	2020-06-12	-0/+135
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \| \| \| \| \|	Incidents tests: create new test module	kwzrd	2020-06-12	-0/+0
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \|	Jam Tests: space out lines for readability	MarkKoz	2020-07-22	-0/+6
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \|	Jam Tests: remove default_args attribute	MarkKoz	2020-07-22	-4/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Kind of redundant since it's only used by two tests.
\| \| * \| \| \| \| \| \| \| \| \| \|	Jam Tests: re-arrange tests to follow definition order in the cog	MarkKoz	2020-07-22	-10/+10
\| \| \| \| \| \| \| \| \| \| \| \| \|