minster586/nadekobot
1
0
Fork 0
mirror of https://gitlab.com/Kwoth/nadekobot.git synced 2025-11-02 15:54:27 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fixed most of the commands which used wrong error color for confirm messages

Browse Source
This commit is contained in:
Kwoth
2021-09-16 23:09:17 +02:00
parent a09be96200
commit 619bee811d
19 changed files with 33 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/NadekoBot/Modules/Administration/MuteCommands.cs
View File

@@ -90,7 +90,7 @@ namespace NadekoBot.Modules.Administration
return; return;
await _service.TimedMute(user, ctx.User, time.Time, reason: reason).ConfigureAwait(false); await _service.TimedMute(user, ctx.User, time.Time, reason: reason).ConfigureAwait(false);
await ReplyErrorLocalizedAsync(strs.user_muted_time(Format.Bold(user.ToString()), (int)time.Time.TotalMinutes)); await ReplyConfirmLocalizedAsync(strs.user_muted_time(Format.Bold(user.ToString()), (int)time.Time.TotalMinutes));
} }
catch (Exception ex) catch (Exception ex)
{ {
@@ -150,7 +150,7 @@ namespace NadekoBot.Modules.Administration
return; return;
await _service.TimedMute(user, ctx.User, time.Time, MuteType.Chat, reason: reason).ConfigureAwait(false); await _service.TimedMute(user, ctx.User, time.Time, MuteType.Chat, reason: reason).ConfigureAwait(false);
await ReplyErrorLocalizedAsync(strs.user_chat_mute_time(Format.Bold(user.ToString()), (int)time.Time.TotalMinutes)); await ReplyConfirmLocalizedAsync(strs.user_chat_mute_time(Format.Bold(user.ToString()), (int)time.Time.TotalMinutes));
} }
catch (Exception ex) catch (Exception ex)
{ {
@@ -209,7 +209,7 @@ namespace NadekoBot.Modules.Administration
return; return;
await _service.TimedMute(user, ctx.User, time.Time, MuteType.Voice, reason: reason).ConfigureAwait(false); await _service.TimedMute(user, ctx.User, time.Time, MuteType.Voice, reason: reason).ConfigureAwait(false);
await ReplyErrorLocalizedAsync(strs.user_voice_mute_time(Format.Bold(user.ToString()), (int)time.Time.TotalMinutes)); await ReplyConfirmLocalizedAsync(strs.user_voice_mute_time(Format.Bold(user.ToString()), (int)time.Time.TotalMinutes));
} }
catch catch
{ {

2
src/NadekoBot/Modules/Administration/PlayingRotateCommands.cs
View File

@@ -61,7 +61,7 @@ namespace NadekoBot.Modules.Administration
if (msg is null) if (msg is null)
return; return;
await ReplyErrorLocalizedAsync(strs.reprm(msg)); await ReplyConfirmLocalizedAsync(strs.reprm(msg));
} }
} }
} }

10
src/NadekoBot/Modules/Administration/ProtectionCommands.cs
View File

@@ -28,7 +28,7 @@ namespace NadekoBot.Modules.Administration
return; return;
} }
await ReplyErrorLocalizedAsync(strs.protection_not_running("Anti-Alt")); await ReplyConfirmLocalizedAsync(strs.protection_not_running("Anti-Alt"));
} }
[NadekoCommand, Aliases] [NadekoCommand, Aliases]
@@ -69,11 +69,11 @@ namespace NadekoBot.Modules.Administration
{ {
if (_service.TryStopAntiRaid(ctx.Guild.Id)) if (_service.TryStopAntiRaid(ctx.Guild.Id))
{ {
return ReplyErrorLocalizedAsync(strs.prot_disable("Anti-Raid")); return ReplyConfirmLocalizedAsync(strs.prot_disable("Anti-Raid"));
} }
else else
{ {
return ReplyErrorLocalizedAsync(strs.protection_not_running("Anti-Raid")); return ReplyPendingLocalizedAsync(strs.protection_not_running("Anti-Raid"));
} }
} }
@@ -145,11 +145,11 @@ namespace NadekoBot.Modules.Administration
{ {
if (_service.TryStopAntiSpam(ctx.Guild.Id)) if (_service.TryStopAntiSpam(ctx.Guild.Id))
{ {
return ReplyErrorLocalizedAsync(strs.prot_disable("Anti-Spam")); return ReplyConfirmLocalizedAsync(strs.prot_disable("Anti-Spam"));
} }
else else
{ {
return ReplyErrorLocalizedAsync(strs.protection_not_running("Anti-Spam")); return ReplyPendingLocalizedAsync(strs.protection_not_running("Anti-Spam"));
} }
} }

2
src/NadekoBot/Modules/Administration/RoleCommands.cs
View File

@@ -189,7 +189,7 @@ namespace NadekoBot.Modules.Administration
index--; index--;
var rr = rrs[index]; var rr = rrs[index];
_service.Remove(ctx.Guild.Id, index); _service.Remove(ctx.Guild.Id, index);
await ReplyErrorLocalizedAsync(strs.reaction_role_removed(index + 1)); await ReplyConfirmLocalizedAsync(strs.reaction_role_removed(index + 1));
} }
[NadekoCommand, Aliases] [NadekoCommand, Aliases]

4
src/NadekoBot/Modules/Administration/SelfAssignedRolesCommands.cs
View File

@@ -24,11 +24,11 @@ namespace NadekoBot.Modules.Administration
if (newVal) if (newVal)
{ {
await ReplyErrorLocalizedAsync(strs.adsarm_enable(Prefix)); await ReplyConfirmLocalizedAsync(strs.adsarm_enable(Prefix));
} }
else else
{ {
await ReplyErrorLocalizedAsync(strs.adsarm_disable(Prefix)); await ReplyConfirmLocalizedAsync(strs.adsarm_disable(Prefix));
} }
} }

2
src/NadekoBot/Modules/CustomReactions/CustomReactions.cs
View File

@@ -294,7 +294,7 @@ namespace NadekoBot.Modules.CustomReactions
.WithDescription("This will delete all custom reactions on this server.")).ConfigureAwait(false)) .WithDescription("This will delete all custom reactions on this server.")).ConfigureAwait(false))
{ {
var count = _service.DeleteAllCustomReactions(ctx.Guild.Id); var count = _service.DeleteAllCustomReactions(ctx.Guild.Id);
await ReplyErrorLocalizedAsync(strs.cleared(count)); await ReplyConfirmLocalizedAsync(strs.cleared(count));
} }
} }

6
src/NadekoBot/Modules/Gambling/Gambling.cs
View File

@@ -217,7 +217,7 @@ namespace NadekoBot.Modules.Gambling
[Priority(0)] [Priority(0)]
public async Task Cash(ulong userId) public async Task Cash(ulong userId)
{ {
await ReplyErrorLocalizedAsync(strs.has(Format.Code(userId.ToString()), $"{GetCurrency(userId)} {CurrencySign}")); await ReplyConfirmLocalizedAsync(strs.has(Format.Code(userId.ToString()), $"{GetCurrency(userId)} {CurrencySign}"));
} }
[NadekoCommand, Aliases] [NadekoCommand, Aliases]
@@ -269,7 +269,7 @@ namespace NadekoBot.Modules.Gambling
$"Awarded by bot owner. ({ctx.User.Username}/{ctx.User.Id}) {(msg ?? "")}", $"Awarded by bot owner. ({ctx.User.Username}/{ctx.User.Id}) {(msg ?? "")}",
amount, amount,
gamble: (ctx.Client.CurrentUser.Id != usrId)).ConfigureAwait(false); gamble: (ctx.Client.CurrentUser.Id != usrId)).ConfigureAwait(false);
await ReplyErrorLocalizedAsync(strs.awarded(n(amount) + CurrencySign, $"<@{usrId}>")); await ReplyConfirmLocalizedAsync(strs.awarded(n(amount) + CurrencySign, $"<@{usrId}>"));
} }
[NadekoCommand, Aliases] [NadekoCommand, Aliases]
@@ -340,7 +340,7 @@ namespace NadekoBot.Modules.Gambling
if (await _cs.RemoveAsync(usrId, $"Taken by bot owner.({ctx.User.Username}/{ctx.User.Id})", amount, if (await _cs.RemoveAsync(usrId, $"Taken by bot owner.({ctx.User.Username}/{ctx.User.Id})", amount,
gamble: (ctx.Client.CurrentUser.Id != usrId)).ConfigureAwait(false)) gamble: (ctx.Client.CurrentUser.Id != usrId)).ConfigureAwait(false))
await ReplyErrorLocalizedAsync(strs.take(amount + CurrencySign, $"<@{usrId}>")); await ReplyConfirmLocalizedAsync(strs.take(amount + CurrencySign, $"<@{usrId}>"));
else else
await ReplyErrorLocalizedAsync(strs.take_fail(amount + CurrencySign, Format.Code(usrId.ToString()), CurrencySign)); await ReplyErrorLocalizedAsync(strs.take_fail(amount + CurrencySign, Format.Code(usrId.ToString()), CurrencySign));
} }

4
src/NadekoBot/Modules/Gambling/WaifuClaimCommands.cs
View File

@@ -145,11 +145,11 @@ namespace NadekoBot.Modules.Gambling
if (result == DivorceResult.SucessWithPenalty) if (result == DivorceResult.SucessWithPenalty)
{ {
await ReplyErrorLocalizedAsync(strs.waifu_divorced_like(Format.Bold(w.Waifu.ToString()), amount + CurrencySign)); await ReplyConfirmLocalizedAsync(strs.waifu_divorced_like(Format.Bold(w.Waifu.ToString()), amount + CurrencySign));
} }
else if (result == DivorceResult.Success) else if (result == DivorceResult.Success)
{ {
await ReplyErrorLocalizedAsync(strs.waifu_divorced_notlike(amount + CurrencySign)); await ReplyConfirmLocalizedAsync(strs.waifu_divorced_notlike(amount + CurrencySign));
} }
else if (result == DivorceResult.NotYourWife) else if (result == DivorceResult.NotYourWife)
{ {

2
src/NadekoBot/Modules/Help/Help.cs
View File

@@ -434,7 +434,7 @@ namespace NadekoBot.Modules.Help
[NadekoCommand, Aliases] [NadekoCommand, Aliases]
public async Task Donate() public async Task Donate()
{ {
await ReplyErrorLocalizedAsync(strs.donate(PatreonUrl, PaypalUrl)); await ReplyConfirmLocalizedAsync(strs.donate(PatreonUrl, PaypalUrl));
} }
} }

4
src/NadekoBot/Modules/Music/Music.cs
View File

@@ -125,7 +125,7 @@ namespace NadekoBot.Modules.Music
queuedMessage?.DeleteAfter(10, _logService); queuedMessage?.DeleteAfter(10, _logService);
if (mp.IsStopped) if (mp.IsStopped)
{ {
var msg = await ReplyErrorLocalizedAsync(strs.queue_stopped(Format.Code(Prefix + "play"))); var msg = await ReplyPendingLocalizedAsync(strs.queue_stopped(Format.Code(Prefix + "play")));
msg.DeleteAfter(10, _logService); msg.DeleteAfter(10, _logService);
} }
} }
@@ -230,7 +230,7 @@ namespace NadekoBot.Modules.Music
return; return;
await _service.SetVolumeAsync(ctx.Guild.Id, vol); await _service.SetVolumeAsync(ctx.Guild.Id, vol);
await ReplyErrorLocalizedAsync(strs.volume_set(vol)); await ReplyConfirmLocalizedAsync(strs.volume_set(vol)));
} }
[NadekoCommand, Aliases] [NadekoCommand, Aliases]

8
src/NadekoBot/Modules/Nsfw/Nsfw.cs
View File

@@ -189,7 +189,7 @@ namespace NadekoBot.Modules.NSFW
return t; return t;
}); });
await ReplyErrorLocalizedAsync(strs.started(interval)); await ReplyConfirmLocalizedAsync(strs.started(interval));
} }
[NadekoCommand, Aliases] [NadekoCommand, Aliases]
@@ -229,7 +229,7 @@ namespace NadekoBot.Modules.NSFW
return t; return t;
}); });
await ReplyErrorLocalizedAsync(strs.started(interval)); await ReplyConfirmLocalizedAsync(strs.started(interval));
} }
#endif #endif
@@ -363,9 +363,9 @@ namespace NadekoBot.Modules.NSFW
var added = _service.ToggleBlacklistedTag(ctx.Guild.Id, tag); var added = _service.ToggleBlacklistedTag(ctx.Guild.Id, tag);
if (added) if (added)
await ReplyErrorLocalizedAsync(strs.blacklisted_tag_add(tag)); await ReplyPendingLocalizedAsync(strs.blacklisted_tag_add(tag));
else else
await ReplyErrorLocalizedAsync(strs.blacklisted_tag_remove(tag)); await ReplyPendingLocalizedAsync(strs.blacklisted_tag_remove(tag));
} }
} }

2
src/NadekoBot/Modules/Permissions/Permissions.cs
View File

@@ -217,7 +217,7 @@ namespace NadekoBot.Modules.Permissions
{ {
} }
} }
await ReplyErrorLocalizedAsync(strs.perm_out_of_range).ConfigureAwait(false); await ReplyConfirmLocalizedAsync(strs.perm_out_of_range).ConfigureAwait(false);
} }
[NadekoCommand, Aliases] [NadekoCommand, Aliases]

2
src/NadekoBot/Modules/Searches/FeedCommands.cs
View File

@@ -66,7 +66,7 @@ namespace NadekoBot.Modules.Searches
} }
} }
await ReplyErrorLocalizedAsync(strs.feed_not_valid).ConfigureAwait(false); await ReplyConfirmLocalizedAsync(strs.feed_not_valid).ConfigureAwait(false);
} }
[NadekoCommand, Aliases] [NadekoCommand, Aliases]

2
src/NadekoBot/Modules/Searches/StreamNotificationCommands.cs
View File

@@ -191,7 +191,7 @@ namespace NadekoBot.Modules.Searches
return; return;
} }
await ReplyErrorLocalizedAsync(strs.stream_message_set_all(count)); await ReplyConfirmLocalizedAsync(strs.stream_message_set_all(count));
} }
[NadekoCommand, Aliases] [NadekoCommand, Aliases]

2
src/NadekoBot/Modules/Searches/TranslatorCommands.cs
View File

@@ -118,7 +118,7 @@ namespace NadekoBot.Modules.Searches
_searches.UserLanguages.AddOrUpdate(ucp, langs, (key, val) => langs); _searches.UserLanguages.AddOrUpdate(ucp, langs, (key, val) => langs);
await ReplyErrorLocalizedAsync(strs.atl_set(from, to)); await ReplyConfirmLocalizedAsync(strs.atl_set(from, to));
} }
[NadekoCommand, Aliases] [NadekoCommand, Aliases]

2
src/NadekoBot/Modules/Utility/CommandMapCommands.cs
View File

@@ -37,7 +37,7 @@ namespace NadekoBot.Modules.Utility
public async Task AliasesClear() public async Task AliasesClear()
{ {
var count = _service.ClearAliases(ctx.Guild.Id); var count = _service.ClearAliases(ctx.Guild.Id);
await ReplyErrorLocalizedAsync(strs.aliases_cleared(count)); await ReplyConfirmLocalizedAsync(strs.aliases_cleared(count));
} }
[NadekoCommand, Aliases] [NadekoCommand, Aliases]

2
src/NadekoBot/Modules/Utility/RemindCommands.cs
View File

@@ -148,7 +148,7 @@ namespace NadekoBot.Modules.Utility
} }
else else
{ {
await ReplyErrorLocalizedAsync(strs.reminder_deleted(index + 1)); await ReplyConfirmLocalizedAsync(strs.reminder_deleted(index + 1));
} }
} }

2
src/NadekoBot/Modules/Xp/ResetCommands.cs
View File

@@ -31,7 +31,7 @@ namespace NadekoBot.Modules.Xp
_service.XpReset(ctx.Guild.Id, userId); _service.XpReset(ctx.Guild.Id, userId);
await ReplyErrorLocalizedAsync(strs.reset_user(userId)); await ReplyConfirmLocalizedAsync(strs.reset_user(userId));
} }
[NadekoCommand, Aliases] [NadekoCommand, Aliases]

2
src/NadekoBot/Modules/Xp/Xp.cs
View File

@@ -128,7 +128,7 @@ namespace NadekoBot.Modules.Xp
public async Task XpRoleReward(int level) public async Task XpRoleReward(int level)
{ {
_service.ResetRoleReward(ctx.Guild.Id, level); _service.ResetRoleReward(ctx.Guild.Id, level);
await ReplyErrorLocalizedAsync(strs.xp_role_reward_cleared(level)); await ReplyConfirmLocalizedAsync(strs.xp_role_reward_cleared(level));
} }
[NadekoCommand, Aliases] [NadekoCommand, Aliases]