summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--poezio/core/handlers.py12
1 files changed, 6 insertions, 6 deletions
diff --git a/poezio/core/handlers.py b/poezio/core/handlers.py
index 3b839925..a394190c 100644
--- a/poezio/core/handlers.py
+++ b/poezio/core/handlers.py
@@ -380,15 +380,15 @@ class HandlerCore:
tabs.DynamicConversationTab) and conv_jid.resource:
conversation.lock(conv_jid.resource)
- if not own and not conversation.nick:
- conversation.nick = remote_nick
- elif not own:
- remote_nick = conversation.get_nick()
-
if not own:
+ if not conversation.nick:
+ conversation.nick = remote_nick
+ else:
+ remote_nick = conversation.get_nick()
+
conversation.last_remote_message = datetime.now()
+ self.core.events.trigger('conversation_msg', message, conversation)
- self.core.events.trigger('conversation_msg', message, conversation)
if not message['body']:
return
body = xhtml.get_body_from_message_stanza(