Minor global context cleanup.
This commit is contained in:
parent
80475a9180
commit
bd86c610a3
3 changed files with 53 additions and 50 deletions
SharpChat/C2SPacketHandlers
|
@ -2,6 +2,8 @@ using SharpChat.Auth;
|
|||
using SharpChat.Bans;
|
||||
using SharpChat.Channels;
|
||||
using SharpChat.Configuration;
|
||||
using SharpChat.Messages;
|
||||
using SharpChat.Snowflake;
|
||||
using SharpChat.SockChat.S2CPackets;
|
||||
|
||||
namespace SharpChat.C2SPacketHandlers;
|
||||
|
@ -10,6 +12,7 @@ public class AuthC2SPacketHandler(
|
|||
AuthClient authClient,
|
||||
BansClient bansClient,
|
||||
ChannelsContext channelsCtx,
|
||||
RandomSnowflake snowflake,
|
||||
CachedValue<int> maxMsgLength,
|
||||
CachedValue<int> maxConns
|
||||
) : C2SPacketHandler {
|
||||
|
@ -90,7 +93,48 @@ public class AuthC2SPacketHandler(
|
|||
await ctx.Connection.Send(new CommandResponseS2CPacket(0, LCR.WELCOME, false, line));
|
||||
}
|
||||
|
||||
await ctx.Chat.HandleJoin(user, channelsCtx.DefaultChannel, ctx.Connection, maxMsgLength);
|
||||
Channel channel = channelsCtx.DefaultChannel;
|
||||
|
||||
if(!ctx.Chat.IsInChannel(user, channel)) {
|
||||
long msgId = snowflake.Next();
|
||||
await ctx.Chat.SendTo(channel, new UserConnectS2CPacket(msgId, DateTimeOffset.Now, user.UserId, user.LegacyNameWithStatus, user.Colour, user.Rank, user.Permissions));
|
||||
await ctx.Chat.Messages.LogMessage(msgId, "user:connect", channel.Name, user.UserId, user.UserName, user.Colour, user.Rank, user.NickName, user.Permissions, null, MessageFlags.Log);
|
||||
}
|
||||
|
||||
await ctx.Connection.Send(new AuthSuccessS2CPacket(
|
||||
user.UserId,
|
||||
user.LegacyNameWithStatus,
|
||||
user.Colour,
|
||||
user.Rank,
|
||||
user.Permissions,
|
||||
channel.Name,
|
||||
maxMsgLength
|
||||
));
|
||||
await ctx.Connection.Send(new ContextUsersS2CPacket(
|
||||
ctx.Chat.GetChannelUsers(channel).Except([user]).OrderByDescending(u => u.Rank)
|
||||
.Select(u => new ContextUsersS2CPacket.Entry(
|
||||
u.UserId,
|
||||
u.LegacyNameWithStatus,
|
||||
u.Colour,
|
||||
u.Rank,
|
||||
u.Permissions,
|
||||
true
|
||||
))
|
||||
));
|
||||
|
||||
IEnumerable<Message> msgs = await ctx.Chat.Messages.GetMessages(channel.Name);
|
||||
foreach(Message msg in msgs)
|
||||
await ctx.Connection.Send(new ContextMessageS2CPacket(msg));
|
||||
|
||||
await ctx.Connection.Send(new ContextChannelsS2CPacket(
|
||||
ctx.Chat.Channels.GetChannels(user.Rank)
|
||||
.Select(c => new ContextChannelsS2CPacket.Entry(c.Name, c.HasPassword, c.IsTemporary))
|
||||
));
|
||||
|
||||
ctx.Chat.Users.Add(user);
|
||||
|
||||
ctx.Chat.ChannelUsers.Add(new Context.ChannelUserAssoc(user.UserId, channel.Name));
|
||||
ctx.Chat.UserLastChannel[user.UserId] = channel;
|
||||
} finally {
|
||||
ctx.Chat.ContextAccess.Release();
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue