From 9ae52a548c983d9687f747b359c0908d92ca82e0 Mon Sep 17 00:00:00 2001 From: Kwoth Date: Fri, 21 Oct 2016 16:40:35 +0200 Subject: [PATCH 1/8] .setstream added --- .../Modules/Administration/Administration.cs | 16 ++++++++++- .../Resources/CommandStrings.Designer.cs | 27 +++++++++++++++++++ src/NadekoBot/Resources/CommandStrings.resx | 9 +++++++ 3 files changed, 51 insertions(+), 1 deletion(-) diff --git a/src/NadekoBot/Modules/Administration/Administration.cs b/src/NadekoBot/Modules/Administration/Administration.cs index b2d7333f..8f123251 100644 --- a/src/NadekoBot/Modules/Administration/Administration.cs +++ b/src/NadekoBot/Modules/Administration/Administration.cs @@ -689,7 +689,21 @@ namespace NadekoBot.Modules.Administration await NadekoBot.Client.GetCurrentUser().ModifyStatusAsync(u => u.Game = new Game(game)).ConfigureAwait(false); - await channel.SendMessageAsync("New game set.").ConfigureAwait(false); + await channel.SendMessageAsync("`New game set.`").ConfigureAwait(false); + } + + [NadekoCommand, Usage, Description, Aliases] + [RequireContext(ContextType.Guild)] + [OwnerOnly] + public async Task SetStream(IUserMessage umsg, string url, [Remainder] string name = null) + { + var channel = (ITextChannel)umsg.Channel; + + name = name ?? ""; + + await NadekoBot.Client.GetCurrentUser().ModifyStatusAsync(u => u.Game = new Game(name, url, StreamType.Twitch)).ConfigureAwait(false); + + await channel.SendMessageAsync("`New stream set.`").ConfigureAwait(false); } [NadekoCommand, Usage, Description, Aliases] diff --git a/src/NadekoBot/Resources/CommandStrings.Designer.cs b/src/NadekoBot/Resources/CommandStrings.Designer.cs index b8e071e5..d88c31c4 100644 --- a/src/NadekoBot/Resources/CommandStrings.Designer.cs +++ b/src/NadekoBot/Resources/CommandStrings.Designer.cs @@ -5729,6 +5729,33 @@ namespace NadekoBot.Resources { } } + /// + /// Looks up a localized string similar to setstream. + /// + public static string setstream_cmd { + get { + return ResourceManager.GetString("setstream_cmd", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Sets the bots stream. First argument is the twitch link, second argument is stream name.. + /// + public static string setstream_desc { + get { + return ResourceManager.GetString("setstream_desc", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to `{0}setstream https://www.twitch.tv/masterkwoth Developing Nakedo`. + /// + public static string setstream_usage { + get { + return ResourceManager.GetString("setstream_usage", resourceCulture); + } + } + /// /// Looks up a localized string similar to settopic st. /// diff --git a/src/NadekoBot/Resources/CommandStrings.resx b/src/NadekoBot/Resources/CommandStrings.resx index 34935eea..1ef8f630 100644 --- a/src/NadekoBot/Resources/CommandStrings.resx +++ b/src/NadekoBot/Resources/CommandStrings.resx @@ -2475,4 +2475,13 @@ `{0}adsarm` + + setstream + + + Sets the bots stream. First argument is the twitch link, second argument is stream name. + + + `{0}setstream https://www.twitch.tv/masterkwoth Developing Nakedo` + \ No newline at end of file From b1e73d5b22b43f1951b477579d216c47e0d50248 Mon Sep 17 00:00:00 2001 From: Kwoth Date: Fri, 21 Oct 2016 16:58:38 +0200 Subject: [PATCH 2/8] Fixed date format --- src/NadekoBot/Modules/Utility/Commands/InfoCommands.cs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/NadekoBot/Modules/Utility/Commands/InfoCommands.cs b/src/NadekoBot/Modules/Utility/Commands/InfoCommands.cs index 1cfc36a5..fad77cc4 100644 --- a/src/NadekoBot/Modules/Utility/Commands/InfoCommands.cs +++ b/src/NadekoBot/Modules/Utility/Commands/InfoCommands.cs @@ -36,7 +36,7 @@ namespace NadekoBot.Modules.Utility `TextChannels:` **{(await server.GetTextChannelsAsync()).Count()}** `VoiceChannels:` **{(await server.GetVoiceChannelsAsync()).Count()}** `Members:` **{users.Count}** `-` {users.Count(u => u.Status == UserStatus.Online)}:green_heart: {users.Count(u => u.Status == UserStatus.Idle)}:yellow_heart: {users.Count(u => u.Status == UserStatus.DoNotDisturb)}:heart: {users.Count(u=> u.Status == UserStatus.Offline || u.Status == UserStatus.Unknown)}:black_heart: `Roles:` **{server.Roles.Count()}** -`Created At:` **{createdAt}** +`Created At:` **{createdAt.ToString("dd.MM.yyyy HH:mm")}** "); if (server.Emojis.Count() > 0) sb.AppendLine($"`Custom Emojis:` **{string.Join(", ", server.Emojis)}**"); @@ -57,7 +57,7 @@ namespace NadekoBot.Modules.Utility var createdAt = new DateTime(2015, 1, 1, 0, 0, 0, 0, DateTimeKind.Utc).AddMilliseconds(ch.Id >> 22); var toReturn = $@"`Name:` **#{ch.Name}** `Id:` **{ch.Id}** -`Created At:` **{createdAt}** +`Created At:` **{createdAt.ToString("dd.MM.yyyy HH:mm")}** `Topic:` **{ch.Topic}** `Users:` **{(await ch.GetUsersAsync()).Count()}**"; await msg.Reply(toReturn).ConfigureAwait(false); @@ -76,7 +76,8 @@ namespace NadekoBot.Modules.Utility toReturn += $"`Nickname:` **{user.Nickname}**"; toReturn += $@"`Id:` **{user.Id}** `Current Game:` **{(user.Game?.Name == null ? "-" : user.Game.Name)}** -`Joined At:` **{user.JoinedAt}** +`Joined Server:` **{user.JoinedAt?.ToString("dd.MM.yyyy HH:mm")}** +`Joined Discord:` **{user.CreatedAt.ToString("dd.MM.yyyy HH:mm")}** `Roles:` **({user.Roles.Count()}) - {string.Join(", ", user.Roles.Select(r => r.Name)).SanitizeMentions()}** `AvatarUrl:` **{user.AvatarUrl}**"; await msg.Reply(toReturn).ConfigureAwait(false); From 1c2236ba66eaf74f63e62ef79fb6bbeac1a6a091 Mon Sep 17 00:00:00 2001 From: Kwoth Date: Fri, 21 Oct 2016 18:13:59 +0200 Subject: [PATCH 3/8] Fixed %target% capitalization --- src/NadekoBot/Modules/CustomReactions/Extensions.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/NadekoBot/Modules/CustomReactions/Extensions.cs b/src/NadekoBot/Modules/CustomReactions/Extensions.cs index bc668931..102522bb 100644 --- a/src/NadekoBot/Modules/CustomReactions/Extensions.cs +++ b/src/NadekoBot/Modules/CustomReactions/Extensions.cs @@ -14,7 +14,7 @@ namespace NadekoBot.Modules.CustomReactions { public static Dictionary> responsePlaceholders = new Dictionary>() { - {"%target%", (ctx, trigger) => { return ctx.Content.ToLowerInvariant().Substring(trigger.Length); } } + {"%target%", (ctx, trigger) => { return ctx.Content.Substring(trigger.Length); } } }; public static Dictionary> placeholders = new Dictionary>() From 574b23070ac1e452a27410356e973a6fafd89000 Mon Sep 17 00:00:00 2001 From: Kwoth Date: Fri, 21 Oct 2016 18:40:04 +0200 Subject: [PATCH 4/8] kick and ban will respoect role hierarchy now --- .../Modules/Administration/Administration.cs | 21 +++++++++++++++++++ .../Modules/Utility/Commands/InfoCommands.cs | 2 +- 2 files changed, 22 insertions(+), 1 deletion(-) diff --git a/src/NadekoBot/Modules/Administration/Administration.cs b/src/NadekoBot/Modules/Administration/Administration.cs index 8f123251..a4802a68 100644 --- a/src/NadekoBot/Modules/Administration/Administration.cs +++ b/src/NadekoBot/Modules/Administration/Administration.cs @@ -301,6 +301,16 @@ namespace NadekoBot.Modules.Administration { msg = "No reason provided."; } + if (umsg.Author.Id != user.Guild.OwnerId && user.Roles.Select(r=>r.Position).Max() >= ((IGuildUser)umsg.Author).Roles.Select(r => r.Position).Max()) + { + await channel.SendMessageAsync("You can't use this command on users with a role higher or equal to yours in the role hierarchy."); + return; + } + if (umsg.Author.Id != user.Guild.OwnerId && user.Roles.Max().Position >= ((IGuildUser)umsg.Author).Roles.Max().Position) + { + await channel.SendMessageAsync("You can't use this command on users with a role higher or equal to yours in the role hierarchy."); + return; + } try { await (await user.CreateDMChannelAsync()).SendMessageAsync($"**You have been BANNED from `{channel.Guild.Name}` server.**\n" + @@ -330,6 +340,11 @@ namespace NadekoBot.Modules.Administration { msg = "No reason provided."; } + if (umsg.Author.Id != user.Guild.OwnerId && user.Roles.Max().Position >= ((IGuildUser)umsg.Author).Roles.Max().Position) + { + await channel.SendMessageAsync("You can't use this command on users with a role higher or equal to yours in the role hierarchy."); + return; + } try { await user.SendMessageAsync($"**You have been SOFT-BANNED from `{channel.Guild.Name}` server.**\n" + @@ -363,6 +378,12 @@ namespace NadekoBot.Modules.Administration await channel.SendMessageAsync("User not found.").ConfigureAwait(false); return; } + + if (umsg.Author.Id != user.Guild.OwnerId && user.Roles.Select(r => r.Position).Max() >= ((IGuildUser)umsg.Author).Roles.Select(r => r.Position).Max()) + { + await channel.SendMessageAsync("You can't use this command on users with a role higher or equal to yours in the role hierarchy."); + return; + } if (!string.IsNullOrWhiteSpace(msg)) { try diff --git a/src/NadekoBot/Modules/Utility/Commands/InfoCommands.cs b/src/NadekoBot/Modules/Utility/Commands/InfoCommands.cs index fad77cc4..5f65fa64 100644 --- a/src/NadekoBot/Modules/Utility/Commands/InfoCommands.cs +++ b/src/NadekoBot/Modules/Utility/Commands/InfoCommands.cs @@ -79,7 +79,7 @@ namespace NadekoBot.Modules.Utility `Joined Server:` **{user.JoinedAt?.ToString("dd.MM.yyyy HH:mm")}** `Joined Discord:` **{user.CreatedAt.ToString("dd.MM.yyyy HH:mm")}** `Roles:` **({user.Roles.Count()}) - {string.Join(", ", user.Roles.Select(r => r.Name)).SanitizeMentions()}** -`AvatarUrl:` **{user.AvatarUrl}**"; +`AvatarUrl:` **{await NadekoBot.Google.ShortenUrl(user.AvatarUrl).ConfigureAwait(false)}**"; await msg.Reply(toReturn).ConfigureAwait(false); } } From f4db6569de269afc23621acf35f695fc8522f301 Mon Sep 17 00:00:00 2001 From: Kwoth Date: Sat, 22 Oct 2016 09:02:05 +0200 Subject: [PATCH 5/8] %target% leading space Really fixed now? --- src/NadekoBot/Modules/CustomReactions/Extensions.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/NadekoBot/Modules/CustomReactions/Extensions.cs b/src/NadekoBot/Modules/CustomReactions/Extensions.cs index 102522bb..a6e6d357 100644 --- a/src/NadekoBot/Modules/CustomReactions/Extensions.cs +++ b/src/NadekoBot/Modules/CustomReactions/Extensions.cs @@ -14,7 +14,7 @@ namespace NadekoBot.Modules.CustomReactions { public static Dictionary> responsePlaceholders = new Dictionary>() { - {"%target%", (ctx, trigger) => { return ctx.Content.Substring(trigger.Length); } } + {"%target%", (ctx, trigger) => { return ctx.Content.Substring(trigger.Length).Trim(); } } }; public static Dictionary> placeholders = new Dictionary>() From 763c1b4951997d5b0c0c834d8d2ea355f8459099 Mon Sep 17 00:00:00 2001 From: Kwoth Date: Sat, 22 Oct 2016 09:29:50 +0200 Subject: [PATCH 6/8] New commandstrings, .unmute, .textunmute --- .../Modules/Administration/Administration.cs | 37 ++++++++++++ .../Resources/CommandStrings.Designer.cs | 58 ++++++++++++++++++- src/NadekoBot/Resources/CommandStrings.resx | 20 ++++++- 3 files changed, 112 insertions(+), 3 deletions(-) diff --git a/src/NadekoBot/Modules/Administration/Administration.cs b/src/NadekoBot/Modules/Administration/Administration.cs index a4802a68..d680859c 100644 --- a/src/NadekoBot/Modules/Administration/Administration.cs +++ b/src/NadekoBot/Modules/Administration/Administration.cs @@ -450,6 +450,25 @@ namespace NadekoBot.Modules.Administration } } + [NadekoCommand, Usage, Description, Aliases] + [RequireContext(ContextType.Guild)] + [RequirePermission(GuildPermission.MuteMembers)] + public async Task Unmute(IUserMessage umsg, IGuildUser user) + { + var channel = (ITextChannel)umsg.Channel; + + try + { + await user.ModifyAsync(usr => usr.Mute = false).ConfigureAwait(false); + await user.RemoveRolesAsync(await GetMuteRole(channel.Guild).ConfigureAwait(false)).ConfigureAwait(false); + await channel.SendMessageAsync($"**{user}** was text and voice muted successfully.").ConfigureAwait(false); + } + catch + { + await channel.SendMessageAsync("I most likely don't have the permission necessary for that.").ConfigureAwait(false); + } + } + [NadekoCommand, Usage, Description, Aliases] [RequireContext(ContextType.Guild)] [RequirePermission(GuildPermission.MuteMembers)] @@ -468,6 +487,24 @@ namespace NadekoBot.Modules.Administration } } + [NadekoCommand, Usage, Description, Aliases] + [RequireContext(ContextType.Guild)] + [RequirePermission(GuildPermission.MuteMembers)] + public async Task TextUnmute(IUserMessage umsg, IGuildUser user) + { + var channel = (ITextChannel)umsg.Channel; + + try + { + await user.RemoveRolesAsync(await GetMuteRole(channel.Guild).ConfigureAwait(false)).ConfigureAwait(false); + await channel.SendMessageAsync($"**{user}** was text muted successfully.").ConfigureAwait(false); + } + catch + { + await channel.SendMessageAsync("I most likely don't have the permission necessary for that.").ConfigureAwait(false); + } + } + [NadekoCommand, Usage, Description, Aliases] [RequireContext(ContextType.Guild)] [RequirePermission(GuildPermission.MuteMembers)] diff --git a/src/NadekoBot/Resources/CommandStrings.Designer.cs b/src/NadekoBot/Resources/CommandStrings.Designer.cs index d88c31c4..3a186371 100644 --- a/src/NadekoBot/Resources/CommandStrings.Designer.cs +++ b/src/NadekoBot/Resources/CommandStrings.Designer.cs @@ -3876,7 +3876,7 @@ namespace NadekoBot.Resources { } /// - /// Looks up a localized string similar to Moves permission from one position to another.. + /// Looks up a localized string similar to Moves permission from one position to another in Permissions list.. /// public static string moveperm_desc { get { @@ -4713,7 +4713,7 @@ namespace NadekoBot.Resources { } /// - /// Looks up a localized string similar to Removes a permission from a given position. + /// Looks up a localized string similar to Removes a permission from a given position in Permissions list.. /// public static string removeperm_desc { get { @@ -6296,6 +6296,33 @@ namespace NadekoBot.Resources { } } + /// + /// Looks up a localized string similar to textunmute. + /// + public static string textunmute_cmd { + get { + return ResourceManager.GetString("textunmute_cmd", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Removes a mute role previously set on a mentioned user with `{0}textmute` which prevented him from chatting in text channels.. + /// + public static string textunmute_desc { + get { + return ResourceManager.GetString("textunmute_desc", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to `{0}textunmute @Someone`. + /// + public static string textunmute_usage { + get { + return ResourceManager.GetString("textunmute_usage", resourceCulture); + } + } + /// /// Looks up a localized string similar to tl. /// @@ -6593,6 +6620,33 @@ namespace NadekoBot.Resources { } } + /// + /// Looks up a localized string similar to unmute. + /// + public static string unmute_cmd { + get { + return ResourceManager.GetString("unmute_cmd", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Unmutes a mentioned user previously muted with `{0}mute` command.. + /// + public static string unmute_desc { + get { + return ResourceManager.GetString("unmute_desc", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to `{0}unmute @Someone`. + /// + public static string unmute_usage { + get { + return ResourceManager.GetString("unmute_usage", resourceCulture); + } + } + /// /// Looks up a localized string similar to unstuck. /// diff --git a/src/NadekoBot/Resources/CommandStrings.resx b/src/NadekoBot/Resources/CommandStrings.resx index e8016c21..c1980beb 100644 --- a/src/NadekoBot/Resources/CommandStrings.resx +++ b/src/NadekoBot/Resources/CommandStrings.resx @@ -2484,4 +2484,22 @@ `{0}setstream https://www.twitch.tv/masterkwoth Developing Nakedo` - + + textunmute + + + Removes a mute role previously set on a mentioned user with `{0}textmute` which prevented him from chatting in text channels. + + + `{0}textunmute @Someone` + + + unmute + + + Unmutes a mentioned user previously muted with `{0}mute` command. + + + `{0}unmute @Someone` + + \ No newline at end of file From b9b42afe873e155f7742478aca2f614d40e31a4c Mon Sep 17 00:00:00 2001 From: Kwoth Date: Sat, 22 Oct 2016 09:31:36 +0200 Subject: [PATCH 7/8] Fixed preconditions on some mute commands --- src/NadekoBot/Modules/Administration/Administration.cs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/NadekoBot/Modules/Administration/Administration.cs b/src/NadekoBot/Modules/Administration/Administration.cs index d680859c..5a050a67 100644 --- a/src/NadekoBot/Modules/Administration/Administration.cs +++ b/src/NadekoBot/Modules/Administration/Administration.cs @@ -433,6 +433,7 @@ namespace NadekoBot.Modules.Administration [NadekoCommand, Usage, Description, Aliases] [RequireContext(ContextType.Guild)] + [RequirePermission(GuildPermission.ManageRoles)] [RequirePermission(GuildPermission.MuteMembers)] public async Task Mute(IUserMessage umsg, IGuildUser user) { @@ -452,6 +453,7 @@ namespace NadekoBot.Modules.Administration [NadekoCommand, Usage, Description, Aliases] [RequireContext(ContextType.Guild)] + [RequirePermission(GuildPermission.ManageRoles)] [RequirePermission(GuildPermission.MuteMembers)] public async Task Unmute(IUserMessage umsg, IGuildUser user) { @@ -471,7 +473,7 @@ namespace NadekoBot.Modules.Administration [NadekoCommand, Usage, Description, Aliases] [RequireContext(ContextType.Guild)] - [RequirePermission(GuildPermission.MuteMembers)] + [RequirePermission(GuildPermission.ManageRoles)] public async Task TextMute(IUserMessage umsg, IGuildUser user) { var channel = (ITextChannel)umsg.Channel; @@ -489,7 +491,7 @@ namespace NadekoBot.Modules.Administration [NadekoCommand, Usage, Description, Aliases] [RequireContext(ContextType.Guild)] - [RequirePermission(GuildPermission.MuteMembers)] + [RequirePermission(GuildPermission.ManageRoles)] public async Task TextUnmute(IUserMessage umsg, IGuildUser user) { var channel = (ITextChannel)umsg.Channel; From 5856f81bc6a137344b4219840a126c7fbf2fb68c Mon Sep 17 00:00:00 2001 From: Kwoth Date: Sat, 22 Oct 2016 09:43:12 +0200 Subject: [PATCH 8/8] .textmute/.textunmute -> .chatmute/.chatunmute --- .../Modules/Administration/Administration.cs | 14 +-- .../Resources/CommandStrings.Designer.cs | 108 +++++++++--------- src/NadekoBot/Resources/CommandStrings.resx | 22 ++-- 3 files changed, 72 insertions(+), 72 deletions(-) diff --git a/src/NadekoBot/Modules/Administration/Administration.cs b/src/NadekoBot/Modules/Administration/Administration.cs index 5a050a67..36bc957d 100644 --- a/src/NadekoBot/Modules/Administration/Administration.cs +++ b/src/NadekoBot/Modules/Administration/Administration.cs @@ -443,7 +443,7 @@ namespace NadekoBot.Modules.Administration { await user.ModifyAsync(usr => usr.Mute = true).ConfigureAwait(false); await user.AddRolesAsync(await GetMuteRole(channel.Guild).ConfigureAwait(false)).ConfigureAwait(false); - await channel.SendMessageAsync($"**{user}** was text and voice muted successfully.").ConfigureAwait(false); + await channel.SendMessageAsync($"**{user}** was muted from text and voice chat successfully.").ConfigureAwait(false); } catch { @@ -463,7 +463,7 @@ namespace NadekoBot.Modules.Administration { await user.ModifyAsync(usr => usr.Mute = false).ConfigureAwait(false); await user.RemoveRolesAsync(await GetMuteRole(channel.Guild).ConfigureAwait(false)).ConfigureAwait(false); - await channel.SendMessageAsync($"**{user}** was text and voice muted successfully.").ConfigureAwait(false); + await channel.SendMessageAsync($"**{user}** was unmuted from text and voice chat successfully.").ConfigureAwait(false); } catch { @@ -474,14 +474,14 @@ namespace NadekoBot.Modules.Administration [NadekoCommand, Usage, Description, Aliases] [RequireContext(ContextType.Guild)] [RequirePermission(GuildPermission.ManageRoles)] - public async Task TextMute(IUserMessage umsg, IGuildUser user) + public async Task ChatMute(IUserMessage umsg, IGuildUser user) { var channel = (ITextChannel)umsg.Channel; try { await user.AddRolesAsync(await GetMuteRole(channel.Guild).ConfigureAwait(false)).ConfigureAwait(false); - await channel.SendMessageAsync($"**{user}** was text muted successfully.").ConfigureAwait(false); + await channel.SendMessageAsync($"**{user}** was muted from chatting successfully.").ConfigureAwait(false); } catch { @@ -492,14 +492,14 @@ namespace NadekoBot.Modules.Administration [NadekoCommand, Usage, Description, Aliases] [RequireContext(ContextType.Guild)] [RequirePermission(GuildPermission.ManageRoles)] - public async Task TextUnmute(IUserMessage umsg, IGuildUser user) + public async Task ChatUnmute(IUserMessage umsg, IGuildUser user) { var channel = (ITextChannel)umsg.Channel; try { await user.RemoveRolesAsync(await GetMuteRole(channel.Guild).ConfigureAwait(false)).ConfigureAwait(false); - await channel.SendMessageAsync($"**{user}** was text muted successfully.").ConfigureAwait(false); + await channel.SendMessageAsync($"**{user}** was unmuted from chatting successfully.").ConfigureAwait(false); } catch { @@ -534,7 +534,7 @@ namespace NadekoBot.Modules.Administration try { await user.ModifyAsync(usr => usr.Mute = false).ConfigureAwait(false); - await channel.SendMessageAsync("Unmute successful").ConfigureAwait(false); + await channel.SendMessageAsync($"**{user}** was voice unmuted successfully.").ConfigureAwait(false); } catch { diff --git a/src/NadekoBot/Resources/CommandStrings.Designer.cs b/src/NadekoBot/Resources/CommandStrings.Designer.cs index 3a186371..2be25e4d 100644 --- a/src/NadekoBot/Resources/CommandStrings.Designer.cs +++ b/src/NadekoBot/Resources/CommandStrings.Designer.cs @@ -1031,6 +1031,60 @@ namespace NadekoBot.Resources { } } + /// + /// Looks up a localized string similar to chatmute. + /// + public static string chatmute_cmd { + get { + return ResourceManager.GetString("chatmute_cmd", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Prevents a mentioned user from chatting in text channels.. + /// + public static string chatmute_desc { + get { + return ResourceManager.GetString("chatmute_desc", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to `{0}chatmute @Someone`. + /// + public static string chatmute_usage { + get { + return ResourceManager.GetString("chatmute_usage", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to chatunmute. + /// + public static string chatunmute_cmd { + get { + return ResourceManager.GetString("chatunmute_cmd", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Removes a mute role previously set on a mentioned user with `{0}chatmute` which prevented him from chatting in text channels.. + /// + public static string chatunmute_desc { + get { + return ResourceManager.GetString("chatunmute_desc", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to `{0}chatunmute @Someone`. + /// + public static string chatunmute_usage { + get { + return ResourceManager.GetString("chatunmute_usage", resourceCulture); + } + } + /// /// Looks up a localized string similar to checkmyperms. /// @@ -6269,60 +6323,6 @@ namespace NadekoBot.Resources { } } - /// - /// Looks up a localized string similar to textmute. - /// - public static string textmute_cmd { - get { - return ResourceManager.GetString("textmute_cmd", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Prevents a mentioned user from chatting in text channels.. - /// - public static string textmute_desc { - get { - return ResourceManager.GetString("textmute_desc", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to `{0}textmute @Someone`. - /// - public static string textmute_usage { - get { - return ResourceManager.GetString("textmute_usage", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to textunmute. - /// - public static string textunmute_cmd { - get { - return ResourceManager.GetString("textunmute_cmd", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Removes a mute role previously set on a mentioned user with `{0}textmute` which prevented him from chatting in text channels.. - /// - public static string textunmute_desc { - get { - return ResourceManager.GetString("textunmute_desc", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to `{0}textunmute @Someone`. - /// - public static string textunmute_usage { - get { - return ResourceManager.GetString("textunmute_usage", resourceCulture); - } - } - /// /// Looks up a localized string similar to tl. /// diff --git a/src/NadekoBot/Resources/CommandStrings.resx b/src/NadekoBot/Resources/CommandStrings.resx index c1980beb..e20fb202 100644 --- a/src/NadekoBot/Resources/CommandStrings.resx +++ b/src/NadekoBot/Resources/CommandStrings.resx @@ -2430,14 +2430,14 @@ `{0}antispam 3 Mute` or `{0}antispam 4 Kick` or `{0}antispam 6 Ban` - - textmute + + chatmute - + Prevents a mentioned user from chatting in text channels. - - `{0}textmute @Someone` + + `{0}chatmute @Someone` voicemute @@ -2484,14 +2484,14 @@ `{0}setstream https://www.twitch.tv/masterkwoth Developing Nakedo` - - textunmute + + chatunmute - - Removes a mute role previously set on a mentioned user with `{0}textmute` which prevented him from chatting in text channels. + + Removes a mute role previously set on a mentioned user with `{0}chatmute` which prevented him from chatting in text channels. - - `{0}textunmute @Someone` + + `{0}chatunmute @Someone` unmute