diff --git a/apps/roster/src/protocol/roster_message.erl b/apps/roster/src/protocol/roster_message.erl index 7ef37e15eaada414e34cb36eff98d38673e3492a..e1350816cafb5b4063c97c43ff9e905099375ccb 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} =