From 355fc6cb0644bf435a59d65b03ab2ee9abe5bcb1 Mon Sep 17 00:00:00 2001
From: imhao183 <wildfirechat86@gmail.com>
Date: Tue, 25 Aug 2020 15:07:32 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=A5=E8=BF=91server=20api=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE=E5=A5=BD=E5=8F=8B=E5=85=B3=E7=B3=BB=E6=97=B6=E4=B8=8D?=
 =?UTF-8?q?=E9=80=9A=E7=9F=A5=E5=AE=A2=E6=88=B7=E7=AB=AF=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../io/moquette/imhandler/HandleFriendRequestHandler.java  | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/broker/src/main/java/io/moquette/imhandler/HandleFriendRequestHandler.java b/broker/src/main/java/io/moquette/imhandler/HandleFriendRequestHandler.java
index 8e5980cb..7d27290f 100644
--- a/broker/src/main/java/io/moquette/imhandler/HandleFriendRequestHandler.java
+++ b/broker/src/main/java/io/moquette/imhandler/HandleFriendRequestHandler.java
@@ -75,11 +75,14 @@ public class HandleFriendRequestHandler extends IMHandler<WFCMessage.HandleFrien
                         builder.setServerTimestamp(timestamp);
                         saveAndPublish(request.getTargetUid(), null, builder.build(), false);
 
-                        publisher.publishNotification(IMTopic.NotifyFriendTopic, request.getTargetUid(), heads[0]);
-                        publisher.publishNotification(IMTopic.NotifyFriendTopic, fromUser, heads[1]);
                     } catch (Exception e) {
                         e.printStackTrace();
                     }
+
+                    if (request.getStatus() == ProtoConstants.FriendRequestStatus.RequestStatus_Accepted || isAdmin) {
+                        publisher.publishNotification(IMTopic.NotifyFriendTopic, request.getTargetUid(), heads[0]);
+                        publisher.publishNotification(IMTopic.NotifyFriendTopic, fromUser, heads[1]);
+                    }
                 }
             }
             return errorCode;