Mercurial > libervia-backend
comparison frontends/src/jp/cmd_message.py @ 1963:a2bc5089c2eb
backend, frontends: message refactoring (huge commit):
/!\ several features are temporarily disabled, like notifications in frontends
next step in refactoring, with the following changes:
- jp: updated jp message to follow changes in backend/bridge
- jp: added --lang, --subject, --subject_lang, and --type options to jp message + fixed unicode handling for jid
- quick_frontend (QuickApp, QuickChat):
- follow backend changes
- refactored chat, message are now handled in OrderedDict and uid are kept so they can be updated
- Message and Occupant classes handle metadata, so frontend just have to display them
- Primitivus (Chat):
- follow backend/QuickFrontend changes
- info & standard messages are handled in the same MessageWidget class
- improved/simplified handling of messages, removed update() method
- user joined/left messages are merged when next to each other
- a separator is shown when message is received while widget is out of focus, so user can quickly see the new messages
- affiliation/role are shown (in a basic way for now) in occupants panel
- removed "/me" messages handling, as it will be done by a backend plugin
- message language is displayed when available (only one language per message for now)
- fixed :history and :search commands
- core (constants): new constants for messages type, XML namespace, entity type
- core: *Message methods renamed to follow new code sytle (e.g. sendMessageToBridge => messageSendToBridge)
- core (messages handling): fixed handling of language
- core (messages handling): mes_data['from'] and ['to'] are now jid.JID
- core (core.xmpp): reorganised message methods, added getNick() method to client.roster
- plugin text commands: fixed plugin and adapted to new messages behaviour. client is now used in arguments instead of profile
- plugins: added information for cancellation reason in CancelError calls
- plugin XEP-0045: various improvments, but this plugin still need work:
- trigger is used to avoid message already handled by the plugin to be handled a second time
- changed the way to handle history, the last message from DB is checked and we request only messages since this one, in seconds (thanks Poezio folks :))
- subject reception is waited before sending the roomJoined signal, this way we are sure that everything including history is ready
- cmd_* method now follow the new convention with client instead of profile
- roomUserJoined and roomUserLeft messages are removed, the events are now handled with info message with a "ROOM_USER_JOINED" info subtype
- probably other forgotten stuffs :p
| author | Goffi <goffi@goffi.org> |
|---|---|
| date | Mon, 20 Jun 2016 18:41:53 +0200 |
| parents | 3e168cde7a7d |
| children | 2265d9df4cfb |
comparison
equal
deleted
inserted
replaced
| 1962:a45235d8dc93 | 1963:a2bc5089c2eb |
|---|---|
| 18 # along with this program. If not, see <http://www.gnu.org/licenses/>. | 18 # along with this program. If not, see <http://www.gnu.org/licenses/>. |
| 19 | 19 |
| 20 from sat_frontends.jp import base | 20 from sat_frontends.jp import base |
| 21 import sys | 21 import sys |
| 22 from sat.core.i18n import _ | 22 from sat.core.i18n import _ |
| 23 from sat.core.constants import Const as C | |
| 23 from sat.tools.utils import clean_ustr | 24 from sat.tools.utils import clean_ustr |
| 24 | 25 |
| 25 __commands__ = ["Message"] | 26 __commands__ = ["Message"] |
| 26 | 27 |
| 27 | 28 |
| 29 | 30 |
| 30 def __init__(self, host): | 31 def __init__(self, host): |
| 31 super(Send, self).__init__(host, 'send', help=_('send a message to a contact')) | 32 super(Send, self).__init__(host, 'send', help=_('send a message to a contact')) |
| 32 | 33 |
| 33 def add_parser_options(self): | 34 def add_parser_options(self): |
| 35 self.parser.add_argument("-l", "--lang", type=str, default='', help=_("language of the message")) | |
| 34 self.parser.add_argument("-s", "--separate", action="store_true", help=_("separate xmpp messages: send one message per line instead of one message alone.")) | 36 self.parser.add_argument("-s", "--separate", action="store_true", help=_("separate xmpp messages: send one message per line instead of one message alone.")) |
| 35 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 ;))")) | 37 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 ;))")) |
| 36 self.parser.add_argument("jid", type=str, help=_("the destination jid")) | 38 self.parser.add_argument("-S", "--subject", type=base.unicode_decoder, help=_("subject of the message")) |
| 39 self.parser.add_argument("-L", "--subject_lang", type=str, default='', help=_("language of subject")) | |
| 40 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")) | |
| 41 self.parser.add_argument("jid", type=base.unicode_decoder, help=_("the destination jid")) | |
| 37 | 42 |
| 38 def start(self): | 43 def start(self): |
| 39 jids = self.host.check_jids([self.args.jid]) | 44 jids = self.host.check_jids([self.args.jid]) |
| 40 jid = jids[0] | 45 jid = jids[0] |
| 41 self.sendStdin(jid) | 46 self.sendStdin(jid) |
| 44 """Send incomming data on stdin to jabber contact | 49 """Send incomming data on stdin to jabber contact |
| 45 | 50 |
| 46 @param dest_jid: destination jid | 51 @param dest_jid: destination jid |
| 47 """ | 52 """ |
| 48 header = "\n" if self.args.new_line else "" | 53 header = "\n" if self.args.new_line else "" |
| 54 if self.args.subject is None: | |
| 55 subject = {} | |
| 56 else: | |
| 57 subject = {self.args.subject_lang: self.args.subject} | |
| 49 | 58 |
| 50 if self.args.separate: #we send stdin in several messages | 59 if self.args.separate: #we send stdin in several messages |
| 51 | 60 |
| 52 if header: | 61 if header: |
| 53 self.host.bridge.sendMessage(dest_jid, header, profile_key=self.profile, callback=lambda: None, errback=lambda ignore: ignore) | 62 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) |
| 54 | 63 |
| 55 while (True): | 64 while (True): |
| 56 line = clean_ustr(sys.stdin.readline().decode('utf-8','ignore')) | 65 line = clean_ustr(sys.stdin.readline().decode('utf-8','ignore')) |
| 57 if not line: | 66 if not line: |
| 58 break | 67 break |
| 59 self.host.bridge.sendMessage(dest_jid, line.replace("\n",""), profile_key=self.host.profile, callback=lambda: None, errback=lambda ignore: ignore) | 68 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) |
| 60 | 69 |
| 61 else: | 70 else: |
| 62 msg = header + clean_ustr(u"".join([stream.decode('utf-8','ignore') for stream in sys.stdin.readlines()])) | 71 msg = header + clean_ustr(u"".join([stream.decode('utf-8','ignore') for stream in sys.stdin.readlines()])) |
| 63 self.host.bridge.sendMessage(dest_jid, msg, profile_key=self.host.profile, callback=lambda: None, errback=lambda ignore: ignore) | 72 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) |
| 64 | 73 |
| 65 | 74 |
| 66 class Message(base.CommandBase): | 75 class Message(base.CommandBase): |
| 67 subcommands = (Send, ) | 76 subcommands = (Send, ) |
| 68 | 77 |