- Small cleanup
This commit is contained in:
@@ -1,6 +1,6 @@
|
|||||||
<Project Sdk="Dalamud.NET.Sdk/12.0.2">
|
<Project Sdk="Dalamud.NET.Sdk/12.0.2">
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<Version>1.30.5</Version>
|
<Version>1.30.6</Version>
|
||||||
<TargetFramework>net9.0-windows</TargetFramework>
|
<TargetFramework>net9.0-windows</TargetFramework>
|
||||||
<ImplicitUsings>enable</ImplicitUsings>
|
<ImplicitUsings>enable</ImplicitUsings>
|
||||||
<Nullable>enable</Nullable>
|
<Nullable>enable</Nullable>
|
||||||
|
|||||||
@@ -405,13 +405,13 @@ internal class MessageStore : IDisposable
|
|||||||
SELECT COUNT(*)
|
SELECT COUNT(*)
|
||||||
FROM messages
|
FROM messages
|
||||||
" + whereClause;
|
" + whereClause;
|
||||||
cmd.CommandTimeout = 120; // this could take a while on slow computers
|
|
||||||
|
|
||||||
if (receiver != null)
|
if (receiver != null)
|
||||||
cmd.Parameters.AddWithValue("$Receiver", receiver);
|
cmd.Parameters.AddWithValue("$Receiver", receiver);
|
||||||
|
|
||||||
cmd.Parameters.AddWithValue("$After", ((DateTimeOffset) after).ToUnixTimeMilliseconds());
|
cmd.Parameters.AddWithValue("$After", ((DateTimeOffset) after).ToUnixTimeMilliseconds());
|
||||||
cmd.Parameters.AddWithValue("$Before", ((DateTimeOffset) before).ToUnixTimeMilliseconds());
|
cmd.Parameters.AddWithValue("$Before", ((DateTimeOffset) before).ToUnixTimeMilliseconds());
|
||||||
|
cmd.CommandTimeout = 120; // this could take a while on slow computers
|
||||||
|
|
||||||
return (long) cmd.ExecuteScalar()!;
|
return (long) cmd.ExecuteScalar()!;
|
||||||
}
|
}
|
||||||
@@ -425,7 +425,7 @@ internal class MessageStore : IDisposable
|
|||||||
whereClauses.Add("Date BETWEEN $After AND $Before");
|
whereClauses.Add("Date BETWEEN $After AND $Before");
|
||||||
whereClauses.Add($"Channel IN ({string.Join(", ", channels)})");
|
whereClauses.Add($"Channel IN ({string.Join(", ", channels)})");
|
||||||
|
|
||||||
var whereClause = "WHERE " + string.Join(" AND ", whereClauses);
|
var whereClause = $"WHERE {string.Join(" AND ", whereClauses)}";
|
||||||
|
|
||||||
var cmd = Connection.CreateCommand();
|
var cmd = Connection.CreateCommand();
|
||||||
// Select last N messages by date DESC, but reverse the order to get
|
// Select last N messages by date DESC, but reverse the order to get
|
||||||
@@ -467,7 +467,7 @@ internal class MessageEnumerator(DbDataReader reader) : IEnumerable<Message>, ID
|
|||||||
|
|
||||||
// FailedIds and FailedCount are separate, because messages might fail to
|
// FailedIds and FailedCount are separate, because messages might fail to
|
||||||
// even parse the ID field.
|
// even parse the ID field.
|
||||||
private readonly List<Guid> FailedIds = new();
|
private readonly List<Guid> FailedIds = [];
|
||||||
private int FailedCount;
|
private int FailedCount;
|
||||||
public bool DidError => FailedCount > 0;
|
public bool DidError => FailedCount > 0;
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user