Firepup650/bitbot-3.11-fork
2
0
Fork 0
Code Issues Pull requests Activity Actions

add "!" arg to !fedi, to denote "dont show content warning"

Browse source
This commit is contained in:
jesopo 2019-10-18 15:43:17 +01:00
parent 482538724f
commit 20a115e71d
1 changed files with 17 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
modules/fediverse/__init__.py
View file

@ -50,21 +50,30 @@ class Module(ModuleManager.BaseModule):
@utils.hook("received.command.fediverse")
@utils.hook("received.command.fedi", alias_of="fediverse")
@utils.kwarg("help", "Get someone's latest toot")
@utils.kwarg("usage", "@<user>@<instance>")
@utils.kwarg("usage", "@<user>@<instance> [!]")
def fedi(self, event):
account = None
url = None
if not event["args"]:
show_cw = True
args_split = event["args_split"][:]
for i, arg in enumerate(args_split):
if arg == "!":
show_cw = False
args_split.pop(i)
break
if not args_split:
account = event["user"].get_setting("fediverse", None)
elif utils.http.REGEX_URL.match(event["args_split"][0]):
url = event["args_split"][0]
elif not "@" in event["args"]:
target = event["args_split"][0]
elif utils.http.REGEX_URL.match(args_split[0]):
url = args_split[0]
elif not "@" in args_split[0]:
target = args_split[0]
if event["server"].has_user_id(target):
target_user = event["server"].get_user(target)
account = target_user.get_setting("fediverse", None)
else:
account = event["args_split"][0]
account = args_split[0]
note = None
type = "Create"
@ -92,7 +101,7 @@ class Module(ModuleManager.BaseModule):
shorturl = self.exports.get_one("shorturl")(event["server"], url,
context=event["target"])
if cw:
if cw and show_cw:
out = "CW: %s - %s" % (cw, shorturl)
else:
out = "%s - %s" % (out, shorturl)