erebion/libervia-backend
Watch
1
0
Fork
You've already forked libervia-backend
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

jp (message/send): message/send can now send XHTML (-x) or rich (-r) messages

Browse source
This commit is contained in:
Goffi 2016-09-25 19:18:45 +02:00
commit 61a68ca0ca
1 changed files with 26 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

40
frontends/src/jp/cmd_message.py
View file

@ -32,15 +32,22 @@ class Send(base.CommandBase):
super(Send, self).__init__(host, 'send', help=_('send a message to a contact'))
def add_parser_options(self):
self.parser.add_argument("-l", "--lang", type=str, default='', help=_("language of the message"))
self.parser.add_argument("-s", "--separate", action="store_true", help=_("separate xmpp messages: send one message per line instead of one message alone."))
self.parser.add_argument("-n", "--new-line", action="store_true", help=_("add a new line at the beginning of the input (usefull for ascii art ;))"))
self.parser.add_argument("-S", "--subject", type=base.unicode_decoder, help=_("subject of the message"))
self.parser.add_argument("-L", "--subject_lang", type=str, default='', help=_("language of subject"))
self.parser.add_argument("-l", "--lang", type=str, default='', help=_(u"language of the message"))
self.parser.add_argument("-s", "--separate", action="store_true", help=_(u"separate xmpp messages: send one message per line instead of one message alone."))
self.parser.add_argument("-n", "--new-line", action="store_true", help=_(u"add a new line at the beginning of the input (usefull for ascii art ;))"))
self.parser.add_argument("-S", "--subject", type=base.unicode_decoder, help=_(u"subject of the message"))
self.parser.add_argument("-L", "--subject_lang", type=str, default='', help=_(u"language of subject"))
self.parser.add_argument("-t", "--type", choices=C.MESS_TYPE_STANDARD + (C.MESS_TYPE_AUTO,), default=C.MESS_TYPE_AUTO, help=_("type of the message"))
self.parser.add_argument("jid", type=base.unicode_decoder, help=_("the destination jid"))
syntax = self.parser.add_mutually_exclusive_group()
syntax.add_argument("-x", "--xhtml", action="store_true", help=_(u"XHTML body"))
syntax.add_argument("-r", "--rich", action="store_true", help=_(u"rich body"))
self.parser.add_argument("jid", type=base.unicode_decoder, help=_(u"the destination jid"))
def start(self):
if self.args.xhtml and self.args.separate:
self.disp(u"argument -s/--separate is not compatible yet with argument -x/--xhtml", error=True)
self.host.quit(2)
jids = self.host.check_jids([self.args.jid])
jid = jids[0]
self.sendStdin(jid)
@ -51,25 +58,30 @@ class Send(base.CommandBase):
@param dest_jid: destination jid
"""
header = "\n" if self.args.new_line else ""
stdin_lines = [stream.decode('utf-8','ignore') for stream in sys.stdin.readlines()]
extra = {}
if self.args.subject is None:
subject = {}
else:
subject = {self.args.subject_lang: self.args.subject}
if self.args.separate: #we send stdin in several messages
if self.args.xhtml or self.args.rich:
key = u"xhtml" if self.args.xhtml else u"rich"
if self.args.lang:
key = u"{}_{}".format(key, self.args.lang)
extra[key] = clean_ustr(u"".join(stdin_lines))
stdin_lines = []
if self.args.separate: #we send stdin in several messages
if header:
self.host.bridge.messageSend(dest_jid, {self.args.lang: header}, subject, self.args.type, profile_key=self.profile, callback=lambda: None, errback=lambda ignore: ignore)
while (True):
line = clean_ustr(sys.stdin.readline().decode('utf-8','ignore'))
if not line:
break
self.host.bridge.messageSend(dest_jid, {self.args.lang: line.replace("\n","")}, subject, self.args.type, profile_key=self.host.profile, callback=lambda: None, errback=lambda ignore: ignore)
for line in stdin_lines:
self.host.bridge.messageSend(dest_jid, {self.args.lang: line.replace("\n","")}, subject, self.args.type, extra, profile_key=self.host.profile, callback=lambda: None, errback=lambda ignore: ignore)
else:
msg = header + clean_ustr(u"".join([stream.decode('utf-8','ignore') for stream in sys.stdin.readlines()]))
self.host.bridge.messageSend(dest_jid, {self.args.lang: msg}, subject, self.args.type, profile_key=self.host.profile, callback=lambda: None, errback=lambda ignore: ignore)
msg = {self.args.lang: header + clean_ustr(u"".join(stdin_lines))} if not (self.args.xhtml or self.args.rich) else {}
self.host.bridge.messageSend(dest_jid, msg, subject, self.args.type, extra, profile_key=self.host.profile, callback=lambda: None, errback=lambda ignore: ignore)
class Message(base.CommandBase):