From 6c9df5c0716caad03faf23341dfb76850e0e5368 Mon Sep 17 00:00:00 2001
From: heavyrian2012 <heavyrain.lee@wildfirehat.cn>
Date: Wed, 17 Dec 2025 09:38:55 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=A5=E5=8F=97=E5=A5=BD=E5=8F=8B=E8=AF=B7?=
 =?UTF-8?q?=E6=B1=82=E5=90=8E=E5=8F=91=E7=9A=84=E9=80=9A=E7=9F=A5=E7=9A=84?=
 =?UTF-8?q?=E5=8F=91=E9=80=81=E8=80=85=E6=94=B9=E4=B8=BA=E6=8E=A5=E5=8F=97?=
 =?UTF-8?q?=E8=80=85=E5=8F=91=E9=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../io/moquette/imhandler/HandleFriendRequestHandler.java | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/broker/src/main/java/io/moquette/imhandler/HandleFriendRequestHandler.java b/broker/src/main/java/io/moquette/imhandler/HandleFriendRequestHandler.java
index 3a543996..87d36479 100644
--- a/broker/src/main/java/io/moquette/imhandler/HandleFriendRequestHandler.java
+++ b/broker/src/main/java/io/moquette/imhandler/HandleFriendRequestHandler.java
@@ -45,20 +45,20 @@ public class HandleFriendRequestHandler extends IMHandler<WFCMessage.HandleFrien
                         contentBuilder.setType(92);
 
                         builder = WFCMessage.Message.newBuilder();
-                        builder.setFromUser(request.getTargetUid());
-                        builder.setConversation(WFCMessage.Conversation.newBuilder().setTarget(fromUser).setLine(0).setType(ProtoConstants.ConversationType.ConversationType_Private).build());
+                        builder.setFromUser(fromUser);
+                        builder.setConversation(WFCMessage.Conversation.newBuilder().setTarget(request.getTargetUid()).setLine(0).setType(ProtoConstants.ConversationType.ConversationType_Private).build());
                         builder.setContent(contentBuilder);
                         builder.setServerTimestamp(++timestamp);
 
                         messageId = MessageShardingUtil.generateId();
                         builder.setMessageId(messageId);
-                        saveAndPublish(request.getTargetUid(), null, builder.build(), requestSourceType);
+                        saveAndPublish(fromUser, null, builder.build(), requestSourceType);
                         contentBuilder.setType(93);
                         builder.setContent(contentBuilder);
                         messageId = MessageShardingUtil.generateId();
                         builder.setMessageId(messageId);
                         builder.setServerTimestamp(++timestamp);
-                        saveAndPublish(request.getTargetUid(), null, builder.build(), requestSourceType);
+                        saveAndPublish(fromUser, null, builder.build(), requestSourceType);
                     } catch (Exception e) {
                         e.printStackTrace();
                     }