aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeLines
* Better docstring for RedisCache.containsGravatar Leon Sandøy2020-05-23-1/+5
|
* Better docstring for RedisCacheGravatar Leon Sandøy2020-05-23-1/+31
|
* Complete asyncified test suite for RedisCacheGravatar Leon Sandøy2020-05-23-94/+112
| | | | | This commit just alters existing code to work with the new interface, and with async. All tests are passing successfully.
* Finish asyncifying RedisCache methodsGravatar Leon Sandøy2020-05-23-16/+34
| | | | | | | | | | | | | | - All methods will now do a validation check - Complete interface spec added to class: - .update - .clear - .pop - .to_dict - .length - .contains - .delete - .get - .set
* Finish .set and .get, and add tests.Gravatar Leon Sandøy2020-05-23-25/+85
| | | | | | | | | | The .set and .get will accept ints, floats, and strings. These will be converted into "typestrings", which is basically just a simple format that's been invented for this object. For example, an int looks like `b"i|2423"`. Note how it is still stored as a bytestring (like everything in Redis), but because of this prefix we are able to coerce it into the type we want on the way out of the db.
* Use autospecced mocks in MockBot for the stats and aiohttp sessionGravatar MarkKoz2020-05-22-0/+4
| | | | | | This will help catch anything that tries to get/set an attribute/method which doesn't exist. It'll also catch missing/too many parameters being passed to methods.
* Properly mock the redis pool in MockBotGravatar MarkKoz2020-05-22-9/+19
| | | | | | | Because some of the redis pool/connection methods return futures rather than being coroutines, the redis pool had to be mocked using the CustomMockMixin so it could take advantage of `additional_spec_asyncs` to use AsyncMocks for these future-returning methods.
* Fix unawaited coro warning when instantiating Bot for MockBot's specGravatar MarkKoz2020-05-22-10/+14
| | | | | | | | The fix is to mock the loop and pass it to the Bot. It will then set it as `self.loop` rather than trying to get an event loop from asyncio. The `create_task` patch has been moved to this loop mock rather than being done in MockBot to ensure that it applies to anything calling it when instantiating the Bot.
* Improve aiohttp context manager mocking in snekbox testsGravatar MarkKoz2020-05-22-3/+12
| | | | | | | I'm not sure how it even managed to work before. It was calling the `post` coroutine (without specifying a URL) and then changing `__aenter__`. Now, a separate mock is created for the context manager and the `post` simply returns that mocked context manager.
* Fix assertion for `create_task` in duck pond testsGravatar MarkKoz2020-05-22-1/+1
| | | | | The assertion wasn't using the assertion method. Furthermore, it was testing a non-existent function `create_loop` rather than `create_task`.
* Set up async testbedGravatar Leon Sandøy2020-05-22-198/+135
|
* Opens a Redis connection in the Bot class.Gravatar Leon Sandøy2020-05-22-3/+20
| | | | | | | | This global connection is the one we will be using in RedisCache to power all our commands. This also ensures that connection is closed when the bot starts its shutdown process.
* Replace redis-py with aioredis.Gravatar Leon Sandøy2020-05-22-60/+104
|
* Add the REDIS_PASSWORD environment variableGravatar Leon Sandøy2020-05-22-137/+115
| | | | In production, we will need this password to make a connection to Redis.
* Add the REDIS_PASSWORD environment variableGravatar Leon Sandøy2020-05-17-6/+17
| | | | In production, we will need this password to make a connection to Redis.
* Changes discord-py to discord.py in PipfileGravatar Leon Sandøy2020-05-17-7/+15
| | | | | The `discord-py` package is no longer the official release, and so making this change silences some warnings about deprecation.
* Merge branch 'master' into redis_persistenceGravatar Leon Sandøy2020-05-17-460/+269
|\
| * Merge pull request #519 from mathsman5133/help-refactorGravatar Sebastiaan Zeeff2020-05-17-460/+269
| |\ | | | | | | Refactor the !help command.
| | * Merge branch 'master' into help-refactorGravatar Sebastiaan Zeeff2020-05-17-1/+1
| | |\ | | |/ | |/|
| | * fix redirect_output decorator; remove ninja codeGravatar mathsman51332020-05-16-76/+66
| | | | | | | | | | | | | | | | | | - Lots of instance of `for c in ...` or `for a in ...` or `fmt` which are non-descriptive and sometimes cryptic. - Ves suggested running the command in an asyncio task for `@redirect_output`, rather than making a workaround which only applies to the help command. This fixes a fundamental flaw where the redirection message wouldn't be deleted until a further 60sec after the command has finished, which for `!help` could be up to 5min, meaning the invocation message could be sitting there for 6min, not the intended 60sec.
| | * Merge branch 'master' into help-refactorGravatar Leon Sandøy2020-05-15-447/+2127
| | |\
| | * | Help: lower score cutoff for fuzzy matchGravatar Mark2020-04-01-1/+1
| | | |
| | * | Fix linting?Gravatar mathsman51332020-03-31-1/+1
| | | | | | | | | | | | | | | | Not sure why my precommit didn't pick that up...
| | * | Merge branch 'master' of https://github.com/python-discord/bot into ↵Gravatar mathsman51332020-03-31-375/+1918
| | |\ \ | | | | | | | | | | | | | | | help-refactor
| | * | | Apply suggestions from review.Gravatar mathsman51332020-03-31-12/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Make exception handling for bin reaction more specific - Channel constants were updated recently - Suggest category names - Tidy up signature formatting - Move score cutoff to 80 to allow a few more matches
| | * | | Merge branch 'master' of https://github.com/python-discord/bot into ↵Gravatar mathsman51332020-03-12-2207/+4239
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | help-refactor  Conflicts:  bot/cogs/help.py
| | * | | | Apply suggestions from Mark's code review.Gravatar mathsman51332020-03-10-60/+63
| | | | | |
| | * | | | Use the new :trashcan: emoji to delete the help message, as per #625Gravatar mathsman51332020-02-10-4/+5
| | | | | |
| | * | | | Merge branch 'master' of https://github.com/python-discord/bot into ↵Gravatar mathsman51332020-02-10-3174/+7258
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | help-refactor  Conflicts:  bot/cogs/help.py
| | * | | | | Remove trailing commaGravatar mathsman51332019-11-16-1/+1
| | | | | | |
| | * | | | | Apply suggestions from reviewGravatar mathsman51332019-11-16-24/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Description was the same as prefix parameter of paginator - Cleanup is redundant pending closure of #514 - Clean/fix couple if statements in help.py
| | * | | | | Show a maximum of 8 commands per page rather than 5.Gravatar mathsman51332019-11-03-1/+1
| | | | | | |
| | * | | | | Few changes to keep formatting same as currentGravatar mathsman51332019-10-13-5/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Change `add_field` back to `description` for error message possible matches - Only add `Commands` and `Subcommands` if subcommands exist to cog/group/command help
| | * | | | | Add a special case for when the help command invokes wolfram checks.Gravatar mathsman51332019-10-13-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Before, running `!help` would invoke the cooldown check, and increase the cooldown counter unnecessarily as no wolfram API calls were being made. - Once `!help` was called enough, the bot would send an error embed to let you know your wolfram cooldown has expired.
| | * | | | | Minor formatting changes to align with current help.Gravatar mathsman51332019-10-12-2/+2
| | | | | | |
| | * | | | | Refactor the `Help` command.Gravatar mathsman51332019-10-12-475/+287
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - `redirect_output` has been adjusted to run the `delete_invocation` inside a task as the help command will wait for that to run before sending the help or doing anything else. - `pagination` has been adjusted to support deleting the paginated message if `cleanup` is True, and an optional `description` that is present through all pages of pagination. - The help command has been refactored to subclass `commands.HelpCommand`. This means that it now supports methods such as `ctx.send_help(ctx.command)`. - `help_cleanup` provides the opportunity to use the :x: reaction to cleanup help even with no pagination. - Pagination purely happens through the `LinePaginator`, forcing a pagination session with 1 line per page where we format the page style before sending it through. - Categories are properly dealt with by finding a match and sending a seperate help where a named tuple of the Category name, description and relevant cogs is the only parameter. - Choices for when a command was not found has been updated to include category names, cog names, aliases of group and command names, and include all subcommands and aliases. This should provide a more helpful output when an error message is sent - Sending command, group, cog, category and bot help has been split into different functions that are called from `command_callback`. This provides an easier way to alter future changes, and cleans up code considerably. - Important note: no outward facing formatting should have changed. Any desired changes can be discussed in review.
* | | | | | | Fix linting errors introduced by flake8 3.8Gravatar Leon Sandøy2020-05-17-34/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Turns out that bumping the flake8 version up to 3.8 introduces a long list of new linting errors. Since this PR is the one that bumps the version, I suppose we will also fix all the linting errors in this branch.
* | | | | | | Merge branch 'master' into redis_persistenceGravatar Leon Sandøy2020-05-17-1/+1
|\| | | | | |
| * | | | | | Merge pull request #946 from vivax3794/masterGravatar Leon Sandøy2020-05-17-1/+1
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | add "solved" as a alias for "closed"
| | * | | | | added "solved" as a alias for "closed"Gravatar vivax37942020-05-17-1/+1
| |/ / / / /
* | | | | | namespace "general" -> "global"Gravatar Leon Sandøy2020-05-17-1/+1
| | | | | |
* | | | | | Make redis host and port configurable.Gravatar Leon Sandøy2020-05-17-1/+11
| | | | | |
* | | | | | Test suite for the redis dict.Gravatar Leon Sandøy2020-05-17-0/+189
| | | | | |
* | | | | | Implement .pop, .popitem and .setdefault.Gravatar Leon Sandøy2020-05-17-2/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Turns out the MutableMapping class doesn't give us servicable implementations of these, so we need to implement them ourselves. Also, let's not have keys returned as bytestrings.
* | | | | | Add fakeredis to the PipfileGravatar Leon Sandøy2020-05-17-3/+27
| | | | | |
* | | | | | Implement .get, equality, and membership checkGravatar Leon Sandøy2020-05-17-2/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is supposed to be provided by our MutableMapping mixin, but unit tests are demonstrating that these don't really work as intended.
* | | | | | Implements .clear with hash deletion.Gravatar Leon Sandøy2020-05-17-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This would've been implemented by MutableMapping, but that implementation is O(n) instead of O(1) since it just iterates the entire hash and does HDEL. Feels wasteful.
* | | | | | copy should dictify the .items(), not just keys.Gravatar Leon Sandøy2020-05-16-1/+1
| | | | | |
* | | | | | Add basic dict methods for RedisDict.Gravatar Leon Sandøy2020-05-16-35/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The rest of the features should be provided by the MutableMapping abc we're interfacing. Specifically, MutableMapping provides these: .pop, .popitem, .clear, .update, .setdefault, __contains__, .keys, .items, .values, .get, __eq__, and __ne__.
* | | | | | Refactor - no more mixins!Gravatar Leon Sandøy2020-05-16-59/+74
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It was brought to my attention that we may need several caches per Cog for some of our Cogs. This means that the original approach of having this be a mixin is a little bit problematic. Instead, RedisDict will be instantiated directly inside the class you want it in. By leveraging __set_name__, we can create a namespace containing both the class name and the variable name without the user having to provide anything. For example, if you create an attribute MyClass.cache = RedisDict(), this will be using the redis namespace 'MyClass.cache.' before anything you store in it. With this approach, it is also possible to instantiate a RedisDict with a custom namespace by simply passing it into the constructor. - RedisDict("firedog") will create items with the 'firedog.your_item' prefix. - If there are multiple RedisDicts using the same namespace, an underscore will be appended to the namespace, such that the second RedisDict("firedog") will actually create items in the 'firedog_.your_item' namespace. This is also possible to use outside of classes, so long as you provide a custom namespace when you instantiate it. Custom namespaces will always take precedence over automatic 'Class.attribute_name' ones.