pep/poezio
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Ensure we only ignore our own reflections in 1:1

Browse source 
Signed-off-by: Maxime “pep” Buquet <pep@bouah.net>
This commit is contained in:
Maxime “pep” Buquet 2022-04-10 17:12:13 +02:00
parent d9a01bb779
commit 98c57924d4
Signed by: pep
GPG key ID: DEDA74AEECA9D0F2
1 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
poezio/tabs/conversationtab.py
View file

@ -110,11 +110,20 @@ class ConversationTab(OneToOneTab):
The message can come from us (carbon copy). The message can come from us (carbon copy).
""" """
# Prevent messages coming from our own devices (1:1) to be reflected
if message['to'].bare == self.core.xmpp.boundjid.bare and \
message['from'].bare == self.core.xmpp.boundjid.bare:
_, index = self._text_buffer._find_message(message['id'])
if index != -1:
return
use_xhtml = config.get_by_tabname( use_xhtml = config.get_by_tabname(
'enable_xhtml_im', 'enable_xhtml_im',
message['from'].bare message['from'].bare
) )
tmp_dir = get_image_cache() tmp_dir = get_image_cache()
# normal message, we are the recipient # normal message, we are the recipient
if message['to'].bare == self.core.xmpp.boundjid.bare: if message['to'].bare == self.core.xmpp.boundjid.bare:
conv_jid = message['from'] conv_jid = message['from']
@ -123,13 +132,6 @@ class ConversationTab(OneToOneTab):
self.last_remote_message = datetime.now() self.last_remote_message = datetime.now()
remote_nick = self.get_nick() remote_nick = self.get_nick()
# we wrote the message (happens with carbons) # we wrote the message (happens with carbons)
elif message['from'].full == self.core.xmpp.boundjid.full:
# XXX: We shouldn't look through messages that have been displayed
# but through messages that have been logged. These don't include
# IDs though.
_, index = self._text_buffer._find_message(message['id'])
if index != -1: # The id has been found
return
elif message['from'].bare == self.core.xmpp.boundjid.bare: elif message['from'].bare == self.core.xmpp.boundjid.bare:
conv_jid = message['to'] conv_jid = message['to']
jid = self.core.xmpp.boundjid jid = self.core.xmpp.boundjid