a7de473107
/!\ 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
79 lines
3.6 KiB
Python
79 lines
3.6 KiB
Python
#!/usr/bin/env python2
|
|
# -*- coding: utf-8 -*-
|
|
|
|
# jp: a SAT command line tool
|
|
# Copyright (C) 2009-2016 Jérôme Poisson (goffi@goffi.org)
|
|
|
|
# This program is free software: you can redistribute it and/or modify
|
|
# it under the terms of the GNU Affero General Public License as published by
|
|
# the Free Software Foundation, either version 3 of the License, or
|
|
# (at your option) any later version.
|
|
|
|
# This program is distributed in the hope that it will be useful,
|
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
# GNU Affero General Public License for more details.
|
|
|
|
# You should have received a copy of the GNU Affero General Public License
|
|
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
from sat_frontends.jp import base
|
|
import sys
|
|
from sat.core.i18n import _
|
|
from sat.core.constants import Const as C
|
|
from sat.tools.utils import clean_ustr
|
|
|
|
__commands__ = ["Message"]
|
|
|
|
|
|
class Send(base.CommandBase):
|
|
|
|
def __init__(self, host):
|
|
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("-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"))
|
|
|
|
def start(self):
|
|
jids = self.host.check_jids([self.args.jid])
|
|
jid = jids[0]
|
|
self.sendStdin(jid)
|
|
|
|
def sendStdin(self, dest_jid):
|
|
"""Send incomming data on stdin to jabber contact
|
|
|
|
@param dest_jid: destination jid
|
|
"""
|
|
header = "\n" if self.args.new_line else ""
|
|
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 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)
|
|
|
|
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)
|
|
|
|
|
|
class Message(base.CommandBase):
|
|
subcommands = (Send, )
|
|
|
|
def __init__(self, host):
|
|
super(Message, self).__init__(host, 'message', use_profile=False, help=_('messages handling'))
|