Skip to content

Commit

Permalink
Refactor namespace for helper functions
Browse files Browse the repository at this point in the history 
The full namespace for helper functions was shortened to a more concise form across multiple files. Instead of calling the methods with `Utils.Helpers.MethodName()`, they are now simply called with `Helpers.MethodName()`. This commit eliminates redundant namespace references improving code readability.
  • Loading branch information
@FabiChan99
FabiChan99 committed Dec 21, 2023
1 parent 041df0d commit d8306ae
Show file tree
Hide file tree
Showing 13 changed files with 47 additions and 46 deletions.
6 changes: 3 additions & 3 deletions src/Commands/Moderation/BanRequestCommand.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@ public async Task BanRequest(CommandContext ctx, DiscordUser user, [RemainingTex
reason = await ModerationHelper.BanReasonSelector(ctx);
}

if (await Utils.Helpers.CheckForReason(ctx, reason)) return;
if (await Utils.Helpers.TicketUrlCheck(ctx, reason)) return;
if (await Helpers.CheckForReason(ctx, reason)) return;
if (await Helpers.TicketUrlCheck(ctx, reason)) return;
reason = await ReasonTemplateResolver.Resolve(reason);
var caseid = Utils.Helpers.GenerateCaseID();
var caseid = Helpers.GenerateCaseID();
var staffrole = ctx.Guild.GetRole(ulong.Parse(BotConfig.GetConfig()["ServerConfig"]["StaffRoleId"]));
var staffmembers = ctx.Guild.Members
.Where(x => x.Value.Roles.Any(y => y.Id == GlobalProperties.StaffRoleId))
Expand Down
6 changes: 3 additions & 3 deletions src/Commands/Moderation/BanUserCommand.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@ public async Task BanMember(CommandContext ctx, DiscordUser user, [RemainingText
reason = await ModerationHelper.BanReasonSelector(ctx);
}

if (await Utils.Helpers.CheckForReason(ctx, reason)) return;
if (await Utils.Helpers.TicketUrlCheck(ctx, reason)) return;
if (await Helpers.CheckForReason(ctx, reason)) return;
if (await Helpers.TicketUrlCheck(ctx, reason)) return;
reason = await ReasonTemplateResolver.Resolve(reason);
var caseid = Utils.Helpers.GenerateCaseID();
var caseid = Helpers.GenerateCaseID();
var embedBuilder = new DiscordEmbedBuilder()
.WithTitle($"Du wurdest von {ctx.Guild.Name} gebannt!")
.WithDescription($"**Begründung:**```{reason}```\n" +
Expand Down
9 changes: 5 additions & 4 deletions src/Commands/Moderation/CaseManagementCommands.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
using System.Net.Http.Headers;
using AGC_Management.Attributes;
using AGC_Management.Services;
using AGC_Management.Utils;
using DisCatSharp;
using DisCatSharp.CommandsNext;
using DisCatSharp.CommandsNext.Attributes;
Expand Down Expand Up @@ -222,7 +223,7 @@ public async Task CaseEdit(CommandContext ctx, string caseid, [RemainingText] st
string sql;
if (wcase)
{
if (await Utils.Helpers.CheckForReason(ctx, reason)) return;
if (await Helpers.CheckForReason(ctx, reason)) return;
await using (NpgsqlConnection conn = new(DatabaseService.GetConnectionString()))
{
await conn.OpenAsync();
Expand Down Expand Up @@ -258,7 +259,7 @@ public async Task CaseEdit(CommandContext ctx, string caseid, [RemainingText] st
urls = await UploadToCatBox(ctx, imgAttachments);
}

if (await Utils.Helpers.CheckForReason(ctx, reason)) return;
if (await Helpers.CheckForReason(ctx, reason)) return;
await using (NpgsqlConnection conn = new(DatabaseService.GetConnectionString()))
{
await conn.OpenAsync();
Expand Down Expand Up @@ -346,7 +347,7 @@ public async Task CaseDelete(CommandContext ctx, string caseid, [RemainingText]
string sql;
if (wcase)
{
if (await Utils.Helpers.CheckForReason(ctx, reason)) return;
if (await Helpers.CheckForReason(ctx, reason)) return;
await using (NpgsqlConnection conn = new(DatabaseService.GetConnectionString()))
{
await conn.OpenAsync();
Expand All @@ -370,7 +371,7 @@ public async Task CaseDelete(CommandContext ctx, string caseid, [RemainingText]

if (fcase)
{
if (await Utils.Helpers.CheckForReason(ctx, reason)) return;
if (await Helpers.CheckForReason(ctx, reason)) return;
await using (NpgsqlConnection conn = new(DatabaseService.GetConnectionString()))
{
await conn.OpenAsync();
Expand Down
6 changes: 3 additions & 3 deletions src/Commands/Moderation/FlagUserCommand.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ public sealed class FlagUserCommand : BaseCommandModule
[RequireTeamCat]
public async Task FlagUser(CommandContext ctx, DiscordUser user, [RemainingText] string reason)
{
if (await Utils.Helpers.CheckForReason(ctx, reason)) return;
var caseid = Utils.Helpers.GenerateCaseID();
if (await Helpers.CheckForReason(ctx, reason)) return;
var caseid = Helpers.GenerateCaseID();
reason = await ReasonTemplateResolver.Resolve(reason);

var imgExtensions = new[] { ".jpg", ".jpeg", ".png", ".gif", ".bmp" };
Expand All @@ -31,7 +31,7 @@ public async Task FlagUser(CommandContext ctx, DiscordUser user, [RemainingText]
string urls = "";
if (imgAttachments.Count > 0)
{
urls = await Utils.Helpers.UploadToCatBox(ctx, imgAttachments);
urls = await Helpers.UploadToCatBox(ctx, imgAttachments);
}


Expand Down
6 changes: 3 additions & 3 deletions src/Commands/Moderation/KickUserCommand.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@ public sealed class KickUserCommand : BaseCommandModule
[Description("Kickt einen User vom Server.")]
public async Task KickMember(CommandContext ctx, DiscordMember user, [RemainingText] string reason)
{
if (await Utils.Helpers.CheckForReason(ctx, reason)) return;
if (await Utils.Helpers.TicketUrlCheck(ctx, reason)) return;
if (await Helpers.CheckForReason(ctx, reason)) return;
if (await Helpers.TicketUrlCheck(ctx, reason)) return;
reason = await ReasonTemplateResolver.Resolve(reason);
var caseid = Utils.Helpers.GenerateCaseID();
var caseid = Helpers.GenerateCaseID();
var embedBuilder = new DiscordEmbedBuilder()
.WithTitle($"Du wurdest von {ctx.Guild.Name} gekickt!")
.WithDescription($"**Begründung:**```{reason}```")
Expand Down
6 changes: 3 additions & 3 deletions src/Commands/Moderation/MultiBanCommand.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ public async Task MultiBan(CommandContext ctx, [RemainingText] string ids_and_re
reason = await ModerationHelper.BanReasonSelector(ctx);
}

if (await Utils.Helpers.CheckForReason(ctx, reason)) return;
if (await Utils.Helpers.TicketUrlCheck(ctx, reason)) return;
if (await Helpers.CheckForReason(ctx, reason)) return;
if (await Helpers.TicketUrlCheck(ctx, reason)) return;
reason = await ReasonTemplateResolver.Resolve(reason);
reason = reason.TrimEnd(' ');
var users_to_ban = new List<DiscordUser>();
Expand Down Expand Up @@ -57,7 +57,7 @@ public async Task MultiBan(CommandContext ctx, [RemainingText] string ids_and_re
}

var busers_formatted = string.Join("\n", users_to_ban.Select(buser => buser.UsernameWithDiscriminator));
var caseid = Utils.Helpers.GenerateCaseID();
var caseid = Helpers.GenerateCaseID();
var confirmEmbedBuilder = new DiscordEmbedBuilder()
.WithTitle("Überprüfe deine Eingabe | Aktion: Multiban")
.WithFooter(ctx.User.UsernameWithDiscriminator, ctx.User.AvatarUrl)
Expand Down
6 changes: 3 additions & 3 deletions src/Commands/Moderation/MultiBanRequestCommand.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ public async Task MultiBanRequest(CommandContext ctx, [RemainingText] string ids
reason = await ModerationHelper.BanReasonSelector(ctx);
}

if (await Utils.Helpers.CheckForReason(ctx, reason)) return;
if (await Utils.Helpers.TicketUrlCheck(ctx, reason)) return;
if (await Helpers.CheckForReason(ctx, reason)) return;
if (await Helpers.TicketUrlCheck(ctx, reason)) return;
reason = await ReasonTemplateResolver.Resolve(reason);
reason = reason.TrimEnd(' ');
var users_to_ban = new List<DiscordUser>();
Expand All @@ -57,7 +57,7 @@ public async Task MultiBanRequest(CommandContext ctx, [RemainingText] string ids
}

var busers_formatted = string.Join("\n", users_to_ban.Select(buser => buser.UsernameWithDiscriminator));
var caseid = Utils.Helpers.GenerateCaseID();
var caseid = Helpers.GenerateCaseID();
var confirmEmbedBuilder = new DiscordEmbedBuilder()
.WithTitle("Überprüfe deine Eingabe | Aktion: Multibanrequest")
.WithFooter(ctx.User.UsernameWithDiscriminator, ctx.User.AvatarUrl)
Expand Down
10 changes: 5 additions & 5 deletions src/Commands/Moderation/MultiFlagUserCommand.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ public async Task MultiFlagUser(CommandContext ctx, [RemainingText] string ids_a
List<ulong> ids;
string reason;
Converter.SeperateIdsAndReason(ids_and_reason, out ids, out reason);
if (await Utils.Helpers.CheckForReason(ctx, reason)) return;
if (await Utils.Helpers.TicketUrlCheck(ctx, reason)) return;
if (await Helpers.CheckForReason(ctx, reason)) return;
if (await Helpers.TicketUrlCheck(ctx, reason)) return;
reason = reason.TrimEnd(' ');
reason = await ReasonTemplateResolver.Resolve(reason);
var users_to_flag = new List<DiscordUser>();
Expand Down Expand Up @@ -59,11 +59,11 @@ public async Task MultiFlagUser(CommandContext ctx, [RemainingText] string ids_a
string urls = "";
if (imgAttachments.Count > 0)
{
urls = await Utils.Helpers.UploadToCatBox(ctx, imgAttachments);
urls = await Helpers.UploadToCatBox(ctx, imgAttachments);
}

var busers_formatted = string.Join("\n", users_to_flag.Select(buser => buser.UsernameWithDiscriminator));
var caseid = Utils.Helpers.GenerateCaseID();
var caseid = Helpers.GenerateCaseID();
var confirmEmbedBuilder = new DiscordEmbedBuilder()
.WithTitle("Überprüfe deine Eingabe | Aktion: MultiFlag")
.WithFooter(ctx.User.UsernameWithDiscriminator, ctx.User.AvatarUrl)
Expand Down Expand Up @@ -141,7 +141,7 @@ public async Task MultiFlagUser(CommandContext ctx, [RemainingText] string ids_a

foreach (var user in users_to_flag_obj)
{
var caseid_ = Utils.Helpers.GenerateCaseID();
var caseid_ = Helpers.GenerateCaseID();
caseid_ = $"{caseid}-{caseid_}";
Dictionary<string, object> data = new()
{
Expand Down
8 changes: 4 additions & 4 deletions src/Commands/Moderation/MultiWarnCommand.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ public async Task MultiWarnUser(CommandContext ctx, [RemainingText] string ids_a
List<ulong> ids;
string reason;
Converter.SeperateIdsAndReason(ids_and_reason, out ids, out reason);
if (await Utils.Helpers.CheckForReason(ctx, reason)) return;
if (await Helpers.CheckForReason(ctx, reason)) return;
reason = reason.TrimEnd(' ');
reason = await ReasonTemplateResolver.Resolve(reason);
var users_to_warn = new List<DiscordUser>();
Expand All @@ -54,7 +54,7 @@ public async Task MultiWarnUser(CommandContext ctx, [RemainingText] string ids_a
}

var busers_formatted = string.Join("\n", users_to_warn.Select(buser => buser.UsernameWithDiscriminator));
var caseid = Utils.Helpers.GenerateCaseID();
var caseid = Helpers.GenerateCaseID();
var confirmEmbedBuilder = new DiscordEmbedBuilder()
.WithTitle("Überprüfe deine Eingabe | Aktion: MultiWarn")
.WithFooter(ctx.User.UsernameWithDiscriminator, ctx.User.AvatarUrl)
Expand Down Expand Up @@ -132,7 +132,7 @@ public async Task MultiWarnUser(CommandContext ctx, [RemainingText] string ids_a

foreach (var user in users_to_warn_obj)
{
var caseid_ = Utils.Helpers.GenerateCaseID();
var caseid_ = Helpers.GenerateCaseID();
caseid_ = $"{caseid}-{caseid_}";
Dictionary<string, object> data = new()
{
Expand Down Expand Up @@ -178,7 +178,7 @@ public async Task MultiWarnUser(CommandContext ctx, [RemainingText] string ids_a

if (!sent)
{
await Utils.Helpers.SendWarnAsChannel(ctx, user, uembed, caseid);
await Helpers.SendWarnAsChannel(ctx, user, uembed, caseid);
}

var dmsent = sent ? "✅" : "⚠️";
Expand Down
8 changes: 4 additions & 4 deletions src/Commands/Moderation/PermaWarnCommand.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,11 @@ public async Task PermaWarnUser(CommandContext ctx, DiscordUser user, [Remaining
reason = await ModerationHelper.WarnReasonSelector(ctx);
}

if (await Utils.Helpers.CheckForReason(ctx, reason)) return;
if (await Utils.Helpers.TicketUrlCheck(ctx, reason)) return;
if (await Helpers.CheckForReason(ctx, reason)) return;
if (await Helpers.TicketUrlCheck(ctx, reason)) return;
reason = await ReasonTemplateResolver.Resolve(reason);
var (warnsToKick, warnsToBan) = await ModerationHelper.GetWarnKickValues();
var caseid = Utils.Helpers.GenerateCaseID();
var caseid = Helpers.GenerateCaseID();


var interactivity = ctx.Client.GetInteractivity();
Expand Down Expand Up @@ -139,7 +139,7 @@ public async Task PermaWarnUser(CommandContext ctx, DiscordUser user, [Remaining

if (!sent)
{
await Utils.Helpers.SendWarnAsChannel(ctx, user, uembed, caseid);
await Helpers.SendWarnAsChannel(ctx, user, uembed, caseid);
}

var dmsent = sent ? "✅" : "⚠️";
Expand Down
8 changes: 4 additions & 4 deletions src/Commands/Moderation/UserInfoCommand.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ public async Task UserInfo(CommandContext ctx, DiscordUser user)
}

string ticketcount = "Tickets konnten nicht abgerufen werden.";
var ticketcount_c = await Utils.Helpers.GetTicketCount(user.Id);
var ticketcount_c = await Helpers.GetTicketCount(user.Id);
if (ticketcount_c != null)

Check warning on line 41 in src/Commands/Moderation/UserInfoCommand.cs

View workflow job for this annotation

GitHub Actions / build 

The result of the expression is always 'true' since a value of type 'long' is never equal to 'null' of type 'long?'
ticketcount = ticketcount_c.ToString();

Expand Down Expand Up @@ -91,15 +91,15 @@ public async Task UserInfo(CommandContext ctx, DiscordUser user)
{
try
{
bsflaglist = await Utils.Helpers.BSWarnToWarn(user);
bsreportlist = await Utils.Helpers.BSReportToWarn(user);
bsflaglist = await Helpers.BSWarnToWarn(user);
bsreportlist = await Helpers.BSReportToWarn(user);
}
catch (Exception)
{
}
}

bs_status = Utils.Helpers.HasActiveBannSystemReport(bsreportlist);
bs_status = Helpers.HasActiveBannSystemReport(bsreportlist);


string bs_icon = bs_status ? "<:BannSystem:1012006073751830529>" : "";
Expand Down
8 changes: 4 additions & 4 deletions src/Commands/Moderation/WarnUserCommand.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,11 @@ public async Task WarnUser(CommandContext ctx, DiscordUser user, [RemainingText]
reason = await ModerationHelper.WarnReasonSelector(ctx);
}

if (await Utils.Helpers.CheckForReason(ctx, reason)) return;
if (await Utils.Helpers.TicketUrlCheck(ctx, reason)) return;
if (await Helpers.CheckForReason(ctx, reason)) return;
if (await Helpers.TicketUrlCheck(ctx, reason)) return;
reason = await ReasonTemplateResolver.Resolve(reason);
var (warnsToKick, warnsToBan) = await ModerationHelper.GetWarnKickValues();
var caseid = Utils.Helpers.GenerateCaseID();
var caseid = Helpers.GenerateCaseID();


var interactivity = ctx.Client.GetInteractivity();
Expand Down Expand Up @@ -139,7 +139,7 @@ public async Task WarnUser(CommandContext ctx, DiscordUser user, [RemainingText]

if (!sent)
{
await Utils.Helpers.SendWarnAsChannel(ctx, user, uembed, caseid);
await Helpers.SendWarnAsChannel(ctx, user, uembed, caseid);
}

var dmsent = sent ? "✅" : "⚠️";
Expand Down
6 changes: 3 additions & 3 deletions src/Commands/TempVC/TempVoice.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1145,7 +1145,7 @@ public async Task JoinRequest(CommandContext ctx, DiscordMember user)
_ = Task.Run(async () =>
{
if (SelfCheck(ctx, user)) return;
var caseid = Utils.Helpers.GenerateCaseID();
var caseid = Helpers.GenerateCaseID();
var db_channels = await GetAllChannelIDsFromDB();
var userchannel = user.VoiceState?.Channel;
var userchannelid = userchannel?.Id;
Expand Down Expand Up @@ -1613,7 +1613,7 @@ await ctx.RespondAsync(
.WithColor(BotConfig.GetEmbedColor()).WithTitle("Voice Channel Informationen")
//.WithThumbnail("https://cdn3.emoji.gg/emojis/2378-discord-voice-channel.png")
.WithFooter($"{ctx.User.UsernameWithDiscriminator}");
var caseid = Utils.Helpers.GenerateCaseID();
var caseid = Helpers.GenerateCaseID();
List<DiscordButtonComponent> buttons = new(2)
{
new DiscordButtonComponent(ButtonStyle.Secondary, $"get_vcinfo_{caseid}",
Expand Down Expand Up @@ -2048,7 +2048,7 @@ await msg.ModifyAsync(
channellimit = "Kein Limit";
}
var caseid = Utils.Helpers.GenerateCaseID();
var caseid = Helpers.GenerateCaseID();
string blockedusers = user["blockedusers"].ToString();
string permitedusers = user["permitedusers"].ToString();
string locked = user["locked"].ToString();
Expand Down

0 comments on commit d8306ae

Please sign in to comment.