Mercurial > prosody-hg
comparison plugins/mod_muc_mam.lua @ 10944:cb52cb8aa706
Merge 0.11->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Sun, 21 Jun 2020 19:24:15 +0200 |
| parents | e402f808de50 22b1298403ff |
| children | cabb022f31c0 |
comparison
equal
deleted
inserted
replaced
| 10942:008f46a92520 | 10944:cb52cb8aa706 |
|---|---|
| 341 | 341 |
| 342 -- Filter out <stanza-id> that claim to be from us | 342 -- Filter out <stanza-id> that claim to be from us |
| 343 stanza:maptags(function (tag) | 343 stanza:maptags(function (tag) |
| 344 if tag.name == "stanza-id" and tag.attr.xmlns == xmlns_st_id | 344 if tag.name == "stanza-id" and tag.attr.xmlns == xmlns_st_id |
| 345 and jid_prep(tag.attr.by) == room.jid then | 345 and jid_prep(tag.attr.by) == room.jid then |
| 346 return nil; | |
| 347 end | |
| 348 if tag.name == "x" and tag.attr.xmlns == xmlns_muc_user then | |
| 349 return nil; | 346 return nil; |
| 350 end | 347 end |
| 351 return tag; | 348 return tag; |
| 352 end); | 349 end); |
| 353 | 350 |