From a321cdbe55a79368839b7183df25125877692b81 Mon Sep 17 00:00:00 2001 From: Toastie Date: Thu, 3 Oct 2024 18:51:55 +1300 Subject: [PATCH] fixed build warnings --- src/EllieBot.Generators/GrpcApiPermGenerator.cs | 7 +++---- src/EllieBot/Services/GrpcApiService.cs | 8 ++++---- src/EllieBot/_common/DownloadTracker.cs | 1 + .../Replacements/Impl/ReplacementRegistrator.default.cs | 8 ++++---- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/EllieBot.Generators/GrpcApiPermGenerator.cs b/src/EllieBot.Generators/GrpcApiPermGenerator.cs index 545fa3a..71f7ce4 100644 --- a/src/EllieBot.Generators/GrpcApiPermGenerator.cs +++ b/src/EllieBot.Generators/GrpcApiPermGenerator.cs @@ -3,7 +3,6 @@ using System.CodeDom.Compiler; using System.Collections.Immutable; using System.Diagnostics; using System.Text; -using System.Text.RegularExpressions; using Microsoft.CodeAnalysis; using Microsoft.CodeAnalysis.CSharp.Syntax; using Microsoft.CodeAnalysis.Text; @@ -50,7 +49,7 @@ namespace EllieBot.Generators predicate: static (s, _) => s is MethodDeclarationSyntax, transform: static (ctx, _) => GetMethodSemanticTargets(ctx.SemanticModel, ctx.TargetNode)) .Where(static m => m is not null) - .Select(static (x, _) => x.Value) + .Select(static (x, _) => x!.Value) .Collect(); context.RegisterSourceOutput(enumsToGenerate, @@ -74,7 +73,7 @@ namespace EllieBot.Generators // if (model.GetSymbolInfo(attr).Symbol is not IMethodSymbol attrSymbol) // return null; - return new MethodPermData(name, attr.ArgumentList.Arguments[0].ToString()); + return new MethodPermData(name, attr.ArgumentList.Arguments[0].ToString() ?? "__missing_perm__"); // return new MethodPermData(name, attrSymbol.Parameters[0].ContainingType.ToDisplayString() + "." + attrSymbol.Parameters[0].Name); } @@ -99,7 +98,7 @@ namespace EllieBot.Generators sw.Indent++; foreach (var field in fields) { - sw.WriteLine("{{ \"{0}\", {1} }},", field!.Name, field!.Value); + sw.WriteLine("{{ \"{0}\", {1} }},", field.Name, field.Value); } sw.Indent--; diff --git a/src/EllieBot/Services/GrpcApiService.cs b/src/EllieBot/Services/GrpcApiService.cs index f16321a..371117d 100644 --- a/src/EllieBot/Services/GrpcApiService.cs +++ b/src/EllieBot/Services/GrpcApiService.cs @@ -8,8 +8,6 @@ public class GrpcApiService : IEService, IReadyExecutor { private Server? _app; - private static readonly bool _isEnabled = true; - private readonly DiscordSocketClient _client; private readonly OtherSvc _other; private readonly ExprsSvc _exprs; @@ -30,11 +28,11 @@ public class GrpcApiService : IEService, IReadyExecutor _creds = creds; } - public async Task OnReadyAsync() + public Task OnReadyAsync() { var creds = _creds.GetCreds(); if (creds.GrpcApi is null || creds.GrpcApi.Enabled) - return; + return Task.CompletedTask; try { @@ -65,5 +63,7 @@ public class GrpcApiService : IEService, IReadyExecutor { _app?.ShutdownAsync().GetAwaiter().GetResult(); } + + return Task.CompletedTask; } } \ No newline at end of file diff --git a/src/EllieBot/_common/DownloadTracker.cs b/src/EllieBot/_common/DownloadTracker.cs index b886228..e780fb6 100644 --- a/src/EllieBot/_common/DownloadTracker.cs +++ b/src/EllieBot/_common/DownloadTracker.cs @@ -14,6 +14,7 @@ public class DownloadTracker : IEService public async Task EnsureUsersDownloadedAsync(IGuild guild) { #if GLOBAL_ELLIE + await Task.CompletedTask; return; #endif await _downloadUsersSemaphore.WaitAsync(); diff --git a/src/EllieBot/_common/Replacements/Impl/ReplacementRegistrator.default.cs b/src/EllieBot/_common/Replacements/Impl/ReplacementRegistrator.default.cs index 82d1d14..de4d1be 100644 --- a/src/EllieBot/_common/Replacements/Impl/ReplacementRegistrator.default.cs +++ b/src/EllieBot/_common/Replacements/Impl/ReplacementRegistrator.default.cs @@ -1,4 +1,3 @@ -#nullable disable using System.Text.RegularExpressions; namespace EllieBot.Common; @@ -71,9 +70,10 @@ public sealed partial class ReplacementPatternStore Register("%user.id%", static (IUser user) => user.Id.ToString()); Register("%user.created_time%", static (IUser user) => user.CreatedAt.ToString("HH:mm")); Register("%user.created_date%", static (IUser user) => user.CreatedAt.ToString("dd.MM.yyyy")); - Register("%user.joined_time%", static (IGuildUser user) => user.JoinedAt?.ToString("HH:mm")); - Register("%user.joined_date%", static (IGuildUser user) => user.JoinedAt?.ToString("dd.MM.yyyy")); - + Register("%user.joined_time%", static (IGuildUser user) => user.JoinedAt?.ToString("HH:mm") ?? "??:??"); + Register("%user.joined_date%", + static (IGuildUser user) => user.JoinedAt?.ToString("dd.MM.yyyy") ?? "??.??.????"); + Register("%user%", static (IUser[] users) => string.Join(" ", users.Select(user => user.Mention))); Register("%user.mention%",