minster586/nadekobot
1
0
Fork 0
mirror of https://gitlab.com/Kwoth/nadekobot.git synced 2025-09-11 01:38:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

dev: Fixed a build warning and small cleanup

Browse Source
This commit is contained in:
Kwoth
2024-05-12 19:00:16 +00:00
parent 1d0f3d3fd6
commit 1c540476d3
3 changed files with 12 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/NadekoBot/Modules/Administration/GreetBye/GreetService.cs
View File

@@ -202,12 +202,6 @@ public class GreetService : INService, IReadyExecutor
if (!users.Any()) if (!users.Any())
return; return;
// var rep = new ReplacementBuilder().WithChannel(channel)
// .WithClient(_client)
// .WithServer(_client, (SocketGuild)channel.Guild)
// .WithManyUsers(users)
// .Build();
var repCtx = new ReplacementContext(client: _client, var repCtx = new ReplacementContext(client: _client,
guild: channel.Guild, guild: channel.Guild,
channel: channel, channel: channel,
@@ -244,17 +238,11 @@ public class GreetService : INService, IReadyExecutor
if (users.Count == 0) if (users.Count == 0)
return; return;
// var rep = new ReplacementBuilder()
// .WithChannel(channel)
// .WithClient(_client)
// .WithServer(_client, (SocketGuild)channel.Guild)
// .WithManyUsers(users)
// .Build();
var repCtx = new ReplacementContext(client: _client, var repCtx = new ReplacementContext(client: _client,
guild: channel.Guild, guild: channel.Guild,
channel: channel, channel: channel,
users: users.ToArray()); users: users.ToArray());
var text = SmartText.CreateFrom(conf.ChannelGreetMessageText); var text = SmartText.CreateFrom(conf.ChannelGreetMessageText);
text = await _repSvc.ReplaceAsync(text, repCtx); text = await _repSvc.ReplaceAsync(text, repCtx);
try try

30
src/NadekoBot/Modules/Searches/SearchesService.cs
View File

@@ -229,25 +229,15 @@ public class SearchesService : INService
{ {
var subpath = tag.ToString().ToLowerInvariant(); var subpath = tag.ToString().ToLowerInvariant();
int max; var max = tag switch
switch (tag)
{ {
case ImageTag.Food: ImageTag.Food => 773,
max = 773; ImageTag.Dogs => 750,
break; ImageTag.Cats => 773,
case ImageTag.Dogs: ImageTag.Birds => 578,
max = 750; _ => 100,
break; };
case ImageTag.Cats:
max = 773;
break;
case ImageTag.Birds:
max = 578;
break;
default:
max = 100;
break;
}
return $"https://nadeko-pictures.nyc3.digitaloceanspaces.com/{subpath}/" return $"https://nadeko-pictures.nyc3.digitaloceanspaces.com/{subpath}/"
+ _rng.Next(1, max).ToString("000") + _rng.Next(1, max).ToString("000")
@@ -427,7 +417,7 @@ public class SearchesService : INService
async () => async () =>
{ {
using var http = _httpFactory.CreateClient(); using var http = _httpFactory.CreateClient();
// https://api.steampowered.com/ISteamApps/GetAppList/v2/ // https://api.steampowered.com/ISteamApps/GetAppList/v2/
var gamesStr = await http.GetStringAsync("https://api.steampowered.com/ISteamApps/GetAppList/v2/"); var gamesStr = await http.GetStringAsync("https://api.steampowered.com/ISteamApps/GetAppList/v2/");
var apps = JsonConvert var apps = JsonConvert
@@ -449,7 +439,7 @@ public class SearchesService : INService
if (gamesMap is null) if (gamesMap is null)
return -1; return -1;
query = query.Trim(); query = query.Trim();
var keyList = gamesMap.Keys.ToList(); var keyList = gamesMap.Keys.ToList();

2
src/NadekoBot/_common/Replacements/Impl/ReplacementRegistrator.default.cs
View File

@@ -40,7 +40,7 @@ public sealed partial class ReplacementPatternStore
Register("%server.id%", static (IGuild g) => g.Id.ToString()); Register("%server.id%", static (IGuild g) => g.Id.ToString());
Register("%server.name%", static (IGuild g) => g.Name); Register("%server.name%", static (IGuild g) => g.Name);
Register("%server.icon%", static (IGuild g) => g.IconUrl); Register("%server.icon%", static (IGuild g) => g.IconUrl);
Register("%server.members%", static async (IGuild g) => (g as SocketGuild)?.MemberCount.ToString() ?? "?"); Register("%server.members%", static (IGuild g) => (g as SocketGuild)?.MemberCount.ToString() ?? "?");
Register("%server.boosters%", static (IGuild g) => g.PremiumSubscriptionCount.ToString()); Register("%server.boosters%", static (IGuild g) => g.PremiumSubscriptionCount.ToString());
Register("%server.boost_level%", static (IGuild g) => ((int)g.PremiumTier).ToString()); Register("%server.boost_level%", static (IGuild g) => ((int)g.PremiumTier).ToString());
} }