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

Corrected some mistakes

Browse source 
Signed-off-by: Octol1ttle <l1ttleofficial@outlook.com>
This commit is contained in:
Octol1ttle 2023-06-23 23:45:52 +05:00
parent 83e438e61c
commit a467c64617
Signed by: Octol1ttle
GPG key ID: B77C34313AEE1FFF
3 changed files with 25 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Commands/BanCommandGroup.cs
View file

@ -21,7 +21,7 @@ using Remora.Results;
namespace Boyfriend.Commands; namespace Boyfriend.Commands;
/// <summary> /// <summary>
/// Handles commands related to ban management: /ban and unban. /// Handles commands related to ban management: /ban and /unban.
/// </summary> /// </summary>
public class BanCommandGroup : CommandGroup { public class BanCommandGroup : CommandGroup {
private readonly IDiscordRestChannelAPI _channelApi; private readonly IDiscordRestChannelAPI _channelApi;

4
Commands/KickCommandGroup.cs
View file

@ -76,8 +76,8 @@ public class KickCommandGroup : CommandGroup {
var cfg = data.Configuration; var cfg = data.Configuration;
Messages.Culture = data.Culture; Messages.Culture = data.Culture;
var existingKickResult = await _guildApi.GetGuildMemberAsync(guildId.Value, target.ID); var memberResult = await _guildApi.GetGuildMemberAsync(guildId.Value, target.ID, CancellationToken);
if (!existingKickResult.IsSuccess) { if (!memberResult.IsSuccess) {
var embed = new EmbedBuilder().WithSmallTitle(Messages.UserNotFoundShort, currentUser) var embed = new EmbedBuilder().WithSmallTitle(Messages.UserNotFoundShort, currentUser)
.WithColour(ColorsList.Red).Build(); .WithColour(ColorsList.Red).Build();

28
Commands/MuteCommandGroup.cs
View file

@ -83,9 +83,20 @@ public class MuteCommandGroup : CommandGroup {
if (!currentUserResult.IsDefined(out var currentUser)) if (!currentUserResult.IsDefined(out var currentUser))
return Result.FromError(currentUserResult); return Result.FromError(currentUserResult);
var memberResult = await _guildApi.GetGuildMemberAsync(guildId.Value, target.ID, CancellationToken);
if (!memberResult.IsSuccess) {
var embed = new EmbedBuilder().WithSmallTitle(Messages.UserNotFoundShort, currentUser)
.WithColour(ColorsList.Red).Build();
if (!embed.IsDefined(out var alreadyBuilt))
return Result.FromError(embed);
return (Result)await _feedbackService.SendContextualEmbedAsync(alreadyBuilt, ct: CancellationToken);
}
var interactionResult var interactionResult
= await _utility.CheckInteractionsAsync( = await _utility.CheckInteractionsAsync(
guildId.Value, userId.Value, target.ID, "Timeout", CancellationToken); guildId.Value, userId.Value, target.ID, "Mute", CancellationToken);
if (!interactionResult.IsSuccess) if (!interactionResult.IsSuccess)
return Result.FromError(interactionResult); return Result.FromError(interactionResult);
@ -187,10 +198,9 @@ public class MuteCommandGroup : CommandGroup {
var cfg = await _dataService.GetConfiguration(guildId.Value, CancellationToken); var cfg = await _dataService.GetConfiguration(guildId.Value, CancellationToken);
Messages.Culture = cfg.GetCulture(); Messages.Culture = cfg.GetCulture();
var existingMuteResult = await _guildApi.ModifyGuildMemberAsync( var memberResult = await _guildApi.GetGuildMemberAsync(guildId.Value, target.ID, CancellationToken);
guildId.Value, target.ID, communicationDisabledUntil: DateTimeOffset.UtcNow); if (!memberResult.IsSuccess) {
if (!existingMuteResult.IsSuccess) { var embed = new EmbedBuilder().WithSmallTitle(Messages.UserNotFoundShort, currentUser)
var embed = new EmbedBuilder().WithSmallTitle(Messages.UserNotMuted, currentUser)
.WithColour(ColorsList.Red).Build(); .WithColour(ColorsList.Red).Build();
if (!embed.IsDefined(out var alreadyBuilt)) if (!embed.IsDefined(out var alreadyBuilt))
@ -199,6 +209,12 @@ public class MuteCommandGroup : CommandGroup {
return (Result)await _feedbackService.SendContextualEmbedAsync(alreadyBuilt, ct: CancellationToken); return (Result)await _feedbackService.SendContextualEmbedAsync(alreadyBuilt, ct: CancellationToken);
} }
var interactionResult
= await _utility.CheckInteractionsAsync(
guildId.Value, userId.Value, target.ID, "Unmute", CancellationToken);
if (!interactionResult.IsSuccess)
return Result.FromError(interactionResult);
// Needed to get the tag and avatar // Needed to get the tag and avatar
var userResult = await _userApi.GetUserAsync(userId.Value, CancellationToken); var userResult = await _userApi.GetUserAsync(userId.Value, CancellationToken);
if (!userResult.IsDefined(out var user)) if (!userResult.IsDefined(out var user))
@ -206,7 +222,7 @@ public class MuteCommandGroup : CommandGroup {
var unmuteResult = await _guildApi.ModifyGuildMemberAsync( var unmuteResult = await _guildApi.ModifyGuildMemberAsync(
guildId.Value, target.ID, $"({user.GetTag()}) {reason}".EncodeHeader(), guildId.Value, target.ID, $"({user.GetTag()}) {reason}".EncodeHeader(),
communicationDisabledUntil: DateTimeOffset.UtcNow, ct: CancellationToken); communicationDisabledUntil: null, ct: CancellationToken);
if (!unmuteResult.IsSuccess) if (!unmuteResult.IsSuccess)
return Result.FromError(unmuteResult.Error); return Result.FromError(unmuteResult.Error);