summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaxime Buquet <pep@bouah.net>2020-01-14 10:20:40 +0100
committerMaxime Buquet <pep@bouah.net>2020-01-14 10:20:40 +0100
commit911784a8985de11292c2fb0ac8ad08b47ef259cf (patch)
treee000a455706e21e93bab81ea6a81e310419920bb
parentd8f7a6127109c437ae621cfa6e78944ad37fb8fd (diff)
parent5e404377d4eb1b80b81be91d75e12300c40b354c (diff)
downloadpoezio-911784a8985de11292c2fb0ac8ad08b47ef259cf.tar.gz
poezio-911784a8985de11292c2fb0ac8ad08b47ef259cf.tar.bz2
poezio-911784a8985de11292c2fb0ac8ad08b47ef259cf.tar.xz
poezio-911784a8985de11292c2fb0ac8ad08b47ef259cf.zip
Merge branch 'biboumi-carbons' into 'master'
Don't ignore carbons if biboumi See merge request poezio/poezio!59
-rw-r--r--poezio/core/handlers.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/poezio/core/handlers.py b/poezio/core/handlers.py
index 158dff17..cfdeb271 100644
--- a/poezio/core/handlers.py
+++ b/poezio/core/handlers.py
@@ -175,7 +175,7 @@ class HandlerCore:
if is_muc_pm is None:
fixes.has_identity(
self.core.xmpp,
- recv['from'].server,
+ recv['from'].bare,
identity='conference',
on_true=functools.partial(ignore_message, recv),
on_false=functools.partial(receive_message, recv))