TeamInklings/Octobot
TeamInklings/Octobot
1
0
Fork 1
mirror of https://github.com/TeamOctolings/Octobot.git synced 2025-05-22 13:40:55 +03:00
Code Issues Wiki Activity

Bump muno92/resharper_inspectcode from 1.12.3 to 1.13.0 (#348)

Browse source
This commit is contained in:
dependabot[bot] 2025-05-19 08:33:14 +00:00 • committed by GitHub
parent f3330c47cc
commit 5a351cbd97
Signed by: GitHub
GPG key ID: B5690EEEBB952194
4 changed files with 29 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.github/workflows/build-pr.yml vendored
View file

@ -28,7 +28,7 @@ jobs:
dotnet-version: '9.0.x' dotnet-version: '9.0.x'
- name: ReSharper CLI InspectCode - name: ReSharper CLI InspectCode
uses: muno92/resharper_inspectcode@1.12.3 uses: muno92/resharper_inspectcode@1.13.0
with: with:
solutionPath: ./Octobot.sln solutionPath: ./Octobot.sln
ignoreIssueType: InvertIf, ConvertIfStatementToSwitchStatement, ConvertToPrimaryConstructor ignoreIssueType: InvertIf, ConvertIfStatementToSwitchStatement, ConvertToPrimaryConstructor

51
TeamOctolings.Octobot/Program.cs
View file

@ -39,8 +39,7 @@ public sealed class Program
private static IHostBuilder CreateHostBuilder(string[] args) private static IHostBuilder CreateHostBuilder(string[] args)
{ {
return Host.CreateDefaultBuilder(args) return Host.CreateDefaultBuilder(args)
.AddDiscordService( .AddDiscordService(services =>
services =>
{ {
var configuration = services.GetRequiredService<IConfiguration>(); var configuration = services.GetRequiredService<IConfiguration>();
@ -49,25 +48,22 @@ public sealed class Program
"No bot token has been provided. Set the " "No bot token has been provided. Set the "
+ "BOT_TOKEN environment variable to a valid token."); + "BOT_TOKEN environment variable to a valid token.");
} }
).ConfigureServices( ).ConfigureServices((_, services) =>
(_, services) =>
{ {
services.Configure<DiscordGatewayClientOptions>( services.Configure<DiscordGatewayClientOptions>(options =>
options => {
{ options.Intents |= GatewayIntents.MessageContents
options.Intents |= GatewayIntents.MessageContents | GatewayIntents.GuildMembers
| GatewayIntents.GuildMembers | GatewayIntents.GuildPresences
| GatewayIntents.GuildPresences | GatewayIntents.GuildScheduledEvents;
| GatewayIntents.GuildScheduledEvents; });
}); services.Configure<CacheSettings>(cSettings =>
services.Configure<CacheSettings>( {
cSettings => cSettings.SetDefaultAbsoluteExpiration(TimeSpan.FromHours(1));
{ cSettings.SetDefaultSlidingExpiration(TimeSpan.FromMinutes(30));
cSettings.SetDefaultAbsoluteExpiration(TimeSpan.FromHours(1)); cSettings.SetAbsoluteExpiration<IMessage>(TimeSpan.FromDays(7));
cSettings.SetDefaultSlidingExpiration(TimeSpan.FromMinutes(30)); cSettings.SetSlidingExpiration<IMessage>(TimeSpan.FromDays(7));
cSettings.SetAbsoluteExpiration<IMessage>(TimeSpan.FromDays(7)); });
cSettings.SetSlidingExpiration<IMessage>(TimeSpan.FromDays(7));
});
services.AddTransient<IConfigurationBuilder, ConfigurationBuilder>() services.AddTransient<IConfigurationBuilder, ConfigurationBuilder>()
// Init // Init
@ -87,14 +83,13 @@ public sealed class Program
.AddHostedService<ScheduledEventUpdateService>() .AddHostedService<ScheduledEventUpdateService>()
.AddHostedService<SongUpdateService>(); .AddHostedService<SongUpdateService>();
} }
).ConfigureLogging( ).ConfigureLogging(c => c.AddConsole()
c => c.AddConsole() .AddFile("Logs/Octobot-{Date}.log",
.AddFile("Logs/Octobot-{Date}.log", outputTemplate: "{Timestamp:o} [{Level:u4}] {Message} {NewLine}{Exception}")
outputTemplate: "{Timestamp:o} [{Level:u4}] {Message} {NewLine}{Exception}") .AddFilter("System.Net.Http.HttpClient.*.LogicalHandler", LogLevel.Warning)
.AddFilter("System.Net.Http.HttpClient.*.LogicalHandler", LogLevel.Warning) .AddFilter("System.Net.Http.HttpClient.*.ClientHandler", LogLevel.Warning)
.AddFilter("System.Net.Http.HttpClient.*.ClientHandler", LogLevel.Warning) .AddFilter<SerilogLoggerProvider>("System.Net.Http.HttpClient.*.LogicalHandler", LogLevel.Warning)
.AddFilter<SerilogLoggerProvider>("System.Net.Http.HttpClient.*.LogicalHandler", LogLevel.Warning) .AddFilter<SerilogLoggerProvider>("System.Net.Http.HttpClient.*.ClientHandler", LogLevel.Warning)
.AddFilter<SerilogLoggerProvider>("System.Net.Http.HttpClient.*.ClientHandler", LogLevel.Warning)
); );
} }
} }

10
TeamOctolings.Octobot/Responders/GuildMemberLeftResponder.cs
View file

@ -36,13 +36,9 @@ public sealed class GuildMemberLeftResponder : IResponder<IGuildMemberRemove>
var cfg = data.Settings; var cfg = data.Settings;
var memberData = data.GetOrCreateMemberData(user.ID); var memberData = data.GetOrCreateMemberData(user.ID);
if (memberData.BannedUntil is not null || memberData.Kicked) if (memberData.BannedUntil is not null || memberData.Kicked
{ || GuildSettings.WelcomeMessagesChannel.Get(cfg).Empty()
return Result.Success; || GuildSettings.LeaveMessage.Get(cfg) is "off" or "disable" or "disabled")
}
if (GuildSettings.WelcomeMessagesChannel.Get(cfg).Empty()
|| GuildSettings.LeaveMessage.Get(cfg) is "off" or "disable" or "disabled")
{ {
return Result.Success; return Result.Success;
} }

4
TeamOctolings.Octobot/Utility.cs
View file

@ -67,8 +67,8 @@ public sealed class Utility
builder.Append($"{Mention.Role(role)} "); builder.Append($"{Mention.Role(role)} ");
} }
builder = subscribers.Where( builder = subscribers.Where(subscriber =>
subscriber => !data.GetOrCreateMemberData(subscriber.User.ID).Roles.Contains(role.Value)) !data.GetOrCreateMemberData(subscriber.User.ID).Roles.Contains(role.Value))
.Aggregate(builder, (current, subscriber) => current.Append($"{Mention.User(subscriber.User)} ")); .Aggregate(builder, (current, subscriber) => current.Append($"{Mention.User(subscriber.User)} "));
return builder.ToString(); return builder.ToString();
} }