[OneBot] Adjust namespace for Lagrange.OneBot.Message

LagrangeDev · Feb 12, 2024 · 27b7454 · 27b7454
1 parent 7787498
commit 27b7454
Show file tree

Hide file tree

Showing 27 changed files with 28 additions and 30 deletions.
diff --git a/Lagrange.OneBot/Core/Entity/Message/OneBotGroupMsg.cs b/Lagrange.OneBot/Core/Entity/Message/OneBotGroupMsg.cs
@@ -1,6 +1,5 @@
 using System.Text.Json.Serialization;
 using Lagrange.Core.Common.Entity;
-using Lagrange.OneBot.Core.Message;
 
 namespace Lagrange.OneBot.Core.Entity.Message;
 

diff --git a/Lagrange.OneBot/Core/Entity/Message/OneBotNode.cs b/Lagrange.OneBot/Core/Entity/Message/OneBotNode.cs
@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 using Lagrange.Core.Message;
-using Lagrange.OneBot.Core.Message;
+using Lagrange.OneBot.Message;
 
 namespace Lagrange.OneBot.Core.Entity.Message;
 

diff --git a/Lagrange.OneBot/Core/Entity/Message/OneBotPrivateMsg.cs b/Lagrange.OneBot/Core/Entity/Message/OneBotPrivateMsg.cs
@@ -1,5 +1,4 @@
 using System.Text.Json.Serialization;
-using Lagrange.OneBot.Core.Message;
 
 namespace Lagrange.OneBot.Core.Entity.Message;
 

diff --git a/Lagrange.OneBot/Core/Entity/Message/OneBotSegment.cs b/Lagrange.OneBot/Core/Entity/Message/OneBotSegment.cs
@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
-using Lagrange.OneBot.Core.Message;
-using Lagrange.OneBot.Core.Message.Entity;
+using Lagrange.OneBot.Message;
+using Lagrange.OneBot.Message.Entity;
 
 namespace Lagrange.OneBot.Core.Entity.Message;
 

diff --git a/Lagrange.OneBot/Core/Operation/Message/GetForwardMsgOperation.cs b/Lagrange.OneBot/Core/Operation/Message/GetForwardMsgOperation.cs
@@ -5,7 +5,7 @@
 using Lagrange.OneBot.Core.Entity.Action;
 using Lagrange.OneBot.Core.Entity.Action.Response;
 using Lagrange.OneBot.Core.Entity.Message;
-using Lagrange.OneBot.Core.Message;
+using Lagrange.OneBot.Message;
 
 namespace Lagrange.OneBot.Core.Operation.Message;
 

diff --git a/Lagrange.OneBot/Core/Operation/Message/GetMessageOperation.cs b/Lagrange.OneBot/Core/Operation/Message/GetMessageOperation.cs
@@ -4,8 +4,8 @@
 using Lagrange.Core.Message;
 using Lagrange.OneBot.Core.Entity.Action;
 using Lagrange.OneBot.Core.Entity.Action.Response;
-using Lagrange.OneBot.Core.Message;
 using Lagrange.OneBot.Database;
+using Lagrange.OneBot.Message;
 using LiteDB;
 
 namespace Lagrange.OneBot.Core.Operation.Message;

diff --git a/Lagrange.OneBot/Core/Operation/Message/MessageCommon.cs b/Lagrange.OneBot/Core/Operation/Message/MessageCommon.cs
@@ -5,7 +5,7 @@
 using Lagrange.Core.Utility.Extension;
 using Lagrange.OneBot.Core.Entity.Action;
 using Lagrange.OneBot.Core.Entity.Message;
-using Lagrange.OneBot.Core.Message;
+using Lagrange.OneBot.Message;
 using LiteDB;
 using JsonSerializer = System.Text.Json.JsonSerializer;
 

diff --git a/Lagrange.OneBot/Core/Operation/OperationService.cs b/Lagrange.OneBot/Core/Operation/OperationService.cs
@@ -1,9 +1,9 @@
 using System.Reflection;
 using Lagrange.Core;
 using Lagrange.OneBot.Core.Entity.Action;
-using Lagrange.OneBot.Core.Message;
 using Lagrange.OneBot.Core.Network;
 using Lagrange.OneBot.Core.Operation.Message;
+using Lagrange.OneBot.Message;
 using LiteDB;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;

diff --git a/Lagrange.OneBot/LagrangeApp.cs b/Lagrange.OneBot/LagrangeApp.cs
@@ -4,10 +4,10 @@
 using Lagrange.Core.Common.Interface.Api;
 using Lagrange.Core.Utility.Extension;
 using Lagrange.Core.Utility.Sign;
-using Lagrange.OneBot.Core.Message;
 using Lagrange.OneBot.Core.Network;
 using Lagrange.OneBot.Core.Notify;
 using Lagrange.OneBot.Core.Operation;
+using Lagrange.OneBot.Message;
 using Lagrange.OneBot.Utility;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;

diff --git a/Lagrange.OneBot/LagrangeAppBuilder.cs b/Lagrange.OneBot/LagrangeAppBuilder.cs
@@ -1,11 +1,11 @@
 using Lagrange.Core.Common;
 using Lagrange.Core.Common.Interface;
 using Lagrange.Core.Utility.Sign;
-using Lagrange.OneBot.Core.Message;
 using Lagrange.OneBot.Core.Network;
 using Lagrange.OneBot.Core.Network.Service;
 using Lagrange.OneBot.Core.Notify;
 using Lagrange.OneBot.Core.Operation;
+using Lagrange.OneBot.Message;
 using Lagrange.OneBot.Utility;
 using LiteDB;
 using Microsoft.Extensions.Configuration;

diff --git a/...neBot/Core/Message/CQPropertyAttribute.cs → ...nge.OneBot/Message/CQPropertyAttribute.cs b/...neBot/Core/Message/CQPropertyAttribute.cs → ...nge.OneBot/Message/CQPropertyAttribute.cs
@@ -1,4 +1,4 @@
-namespace Lagrange.OneBot.Core.Message;
+namespace Lagrange.OneBot.Message;
 
 [AttributeUsage(AttributeTargets.Property)]
 public class CQPropertyAttribute : Attribute;
diff --git a/...e.OneBot/Core/Message/Entity/AtSegment.cs → Lagrange.OneBot/Message/Entity/AtSegment.cs b/...e.OneBot/Core/Message/Entity/AtSegment.cs → Lagrange.OneBot/Message/Entity/AtSegment.cs
@@ -2,7 +2,7 @@
 using Lagrange.Core.Message;
 using Lagrange.Core.Message.Entity;
 
-namespace Lagrange.OneBot.Core.Message.Entity;
+namespace Lagrange.OneBot.Message.Entity;
 
 [Serializable]
 public partial class AtSegment(uint at)

diff --git a/...Bot/Core/Message/Entity/CommonResolver.cs → ...e.OneBot/Message/Entity/CommonResolver.cs b/...Bot/Core/Message/Entity/CommonResolver.cs → ...e.OneBot/Message/Entity/CommonResolver.cs
@@ -1,4 +1,4 @@
-namespace Lagrange.OneBot.Core.Message.Entity;
+namespace Lagrange.OneBot.Message.Entity;
 
 public static class CommonResolver
 {

diff --git a/...OneBot/Core/Message/Entity/DiceSegment.cs → ...ange.OneBot/Message/Entity/DiceSegment.cs b/...OneBot/Core/Message/Entity/DiceSegment.cs → ...ange.OneBot/Message/Entity/DiceSegment.cs
@@ -1,7 +1,7 @@
 using Lagrange.Core.Message;
 using Lagrange.Core.Message.Entity;
 
-namespace Lagrange.OneBot.Core.Message.Entity;
+namespace Lagrange.OneBot.Message.Entity;
 
 [Serializable]
 public partial class DiceSegment

diff --git a/...OneBot/Core/Message/Entity/FaceSegment.cs → ...ange.OneBot/Message/Entity/FaceSegment.cs b/...OneBot/Core/Message/Entity/FaceSegment.cs → ...ange.OneBot/Message/Entity/FaceSegment.cs
@@ -2,7 +2,7 @@
 using Lagrange.Core.Message;
 using Lagrange.Core.Message.Entity;
 
-namespace Lagrange.OneBot.Core.Message.Entity;
+namespace Lagrange.OneBot.Message.Entity;
 
 [Serializable]
 public partial class FaceSegment(int id)

diff --git a/...Bot/Core/Message/Entity/ForwardSegment.cs → ...e.OneBot/Message/Entity/ForwardSegment.cs b/...Bot/Core/Message/Entity/ForwardSegment.cs → ...e.OneBot/Message/Entity/ForwardSegment.cs
@@ -2,7 +2,7 @@
 using Lagrange.Core.Message;
 using Lagrange.Core.Message.Entity;
 
-namespace Lagrange.OneBot.Core.Message.Entity;
+namespace Lagrange.OneBot.Message.Entity;
 
 [Serializable]
 public partial class ForwardSegment(string name)

diff --git a/...neBot/Core/Message/Entity/ImageSegment.cs → ...nge.OneBot/Message/Entity/ImageSegment.cs b/...neBot/Core/Message/Entity/ImageSegment.cs → ...nge.OneBot/Message/Entity/ImageSegment.cs
@@ -2,7 +2,7 @@
 using Lagrange.Core.Message;
 using Lagrange.Core.Message.Entity;
 
-namespace Lagrange.OneBot.Core.Message.Entity;
+namespace Lagrange.OneBot.Message.Entity;
 
 [Serializable]
 public partial class ImageSegment(string url)

diff --git a/...ot/Core/Message/Entity/LocationSegment.cs → ....OneBot/Message/Entity/LocationSegment.cs b/...ot/Core/Message/Entity/LocationSegment.cs → ....OneBot/Message/Entity/LocationSegment.cs
@@ -4,7 +4,7 @@
 using Lagrange.Core.Message.Entity;
 using Lagrange.OneBot.Core.Entity.Common;
 
-namespace Lagrange.OneBot.Core.Message.Entity;
+namespace Lagrange.OneBot.Message.Entity;
 
 [Serializable]
 public partial class LocationSegment(float latitude, float longitude)

diff --git a/...OneBot/Core/Message/Entity/PokeSegment.cs → ...ange.OneBot/Message/Entity/PokeSegment.cs b/...OneBot/Core/Message/Entity/PokeSegment.cs → ...ange.OneBot/Message/Entity/PokeSegment.cs
@@ -2,7 +2,7 @@
 using Lagrange.Core.Message;
 using Lagrange.Core.Message.Entity;
 
-namespace Lagrange.OneBot.Core.Message.Entity;
+namespace Lagrange.OneBot.Message.Entity;
 
 [Serializable]
 public partial class PokeSegment(uint type)

diff --git a/...eBot/Core/Message/Entity/RecordSegment.cs → ...ge.OneBot/Message/Entity/RecordSegment.cs b/...eBot/Core/Message/Entity/RecordSegment.cs → ...ge.OneBot/Message/Entity/RecordSegment.cs
@@ -2,7 +2,7 @@
 using Lagrange.Core.Message;
 using Lagrange.Core.Message.Entity;
 
-namespace Lagrange.OneBot.Core.Message.Entity;
+namespace Lagrange.OneBot.Message.Entity;
 
 [Serializable]
 public partial class RecordSegment(string url)

diff --git a/...neBot/Core/Message/Entity/ReplySegment.cs → ...nge.OneBot/Message/Entity/ReplySegment.cs b/...neBot/Core/Message/Entity/ReplySegment.cs → ...nge.OneBot/Message/Entity/ReplySegment.cs
@@ -3,7 +3,7 @@
 using Lagrange.Core.Message.Entity;
 using Lagrange.OneBot.Database;
 
-namespace Lagrange.OneBot.Core.Message.Entity;
+namespace Lagrange.OneBot.Message.Entity;
 
 [Serializable]
 public partial class ReplySegment(uint messageId)

diff --git a/....OneBot/Core/Message/Entity/RpsSegment.cs → Lagrange.OneBot/Message/Entity/RpsSegment.cs b/....OneBot/Core/Message/Entity/RpsSegment.cs → Lagrange.OneBot/Message/Entity/RpsSegment.cs
@@ -1,7 +1,7 @@
 using Lagrange.Core.Message;
 using Lagrange.Core.Message.Entity;
 
-namespace Lagrange.OneBot.Core.Message.Entity;
+namespace Lagrange.OneBot.Message.Entity;
 
 [Serializable]
 public partial class RpsSegment

diff --git a/...OneBot/Core/Message/Entity/TextSegment.cs → ...ange.OneBot/Message/Entity/TextSegment.cs b/...OneBot/Core/Message/Entity/TextSegment.cs → ...ange.OneBot/Message/Entity/TextSegment.cs
@@ -2,7 +2,7 @@
 using Lagrange.Core.Message;
 using Lagrange.Core.Message.Entity;
 
-namespace Lagrange.OneBot.Core.Message.Entity;
+namespace Lagrange.OneBot.Message.Entity;
 
 [Serializable]
 public partial class TextSegment(string text)

diff --git a/...neBot/Core/Message/Entity/VideoSegment.cs → ...nge.OneBot/Message/Entity/VideoSegment.cs b/...neBot/Core/Message/Entity/VideoSegment.cs → ...nge.OneBot/Message/Entity/VideoSegment.cs
@@ -2,7 +2,7 @@
 using Lagrange.Core.Message;
 using Lagrange.Core.Message.Entity;
 
-namespace Lagrange.OneBot.Core.Message.Entity;
+namespace Lagrange.OneBot.Message.Entity;
 
 [Serializable]
 public partial class VideoSegment(string url)

diff --git a/...nge.OneBot/Core/Message/MessageService.cs → Lagrange.OneBot/Message/MessageService.cs b/...nge.OneBot/Core/Message/MessageService.cs → Lagrange.OneBot/Message/MessageService.cs
@@ -2,19 +2,19 @@
 using System.Text;
 using System.Text.Json;
 using System.Text.Json.Serialization.Metadata;
-using JsonSerializer = System.Text.Json.JsonSerializer;
 using Lagrange.Core;
 using Lagrange.Core.Event.EventArg;
 using Lagrange.Core.Message;
 using Lagrange.Core.Utility.Extension;
 using Lagrange.OneBot.Core.Entity.Message;
-using Lagrange.OneBot.Core.Message.Entity;
 using Lagrange.OneBot.Core.Network;
 using Lagrange.OneBot.Database;
+using Lagrange.OneBot.Message.Entity;
 using LiteDB;
 using Microsoft.Extensions.Configuration;
+using JsonSerializer = System.Text.Json.JsonSerializer;
 
-namespace Lagrange.OneBot.Core.Message;
+namespace Lagrange.OneBot.Message;
 
 /// <summary>
 /// The class that converts the OneBot message to/from MessageEntity of Lagrange.Core

diff --git a/Lagrange.OneBot/Core/Message/SegmentBase.cs → Lagrange.OneBot/Message/SegmentBase.cs b/Lagrange.OneBot/Core/Message/SegmentBase.cs → Lagrange.OneBot/Message/SegmentBase.cs
@@ -1,7 +1,7 @@
 using Lagrange.Core.Message;
 using LiteDB;
 
-namespace Lagrange.OneBot.Core.Message;
+namespace Lagrange.OneBot.Message;
 
 public abstract class SegmentBase
 {

diff --git a/...ore/Message/SegmentSubscriberAttribute.cs → ...Bot/Message/SegmentSubscriberAttribute.cs b/...ore/Message/SegmentSubscriberAttribute.cs → ...Bot/Message/SegmentSubscriberAttribute.cs
@@ -1,4 +1,4 @@
-namespace Lagrange.OneBot.Core.Message;
+namespace Lagrange.OneBot.Message;
 
 [AttributeUsage(AttributeTargets.Class)]
 public class SegmentSubscriberAttribute(Type entity, string type, string? sendType = null) : Attribute