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

Filter MUC PMs in MAM

Browse source 
Since prosody returns all of the PMs from the room, regardless of who
sent them, we need to filter out messages by full jid here.
This commit is contained in:
mathieui 2022-03-25 22:11:50 +01:00
parent a224d8820f
commit 41a45068a4
1 changed files with 22 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
poezio/mam.py
View file

@ -130,6 +130,20 @@ def _parse_message(msg: SMessage) -> Dict:
}
def _ignore_private_message(stanza: SMessage, filter_jid: JID) -> bool:
"""Returns True if a MUC-PM should be ignored, as prosody returns
all PMs within the same room.
"""
if filter_jid is None:
return False
sent = stanza['from'].bare != filter_jid.bare
if sent and stanza['to'].full != filter_jid.full:
return True
elif not sent and stanza['from'].full != filter_jid.full:
return True
return False
async def retrieve_messages(tab: tabs.ChatTab,
results: AsyncIterable[SMessage],
amount: int = 100) -> List[BaseMessage]:
@ -137,11 +151,17 @@ async def retrieve_messages(tab: tabs.ChatTab,
msg_count = 0
msgs = []
to_add = []
tab_is_private = isinstance(tab, tabs.PrivateTab)
filter_jid = None
if tab_is_private:
filter_jid = tab.jid
try:
async for rsm in results:
for msg in rsm['mam']['results']:
if msg['mam_result']['forwarded']['stanza'] \
.xml.find('{%s}%s' % ('jabber:client', 'body')) is not None:
stanza = msg['mam_result']['forwarded']['stanza']
if stanza.xml.find('{%s}%s' % ('jabber:client', 'body')) is not None:
if _ignore_private_message(stanza, filter_jid):
continue
args = _parse_message(msg)
msgs.append(make_line(tab, **args))
for msg in reversed(msgs):