flashii/sharp-chat
3
0
Fork 0
Code Issues Pull requests Releases Activity

Removed all Async suffixes within my jurisdiction.

Browse source
This commit is contained in:
flash 2025-04-27 00:33:59 +00:00
parent 0a7e01f154
commit b4aa5873c3
Signed by: flash
GPG key ID: 2C9C2C574D47FE3E
11 changed files with 27 additions and 27 deletions

12
SharpChat.Flashii/FlashiiClient.cs
View file

@ -27,7 +27,7 @@ public class FlashiiClient(HttpClient httpClient, Config config) : AuthClient, B
private const string AUTH_VERIFY_URL = "{0}/verify"; private const string AUTH_VERIFY_URL = "{0}/verify";
private const string AUTH_VERIFY_SIG = "verify#{0}#{1}#{2}"; private const string AUTH_VERIFY_SIG = "verify#{0}#{1}#{2}";
public async Task<AuthResult> AuthVerifyAsync(IPAddress remoteAddr, string scheme, string token) { public async Task<AuthResult> AuthVerify(IPAddress remoteAddr, string scheme, string token) {
string remoteAddrStr = remoteAddr.ToString(); string remoteAddrStr = remoteAddr.ToString();
HttpRequestMessage request = new(HttpMethod.Post, string.Format(AUTH_VERIFY_URL, BaseURL)) { HttpRequestMessage request = new(HttpMethod.Post, string.Format(AUTH_VERIFY_URL, BaseURL)) {
@ -54,7 +54,7 @@ public class FlashiiClient(HttpClient httpClient, Config config) : AuthClient, B
private const string AUTH_BUMP_USERS_ONLINE_URL = "{0}/bump"; private const string AUTH_BUMP_USERS_ONLINE_URL = "{0}/bump";
public async Task AuthBumpUsersOnlineAsync(IEnumerable<(IPAddress remoteAddr, string userId)> entries) { public async Task AuthBumpUsersOnline(IEnumerable<(IPAddress remoteAddr, string userId)> entries) {
if(!entries.Any()) if(!entries.Any())
return; return;
@ -86,7 +86,7 @@ public class FlashiiClient(HttpClient httpClient, Config config) : AuthClient, B
private const string BANS_CREATE_URL = "{0}/bans/create"; private const string BANS_CREATE_URL = "{0}/bans/create";
private const string BANS_CREATE_SIG = "create#{0}#{1}#{2}#{3}#{4}#{5}#{6}#{7}"; private const string BANS_CREATE_SIG = "create#{0}#{1}#{2}#{3}#{4}#{5}#{6}#{7}";
public async Task BanCreateAsync( public async Task BanCreate(
BanKind kind, BanKind kind,
TimeSpan duration, TimeSpan duration,
IPAddress remoteAddr, IPAddress remoteAddr,
@ -140,7 +140,7 @@ public class FlashiiClient(HttpClient httpClient, Config config) : AuthClient, B
private const string BANS_REVOKE_URL = "{0}/bans/revoke?t={1}&s={2}&x={3}"; private const string BANS_REVOKE_URL = "{0}/bans/revoke?t={1}&s={2}&x={3}";
private const string BANS_REVOKE_SIG = "revoke#{0}#{1}#{2}"; private const string BANS_REVOKE_SIG = "revoke#{0}#{1}#{2}";
public async Task<bool> BanRevokeAsync(BanInfo info) { public async Task<bool> BanRevoke(BanInfo info) {
string type; string type;
string target; string target;
@ -180,7 +180,7 @@ public class FlashiiClient(HttpClient httpClient, Config config) : AuthClient, B
private const string BANS_CHECK_URL = "{0}/bans/check?u={1}&a={2}&x={3}&n={4}"; private const string BANS_CHECK_URL = "{0}/bans/check?u={1}&a={2}&x={3}&n={4}";
private const string BANS_CHECK_SIG = "check#{0}#{1}#{2}#{3}"; private const string BANS_CHECK_SIG = "check#{0}#{1}#{2}#{3}";
public async Task<BanInfo?> BanGetAsync(string? userIdOrName = null, IPAddress? remoteAddr = null) { public async Task<BanInfo?> BanGet(string? userIdOrName = null, IPAddress? remoteAddr = null) {
userIdOrName ??= "0"; userIdOrName ??= "0";
remoteAddr ??= IPAddress.None; remoteAddr ??= IPAddress.None;
@ -213,7 +213,7 @@ public class FlashiiClient(HttpClient httpClient, Config config) : AuthClient, B
private const string BANS_LIST_URL = "{0}/bans/list?x={1}"; private const string BANS_LIST_URL = "{0}/bans/list?x={1}";
private const string BANS_LIST_SIG = "list#{0}"; private const string BANS_LIST_SIG = "list#{0}";
public async Task<BanInfo[]> BanGetListAsync() { public async Task<BanInfo[]> BanGetList() {
string now = DateTimeOffset.Now.ToUnixTimeSeconds().ToString(); string now = DateTimeOffset.Now.ToUnixTimeSeconds().ToString();
string url = string.Format(BANS_LIST_URL, BaseURL, Uri.EscapeDataString(now)); string url = string.Format(BANS_LIST_URL, BaseURL, Uri.EscapeDataString(now));
string sig = string.Format(BANS_LIST_SIG, now); string sig = string.Format(BANS_LIST_SIG, now);

4
SharpChat/C2SPacketHandlers/AuthC2SPacketHandler.cs
View file

@ -39,13 +39,13 @@ public class AuthC2SPacketHandler(
} }
try { try {
AuthResult authResult = await authClient.AuthVerifyAsync( AuthResult authResult = await authClient.AuthVerify(
ctx.Connection.RemoteAddress, ctx.Connection.RemoteAddress,
authMethod, authMethod,
authToken authToken
); );
BanInfo? banInfo = await bansClient.BanGetAsync(authResult.UserId, ctx.Connection.RemoteAddress); BanInfo? banInfo = await bansClient.BanGet(authResult.UserId, ctx.Connection.RemoteAddress);
if(banInfo is not null) { if(banInfo is not null) {
Logger.Write($"<{ctx.Connection.Id}> User is banned."); Logger.Write($"<{ctx.Connection.Id}> User is banned.");
await ctx.Connection.Send(new AuthFailS2CPacket(AuthFailS2CPacket.Reason.Banned, banInfo.IsPermanent ? DateTimeOffset.MaxValue : banInfo.ExpiresAt)); await ctx.Connection.Send(new AuthFailS2CPacket(AuthFailS2CPacket.Reason.Banned, banInfo.IsPermanent ? DateTimeOffset.MaxValue : banInfo.ExpiresAt));

2
SharpChat/C2SPacketHandlers/PingC2SPacketHandler.cs
View file

@ -29,7 +29,7 @@ public class PingC2SPacketHandler(AuthClient authClient) : C2SPacketHandler {
.Select(u => (ctx.Chat.GetRemoteAddresses(u).FirstOrDefault() ?? IPAddress.None, u.UserId))]; .Select(u => (ctx.Chat.GetRemoteAddresses(u).FirstOrDefault() ?? IPAddress.None, u.UserId))];
if(bumpList.Length > 0) if(bumpList.Length > 0)
await authClient.AuthBumpUsersOnlineAsync(bumpList); await authClient.AuthBumpUsersOnline(bumpList);
LastBump = DateTimeOffset.UtcNow; LastBump = DateTimeOffset.UtcNow;
} }

2
SharpChat/ClientCommands/BanListClientCommand.cs
View file

@ -18,7 +18,7 @@ public class BanListClientCommand(BansClient bansClient) : ClientCommand {
} }
try { try {
BanInfo[] banInfos = await bansClient.BanGetListAsync(); BanInfo[] banInfos = await bansClient.BanGetList();
await ctx.Chat.SendTo(ctx.User, new BanListS2CPacket( await ctx.Chat.SendTo(ctx.User, new BanListS2CPacket(
msgId, msgId,
banInfos.Select(bi => new BanListS2CPacket.Entry(bi.Kind, bi.ToString())) banInfos.Select(bi => new BanListS2CPacket.Entry(bi.Kind, bi.ToString()))

4
SharpChat/ClientCommands/KickBanClientCommand.cs
View file

@ -52,13 +52,13 @@ public class KickBanClientCommand(BansClient bansClient) : ClientCommand {
string banReason = string.Join(' ', ctx.Args.Skip(banReasonIndex)); string banReason = string.Join(' ', ctx.Args.Skip(banReasonIndex));
BanInfo? banInfo = await bansClient.BanGetAsync(banUser.UserId); BanInfo? banInfo = await bansClient.BanGet(banUser.UserId);
if(banInfo is not null) { if(banInfo is not null) {
await ctx.Chat.SendTo(ctx.User, new CommandResponseS2CPacket(msgId, LCR.KICK_NOT_ALLOWED, true, banUser.LegacyName)); await ctx.Chat.SendTo(ctx.User, new CommandResponseS2CPacket(msgId, LCR.KICK_NOT_ALLOWED, true, banUser.LegacyName));
return; return;
} }
await bansClient.BanCreateAsync( await bansClient.BanCreate(
BanKind.User, BanKind.User,
duration, duration,
ctx.Chat.GetRemoteAddresses(banUser).FirstOrDefault() ?? IPAddress.None, ctx.Chat.GetRemoteAddresses(banUser).FirstOrDefault() ?? IPAddress.None,

4
SharpChat/ClientCommands/PardonAddressClientCommand.cs
View file

@ -26,13 +26,13 @@ public class PardonAddressClientCommand(BansClient bansClient) : ClientCommand {
unbanAddrTarget = unbanAddr.ToString(); unbanAddrTarget = unbanAddr.ToString();
BanInfo? banInfo = await bansClient.BanGetAsync(remoteAddr: unbanAddr); BanInfo? banInfo = await bansClient.BanGet(remoteAddr: unbanAddr);
if(banInfo?.Kind != BanKind.IPAddress) { if(banInfo?.Kind != BanKind.IPAddress) {
await ctx.Chat.SendTo(ctx.User, new CommandResponseS2CPacket(msgId, LCR.USER_NOT_BANNED, true, unbanAddrTarget)); await ctx.Chat.SendTo(ctx.User, new CommandResponseS2CPacket(msgId, LCR.USER_NOT_BANNED, true, unbanAddrTarget));
return; return;
} }
if(await bansClient.BanRevokeAsync(banInfo)) if(await bansClient.BanRevoke(banInfo))
await ctx.Chat.SendTo(ctx.User, new CommandResponseS2CPacket(msgId, LCR.USER_UNBANNED, false, unbanAddrTarget)); await ctx.Chat.SendTo(ctx.User, new CommandResponseS2CPacket(msgId, LCR.USER_UNBANNED, false, unbanAddrTarget));
else else
await ctx.Chat.SendTo(ctx.User, new CommandResponseS2CPacket(msgId, LCR.USER_NOT_BANNED, true, unbanAddrTarget)); await ctx.Chat.SendTo(ctx.User, new CommandResponseS2CPacket(msgId, LCR.USER_NOT_BANNED, true, unbanAddrTarget));

4
SharpChat/ClientCommands/PardonUserClientCommand.cs
View file

@ -32,13 +32,13 @@ public class PardonUserClientCommand(BansClient bansClient) : ClientCommand {
unbanUserDisplay = unbanUser.UserName; unbanUserDisplay = unbanUser.UserName;
} }
BanInfo? banInfo = await bansClient.BanGetAsync(unbanUserTarget); BanInfo? banInfo = await bansClient.BanGet(unbanUserTarget);
if(banInfo?.Kind != BanKind.User) { if(banInfo?.Kind != BanKind.User) {
await ctx.Chat.SendTo(ctx.User, new CommandResponseS2CPacket(msgId, LCR.USER_NOT_BANNED, true, unbanUserDisplay)); await ctx.Chat.SendTo(ctx.User, new CommandResponseS2CPacket(msgId, LCR.USER_NOT_BANNED, true, unbanUserDisplay));
return; return;
} }
if(await bansClient.BanRevokeAsync(banInfo)) if(await bansClient.BanRevoke(banInfo))
await ctx.Chat.SendTo(ctx.User, new CommandResponseS2CPacket(msgId, LCR.USER_UNBANNED, false, unbanUserDisplay)); await ctx.Chat.SendTo(ctx.User, new CommandResponseS2CPacket(msgId, LCR.USER_UNBANNED, false, unbanUserDisplay));
else else
await ctx.Chat.SendTo(ctx.User, new CommandResponseS2CPacket(msgId, LCR.USER_NOT_BANNED, true, unbanUserDisplay)); await ctx.Chat.SendTo(ctx.User, new CommandResponseS2CPacket(msgId, LCR.USER_NOT_BANNED, true, unbanUserDisplay));

8
SharpChat/EventStorage/MariaDBEventStorage_Database.cs
View file

@ -29,7 +29,7 @@ public partial class MariaDBEventStorage {
}.ToString(); }.ToString();
} }
private async Task<MySqlConnection> GetConnectionAsync() { private async Task<MySqlConnection> GetConnection() {
MySqlConnection conn = new(ConnectionString); MySqlConnection conn = new(ConnectionString);
await conn.OpenAsync(); await conn.OpenAsync();
return conn; return conn;
@ -37,7 +37,7 @@ public partial class MariaDBEventStorage {
private async Task<int> RunCommand(string command, params MySqlParameter[] parameters) { private async Task<int> RunCommand(string command, params MySqlParameter[] parameters) {
try { try {
using MySqlConnection conn = await GetConnectionAsync(); using MySqlConnection conn = await GetConnection();
using MySqlCommand cmd = conn.CreateCommand(); using MySqlCommand cmd = conn.CreateCommand();
if(parameters?.Length > 0) if(parameters?.Length > 0)
cmd.Parameters.AddRange(parameters); cmd.Parameters.AddRange(parameters);
@ -52,7 +52,7 @@ public partial class MariaDBEventStorage {
private async Task<MySqlDataReader?> RunQuery(string command, params MySqlParameter[] parameters) { private async Task<MySqlDataReader?> RunQuery(string command, params MySqlParameter[] parameters) {
try { try {
MySqlConnection conn = await GetConnectionAsync(); MySqlConnection conn = await GetConnection();
MySqlCommand cmd = conn.CreateCommand(); MySqlCommand cmd = conn.CreateCommand();
if(parameters?.Length > 0) if(parameters?.Length > 0)
cmd.Parameters.AddRange(parameters); cmd.Parameters.AddRange(parameters);
@ -68,7 +68,7 @@ public partial class MariaDBEventStorage {
private async Task<T> RunQueryValue<T>(string command, params MySqlParameter[] parameters) private async Task<T> RunQueryValue<T>(string command, params MySqlParameter[] parameters)
where T : struct { where T : struct {
try { try {
using MySqlConnection conn = await GetConnectionAsync(); using MySqlConnection conn = await GetConnection();
using MySqlCommand cmd = conn.CreateCommand(); using MySqlCommand cmd = conn.CreateCommand();
if(parameters?.Length > 0) if(parameters?.Length > 0)
cmd.Parameters.AddRange(parameters); cmd.Parameters.AddRange(parameters);

2
SharpChat/SockChatServer.cs
View file

@ -189,7 +189,7 @@ public class SockChatServer : IDisposable {
await Context.BanUser(conn.User, banDuration, UserDisconnectS2CPacket.Reason.Flood); await Context.BanUser(conn.User, banDuration, UserDisconnectS2CPacket.Reason.Flood);
if(banDuration > TimeSpan.Zero) if(banDuration > TimeSpan.Zero)
await BansClient.BanCreateAsync( await BansClient.BanCreate(
BanKind.User, BanKind.User,
banDuration, banDuration,
conn.RemoteAddress, conn.RemoteAddress,

4
SharpChatCommon/Auth/AuthClient.cs
View file

@ -3,6 +3,6 @@ using System.Net;
namespace SharpChat.Auth; namespace SharpChat.Auth;
public interface AuthClient { public interface AuthClient {
Task<AuthResult> AuthVerifyAsync(IPAddress remoteAddr, string scheme, string token); Task<AuthResult> AuthVerify(IPAddress remoteAddr, string scheme, string token);
Task AuthBumpUsersOnlineAsync(IEnumerable<(IPAddress remoteAddr, string userId)> entries); Task AuthBumpUsersOnline(IEnumerable<(IPAddress remoteAddr, string userId)> entries);
} }

8
SharpChatCommon/Bans/BansClient.cs
View file

@ -3,7 +3,7 @@ using System.Net;
namespace SharpChat.Bans; namespace SharpChat.Bans;
public interface BansClient { public interface BansClient {
Task BanCreateAsync( Task BanCreate(
BanKind kind, BanKind kind,
TimeSpan duration, TimeSpan duration,
IPAddress remoteAddr, IPAddress remoteAddr,
@ -12,7 +12,7 @@ public interface BansClient {
IPAddress? issuerRemoteAddr = null, IPAddress? issuerRemoteAddr = null,
string? issuerUserId = null string? issuerUserId = null
); );
Task<bool> BanRevokeAsync(BanInfo info); Task<bool> BanRevoke(BanInfo info);
Task<BanInfo?> BanGetAsync(string? userIdOrName = null, IPAddress? remoteAddr = null); Task<BanInfo?> BanGet(string? userIdOrName = null, IPAddress? remoteAddr = null);
Task<BanInfo[]> BanGetListAsync(); Task<BanInfo[]> BanGetList();
} }