From f16628a44eb6d5407f9e37bd4f5cc43ec6d18470 Mon Sep 17 00:00:00 2001 From: Noi Date: Thu, 30 Sep 2021 13:45:37 -0700 Subject: [PATCH] Update packages; fix Npgsql issues --- RegexBot/EntityCache/CacheChannel.cs | 4 ++-- RegexBot/EntityCache/CacheUser.cs | 4 ++-- RegexBot/EntityCache/SqlHelper.cs | 10 +++++----- RegexBot/Module/ModLogs/LogEntry.cs | 10 +++++----- RegexBot/Module/ModLogs/MessageCache.cs | 18 +++++++++--------- RegexBot/RegexBot.csproj | 6 +++--- 6 files changed, 26 insertions(+), 26 deletions(-) diff --git a/RegexBot/EntityCache/CacheChannel.cs b/RegexBot/EntityCache/CacheChannel.cs index 731f85f..98182d5 100644 --- a/RegexBot/EntityCache/CacheChannel.cs +++ b/RegexBot/EntityCache/CacheChannel.cs @@ -65,8 +65,8 @@ namespace Noikoio.RegexBot.EntityCache { c.CommandText = $"SELECT {QueryColumns} from {SqlHelper.TableTextChannel} WHERE " + "channel_id = @Cid AND guild_id = @Gid"; - c.Parameters.Add("@Cid", NpgsqlTypes.NpgsqlDbType.Bigint).Value = channel; - c.Parameters.Add("@Gid", NpgsqlTypes.NpgsqlDbType.Bigint).Value = guild; + c.Parameters.Add("@Cid", NpgsqlTypes.NpgsqlDbType.Bigint).Value = (long)channel; + c.Parameters.Add("@Gid", NpgsqlTypes.NpgsqlDbType.Bigint).Value = (long)guild; c.Prepare(); using (var r = await c.ExecuteReaderAsync()) { diff --git a/RegexBot/EntityCache/CacheUser.cs b/RegexBot/EntityCache/CacheUser.cs index bdfd46c..194d15f 100644 --- a/RegexBot/EntityCache/CacheUser.cs +++ b/RegexBot/EntityCache/CacheUser.cs @@ -125,8 +125,8 @@ namespace Noikoio.RegexBot.EntityCache { c.CommandText = $"SELECT {QueryColumns} FROM {SqlHelper.TableUser} WHERE " + "user_id = @Uid AND guild_id = @Gid"; - c.Parameters.Add("@Uid", NpgsqlTypes.NpgsqlDbType.Bigint).Value = user; - c.Parameters.Add("@Gid", NpgsqlTypes.NpgsqlDbType.Bigint).Value = guild; + c.Parameters.Add("@Uid", NpgsqlTypes.NpgsqlDbType.Bigint).Value = (long)user; + c.Parameters.Add("@Gid", NpgsqlTypes.NpgsqlDbType.Bigint).Value = (long)guild; c.Prepare(); using (var r = await c.ExecuteReaderAsync()) { diff --git a/RegexBot/EntityCache/SqlHelper.cs b/RegexBot/EntityCache/SqlHelper.cs index b3a3167..17962cd 100644 --- a/RegexBot/EntityCache/SqlHelper.cs +++ b/RegexBot/EntityCache/SqlHelper.cs @@ -102,7 +102,7 @@ namespace Noikoio.RegexBot.EntityCache + "VALUES (@GuildId, now(), @CurrentName) " + "ON CONFLICT (guild_id) DO UPDATE SET " + "current_name = EXCLUDED.current_name, cache_date = EXCLUDED.cache_date"; - c.Parameters.Add("@GuildId", NpgsqlDbType.Bigint).Value = g.Id; + c.Parameters.Add("@GuildId", NpgsqlDbType.Bigint).Value = (long)g.Id; c.Parameters.Add("@CurrentName", NpgsqlDbType.Text).Value = g.Name; c.Prepare(); await c.ExecuteNonQueryAsync(); @@ -140,8 +140,8 @@ namespace Noikoio.RegexBot.EntityCache { if (item.IsWebhook) continue; - uid.Value = item.Id; - gid.Value = item.Guild.Id; + uid.Value = (long)item.Id; + gid.Value = (long)item.Guild.Id; uname.Value = item.Username; disc.Value = item.Discriminator; nname.Value = item.Nickname; @@ -180,8 +180,8 @@ namespace Noikoio.RegexBot.EntityCache { if (!(item is ITextChannel ich)) continue; - cid.Value = item.Id; - gid.Value = item.Guild.Id; + cid.Value = (long)item.Id; + gid.Value = (long)item.Guild.Id; cname.Value = item.Name; await c.ExecuteNonQueryAsync(); } diff --git a/RegexBot/Module/ModLogs/LogEntry.cs b/RegexBot/Module/ModLogs/LogEntry.cs index c47d05d..e500e75 100644 --- a/RegexBot/Module/ModLogs/LogEntry.cs +++ b/RegexBot/Module/ModLogs/LogEntry.cs @@ -178,8 +178,8 @@ namespace Noikoio.RegexBot.Module.ModLogs { c.CommandText = $"SELECT {QueryColumns} FROM {TblEntry} " + "WHERE guild_id = @Guild and id = @Id"; - c.Parameters.Add("@Guild", NpgsqlTypes.NpgsqlDbType.Bigint).Value = guild; - c.Parameters.Add("@Id", NpgsqlTypes.NpgsqlDbType.Numeric).Value = id; + c.Parameters.Add("@Guild", NpgsqlTypes.NpgsqlDbType.Bigint).Value = (long)guild; + c.Parameters.Add("@Id", NpgsqlTypes.NpgsqlDbType.Numeric).Value = (long)id; c.Prepare(); using (var r = await c.ExecuteReaderAsync()) { @@ -221,21 +221,21 @@ namespace Noikoio.RegexBot.Module.ModLogs if (and) c.CommandText += " AND"; else and = true; c.CommandText += " target_id = @TargetId"; - c.Parameters.Add("@TargetId", NpgsqlTypes.NpgsqlDbType.Bigint).Value = target.Value; + c.Parameters.Add("@TargetId", NpgsqlTypes.NpgsqlDbType.Bigint).Value = (long)target.Value; } if (invoker.HasValue) { if (and) c.CommandText += " AND"; else and = true; c.CommandText += " invoke_id = @InvokeId"; - c.Parameters.Add("@InvokeId", NpgsqlTypes.NpgsqlDbType.Bigint).Value = invoker.Value; + c.Parameters.Add("@InvokeId", NpgsqlTypes.NpgsqlDbType.Bigint).Value = (long)invoker.Value; } if (channel.HasValue) { if (and) c.CommandText += " AND"; else and = true; c.CommandText += " target_channel_id = @ChannelId"; - c.Parameters.Add("@ChannelId", NpgsqlTypes.NpgsqlDbType.Bigint).Value = channel.Value; + c.Parameters.Add("@ChannelId", NpgsqlTypes.NpgsqlDbType.Bigint).Value = (long)channel.Value; } if (category.HasValue) { diff --git a/RegexBot/Module/ModLogs/MessageCache.cs b/RegexBot/Module/ModLogs/MessageCache.cs index fd1d7d0..713af62 100644 --- a/RegexBot/Module/ModLogs/MessageCache.cs +++ b/RegexBot/Module/ModLogs/MessageCache.cs @@ -105,7 +105,7 @@ namespace Noikoio.RegexBot.Module.ModLogs { c.CommandText = "SELECT author_id, message, created_ts, edited_ts as msgtime FROM " + TableMessage + " WHERE message_id = @MessageId"; - c.Parameters.Add("@MessageId", NpgsqlDbType.Bigint).Value = messageId; + c.Parameters.Add("@MessageId", NpgsqlDbType.Bigint).Value = (long)messageId; c.Prepare(); using (var r = await c.ExecuteReaderAsync()) { @@ -320,15 +320,15 @@ namespace Noikoio.RegexBot.Module.ModLogs + " (@MessageId, @UserId, @GuildId, @ChannelId, @Date, @Edit, @Message)" + " ON CONFLICT (message_id) DO UPDATE" + " SET message = EXCLUDED.message, edited_ts = EXCLUDED.edited_ts"; - c.Parameters.Add("@MessageId", NpgsqlDbType.Bigint).Value = msg.Id; - c.Parameters.Add("@UserId", NpgsqlDbType.Bigint).Value = msg.Author.Id; - c.Parameters.Add("@GuildId", NpgsqlDbType.Bigint).Value = ((SocketGuildUser)msg.Author).Guild.Id; - c.Parameters.Add("@ChannelId", NpgsqlDbType.Bigint).Value = msg.Channel.Id; - c.Parameters.Add("@Date", NpgsqlDbType.TimestampTZ).Value = msg.Timestamp; + c.Parameters.Add("@MessageId", NpgsqlDbType.Bigint).Value = (long)msg.Id; + c.Parameters.Add("@UserId", NpgsqlDbType.Bigint).Value = (long)msg.Author.Id; + c.Parameters.Add("@GuildId", NpgsqlDbType.Bigint).Value = (long)((SocketGuildUser)msg.Author).Guild.Id; + c.Parameters.Add("@ChannelId", NpgsqlDbType.Bigint).Value = (long)msg.Channel.Id; + c.Parameters.Add("@Date", NpgsqlDbType.TimestampTz).Value = msg.Timestamp; if (msg.EditedTimestamp.HasValue) - c.Parameters.Add("@Edit", NpgsqlDbType.TimestampTZ).Value = msg.EditedTimestamp.Value; + c.Parameters.Add("@Edit", NpgsqlDbType.TimestampTz).Value = msg.EditedTimestamp.Value; else - c.Parameters.Add("@Edit", NpgsqlDbType.TimestampTZ).Value = DBNull.Value; + c.Parameters.Add("@Edit", NpgsqlDbType.TimestampTz).Value = DBNull.Value; c.Parameters.Add("@Message", NpgsqlDbType.Text).Value = dbinsert.ToString(); c.Prepare(); await c.ExecuteNonQueryAsync(); @@ -351,7 +351,7 @@ namespace Noikoio.RegexBot.Module.ModLogs { c.CommandText = "SELECT message FROM " + TableMessage + " WHERE message_id = @MessageId"; - c.Parameters.Add("@MessageId", NpgsqlDbType.Bigint).Value = messageId; + c.Parameters.Add("@MessageId", NpgsqlDbType.Bigint).Value = (long)messageId; c.Prepare(); using (var r = await c.ExecuteReaderAsync()) { diff --git a/RegexBot/RegexBot.csproj b/RegexBot/RegexBot.csproj index f54c5d4..2219e09 100644 --- a/RegexBot/RegexBot.csproj +++ b/RegexBot/RegexBot.csproj @@ -15,9 +15,9 @@ - - - + + +