Skip to content

Commit 526068f

Browse files
author
Ilya Ableev
committed
#145, signature improvement
1 parent f0ec069 commit 526068f

File tree

1 file changed

+7
-3
lines changed

1 file changed

+7
-3
lines changed

zbxtg.py

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -496,7 +496,7 @@ def main():
496496
"is_single_message": False,
497497
"markdown": False,
498498
"html": False,
499-
"signature": False,
499+
"signature": None,
500500
"signature_disable": False,
501501
"graph_buttons": False,
502502
"extimg": None,
@@ -536,7 +536,7 @@ def main():
536536
"url": "Why-am-I-getting-two-messages-instead-of-one"},
537537
"markdown": {"name": "markdown", "type": "bool", "help": "markdown support", "url": "Markdown-and-HTML"},
538538
"html": {"name": "html", "type": "bool", "help": "markdown support", "url": "Markdown-and-HTML"},
539-
"signature": {"name": "signature", "type": "bool",
539+
"signature": {"name": "signature", "type": "str",
540540
"help": "bot's signature", "url": "Bot-signature"},
541541
"signature_disable": {"name": "signature_disable", "type": "bool",
542542
"help": "enables/disables bot's signature", "url": "Bot-signature"},
@@ -799,8 +799,12 @@ def main():
799799
try:
800800
if "--signature" in args or settings["signature"] or zbxtg_settings.zbx_tg_signature\
801801
and not "--signature_disable" in args and not settings["signature_disable"]:
802+
if "--signature" in args:
803+
settings["signature"] = args[args.index("--signature") + 1]
804+
if not settings["signature"]:
805+
settings["signature"] = zbxtg_settings.zbx_server
802806
zbxtg_body_text.append("--")
803-
zbxtg_body_text.append(zbxtg_settings.zbx_server)
807+
zbxtg_body_text.append(settings["signature"])
804808
except:
805809
pass
806810

0 commit comments

Comments
 (0)