aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Chris Goes <[email protected]>2018-12-24 19:48:03 -0700
committerGravatar GitHub <[email protected]>2018-12-24 19:48:03 -0700
commit730ff3b22e323062e6ce1d46e8d3adf56ba52150 (patch)
treeaf291cf2f33ef37c510a95c704c6a8bac53a5b26
parentMerge pull request #221 from python-discord/emoji-config-fix (diff)
parentMerge branch 'master' into force-bb-watch-note (diff)
Merge pull request #219 from python-discord/force-bb-watch-note
Make reason a required input to bb watch
-rw-r--r--bot/cogs/bigbrother.py12
1 files changed, 6 insertions, 6 deletions
diff --git a/bot/cogs/bigbrother.py b/bot/cogs/bigbrother.py
index 7964c81a8..29b13f038 100644
--- a/bot/cogs/bigbrother.py
+++ b/bot/cogs/bigbrother.py
@@ -216,11 +216,12 @@ class BigBrother:
@bigbrother_group.command(name='watch', aliases=('w',))
@with_role(Roles.owner, Roles.admin, Roles.moderator)
- async def watch_command(self, ctx: Context, user: User, *, reason: str = None):
+ async def watch_command(self, ctx: Context, user: User, *, reason: str):
"""
Relay messages sent by the given `user` to the `#big-brother-logs` channel
- If a `reason` is specified, a note is added for `user`
+ A `reason` for watching is required, which is added for the user to be watched as a
+ note (aka: shadow warning)
"""
channel_id = Channels.big_brother_logs
@@ -251,10 +252,9 @@ class BigBrother:
reason = data.get('error_message', "no message provided")
await ctx.send(f":x: the API returned an error: {reason}")
- # Add a note (shadow warning) if a reason is specified
- if reason:
- reason = "bb watch: " + reason # Prepend for situational awareness
- await post_infraction(ctx, user, type="warning", reason=reason, hidden=True)
+ # Add a note (shadow warning) with the reason for watching
+ reason = "bb watch: " + reason # Prepend for situational awareness
+ await post_infraction(ctx, user, type="warning", reason=reason, hidden=True)
@bigbrother_group.command(name='unwatch', aliases=('uw',))
@with_role(Roles.owner, Roles.admin, Roles.moderator)