From 84719b175cf4702d5320c228313d80848e347ab5 Mon Sep 17 00:00:00 2001 From: Leon Sandøy Date: Wed, 5 Dec 2018 00:57:42 +0100 Subject: Fixes a bug with the watch alias introduced by our recent change of the watch command. --- bot/cogs/alias.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bot/cogs/alias.py b/bot/cogs/alias.py index 12edb202f..7824b2c6b 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 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): -- cgit v1.2.3 From b85699ab48be91a3a170c8bad373f1bc91a85096 Mon Sep 17 00:00:00 2001 From: scragly <29337040+scragly@users.noreply.github.com> Date: Wed, 5 Dec 2018 13:13:10 +0100 Subject: Update bot/cogs/alias.py Co-Authored-By: heavysaturn --- bot/cogs/alias.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bot/cogs/alias.py b/bot/cogs/alias.py index 7824b2c6b..2ce4a51e3 100644 --- a/bot/cogs/alias.py +++ b/bot/cogs/alias.py @@ -71,7 +71,7 @@ class Alias: @command(name="watch", hidden=True) async def bigbrother_watch_alias( - self, ctx, user: User, reason: str = None + self, ctx, user: User, *, reason: str = None ): """ Alias for invoking bigbrother watch user [text_channel]. -- cgit v1.2.3 From 8e5886566d970f9fa6aec8a357bbf5c212b792fe Mon Sep 17 00:00:00 2001 From: Leon Sandøy Date: Wed, 5 Dec 2018 21:29:57 +0100 Subject: Adding git to the base dockerfile --- docker/base.Dockerfile | 1 + 1 file changed, 1 insertion(+) 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 -- cgit v1.2.3 From 81b0bfaac0a1ac3d8c810d15aee51939f622fd4c Mon Sep 17 00:00:00 2001 From: Leon Sandøy Date: Tue, 18 Dec 2018 15:43:12 +0100 Subject: Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index bfa9d3e42..1c9e52b71 100644 --- a/README.md +++ b/README.md @@ -3,5 +3,5 @@ [![Build Status](https://dev.azure.com/python-discord/Python%20Discord/_apis/build/status/Bot%20(Mainline))](https://dev.azure.com/python-discord/Python%20Discord/_build/latest?definitionId=1) [![Discord](https://discordapp.com/api/guilds/267624335836053506/embed.png)](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. -- cgit v1.2.3