From 44f54ecd1773f7038f36fc49ad479a2e32d8a069 Mon Sep 17 00:00:00 2001
From: heavyrain2012 <heavyrain.lee@gmail.com>
Date: Wed, 29 Sep 2021 10:19:24 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E9=86=92=E6=B6=88=E6=81=AF=E5=88=A4?=
 =?UTF-8?q?=E6=96=AD=E6=98=AF=E4=B8=8D=E6=98=AFserver=20api=E5=8F=91?=
 =?UTF-8?q?=E9=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/io/moquette/imhandler/SendMessageHandler.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/broker/src/main/java/io/moquette/imhandler/SendMessageHandler.java b/broker/src/main/java/io/moquette/imhandler/SendMessageHandler.java
index a767c1da..69c6c634 100644
--- a/broker/src/main/java/io/moquette/imhandler/SendMessageHandler.java
+++ b/broker/src/main/java/io/moquette/imhandler/SendMessageHandler.java
@@ -174,7 +174,7 @@ public class SendMessageHandler extends IMHandler<WFCMessage.Message> {
                 publisher.forwardMessage(message, mForwardUrl);
             }
 
-            if(!StringUtil.isNullOrEmpty(mMentionForwardUrl) && message.hasContent() && message.getContent().getMentionedType() != 0) {
+            if(!StringUtil.isNullOrEmpty(mMentionForwardUrl) && message.hasContent() && message.getContent().getMentionedType() != 0 && !(isAdmin && mNoForwardAdminMessage)) {
                 publisher.forwardMessage(message, mMentionForwardUrl);
             }