From b1fae4bdeb67fdd92a3a396f0c7d3349968ef0f4 Mon Sep 17 00:00:00 2001 From: flashwave Date: Fri, 10 May 2024 15:24:43 +0000 Subject: [PATCH] Simplified Pack method return type. --- SharpChat/ChatConnection.cs | 10 +++------- SharpChat/IServerPacket.cs | 8 +++----- SharpChat/Packet/AuthFailPacket.cs | 5 ++--- SharpChat/Packet/AuthSuccessPacket.cs | 5 ++--- SharpChat/Packet/BanListPacket.cs | 4 ++-- SharpChat/Packet/ChannelCreatePacket.cs | 7 +++---- SharpChat/Packet/ChannelDeletePacket.cs | 5 ++--- SharpChat/Packet/ChannelUpdatePacket.cs | 7 +++---- SharpChat/Packet/ChatMessageAddPacket.cs | 5 ++--- SharpChat/Packet/ChatMessageDeletePacket.cs | 7 +++---- SharpChat/Packet/ContextChannelsPacket.cs | 4 ++-- SharpChat/Packet/ContextClearPacket.cs | 7 +++---- SharpChat/Packet/ContextMessagePacket.cs | 8 +++----- SharpChat/Packet/ContextUsersPacket.cs | 4 ++-- SharpChat/Packet/ForceDisconnectPacket.cs | 5 ++--- SharpChat/Packet/LegacyCommandResponse.cs | 4 ++-- SharpChat/Packet/PongPacket.cs | 5 ++--- SharpChat/Packet/UserChannelForceJoinPacket.cs | 5 ++--- SharpChat/Packet/UserChannelJoinPacket.cs | 5 ++--- SharpChat/Packet/UserChannelLeavePacket.cs | 5 ++--- SharpChat/Packet/UserConnectPacket.cs | 5 ++--- SharpChat/Packet/UserDisconnectPacket.cs | 5 ++--- SharpChat/Packet/UserUpdateNotificationPacket.cs | 5 ++--- SharpChat/Packet/UserUpdatePacket.cs | 5 ++--- 24 files changed, 55 insertions(+), 80 deletions(-) diff --git a/SharpChat/ChatConnection.cs b/SharpChat/ChatConnection.cs index 38f7e7d..7ea9e3f 100644 --- a/SharpChat/ChatConnection.cs +++ b/SharpChat/ChatConnection.cs @@ -1,6 +1,5 @@ using Fleck; using System; -using System.Collections.Generic; using System.Net; namespace SharpChat { @@ -49,12 +48,9 @@ namespace SharpChat { if(!Socket.IsAvailable) return; - IEnumerable data = packet.Pack(); - - if(data != null) - foreach(string line in data) - if(!string.IsNullOrWhiteSpace(line)) - Socket.Send(line); + string data = packet.Pack(); + if(!string.IsNullOrWhiteSpace(data)) + Socket.Send(data); } public void BumpPing() { diff --git a/SharpChat/IServerPacket.cs b/SharpChat/IServerPacket.cs index 67381bb..7b6518d 100644 --- a/SharpChat/IServerPacket.cs +++ b/SharpChat/IServerPacket.cs @@ -1,9 +1,7 @@ -using System.Collections.Generic; - -namespace SharpChat { +namespace SharpChat { public interface IServerPacket { long SequenceId { get; } - IEnumerable Pack(); + string Pack(); } public abstract class ServerPacket : IServerPacket { @@ -14,6 +12,6 @@ namespace SharpChat { SequenceId = sequenceId > 0 ? sequenceId : SharpId.Next(); } - public abstract IEnumerable Pack(); + public abstract string Pack(); } } diff --git a/SharpChat/Packet/AuthFailPacket.cs b/SharpChat/Packet/AuthFailPacket.cs index 8e5e0a9..531701c 100644 --- a/SharpChat/Packet/AuthFailPacket.cs +++ b/SharpChat/Packet/AuthFailPacket.cs @@ -1,6 +1,5 @@ using SharpChat.Misuzu; using System; -using System.Collections.Generic; using System.Text; namespace SharpChat.Packet { @@ -21,7 +20,7 @@ namespace SharpChat.Packet { BanInfo = fbi ?? throw new ArgumentNullException(nameof(fbi)); } - public override IEnumerable Pack() { + public override string Pack() { StringBuilder sb = new(); sb.Append('1'); @@ -49,7 +48,7 @@ namespace SharpChat.Packet { sb.Append(BanInfo.ExpiresAt.ToUnixTimeSeconds()); } - yield return sb.ToString(); + return sb.ToString(); } } } diff --git a/SharpChat/Packet/AuthSuccessPacket.cs b/SharpChat/Packet/AuthSuccessPacket.cs index e614f54..bb6ef9a 100644 --- a/SharpChat/Packet/AuthSuccessPacket.cs +++ b/SharpChat/Packet/AuthSuccessPacket.cs @@ -1,5 +1,4 @@ using System; -using System.Collections.Generic; using System.Text; namespace SharpChat.Packet { @@ -21,7 +20,7 @@ namespace SharpChat.Packet { MaxMessageLength = maxMsgLength; } - public override IEnumerable Pack() { + public override string Pack() { StringBuilder sb = new(); sb.Append('1'); @@ -32,7 +31,7 @@ namespace SharpChat.Packet { sb.Append('\t'); sb.Append(MaxMessageLength); - return new[] { sb.ToString() }; + return sb.ToString(); } } } diff --git a/SharpChat/Packet/BanListPacket.cs b/SharpChat/Packet/BanListPacket.cs index 03b2b2c..19d17c3 100644 --- a/SharpChat/Packet/BanListPacket.cs +++ b/SharpChat/Packet/BanListPacket.cs @@ -12,7 +12,7 @@ namespace SharpChat.Packet { Bans = bans ?? throw new ArgumentNullException(nameof(bans)); } - public override IEnumerable Pack() { + public override string Pack() { StringBuilder sb = new(); sb.Append('2'); @@ -32,7 +32,7 @@ namespace SharpChat.Packet { sb.Append(SequenceId); sb.Append("\t10010"); - return new[] { sb.ToString() }; + return sb.ToString(); } } } diff --git a/SharpChat/Packet/ChannelCreatePacket.cs b/SharpChat/Packet/ChannelCreatePacket.cs index 94db4e4..f1778b0 100644 --- a/SharpChat/Packet/ChannelCreatePacket.cs +++ b/SharpChat/Packet/ChannelCreatePacket.cs @@ -1,5 +1,4 @@ -using System.Collections.Generic; -using System.Text; +using System.Text; namespace SharpChat.Packet { public class ChannelCreatePacket : ServerPacket { @@ -9,7 +8,7 @@ namespace SharpChat.Packet { Channel = channel; } - public override IEnumerable Pack() { + public override string Pack() { StringBuilder sb = new(); sb.Append('4'); @@ -18,7 +17,7 @@ namespace SharpChat.Packet { sb.Append('\t'); sb.Append(Channel.Pack()); - yield return sb.ToString(); + return sb.ToString(); } } } diff --git a/SharpChat/Packet/ChannelDeletePacket.cs b/SharpChat/Packet/ChannelDeletePacket.cs index 7b1e453..e825715 100644 --- a/SharpChat/Packet/ChannelDeletePacket.cs +++ b/SharpChat/Packet/ChannelDeletePacket.cs @@ -1,5 +1,4 @@ using System; -using System.Collections.Generic; using System.Text; namespace SharpChat.Packet { @@ -10,7 +9,7 @@ namespace SharpChat.Packet { Channel = channel ?? throw new ArgumentNullException(nameof(channel)); } - public override IEnumerable Pack() { + public override string Pack() { StringBuilder sb = new(); sb.Append('4'); @@ -19,7 +18,7 @@ namespace SharpChat.Packet { sb.Append('\t'); sb.Append(Channel.Name); - yield return sb.ToString(); + return sb.ToString(); } } } diff --git a/SharpChat/Packet/ChannelUpdatePacket.cs b/SharpChat/Packet/ChannelUpdatePacket.cs index 6e35cc7..cc3f40e 100644 --- a/SharpChat/Packet/ChannelUpdatePacket.cs +++ b/SharpChat/Packet/ChannelUpdatePacket.cs @@ -1,5 +1,4 @@ -using System.Collections.Generic; -using System.Text; +using System.Text; namespace SharpChat.Packet { public class ChannelUpdatePacket : ServerPacket { @@ -11,7 +10,7 @@ namespace SharpChat.Packet { Channel = channel; } - public override IEnumerable Pack() { + public override string Pack() { StringBuilder sb = new(); sb.Append('4'); @@ -22,7 +21,7 @@ namespace SharpChat.Packet { sb.Append('\t'); sb.Append(Channel.Pack()); - yield return sb.ToString(); + return sb.ToString(); } } } diff --git a/SharpChat/Packet/ChatMessageAddPacket.cs b/SharpChat/Packet/ChatMessageAddPacket.cs index 39c7076..f912728 100644 --- a/SharpChat/Packet/ChatMessageAddPacket.cs +++ b/SharpChat/Packet/ChatMessageAddPacket.cs @@ -1,6 +1,5 @@ using SharpChat.EventStorage; using System; -using System.Collections.Generic; using System.Text; namespace SharpChat.Packet { @@ -42,7 +41,7 @@ namespace SharpChat.Packet { ); } - public override IEnumerable Pack() { + public override string Pack() { StringBuilder sb = new(); sb.Append('2'); @@ -76,7 +75,7 @@ namespace SharpChat.Packet { IsPrivate ? '1' : '0' ); - yield return sb.ToString(); + return sb.ToString(); } } } diff --git a/SharpChat/Packet/ChatMessageDeletePacket.cs b/SharpChat/Packet/ChatMessageDeletePacket.cs index 59f741c..ee046b1 100644 --- a/SharpChat/Packet/ChatMessageDeletePacket.cs +++ b/SharpChat/Packet/ChatMessageDeletePacket.cs @@ -1,5 +1,4 @@ -using System.Collections.Generic; -using System.Text; +using System.Text; namespace SharpChat.Packet { public class ChatMessageDeletePacket : ServerPacket { @@ -9,14 +8,14 @@ namespace SharpChat.Packet { EventId = eventId; } - public override IEnumerable Pack() { + public override string Pack() { StringBuilder sb = new(); sb.Append('6'); sb.Append('\t'); sb.Append(EventId); - yield return sb.ToString(); + return sb.ToString(); } } } diff --git a/SharpChat/Packet/ContextChannelsPacket.cs b/SharpChat/Packet/ContextChannelsPacket.cs index 089dee5..3014191 100644 --- a/SharpChat/Packet/ContextChannelsPacket.cs +++ b/SharpChat/Packet/ContextChannelsPacket.cs @@ -11,7 +11,7 @@ namespace SharpChat.Packet { Channels = channels?.Where(c => c != null) ?? throw new ArgumentNullException(nameof(channels)); } - public override IEnumerable Pack() { + public override string Pack() { StringBuilder sb = new(); sb.Append('7'); @@ -25,7 +25,7 @@ namespace SharpChat.Packet { sb.Append(channel.Pack()); } - yield return sb.ToString(); + return sb.ToString(); } } } diff --git a/SharpChat/Packet/ContextClearPacket.cs b/SharpChat/Packet/ContextClearPacket.cs index e4679e6..6bc268d 100644 --- a/SharpChat/Packet/ContextClearPacket.cs +++ b/SharpChat/Packet/ContextClearPacket.cs @@ -1,5 +1,4 @@ -using System.Collections.Generic; -using System.Text; +using System.Text; namespace SharpChat.Packet { public enum ContextClearMode { @@ -22,14 +21,14 @@ namespace SharpChat.Packet { Mode = mode; } - public override IEnumerable Pack() { + public override string Pack() { StringBuilder sb = new(); sb.Append('8'); sb.Append('\t'); sb.Append((int)Mode); - yield return sb.ToString(); + return sb.ToString(); } } } diff --git a/SharpChat/Packet/ContextMessagePacket.cs b/SharpChat/Packet/ContextMessagePacket.cs index cf67340..44db9f7 100644 --- a/SharpChat/Packet/ContextMessagePacket.cs +++ b/SharpChat/Packet/ContextMessagePacket.cs @@ -1,10 +1,8 @@ using SharpChat.EventStorage; using System; -using System.Collections.Generic; using System.Text; -namespace SharpChat.Packet -{ +namespace SharpChat.Packet { public class ContextMessagePacket : ServerPacket { public StoredEventInfo Event { get; private set; } public bool Notify { get; private set; } @@ -16,7 +14,7 @@ namespace SharpChat.Packet private const string V1_CHATBOT = "-1\tChatBot\tinherit\t\t"; - public override IEnumerable Pack() { + public override string Pack() { bool isAction = Event.Flags.HasFlag(StoredEventFlags.Action); bool isBroadcast = Event.Flags.HasFlag(StoredEventFlags.Broadcast); bool isPrivate = Event.Flags.HasFlag(StoredEventFlags.Private); @@ -114,7 +112,7 @@ namespace SharpChat.Packet isPrivate ? '1' : '0' ); - yield return sb.ToString(); + return sb.ToString(); } } } diff --git a/SharpChat/Packet/ContextUsersPacket.cs b/SharpChat/Packet/ContextUsersPacket.cs index ce4428f..545a49e 100644 --- a/SharpChat/Packet/ContextUsersPacket.cs +++ b/SharpChat/Packet/ContextUsersPacket.cs @@ -11,7 +11,7 @@ namespace SharpChat.Packet { Users = users?.Where(u => u != null) ?? throw new ArgumentNullException(nameof(users)); } - public override IEnumerable Pack() { + public override string Pack() { StringBuilder sb = new(); sb.Append('7'); @@ -27,7 +27,7 @@ namespace SharpChat.Packet { sb.Append('1'); // visibility flag } - yield return sb.ToString(); + return sb.ToString(); } } } diff --git a/SharpChat/Packet/ForceDisconnectPacket.cs b/SharpChat/Packet/ForceDisconnectPacket.cs index 96f06c6..fcf4db7 100644 --- a/SharpChat/Packet/ForceDisconnectPacket.cs +++ b/SharpChat/Packet/ForceDisconnectPacket.cs @@ -1,5 +1,4 @@ using System; -using System.Collections.Generic; using System.Text; namespace SharpChat.Packet { @@ -22,7 +21,7 @@ namespace SharpChat.Packet { } } - public override IEnumerable Pack() { + public override string Pack() { StringBuilder sb = new(); sb.Append('9'); @@ -37,7 +36,7 @@ namespace SharpChat.Packet { sb.Append(Expires.ToUnixTimeSeconds()); } - yield return sb.ToString(); + return sb.ToString(); } } } diff --git a/SharpChat/Packet/LegacyCommandResponse.cs b/SharpChat/Packet/LegacyCommandResponse.cs index eaf14e8..33c41c4 100644 --- a/SharpChat/Packet/LegacyCommandResponse.cs +++ b/SharpChat/Packet/LegacyCommandResponse.cs @@ -19,7 +19,7 @@ namespace SharpChat.Packet { Arguments = args; } - public override IEnumerable Pack() { + public override string Pack() { StringBuilder sb = new(); if(StringId == LCR.WELCOME) { @@ -62,7 +62,7 @@ namespace SharpChat.Packet { Flags.HasFlag(ChatMessageFlags.Private) ? '1' : '0' );*/ - yield return sb.ToString(); + return sb.ToString(); } } diff --git a/SharpChat/Packet/PongPacket.cs b/SharpChat/Packet/PongPacket.cs index 062ab79..36d3491 100644 --- a/SharpChat/Packet/PongPacket.cs +++ b/SharpChat/Packet/PongPacket.cs @@ -1,5 +1,4 @@ using System; -using System.Collections.Generic; using System.Text; namespace SharpChat.Packet { @@ -10,14 +9,14 @@ namespace SharpChat.Packet { PongTime = dto; } - public override IEnumerable Pack() { + public override string Pack() { StringBuilder sb = new(); sb.Append('0'); sb.Append('\t'); sb.Append(PongTime.ToUnixTimeSeconds()); - yield return sb.ToString(); + return sb.ToString(); } } } diff --git a/SharpChat/Packet/UserChannelForceJoinPacket.cs b/SharpChat/Packet/UserChannelForceJoinPacket.cs index 9e7c882..a1da078 100644 --- a/SharpChat/Packet/UserChannelForceJoinPacket.cs +++ b/SharpChat/Packet/UserChannelForceJoinPacket.cs @@ -1,5 +1,4 @@ using System; -using System.Collections.Generic; using System.Text; namespace SharpChat.Packet { @@ -10,7 +9,7 @@ namespace SharpChat.Packet { Channel = channel ?? throw new ArgumentNullException(nameof(channel)); } - public override IEnumerable Pack() { + public override string Pack() { StringBuilder sb = new(); sb.Append('5'); @@ -19,7 +18,7 @@ namespace SharpChat.Packet { sb.Append('\t'); sb.Append(Channel.Name); - yield return sb.ToString(); + return sb.ToString(); } } } diff --git a/SharpChat/Packet/UserChannelJoinPacket.cs b/SharpChat/Packet/UserChannelJoinPacket.cs index b931273..04a052c 100644 --- a/SharpChat/Packet/UserChannelJoinPacket.cs +++ b/SharpChat/Packet/UserChannelJoinPacket.cs @@ -1,5 +1,4 @@ using System; -using System.Collections.Generic; using System.Text; namespace SharpChat.Packet { @@ -10,7 +9,7 @@ namespace SharpChat.Packet { User = user ?? throw new ArgumentNullException(nameof(user)); } - public override IEnumerable Pack() { + public override string Pack() { StringBuilder sb = new(); sb.Append('5'); @@ -21,7 +20,7 @@ namespace SharpChat.Packet { sb.Append('\t'); sb.Append(SequenceId); - return new[] { sb.ToString() }; + return sb.ToString(); } } } diff --git a/SharpChat/Packet/UserChannelLeavePacket.cs b/SharpChat/Packet/UserChannelLeavePacket.cs index b8607f7..1300a78 100644 --- a/SharpChat/Packet/UserChannelLeavePacket.cs +++ b/SharpChat/Packet/UserChannelLeavePacket.cs @@ -1,5 +1,4 @@ using System; -using System.Collections.Generic; using System.Text; namespace SharpChat.Packet { @@ -10,7 +9,7 @@ namespace SharpChat.Packet { User = user ?? throw new ArgumentNullException(nameof(user)); } - public override IEnumerable Pack() { + public override string Pack() { StringBuilder sb = new(); sb.Append('5'); @@ -21,7 +20,7 @@ namespace SharpChat.Packet { sb.Append('\t'); sb.Append(SequenceId); - yield return sb.ToString(); + return sb.ToString(); } } } diff --git a/SharpChat/Packet/UserConnectPacket.cs b/SharpChat/Packet/UserConnectPacket.cs index 263c918..7267407 100644 --- a/SharpChat/Packet/UserConnectPacket.cs +++ b/SharpChat/Packet/UserConnectPacket.cs @@ -1,5 +1,4 @@ using System; -using System.Collections.Generic; using System.Text; namespace SharpChat.Packet { @@ -12,7 +11,7 @@ namespace SharpChat.Packet { User = user ?? throw new ArgumentNullException(nameof(user)); } - public override IEnumerable Pack() { + public override string Pack() { StringBuilder sb = new(); sb.Append('1'); @@ -23,7 +22,7 @@ namespace SharpChat.Packet { sb.Append('\t'); sb.Append(SequenceId); - yield return sb.ToString(); + return sb.ToString(); } } } diff --git a/SharpChat/Packet/UserDisconnectPacket.cs b/SharpChat/Packet/UserDisconnectPacket.cs index 9d9840c..6fb571c 100644 --- a/SharpChat/Packet/UserDisconnectPacket.cs +++ b/SharpChat/Packet/UserDisconnectPacket.cs @@ -1,5 +1,4 @@ using System; -using System.Collections.Generic; using System.Text; namespace SharpChat.Packet { @@ -21,7 +20,7 @@ namespace SharpChat.Packet { Reason = reason; } - public override IEnumerable Pack() { + public override string Pack() { StringBuilder sb = new(); sb.Append('3'); @@ -52,7 +51,7 @@ namespace SharpChat.Packet { sb.Append('\t'); sb.Append(SequenceId); - return new[] { sb.ToString() }; + return sb.ToString(); } } } diff --git a/SharpChat/Packet/UserUpdateNotificationPacket.cs b/SharpChat/Packet/UserUpdateNotificationPacket.cs index cb74838..147bf34 100644 --- a/SharpChat/Packet/UserUpdateNotificationPacket.cs +++ b/SharpChat/Packet/UserUpdateNotificationPacket.cs @@ -1,5 +1,4 @@ using System; -using System.Collections.Generic; using System.Text; namespace SharpChat.Packet { @@ -14,7 +13,7 @@ namespace SharpChat.Packet { Timestamp = DateTimeOffset.Now; } - public override IEnumerable Pack() { + public override string Pack() { StringBuilder sb = new(); sb.Append('2'); @@ -28,7 +27,7 @@ namespace SharpChat.Packet { sb.Append(SequenceId); sb.Append("\t10010"); - yield return sb.ToString(); + return sb.ToString(); } } } diff --git a/SharpChat/Packet/UserUpdatePacket.cs b/SharpChat/Packet/UserUpdatePacket.cs index b172b01..d2686b8 100644 --- a/SharpChat/Packet/UserUpdatePacket.cs +++ b/SharpChat/Packet/UserUpdatePacket.cs @@ -1,5 +1,4 @@ using System; -using System.Collections.Generic; using System.Text; namespace SharpChat.Packet { @@ -10,14 +9,14 @@ namespace SharpChat.Packet { User = user ?? throw new ArgumentNullException(nameof(user)); } - public override IEnumerable Pack() { + public override string Pack() { StringBuilder sb = new(); sb.Append("10"); sb.Append('\t'); sb.Append(User.Pack()); - yield return sb.ToString(); + return sb.ToString(); } } }