From f6cd0dae34fb84970f8a2a36f3b1362aa4f01ce0 Mon Sep 17 00:00:00 2001
From: cKey <35512826+colinin@users.noreply.github.com>
Date: Sun, 1 Nov 2020 14:57:24 +0800
Subject: [PATCH] Message adds IsAnonymous property

---
 .../Abp/MessageService/Chat/MessageStore.cs   |  6 ++--
 .../Abp/MessageService/Packages/Emoji.cs      | 29 -------------------
 2 files changed, 3 insertions(+), 32 deletions(-)
 delete mode 100644 aspnet-core/modules/message/LINGYUN.Abp.MessageService.Domain/LINGYUN/Abp/MessageService/Packages/Emoji.cs

diff --git a/aspnet-core/modules/message/LINGYUN.Abp.MessageService.Domain/LINGYUN/Abp/MessageService/Chat/MessageStore.cs b/aspnet-core/modules/message/LINGYUN.Abp.MessageService.Domain/LINGYUN/Abp/MessageService/Chat/MessageStore.cs
index d632e16b3..fb42c9ddf 100644
--- a/aspnet-core/modules/message/LINGYUN.Abp.MessageService.Domain/LINGYUN/Abp/MessageService/Chat/MessageStore.cs
+++ b/aspnet-core/modules/message/LINGYUN.Abp.MessageService.Domain/LINGYUN/Abp/MessageService/Chat/MessageStore.cs
@@ -7,9 +7,9 @@ using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
 using Volo.Abp;
+using Volo.Abp.Data;
 using Volo.Abp.DependencyInjection;
 using Volo.Abp.MultiTenancy;
-using Volo.Abp.ObjectExtending;
 using Volo.Abp.ObjectMapping;
 using Volo.Abp.Uow;
 
@@ -212,7 +212,7 @@ namespace LINGYUN.Abp.MessageService.Chat
             var message = new UserMessage(messageId, chatMessage.FormUserId, chatMessage.FormUserName, chatMessage.Content, chatMessage.MessageType);
 
             message.SendToUser(chatMessage.ToUserId.Value);
-            chatMessage.MapExtraPropertiesTo(message);
+            message.SetProperty(nameof(ChatMessage.IsAnonymous), chatMessage.IsAnonymous);
 
             await _messageRepository.InsertUserMessageAsync(message, cancellationToken);
 
@@ -246,7 +246,7 @@ namespace LINGYUN.Abp.MessageService.Chat
             var message = new GroupMessage(messageId, chatMessage.FormUserId, chatMessage.FormUserName, chatMessage.Content, chatMessage.MessageType);
 
             message.SendToGroup(groupId);
-            chatMessage.MapExtraPropertiesTo(message);
+            message.SetProperty(nameof(ChatMessage.IsAnonymous), chatMessage.IsAnonymous);
 
             await _messageRepository.InsertGroupMessageAsync(message, cancellationToken);
 
diff --git a/aspnet-core/modules/message/LINGYUN.Abp.MessageService.Domain/LINGYUN/Abp/MessageService/Packages/Emoji.cs b/aspnet-core/modules/message/LINGYUN.Abp.MessageService.Domain/LINGYUN/Abp/MessageService/Packages/Emoji.cs
deleted file mode 100644
index 99f8d0929..000000000
--- a/aspnet-core/modules/message/LINGYUN.Abp.MessageService.Domain/LINGYUN/Abp/MessageService/Packages/Emoji.cs
+++ /dev/null
@@ -1,29 +0,0 @@
-using System;
-using Volo.Abp.Domain.Entities;
-
-namespace LINGYUN.Abp.MessageService.Packages
-{
-    public class Emoji : Entity<Guid>
-    {
-        public virtual string Name { get; protected set; }
-        public virtual string Title { get; protected set; }
-        public virtual string LinkUrl { get; protected set; }
-        protected Emoji() { }
-        public Emoji(
-            Guid id,
-            string name,
-            string title,
-            string linkUrl)
-            :base(id)
-        {
-            Name = name;
-            Title = title;
-            LinkUrl = linkUrl;
-        }
-
-        public void SetUrl(string linkUrl)
-        {
-            LinkUrl = linkUrl;
-        }
-    }
-}