fix: normalize username / host capitalization

Resolves #74

ModShark/Program.cs

@@ -72,7 +72,7 @@
 
 builder.Services.AddSingleton<ILinkService, LinkService>();
 builder.Services.AddScoped<IMetaService, MetaService>();
-builder.Services.AddScoped<IServiceAccountService, ServiceAccountService>();
+builder.Services.AddScoped<IUserService, UserService>();
 builder.Services.AddHostedService<Worker>();
 
 var host = builder.Build();

ModShark/Reports/Reporter/NativeReporter.cs

@@ -15,7 +15,7 @@ public class NativeReporterConfig
     public bool UseApi { get; set; }
 }
 
-public class NativeReporter(ILogger<NativeReporter> logger, NativeReporterConfig reporterConfig, SharkeyContext db, ISharkeyIdService sharkeyIdService, IServiceAccountService serviceAccountService, ISharkeyHttpService http, ILinkService linkService) : INativeReporter
+public class NativeReporter(ILogger<NativeReporter> logger, NativeReporterConfig reporterConfig, SharkeyContext db, ISharkeyIdService sharkeyIdService, IUserService userService, ISharkeyHttpService http, ILinkService linkService) : INativeReporter
 {
     private const string UserReportComment = "ModShark: username matched one or more flagged patterns";
     private const string InstanceReportComment = "ModShark: instance hostname matched one or more flagged patterns";
@@ -34,7 +34,7 @@ public async Task MakeReport(Report report, CancellationToken stoppingToken)
             return;
         }
 
-        var reporterId = await serviceAccountService.GetServiceAccountId(stoppingToken);
+        var reporterId = await userService.GetServiceAccountId(stoppingToken);
         if (reporterId == null)
         {
             logger.LogWarning("Skipping native - configured service account could not be found");

ModShark/Reports/Reporter/PostReporter.cs

@@ -5,7 +5,6 @@
 using Microsoft.EntityFrameworkCore;
 using ModShark.Services;
 using ModShark.Utils;
-using SharkeyDB;
 using SharkeyDB.Entities;
 
 namespace ModShark.Reports.Reporter;
@@ -52,7 +51,7 @@ public enum PostVisibility
     Private
 }
 
-public partial class PostReporter(ILogger<PostReporter> logger, PostReporterConfig reporterConfig, SharkeyContext db, ISharkeyHttpService http, ILinkService linkService) : IPostReporter
+public partial class PostReporter(ILogger<PostReporter> logger, PostReporterConfig reporterConfig, IUserService userService, ISharkeyHttpService http, ILinkService linkService) : IPostReporter
 {
     // Parse the audience list from handle[] into (handle, username, host?)[].
     // For performance, we do this only once.
@@ -62,12 +61,15 @@ public partial class PostReporter(ILogger<PostReporter> logger, PostReporterConf
         .Where(m => m.Success)
         .Select(m =>
         {
-            var handle = m.Value;
             var username = m.Groups[1].Value;
             var host =
                 m.Groups[2].Success
-                    ? m.Groups[2].Value
+                    ? m.Groups[2].Value.ToLower()
                     : null;
+            var handle =
+                host == null
+                    ? $"@{username}"
+                    : $"@{username}@{host}";
             return new Audience(handle, username, host);
         })
         .ToList();
@@ -122,7 +124,9 @@ await http.CreateNote(
 
     private string RenderPost(Report report)
     {
-        var audienceText = string.Join(' ', reporterConfig.Audience);
+        var audienceHandles = ParsedAudience
+            .Select(a => a.Handle);
+        var audienceText = string.Join(' ', audienceHandles);
         var reportText = RenderReport(report);
 
         return reporterConfig.Template
@@ -337,9 +341,8 @@ private void RenderNoteReports(Report report, StringBuilder message)
         var audienceIds = new HashSet<string>();
         foreach (var (handle, username, host) in ParsedAudience)
         {
-            var id = await db.Users
-                .AsNoTracking()
-                .Where(u => u.Host == host && u.Username == username)
+            var id = await
+                userService.QueryByUserHost(username, host)
                 .Select(u => u.Id)
                 .FirstOrDefaultAsync(stoppingToken);
 

ModShark/Services/SharkeyHttpService.cs

@@ -11,7 +11,7 @@ public interface ISharkeyHttpService
     Task CreateNote(CreateNoteRequest request, CancellationToken stoppingToken);
 }
 
-public class SharkeyHttpService(ILogger<SharkeyHttpService> logger, SharkeyConfig config, IHttpService http, IServiceAccountService serviceAccountService) : ISharkeyHttpService
+public class SharkeyHttpService(ILogger<SharkeyHttpService> logger, SharkeyConfig config, IHttpService http, IUserService userService) : ISharkeyHttpService
 {
     public async Task ReportAbuse(string userId, string comment, CancellationToken stoppingToken)
         => await ReportAbuse(new ReportAbuseRequest
@@ -42,7 +42,7 @@ private async Task PostAuthenticatedAsync<TRequest>(string action, TRequest requ
     {
         // Populate the auto token, if not already set
         request.AuthToken
-            ??= await serviceAccountService.GetServiceAccountToken(stoppingToken)
+            ??= await userService.GetServiceAccountToken(stoppingToken)
             ?? throw new ArgumentException("Authenticated request is missing auth token, and no service account token was found in the database", nameof(request));
 
         // Make the request
@@ -70,7 +70,7 @@ public abstract class AuthenticatedRequestBase
 {
     /// <summary>
     /// Authentication token for the user to make this request.
-    /// If null, will be populated automatically by the <see cref="IServiceAccountService"/>.
+    /// If null, will be populated automatically by the <see cref="IUserService"/>.
     /// </summary>
     [JsonPropertyName("i")]
     public string? AuthToken { get; set; }

ModShark/Services/ServiceAccountService.cs → ModShark/Services/UserService.cs

@@ -1,37 +1,55 @@
 using Microsoft.EntityFrameworkCore;
 using SharkeyDB;
+using SharkeyDB.Entities;
 
 namespace ModShark.Services;
 
-public interface IServiceAccountService
+public interface IUserService
 {
+    /// <summary>
+    /// Finds a User by username and hostname.
+    /// If host is null, then searches local users. 
+    /// </summary>
+    /// <remarks>
+    /// The returned IQueryable is non-tracking.
+    /// </remarks>
+    IQueryable<User> QueryByUserHost(string username, string? host);
     Task<string?> GetServiceAccountId(CancellationToken stoppingToken);
 
     Task<string?> GetServiceAccountToken(CancellationToken stoppingToken);
 }
 
-public class ServiceAccountService(SharkeyConfig config, SharkeyContext db) : IServiceAccountService
+public class UserService(SharkeyConfig config, SharkeyContext db) : IUserService
 {
     private string? CachedId { get; set; }
     private string? CachedToken { get; set; }
-
+
+    public IQueryable<User> QueryByUserHost(string username, string? host)
+    {
+        var usernameLower = username.ToLower();
+        var hostLower = host?.ToLower();
+
+        return
+            db.Users
+            .AsNoTracking()
+            .Where(u => u.UsernameLower == usernameLower && u.Host == hostLower);
+    }
+
     public async Task<string?> GetServiceAccountId(CancellationToken stoppingToken)
         => CachedId ??= await LookupReporterId(stoppingToken);
 
     private async Task<string?> LookupReporterId(CancellationToken stoppingToken)
-        => await db.Users
-            .AsNoTracking()
-            .Where(u => u.Host == null && u.Username == config.ServiceAccount)
+        => await 
+            QueryByUserHost(config.ServiceAccount, null)
             .Select(u => u.Id)
             .FirstOrDefaultAsync(stoppingToken);
 
     public async Task<string?> GetServiceAccountToken(CancellationToken stoppingToken)
         => CachedToken ??= await LookupReporterToken(stoppingToken);
 
     private async Task<string?> LookupReporterToken(CancellationToken stoppingToken)
-        => await db.Users
-            .AsNoTracking()
-            .Where(u => u.Host == null && u.Username == config.ServiceAccount)
+        => await
+            QueryByUserHost(config.ServiceAccount, null)
             .Select(u => u.Token)
             .FirstOrDefaultAsync(stoppingToken);
 }