diff options
| author |  Leon Sandøy <[email protected]> | 2018-12-18 22:27:14 +0100 |
|---|---|---|
| committer |  GitHub <[email protected]> | 2018-12-18 22:27:14 +0100 |
| commit | 17c75f682a56f7456974d069cf1289e99c82d888 (patch) | |
| tree | c426e751c539efb727c6ce44ec96be97554b49fd | |
| parent | Update bot/cogs/information.py (diff) | |
| parent | Update README.md (diff) | |
Merge branch 'master' into user_command_improvements
| -rw-r--r-- | README.md | 2 | ||||
| -rw-r--r-- | bot/cogs/alias.py | 6 | ||||
| -rw-r--r-- | docker/base.Dockerfile | 1 |
3 files changed, 5 insertions, 4 deletions
@@ -3,5 +3,5 @@ [)](https://dev.azure.com/python-discord/Python%20Discord/_build/latest?definitionId=1) [](https://discord.gg/2B963hn) -This project is a Discord bot specifically for use with the Python Discord server. It will provide numerous utilities +This project is a Discord bot specifically for use with the Python Discord server. It provides numerous utilities and other tools to help keep the server running like a well-oiled machine. diff --git a/bot/cogs/alias.py b/bot/cogs/alias.py index 12edb202f..2ce4a51e3 100644 --- a/bot/cogs/alias.py +++ b/bot/cogs/alias.py @@ -1,7 +1,7 @@ import inspect import logging -from discord import Colour, Embed, TextChannel, User +from discord import Colour, Embed, User from discord.ext.commands import ( Command, Context, clean_content, command, group ) @@ -71,13 +71,13 @@ class Alias: @command(name="watch", hidden=True) async def bigbrother_watch_alias( - self, ctx, user: User, channel: TextChannel = None + self, ctx, user: User, *, reason: str = None ): """ Alias for invoking <prefix>bigbrother watch user [text_channel]. """ - await self.invoke(ctx, "bigbrother watch", user, channel) + await self.invoke(ctx, "bigbrother watch", user, reason=reason) @command(name="unwatch", hidden=True) async def bigbrother_unwatch_alias(self, ctx, user: User): diff --git a/docker/base.Dockerfile b/docker/base.Dockerfile index a1ec0866e..e46db756a 100644 --- a/docker/base.Dockerfile +++ b/docker/base.Dockerfile @@ -8,6 +8,7 @@ RUN apk add --update jpeg-dev RUN apk add --update libxml2 libxml2-dev libxslt-dev RUN apk add --update zlib-dev RUN apk add --update freetype-dev +RUN apk add --update git ENV LIBRARY_PATH=/lib:/usr/lib ENV PIPENV_VENV_IN_PROJECT=1 |