Removed AddEvent aliases.
This commit is contained in:
parent
968df2b161
commit
4ace355374
|
@ -254,7 +254,19 @@ namespace SharpChat {
|
||||||
user.Rank,
|
user.Rank,
|
||||||
user.Permissions
|
user.Permissions
|
||||||
));
|
));
|
||||||
Events.AddEvent("user:connect", user, chan, flags: StoredEventFlags.Log);
|
Events.AddEvent(
|
||||||
|
SharpId.Next(),
|
||||||
|
"user:connect",
|
||||||
|
chan.Name,
|
||||||
|
user.UserId,
|
||||||
|
user.UserName,
|
||||||
|
user.Colour,
|
||||||
|
user.Rank,
|
||||||
|
user.NickName,
|
||||||
|
user.Permissions,
|
||||||
|
null,
|
||||||
|
StoredEventFlags.Log
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
conn.Send(new AuthSuccessS2CPacket(
|
conn.Send(new AuthSuccessS2CPacket(
|
||||||
|
@ -302,7 +314,19 @@ namespace SharpChat {
|
||||||
SockChatUtility.GetUserNameWithStatus(user),
|
SockChatUtility.GetUserNameWithStatus(user),
|
||||||
reason
|
reason
|
||||||
));
|
));
|
||||||
Events.AddEvent("user:disconnect", user, chan, new { reason = (int)reason }, StoredEventFlags.Log);
|
Events.AddEvent(
|
||||||
|
SharpId.Next(),
|
||||||
|
"user:disconnect",
|
||||||
|
chan.Name,
|
||||||
|
user.UserId,
|
||||||
|
user.UserName,
|
||||||
|
user.Colour,
|
||||||
|
user.Rank,
|
||||||
|
user.NickName,
|
||||||
|
user.Permissions,
|
||||||
|
new { reason = (int)reason },
|
||||||
|
StoredEventFlags.Log
|
||||||
|
);
|
||||||
|
|
||||||
if(chan.IsTemporary && chan.IsOwner(user))
|
if(chan.IsTemporary && chan.IsOwner(user))
|
||||||
RemoveChannel(chan);
|
RemoveChannel(chan);
|
||||||
|
@ -337,7 +361,19 @@ namespace SharpChat {
|
||||||
|
|
||||||
if(oldChan != null) {
|
if(oldChan != null) {
|
||||||
SendTo(oldChan, new UserChannelLeaveS2CPacket(user.UserId));
|
SendTo(oldChan, new UserChannelLeaveS2CPacket(user.UserId));
|
||||||
Events.AddEvent("chan:leave", user, oldChan, flags: StoredEventFlags.Log);
|
Events.AddEvent(
|
||||||
|
SharpId.Next(),
|
||||||
|
"chan:leave",
|
||||||
|
oldChan.Name,
|
||||||
|
user.UserId,
|
||||||
|
user.UserName,
|
||||||
|
user.Colour,
|
||||||
|
user.Rank,
|
||||||
|
user.NickName,
|
||||||
|
user.Permissions,
|
||||||
|
null,
|
||||||
|
StoredEventFlags.Log
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
SendTo(chan, new UserChannelJoinS2CPacket(
|
SendTo(chan, new UserChannelJoinS2CPacket(
|
||||||
|
@ -349,7 +385,19 @@ namespace SharpChat {
|
||||||
));
|
));
|
||||||
|
|
||||||
if(oldChan != null)
|
if(oldChan != null)
|
||||||
Events.AddEvent("chan:join", user, oldChan, flags: StoredEventFlags.Log);
|
Events.AddEvent(
|
||||||
|
SharpId.Next(),
|
||||||
|
"chan:join",
|
||||||
|
oldChan.Name,
|
||||||
|
user.UserId,
|
||||||
|
user.UserName,
|
||||||
|
user.Colour,
|
||||||
|
user.Rank,
|
||||||
|
user.NickName,
|
||||||
|
user.Permissions,
|
||||||
|
null,
|
||||||
|
StoredEventFlags.Log
|
||||||
|
);
|
||||||
|
|
||||||
SendTo(user, new ContextClearS2CPacket(ContextClearS2CPacket.ClearMode.MessagesUsers));
|
SendTo(user, new ContextClearS2CPacket(ContextClearS2CPacket.ClearMode.MessagesUsers));
|
||||||
SendTo(user, new UsersPopulateS2CPacket(GetChannelUsers(chan).Except(new[] { user }).Select(
|
SendTo(user, new UsersPopulateS2CPacket(GetChannelUsers(chan).Except(new[] { user }).Select(
|
||||||
|
|
|
@ -3,31 +3,19 @@
|
||||||
namespace SharpChat.EventStorage {
|
namespace SharpChat.EventStorage {
|
||||||
public interface IEventStorage {
|
public interface IEventStorage {
|
||||||
void AddEvent(
|
void AddEvent(
|
||||||
long id, string type,
|
long id,
|
||||||
object? data = null,
|
string type,
|
||||||
StoredEventFlags flags = StoredEventFlags.None
|
|
||||||
);
|
|
||||||
void AddEvent(
|
|
||||||
long id, string type,
|
|
||||||
string? channelName,
|
string? channelName,
|
||||||
object? data = null,
|
long senderId,
|
||||||
StoredEventFlags flags = StoredEventFlags.None
|
string? senderName,
|
||||||
);
|
Colour senderColour,
|
||||||
void AddEvent(
|
int senderRank,
|
||||||
long id, string type,
|
string? senderNick,
|
||||||
long senderId, string? senderName, Colour senderColour, int senderRank, string? senderNick, UserPermissions senderPerms,
|
UserPermissions senderPerms,
|
||||||
object? data = null,
|
|
||||||
StoredEventFlags flags = StoredEventFlags.None
|
|
||||||
);
|
|
||||||
void AddEvent(
|
|
||||||
long id, string type,
|
|
||||||
string? channelName,
|
|
||||||
long senderId, string? senderName, Colour senderColour, int senderRank, string? senderNick, UserPermissions senderPerms,
|
|
||||||
object? data = null,
|
object? data = null,
|
||||||
StoredEventFlags flags = StoredEventFlags.None
|
StoredEventFlags flags = StoredEventFlags.None
|
||||||
);
|
);
|
||||||
|
|
||||||
long AddEvent(string type, UserInfo user, ChannelInfo channel, object? data = null, StoredEventFlags flags = StoredEventFlags.None);
|
|
||||||
void RemoveEvent(StoredEventInfo evt);
|
void RemoveEvent(StoredEventInfo evt);
|
||||||
StoredEventInfo? GetEvent(long seqId);
|
StoredEventInfo? GetEvent(long seqId);
|
||||||
IEnumerable<StoredEventInfo> GetChannelEventLog(string channelName, int amount = 20, int offset = 0);
|
IEnumerable<StoredEventInfo> GetChannelEventLog(string channelName, int amount = 20, int offset = 0);
|
||||||
|
|
|
@ -13,35 +13,15 @@ namespace SharpChat.EventStorage {
|
||||||
}
|
}
|
||||||
|
|
||||||
public void AddEvent(
|
public void AddEvent(
|
||||||
long id, string type,
|
long id,
|
||||||
object? data = null,
|
string type,
|
||||||
StoredEventFlags flags = StoredEventFlags.None
|
|
||||||
) {
|
|
||||||
AddEvent(id, type, null, 0, null, Colour.None, 0, null, 0, data, flags);
|
|
||||||
}
|
|
||||||
|
|
||||||
public void AddEvent(
|
|
||||||
long id, string type,
|
|
||||||
string? channelName,
|
string? channelName,
|
||||||
object? data = null,
|
long senderId,
|
||||||
StoredEventFlags flags = StoredEventFlags.None
|
string? senderName,
|
||||||
) {
|
Colour senderColour,
|
||||||
AddEvent(id, type, channelName, 0, null, Colour.None, 0, null, 0, data, flags);
|
int senderRank,
|
||||||
}
|
string? senderNick,
|
||||||
|
UserPermissions senderPerms,
|
||||||
public void AddEvent(
|
|
||||||
long id, string type,
|
|
||||||
long senderId, string? senderName, Colour senderColour, int senderRank, string? senderNick, UserPermissions senderPerms,
|
|
||||||
object? data = null,
|
|
||||||
StoredEventFlags flags = StoredEventFlags.None
|
|
||||||
) {
|
|
||||||
AddEvent(id, type, null, senderId, senderName, senderColour, senderRank, senderNick, senderPerms, data, flags);
|
|
||||||
}
|
|
||||||
|
|
||||||
public void AddEvent(
|
|
||||||
long id, string type,
|
|
||||||
string? channelName,
|
|
||||||
long senderId, string? senderName, Colour senderColour, int senderRank, string? senderNick, UserPermissions senderPerms,
|
|
||||||
object? data = null,
|
object? data = null,
|
||||||
StoredEventFlags flags = StoredEventFlags.None
|
StoredEventFlags flags = StoredEventFlags.None
|
||||||
) {
|
) {
|
||||||
|
@ -64,25 +44,6 @@ namespace SharpChat.EventStorage {
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
public long AddEvent(string type, UserInfo user, ChannelInfo channel, object? data = null, StoredEventFlags flags = StoredEventFlags.None) {
|
|
||||||
long id = SharpId.Next();
|
|
||||||
|
|
||||||
AddEvent(
|
|
||||||
id, type,
|
|
||||||
channel?.Name,
|
|
||||||
user?.UserId ?? 0,
|
|
||||||
user?.UserName ?? string.Empty,
|
|
||||||
user?.Colour ?? Colour.None,
|
|
||||||
user?.Rank ?? 0,
|
|
||||||
user?.NickName,
|
|
||||||
user?.Permissions ?? 0,
|
|
||||||
data,
|
|
||||||
flags
|
|
||||||
);
|
|
||||||
|
|
||||||
return id;
|
|
||||||
}
|
|
||||||
|
|
||||||
public StoredEventInfo? GetEvent(long seqId) {
|
public StoredEventInfo? GetEvent(long seqId) {
|
||||||
try {
|
try {
|
||||||
using MySqlDataReader? reader = RunQuery(
|
using MySqlDataReader? reader = RunQuery(
|
||||||
|
|
|
@ -8,35 +8,15 @@ namespace SharpChat.EventStorage {
|
||||||
private readonly Dictionary<long, StoredEventInfo> Events = new();
|
private readonly Dictionary<long, StoredEventInfo> Events = new();
|
||||||
|
|
||||||
public void AddEvent(
|
public void AddEvent(
|
||||||
long id, string type,
|
long id,
|
||||||
object? data = null,
|
string type,
|
||||||
StoredEventFlags flags = StoredEventFlags.None
|
|
||||||
) {
|
|
||||||
AddEvent(id, type, null, 0, null, Colour.None, 0, null, 0, data, flags);
|
|
||||||
}
|
|
||||||
|
|
||||||
public void AddEvent(
|
|
||||||
long id, string type,
|
|
||||||
string? channelName,
|
string? channelName,
|
||||||
object? data = null,
|
long senderId,
|
||||||
StoredEventFlags flags = StoredEventFlags.None
|
string? senderName,
|
||||||
) {
|
Colour senderColour,
|
||||||
AddEvent(id, type, channelName, 0, null, Colour.None, 0, null, 0, data, flags);
|
int senderRank,
|
||||||
}
|
string? senderNick,
|
||||||
|
UserPermissions senderPerms,
|
||||||
public void AddEvent(
|
|
||||||
long id, string type,
|
|
||||||
long senderId, string? senderName, Colour senderColour, int senderRank, string? senderNick, UserPermissions senderPerms,
|
|
||||||
object? data = null,
|
|
||||||
StoredEventFlags flags = StoredEventFlags.None
|
|
||||||
) {
|
|
||||||
AddEvent(id, type, null, senderId, senderName, senderColour, senderRank, senderNick, senderPerms, data, flags);
|
|
||||||
}
|
|
||||||
|
|
||||||
public void AddEvent(
|
|
||||||
long id, string type,
|
|
||||||
string? channelName,
|
|
||||||
long senderId, string? senderName, Colour senderColour, int senderRank, string? senderNick, UserPermissions senderPerms,
|
|
||||||
object? data = null,
|
object? data = null,
|
||||||
StoredEventFlags flags = StoredEventFlags.None
|
StoredEventFlags flags = StoredEventFlags.None
|
||||||
) {
|
) {
|
||||||
|
@ -52,25 +32,6 @@ namespace SharpChat.EventStorage {
|
||||||
), DateTimeOffset.Now, null, channelName, hack, flags));
|
), DateTimeOffset.Now, null, channelName, hack, flags));
|
||||||
}
|
}
|
||||||
|
|
||||||
public long AddEvent(string type, UserInfo user, ChannelInfo channel, object? data = null, StoredEventFlags flags = StoredEventFlags.None) {
|
|
||||||
long id = SharpId.Next();
|
|
||||||
|
|
||||||
AddEvent(
|
|
||||||
id, type,
|
|
||||||
channel?.Name,
|
|
||||||
user?.UserId ?? 0,
|
|
||||||
user?.UserName,
|
|
||||||
user?.Colour ?? Colour.None,
|
|
||||||
user?.Rank ?? 0,
|
|
||||||
user?.NickName,
|
|
||||||
user?.Permissions ?? 0,
|
|
||||||
data,
|
|
||||||
flags
|
|
||||||
);
|
|
||||||
|
|
||||||
return id;
|
|
||||||
}
|
|
||||||
|
|
||||||
public StoredEventInfo? GetEvent(long seqId) {
|
public StoredEventInfo? GetEvent(long seqId) {
|
||||||
return Events.TryGetValue(seqId, out StoredEventInfo? evt) ? evt : null;
|
return Events.TryGetValue(seqId, out StoredEventInfo? evt) ? evt : null;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue