From 8243354f395b8054afb63d2b36a28956812b39a8 Mon Sep 17 00:00:00 2001 From: Max Dor Date: Sat, 4 May 2019 11:17:36 +0200 Subject: [PATCH] Remove unused but bug-triggering code block (Fix #172) --- .../as/processor/event/MembershipEventProcessor.java | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/src/main/java/io/kamax/mxisd/as/processor/event/MembershipEventProcessor.java b/src/main/java/io/kamax/mxisd/as/processor/event/MembershipEventProcessor.java index 2f83fc99..306b955b 100644 --- a/src/main/java/io/kamax/mxisd/as/processor/event/MembershipEventProcessor.java +++ b/src/main/java/io/kamax/mxisd/as/processor/event/MembershipEventProcessor.java @@ -27,7 +27,6 @@ import io.kamax.matrix._ThreePid; import io.kamax.matrix.client.as.MatrixApplicationServiceClient; import io.kamax.matrix.event.EventKey; -import io.kamax.matrix.hs._MatrixRoom; import io.kamax.mxisd.Mxisd; import io.kamax.mxisd.backend.sql.synapse.Synapse; import io.kamax.mxisd.config.MxisdConfig; @@ -81,7 +80,7 @@ public void process(JsonObject ev, _MatrixID sender, String roomId) { _MatrixID target = MatrixID.asAcceptable(targetId); if (!StringUtils.equals(target.getDomain(), cfg.getMatrix().getDomain())) { - log.debug("Ignoring invite for {}: not a local user"); + log.debug("Ignoring invite for {}: not a local user", targetId); return; } @@ -89,7 +88,6 @@ public void process(JsonObject ev, _MatrixID sender, String roomId) { boolean isForMainUser = StringUtils.equals(target.getLocalPart(), cfg.getAppsvc().getUser().getMain()); boolean isForExpInvUser = StringUtils.equals(target.getLocalPart(), cfg.getAppsvc().getUser().getInviteExpired()); - boolean isUs = isForMainUser || isForExpInvUser; if (StringUtils.equals("join", EventKey.Membership.getStringOrNull(content))) { if (!isForMainUser) { @@ -108,10 +106,7 @@ public void process(JsonObject ev, _MatrixID sender, String roomId) { processForUserIdInvite(roomId, sender, target); } } else if (StringUtils.equals("leave", EventKey.Membership.getStringOrNull(content))) { - _MatrixRoom room = client.getRoom(roomId); - if (!isUs && room.getJoinedUsers().size() == 1) { - // TODO we need to find out if this is only us remaining and leave the room if so, using the right client for it - } + // TODO we need to find out if this is only us remaining and leave the room if so, using the right client for it } else { log.debug("This is not an supported type of membership event, skipping"); }