fix build error

broker/pom.xml

@@ -5,7 +5,7 @@
         <relativePath>../</relativePath>
         <artifactId>wildfirechat-parent</artifactId>
         <groupId>cn.wildfirechat</groupId>
-        <version>1.1.1</version>
+        <version>1.1.2</version>
     </parent>
 
     <artifactId>moquette-broker</artifactId>

broker/src/main/java/io/moquette/persistence/MemoryMessagesStore.java

@@ -585,21 +585,17 @@ public class MemoryMessagesStore implements IMessagesStore {
         int pullType = ProtoConstants.PullType.Pull_Normal;
 
         if (type == ProtoConstants.ConversationType.ConversationType_Private) {
+            notifyReceivers.add(fromUser);
             if(message.getToCount() > 0) {
-                if(message.getToList().contains(fromUser)) {
-                    notifyReceivers.add(fromUser);
-                }
                 if(message.getToList().contains(message.getConversation().getTarget())) {
                     notifyReceivers.add(message.getConversation().getTarget());
                 }
             } else {
-                notifyReceivers.add(fromUser);
                 notifyReceivers.add(message.getConversation().getTarget());
             }
             pullType = ProtoConstants.PullType.Pull_Normal;
         } else if (type == ProtoConstants.ConversationType.ConversationType_Group) {
             notifyReceivers.add(fromUser);
-
             if (!StringUtil.isNullOrEmpty(message.getToUser())) {
                 notifyReceivers.add(message.getToUser());
             } else if(message.getToList()!=null && !message.getToList().isEmpty()) {
@@ -625,9 +621,6 @@ public class MemoryMessagesStore implements IMessagesStore {
                     }
                 }
             }
-
-            //如果是群助手的消息，返回pull type group，否则返回normal
-            //群助手还没有实现
             pullType = ProtoConstants.PullType.Pull_Normal;
         } else if (type == ProtoConstants.ConversationType.ConversationType_ChatRoom) {
             boolean isDirect = !StringUtil.isNullOrEmpty(message.getToUser());

common/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>wildfirechat-parent</artifactId>
         <groupId>cn.wildfirechat</groupId>
-        <version>1.1.1</version>
+        <version>1.1.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

common/src/main/java/cn/wildfirechat/common/APIPath.java

@@ -90,6 +90,7 @@ public interface APIPath {
     String Health = "/admin/health";
 
     String Conference_List = "/admin/conference/list";
+    String Conference_Exist = "/admin/conference/exist";
     String Conference_List_Participant = "/admin/conference/list_participant";
     String Conference_Create = "/admin/conference/create";
     String Conference_Destroy = "/admin/conference/destroy";

distribution/pom.xml

@@ -6,7 +6,7 @@
         <!--<relativePath>../pom.xml</relativePath>-->
         <artifactId>wildfirechat-parent</artifactId>
         <groupId>cn.wildfirechat</groupId>
-        <version>1.1.1</version>
+        <version>1.1.2</version>
     </parent>
 
     <artifactId>distribution</artifactId>

pom.xml

@@ -12,7 +12,7 @@
     <artifactId>wildfirechat-parent</artifactId>
 
     <packaging>pom</packaging>
-    <version>1.1.1</version>
+    <version>1.1.2</version>
     <name>Wildfire Chat</name>
     <description>Wildfire Chat Server</description>
     <inceptionYear>2019</inceptionYear>

release_note.md

@@ -12,6 +12,11 @@
 
 # 更新记录
 
+--------------
+Release note 1.1.2:
+1. 会议SDK添加查询会议是否存在的接口
+2. 单聊会话定向消息分发包含发送者
+
 --------------
 Release note 1.1.1:
 1. 当用户获取群组信息，可以根据返回信息判断是否在群中。

sdk/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <artifactId>wildfirechat-parent</artifactId>
         <groupId>cn.wildfirechat</groupId>
-        <version>1.1.1</version>
+        <version>1.1.2</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

sdk/src/main/java/cn/wildfirechat/sdk/ConferenceAdmin.java

@@ -11,6 +11,12 @@ public class ConferenceAdmin {
         return AdminHttpUtils.httpJsonPost(path, null, PojoConferenceInfoList.class);
     }
 
+    public static IMResult<Boolean> existsConferences(String conferenceId) throws Exception {
+        String path = APIPath.Conference_Exist;
+        PojoConferenceRoomId data = new PojoConferenceRoomId(conferenceId, false);
+        return AdminHttpUtils.httpJsonPost(path, data, Boolean.class);
+    }
+
     public static IMResult<PojoConferenceParticipantList> listParticipants(String roomId, boolean advance) throws Exception {
         String path = APIPath.Conference_List_Participant;
         PojoConferenceRoomId data = new PojoConferenceRoomId(roomId, advance);

sdk/src/main/java/cn/wildfirechat/sdk/Main.java

@@ -1691,6 +1691,14 @@ public class Main {
             System.out.println("create conference");
         }
 
+        IMResult<Boolean> booleanIMResult = ConferenceAdmin.existsConferences("helloroomid2");
+        if(booleanIMResult == null || booleanIMResult.getErrorCode() != ErrorCode.ERROR_CODE_SUCCESS) {
+            System.out.println("exist conference failure");
+            System.exit(-1);
+        } else {
+            System.out.println("exit conference success");
+        }
+
         voidIMResult = ConferenceAdmin.enableRecording("helloroomid2", true, true);
         if(voidIMResult == null || voidIMResult.getErrorCode() != ErrorCode.ERROR_CODE_SUCCESS) {
             System.out.println("recording conference failure");