From 7ed5702ce2ed2a677ac961a095b79c3992b63229 Mon Sep 17 00:00:00 2001 From: Hans Svensson Date: Wed, 10 Jun 2020 15:50:41 +0200 Subject: [PATCH] Revert the clever stuff in roster_message --- apps/roster/src/protocol/roster_message.erl | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/apps/roster/src/protocol/roster_message.erl b/apps/roster/src/protocol/roster_message.erl index 7ef37e15e..e1350816c 100644 --- a/apps/roster/src/protocol/roster_message.erl +++ b/apps/roster/src/protocol/roster_message.erl @@ -49,13 +49,7 @@ info(#'Message'{status = [], id = [], feed_id = F, from=From0, to = To, try From = case hd(binary:split(ClientId, <<"_">>)) of <<"sys">> -> From0; - <<"emqttd">> -> - PhoneId = roster:phone_id(ClientId), - case Type of - [forward] when PhoneId == To -> From0; - [forward] -> <<>>; %% bad request - _ -> PhoneId - end + <<"emqttd">> -> roster:phone_id(ClientId) end, {R, UID} = -- GitLab