TeamInklings/Octobot
TeamInklings/Octobot
1
0
Fork 1
mirror of https://github.com/TeamOctolings/Octobot.git synced 2025-04-20 00:43:36 +03:00
Code Issues Wiki Activity

Optimize and fix logic of CheckInteractionsAsync

Browse source 
Signed-off-by: Octol1ttle <l1ttleofficial@outlook.com>
This commit is contained in:
Octol1ttle 2023-06-09 19:32:07 +05:00
parent 014e825182
commit 14adad22ba
Signed by: Octol1ttle
GPG key ID: B77C34313AEE1FFF
1 changed files with 16 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
Services/UtilityService.cs
View file

@ -27,20 +27,16 @@ public class UtilityService : IHostedService {
if (interacterId == targetId) if (interacterId == targetId)
return Result<string?>.FromSuccess($"UserCannot{action}Themselves".Localized()); return Result<string?>.FromSuccess($"UserCannot{action}Themselves".Localized());
var guildResult = await _guildApi.GetGuildAsync(guildId, ct: ct);
if (!guildResult.IsDefined(out var guild))
return Result<string?>.FromError(guildResult);
if (targetId == guild.OwnerID) return Result<string?>.FromSuccess($"UserCannot{action}Owner".Localized());
var currentUserResult = await _userApi.GetCurrentUserAsync(ct); var currentUserResult = await _userApi.GetCurrentUserAsync(ct);
if (!currentUserResult.IsDefined(out var currentUser)) if (!currentUserResult.IsDefined(out var currentUser))
return Result<string?>.FromError(currentUserResult); return Result<string?>.FromError(currentUserResult);
if (currentUser.ID == targetId) if (currentUser.ID == targetId)
return Result<string?>.FromSuccess($"UserCannot{action}Bot".Localized()); return Result<string?>.FromSuccess($"UserCannot{action}Bot".Localized());
if (interacterId == guild.OwnerID) return Result<string?>.FromSuccess(null); var guildResult = await _guildApi.GetGuildAsync(guildId, ct: ct);
if (!guildResult.IsDefined(out var guild))
return Result<string?>.FromError(guildResult);
if (targetId == guild.OwnerID) return Result<string?>.FromSuccess($"UserCannot{action}Owner".Localized());
var targetMemberResult = await _guildApi.GetGuildMemberAsync(guildId, targetId, ct); var targetMemberResult = await _guildApi.GetGuildMemberAsync(guildId, targetId, ct);
if (!targetMemberResult.IsDefined(out var targetMember)) if (!targetMemberResult.IsDefined(out var targetMember))
@ -54,25 +50,26 @@ public class UtilityService : IHostedService {
if (!rolesResult.IsDefined(out var roles)) if (!rolesResult.IsDefined(out var roles))
return Result<string?>.FromError(rolesResult); return Result<string?>.FromError(rolesResult);
var targetRoles = roles.Where(r => targetMember.Roles.Contains(r.ID)).ToList();
var botRoles = roles.Where(r => currentMember.Roles.Contains(r.ID));
var targetBotRoleDiff = targetRoles.MaxOrDefault(r => r.Position) - botRoles.MaxOrDefault(r => r.Position);
if (targetBotRoleDiff >= 0)
return Result<string?>.FromSuccess($"BotCannot{action}Target".Localized());
if (interacterId == guild.OwnerID)
return Result<string?>.FromSuccess(null);
var interacterResult = await _guildApi.GetGuildMemberAsync(guildId, interacterId, ct); var interacterResult = await _guildApi.GetGuildMemberAsync(guildId, interacterId, ct);
if (!interacterResult.IsDefined(out var interacter)) if (!interacterResult.IsDefined(out var interacter))
return Result<string?>.FromError(interacterResult); return Result<string?>.FromError(interacterResult);
var targetRoles = roles.Where(r => targetMember.Roles.Contains(r.ID));
var interacterRoles = roles.Where(r => interacter.Roles.Contains(r.ID)); var interacterRoles = roles.Where(r => interacter.Roles.Contains(r.ID));
var botRoles = roles.Where(r => currentMember.Roles.Contains(r.ID));
var targetRolesList = targetRoles.ToList();
var targetBotRoleDiff = targetRolesList.MaxOrDefault(r => r.Position) - botRoles.Max(r => r.Position);
var targetInteracterRoleDiff var targetInteracterRoleDiff
= targetRolesList.MaxOrDefault(r => r.Position) - interacterRoles.Max(r => r.Position); = targetRoles.MaxOrDefault(r => r.Position) - interacterRoles.MaxOrDefault(r => r.Position);
if (targetInteracterRoleDiff >= 0) if (targetInteracterRoleDiff >= 0)
return Result<string?>.FromSuccess($"UserCannot{action}Target".Localized()); return Result<string?>.FromSuccess($"UserCannot{action}Target".Localized());
if (targetBotRoleDiff >= 0)
return Result<string?>.FromSuccess($"BotCannot{action}Target".Localized());
return Result<string?>.FromSuccess(null); return Result<string?>.FromSuccess(null);
} }
} }