summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaxime Buquet <pep@bouah.net>2019-08-23 13:45:34 +0200
committerMaxime Buquet <pep@bouah.net>2019-08-23 13:45:34 +0200
commitcbc460106ff9ebb011be7e2643a2682e00080cad (patch)
tree57acf41eca2dde16cf29c29118763196c24e57b6
parentb112748d1fdf097ae1a374264d5012bb564c62fd (diff)
parentfe249417b2e2abf739fe5924a6372d5c14c41b03 (diff)
downloadpoezio-cbc460106ff9ebb011be7e2643a2682e00080cad.tar.gz
poezio-cbc460106ff9ebb011be7e2643a2682e00080cad.tar.bz2
poezio-cbc460106ff9ebb011be7e2643a2682e00080cad.tar.xz
poezio-cbc460106ff9ebb011be7e2643a2682e00080cad.zip
Merge branch 'remove-duplicated-display-code' into 'master'
Remove display code from command_say See merge request poezio/poezio!42
-rw-r--r--poezio/tabs/conversationtab.py35
-rw-r--r--poezio/tabs/privatetab.py38
2 files changed, 12 insertions, 61 deletions
diff --git a/poezio/tabs/conversationtab.py b/poezio/tabs/conversationtab.py
index f8490233..39411872 100644
--- a/poezio/tabs/conversationtab.py
+++ b/poezio/tabs/conversationtab.py
@@ -103,9 +103,13 @@ class ConversationTab(OneToOneTab):
def completion(self):
self.complete_commands(self.input)
+ @refresh_wrapper.always
@command_args_parser.raw
def command_say(self, line, attention=False, correct=False):
- msg = self.core.xmpp.make_message(self.get_dest_jid())
+ msg = self.core.xmpp.make_message(
+ mto=self.get_dest_jid(),
+ mfrom=self.core.xmpp.boundjid
+ )
msg['type'] = 'chat'
msg['body'] = line
if not self.nick_sent:
@@ -117,24 +121,10 @@ class ConversationTab(OneToOneTab):
# be converted in xhtml.
self.core.events.trigger('conversation_say', msg, self)
if not msg['body']:
- self.cancel_paused_delay()
- self.text_win.refresh()
- self.input.refresh()
return
replaced = False
if correct or msg['replace']['id']:
msg['replace']['id'] = self.last_sent_message['id']
- if config.get_by_tabname('group_corrections', self.jid.full):
- try:
- self.modify_message(
- msg['body'],
- self.last_sent_message['id'],
- msg['id'],
- jid=self.core.xmpp.boundjid,
- nickname=self.core.own_nick)
- replaced = True
- except CorrectionError:
- log.error('Unable to correct a message', exc_info=True)
else:
del msg['replace']
if msg['body'].find('\x19') != -1:
@@ -148,25 +138,12 @@ class ConversationTab(OneToOneTab):
msg['attention'] = True
self.core.events.trigger('conversation_say_after', msg, self)
if not msg['body']:
- self.cancel_paused_delay()
- self.text_win.refresh()
- self.input.refresh()
return
- if not replaced:
- self.add_message(
- msg['body'],
- nickname=self.core.own_nick,
- nick_color=get_theme().COLOR_OWN_NICK,
- identifier=msg['id'],
- jid=self.core.xmpp.boundjid,
- typ=1)
-
self.last_sent_message = msg
+ self.core.handler.on_normal_message(msg)
msg._add_receipt = True
msg.send()
self.cancel_paused_delay()
- self.text_win.refresh()
- self.input.refresh()
@command_args_parser.quoted(0, 1)
def command_last_activity(self, args):
diff --git a/poezio/tabs/privatetab.py b/poezio/tabs/privatetab.py
index b4a64ba8..c1bc95ad 100644
--- a/poezio/tabs/privatetab.py
+++ b/poezio/tabs/privatetab.py
@@ -144,12 +144,16 @@ class PrivateTab(OneToOneTab):
and not self.input.get_text().startswith('//'))
self.send_composing_chat_state(empty_after)
+ @refresh_wrapper.always
@command_args_parser.raw
def command_say(self, line, attention=False, correct=False):
if not self.on:
return
echo_message = self.jid.resource != self.own_nick
- msg = self.core.xmpp.make_message(self.jid.full)
+ msg = self.core.xmpp.make_message(
+ mto=self.jid.full,
+ mfrom=self.core.xmpp.boundjid
+ )
msg['type'] = 'chat'
msg['body'] = line
# trigger the event BEFORE looking for colors.
@@ -157,27 +161,11 @@ class PrivateTab(OneToOneTab):
# be converted in xhtml.
self.core.events.trigger('private_say', msg, self)
if not msg['body']:
- self.cancel_paused_delay()
- self.text_win.refresh()
- self.input.refresh()
return
user = self.parent_muc.get_user_by_name(self.own_nick)
replaced = False
if correct or msg['replace']['id']:
msg['replace']['id'] = self.last_sent_message['id']
- if (config.get_by_tabname('group_corrections', self.jid.full)
- and echo_message):
- try:
- self.modify_message(
- msg['body'],
- self.last_sent_message['id'],
- msg['id'],
- user=user,
- jid=self.core.xmpp.boundjid,
- nickname=self.own_nick)
- replaced = True
- except:
- log.error('Unable to correct a message', exc_info=True)
else:
del msg['replace']
@@ -192,26 +180,12 @@ class PrivateTab(OneToOneTab):
msg['attention'] = True
self.core.events.trigger('private_say_after', msg, self)
if not msg['body']:
- self.cancel_paused_delay()
- self.text_win.refresh()
- self.input.refresh()
return
- if not replaced and echo_message:
- self.add_message(
- msg['body'],
- nickname=self.own_nick or self.core.own_nick,
- forced_user=user,
- nick_color=get_theme().COLOR_OWN_NICK,
- identifier=msg['id'],
- jid=self.core.xmpp.boundjid,
- typ=1)
-
self.last_sent_message = msg
+ self.core.handler.on_normal_message(msg)
msg._add_receipt = True
msg.send()
self.cancel_paused_delay()
- self.text_win.refresh()
- self.input.refresh()
@command_args_parser.quoted(0, 1)
def command_version(self, args):