mattburchett/NadekoBot
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #2 from Kwoth/1.0

Browse Source 
1.0
This commit is contained in:
miraai 2016-11-08 21:33:38 +01:00 committed by GitHub
commit bc32531719
16 changed files with 610 additions and 179 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
docs/Commands List.md
View File

@ -1,17 +1,17 @@
For more information and how to setup your own NadekoBot, go to: <http://github.com/Kwoth/NadekoBot/wiki>
You can support the project on patreon: <https://patreon.com/nadekobot> or paypal: `nadekodiscordbot@gmail.com`
##Table Of Contents
- [Searches](#searches)
- [NSFW](#nsfw)
- [Music](#music)
- [Help](#help)
- [Permissions](#permissions)
- [Gambling](#gambling)
- [Administration](#administration)
- [Utility](#utility)
- [ClashOfClans](#clashofclans)
- [CustomReactions](#customreactions)
- [Gambling](#gambling)
- [Games](#games)
- [Music](#music)
- [NSFW](#nsfw)
- [Permissions](#permissions)
- [Searches](#searches)
- [Utility](#utility)
### Administration
@ -154,7 +154,7 @@ Command and aliases | Description | Usage
`>poll` | Creates a poll which requires users to send the number of the voting option to the bot. **Requires ManageMessages server permission.** | `>poll Question?;Answer1;Answ 2;A_3`
`>publicpoll` `>ppoll` | Creates a public poll which requires users to type a number of the voting option in the channel command is ran in. **Requires ManageMessages server permission.** | `>ppoll Question?;Answer1;Answ 2;A_3`
`>pollend` | Stops active poll on this server and prints the results in this channel. **Requires ManageMessages server permission.** | `>pollend`
`>cleverbot` | Toggles cleverbot session. When enabled, the bot will reply to messages starting with bot mention in the channel this command is ran in. You can specify "all" parameter to enable it in the whole server. Custom reactions starting with %mention% won't work if cleverbot is enabled.' **Requires ManageMessages server permission.** | `>cleverbot`
`>cleverbot` | Toggles cleverbot session. When enabled, the bot will reply to messages starting with bot mention in the server. Custom reactions starting with %mention% won't work if cleverbot is enabled. **Requires ManageMessages server permission.** | `>cleverbot`
`>pick` | Picks the currency planted in this channel. | `>pick`
`>plant` | Spend a unit of currency to plant it in this channel. (If bot is restarted or crashes, the currency will be lost) | `>plant`
`>gencurrency` `>gc` | Toggles currency generation on this channel. Every posted message will have chance to spawn currency. Chance is specified by the Bot Owner. (default is 2%) **Requires ManageMessages server permission.** | `>gc`

116
src/NadekoBot/Modules/Games/Commands/CleverBotCommands.cs
View File

@ -5,6 +5,7 @@ using NadekoBot.Services;
using NadekoBot.Services.Database;
using Newtonsoft.Json;
using NLog;
using Services.CleverBotApi;
using System;
using System.Collections.Concurrent;
using System.Collections.Generic;
@ -21,26 +22,27 @@ namespace NadekoBot.Modules.Games
[Group]
public class CleverBotCommands
{
private Logger _log { get; }
private static Logger _log { get; }
class CleverAnswer {
public string Status { get; set; }
public string Response { get; set; }
}
public CleverBotCommands()
{
_log = LogManager.GetCurrentClassLogger();
}
//user#discrim is the key
public static ConcurrentHashSet<string> ChannelsInConversation { get; } = new ConcurrentHashSet<string>();
public static ConcurrentHashSet<ulong> CleverbotGuilds { get; } = new ConcurrentHashSet<ulong>();
public static ConcurrentDictionary<ulong, ChatterBotSession> CleverbotGuilds { get; } = new ConcurrentDictionary<ulong, ChatterBotSession>();
static CleverBotCommands()
{
_log = LogManager.GetCurrentClassLogger();
using (var uow = DbHandler.UnitOfWork())
{
CleverbotGuilds = new ConcurrentHashSet<ulong>(uow.GuildConfigs.GetAll().Where(gc => gc.CleverbotEnabled).Select(gc => gc.GuildId));
var bot = ChatterBotFactory.Create(ChatterBotType.CLEVERBOT);
CleverbotGuilds = new ConcurrentDictionary<ulong, ChatterBotSession>(
uow.GuildConfigs.GetAll()
.Where(gc => gc.CleverbotEnabled)
.ToDictionary(gc => gc.GuildId, gc => bot.CreateSession()));
}
}
@ -50,9 +52,8 @@ namespace NadekoBot.Modules.Games
if (channel == null)
return false;
var nick = msg.Channel.Id + "NadekoBot";
if (!ChannelsInConversation.Contains(nick) && !CleverbotGuilds.Contains(channel.Guild.Id))
ChatterBotSession cleverbot;
if (!CleverbotGuilds.TryGetValue(channel.Guild.Id, out cleverbot))
return false;
var nadekoId = NadekoBot.Client.GetCurrentUser().Id;
@ -61,11 +62,11 @@ namespace NadekoBot.Modules.Games
string message;
if (msg.Content.StartsWith(normalMention))
{
message = msg.Content.Substring(normalMention.Length);
message = msg.Content.Substring(normalMention.Length).Trim();
}
else if (msg.Content.StartsWith(nickMention))
{
message = msg.Content.Substring(nickMention.Length);
message = msg.Content.Substring(nickMention.Length).Trim();
}
else
{
@ -74,98 +75,51 @@ namespace NadekoBot.Modules.Games
await msg.Channel.TriggerTypingAsync().ConfigureAwait(false);
using (var http = new HttpClient())
{
var content = new FormUrlEncodedContent(new Dictionary<string, string>
{
{ "user", NadekoBot.Credentials.CleverbotApiUser},
{ "key", NadekoBot.Credentials.CleverbotApiKey},
{ "nick", nick},
{ "text", message},
});
var res = await http.PostAsync("https://cleverbot.io/1.0/ask", content).ConfigureAwait(false);
if (res.StatusCode == System.Net.HttpStatusCode.OK)
{
var response = await cleverbot.Think(message).ConfigureAwait(false);
try
{
var answer = JsonConvert.DeserializeObject<CleverAnswer>(await res.Content.ReadAsStringAsync().ConfigureAwait(false));
try
await msg.Channel.SendMessageAsync(response).ConfigureAwait(false);
}
catch (Exception ex)
{
await msg.Channel.SendMessageAsync(WebUtility.HtmlDecode(answer.Response)).ConfigureAwait(false);
_log.Warn(ex, "Eror sending response");
await msg.Channel.SendMessageAsync(response).ConfigureAwait(false); // try twice :\
}
catch
{
await msg.Channel.SendMessageAsync(answer.Response).ConfigureAwait(false); // try twice :\
}
}
catch { }
return true;
}
return false;
}
}
[NadekoCommand, Usage, Description, Aliases]
[RequireContext(ContextType.Guild)]
[RequirePermission(ChannelPermission.ManageMessages)]
public async Task Cleverbot(IUserMessage imsg, string all = null)
public async Task Cleverbot(IUserMessage imsg)
{
var channel = (ITextChannel)imsg.Channel;
if (string.IsNullOrWhiteSpace(NadekoBot.Credentials.CleverbotApiKey) ||
string.IsNullOrWhiteSpace(NadekoBot.Credentials.CleverbotApiKey))
ChatterBotSession throwaway;
if (CleverbotGuilds.TryRemove(channel.Guild.Id, out throwaway))
{
await channel.SendMessageAsync(":anger: `Bot owner didn't setup Cleverbot Api keys. Session will not start.`").ConfigureAwait(false);
using (var uow = DbHandler.UnitOfWork())
{
uow.GuildConfigs.SetCleverbotEnabled(channel.Guild.Id, false);
await uow.CompleteAsync().ConfigureAwait(false);
}
await channel.SendMessageAsync($"{imsg.Author.Mention} `Disabled cleverbot on this server.`").ConfigureAwait(false);
return;
}
if (all?.Trim().ToLowerInvariant() == "all")
{
var cleverbotEnabled = CleverbotGuilds.Add(channel.Guild.Id);
if (!cleverbotEnabled)
CleverbotGuilds.TryRemove(channel.Guild.Id);
var cleverbot = ChatterBotFactory.Create(ChatterBotType.CLEVERBOT);
var session = cleverbot.CreateSession();
CleverbotGuilds.TryAdd(channel.Guild.Id, session);
using (var uow = DbHandler.UnitOfWork())
{
uow.GuildConfigs.SetCleverbotEnabled(channel.Guild.Id, cleverbotEnabled);
uow.GuildConfigs.SetCleverbotEnabled(channel.Guild.Id, true);
await uow.CompleteAsync().ConfigureAwait(false);
}
await channel.SendMessageAsync($"{imsg.Author.Mention} `{(cleverbotEnabled ? "Enabled" : "Disabled")} cleverbot for all users.`").ConfigureAwait(false);
return;
await channel.SendMessageAsync($"{imsg.Author.Mention} `Enabled cleverbot on this server.`").ConfigureAwait(false);
}
var nick = channel.Id + "NadekoBot";
if (ChannelsInConversation.TryRemove(nick))
{
await channel.SendMessageAsync($"{imsg.Author.Mention} `I will no longer reply to your messages starting with my mention.`").ConfigureAwait(false);
return;
}
using (var http = new HttpClient())
{
var content = new FormUrlEncodedContent(new Dictionary<string, string>()
{
{ "user", NadekoBot.Credentials.CleverbotApiUser},
{ "key", NadekoBot.Credentials.CleverbotApiKey},
{ "nick", nick},
});
var res = await http.PostAsync("https://cleverbot.io/1.0/create", content).ConfigureAwait(false);
if (res.StatusCode != System.Net.HttpStatusCode.OK)
{
await channel.SendMessageAsync($"{imsg.Author.Mention} `Something went wrong in starting your cleverbot session :\\`");
_log.Warn(await res.Content.ReadAsStringAsync());
return;
}
ChannelsInConversation.Add(nick);
}
await channel.SendMessageAsync($"{imsg.Author.Mention} `I will reply to your messages starting with my mention.`").ConfigureAwait(false);
}
}
}
}

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

@ -128,7 +128,7 @@ namespace NadekoBot.Modules.Help
helpstr.AppendLine(@"For more information and how to setup your own NadekoBot, go to: <http://github.com/Kwoth/NadekoBot/wiki>
You can support the project on patreon: <https://patreon.com/nadekobot> or paypal: `nadekodiscordbot@gmail.com`");
helpstr.AppendLine("##Table Of Contents");
helpstr.AppendLine(string.Join("\n", NadekoBot.CommandService.Modules.Select(m => $"- [{m.Name}](#{m.Name.ToLowerInvariant()})")));
helpstr.AppendLine(string.Join("\n", NadekoBot.CommandService.Modules.Where(m => m.Name.ToLowerInvariant() != "help").OrderBy(m => m.Name).Prepend(NadekoBot.CommandService.Modules.FirstOrDefault(m=>m.Name.ToLowerInvariant()=="help")).Select(m => $"- [{m.Name}](#{m.Name.ToLowerInvariant()})")));
helpstr.AppendLine();
string lastModule = null;
foreach (var com in _commands.Commands.OrderBy(com=>com.Module.Name).GroupBy(c=>c.Text).Select(g=>g.First()))

3
src/NadekoBot/Modules/Searches/Commands/Translator.cs
View File

@ -59,7 +59,7 @@ namespace NadekoBot.Modules.Searches
.ConfigureAwait(false);
if (autoDelete)
try { await umsg.DeleteAsync().ConfigureAwait(false); } catch { }
await umsg.Channel.SendMessageAsync($"{umsg.Author.Mention} `said:` "+text.Replace("<@ ", "<@").Replace("<@! ", "<@!")).ConfigureAwait(false);
await umsg.Channel.SendMessageAsync($"{umsg.Author.Mention} `:` "+text.Replace("<@ ", "<@").Replace("<@! ", "<@!")).ConfigureAwait(false);
}
catch { }
@ -161,6 +161,7 @@ namespace NadekoBot.Modules.Searches
if (!GoogleTranslator.Instance.Languages.Contains(from) || !GoogleTranslator.Instance.Languages.Contains(to))
{
try { await channel.SendMessageAsync("`Invalid source and/or target Language.`").ConfigureAwait(false); } catch { }
return;
}
UserLanguages.AddOrUpdate(ucp, langs, (key, val) => langs);

82
src/NadekoBot/Resources/CommandStrings.resx
View File

@ -166,7 +166,7 @@
<value>greetdel grdel</value>
</data>
<data name="greetdel_desc" xml:space="preserve">
<value>Toggles automatic deletion of greet messages. </value>
<value>Toggles automatic deletion of greet messages.</value>
</data>
<data name="greetdel_usage" xml:space="preserve">
<value>`{0}greetdel`</value>
@ -175,7 +175,7 @@
<value>greet</value>
</data>
<data name="greet_desc" xml:space="preserve">
<value>Toggles anouncements on the current channel when someone joins the server. </value>
<value>Toggles anouncements on the current channel when someone joins the server.</value>
</data>
<data name="greet_usage" xml:space="preserve">
<value>`{0}greet`</value>
@ -184,7 +184,7 @@
<value>greetmsg</value>
</data>
<data name="greetmsg_desc" xml:space="preserve">
<value>Sets a new join announcement message which will be shown in the server's channel. Type %user% if you want to mention the new member. Using it with no message will show the current greet message. </value>
<value>Sets a new join announcement message which will be shown in the server's channel. Type %user% if you want to mention the new member. Using it with no message will show the current greet message.</value>
</data>
<data name="greetmsg_usage" xml:space="preserve">
<value>`{0}greetmsg Welcome, %user%.`</value>
@ -202,7 +202,7 @@
<value>byemsg</value>
</data>
<data name="byemsg_desc" xml:space="preserve">
<value>Sets a new leave announcement message. Type %user% if you want to mention the new member. Using it with no message will show the current bye message. </value>
<value>Sets a new leave announcement message. Type %user% if you want to mention the new member. Using it with no message will show the current bye message.</value>
</data>
<data name="byemsg_usage" xml:space="preserve">
<value>`{0}byemsg %user% has left.`</value>
@ -211,7 +211,7 @@
<value>byedel</value>
</data>
<data name="byedel_desc" xml:space="preserve">
<value>Toggles automatic deletion of bye messages. </value>
<value>Toggles automatic deletion of bye messages.</value>
</data>
<data name="byedel_usage" xml:space="preserve">
<value>`{0}byedel`</value>
@ -220,7 +220,7 @@
<value>greetdm</value>
</data>
<data name="greetdm_desc" xml:space="preserve">
<value>Toggles whether the greet messages will be sent in a DM (This is separate from greet - you can have both, any or neither enabled). </value>
<value>Toggles whether the greet messages will be sent in a DM (This is separate from greet - you can have both, any or neither enabled).</value>
</data>
<data name="greetdm_usage" xml:space="preserve">
<value>`{0}greetdm`</value>
@ -247,7 +247,7 @@
<value>userpresence</value>
</data>
<data name="userpresence_desc" xml:space="preserve">
<value>Starts logging to this channel when someone from the server goes online/offline/idle. </value>
<value>Starts logging to this channel when someone from the server goes online/offline/idle.</value>
</data>
<data name="userpresence_usage" xml:space="preserve">
<value>`{0}userpresence`</value>
@ -256,7 +256,7 @@
<value>voicepresence</value>
</data>
<data name="voicepresence_desc" xml:space="preserve">
<value>Toggles logging to this channel whenever someone joins or leaves a voice channel you are currently in. </value>
<value>Toggles logging to this channel whenever someone joins or leaves a voice channel you are currently in.</value>
</data>
<data name="voicepresence_usage" xml:space="preserve">
<value>`{0}voicepresence`</value>
@ -265,7 +265,7 @@
<value>repeatinvoke repinv</value>
</data>
<data name="repeatinvoke_desc" xml:space="preserve">
<value>Immediately shows the repeat message and restarts the timer. </value>
<value>Immediately shows the repeat message and restarts the timer.</value>
</data>
<data name="repeatinvoke_usage" xml:space="preserve">
<value>`{0}repinv`</value>
@ -310,7 +310,7 @@
<value>removeplaying rmpl repl</value>
</data>
<data name="removeplaying_desc" xml:space="preserve">
<value>Removes a playing string on a given number. </value>
<value>Removes a playing string on a given number.</value>
</data>
<data name="removeplaying_usage" xml:space="preserve">
<value>`{0}rmpl`</value>
@ -337,7 +337,7 @@
<value>voice+text v+t</value>
</data>
<data name="voiceplustext_desc" xml:space="preserve">
<value>Creates a text channel for each voice channel only users in that voice channel can see.If you are server owner, keep in mind you will see them all the time regardless. </value>
<value>Creates a text channel for each voice channel only users in that voice channel can see.If you are server owner, keep in mind you will see them all the time regardless.</value>
</data>
<data name="voiceplustext_usage" xml:space="preserve">
<value>`{0}voice+text`</value>
@ -355,7 +355,7 @@
<value>jcsc</value>
</data>
<data name="jcsc_desc" xml:space="preserve">
<value>Joins current channel to an instance of cross server channel using the token. </value>
<value>Joins current channel to an instance of cross server channel using the token.</value>
</data>
<data name="jcsc_usage" xml:space="preserve">
<value>`{0}jcsc TokenHere`</value>
@ -364,7 +364,7 @@
<value>lcsc</value>
</data>
<data name="lcsc_desc" xml:space="preserve">
<value>Leaves Cross server channel instance from this channel. </value>
<value>Leaves Cross server channel instance from this channel.</value>
</data>
<data name="lcsc_usage" xml:space="preserve">
<value>`{0}lcsc`</value>
@ -463,7 +463,7 @@
<value>autoassignrole aar</value>
</data>
<data name="autoassignrole_desc" xml:space="preserve">
<value>Automaticaly assigns a specified role to every user who joins the server. </value>
<value>Automaticaly assigns a specified role to every user who joins the server.</value>
</data>
<data name="autoassignrole_usage" xml:space="preserve">
<value>`{0}aar` to disable, `{0}aar Role Name` to enable</value>
@ -472,7 +472,7 @@
<value>leave</value>
</data>
<data name="leave_desc" xml:space="preserve">
<value>Makes Nadeko leave the server. Either name or id required. </value>
<value>Makes Nadeko leave the server. Either name or id required.</value>
</data>
<data name="leave_usage" xml:space="preserve">
<value>`{0}leave 123123123331`</value>
@ -499,7 +499,7 @@
<value>setrole sr</value>
</data>
<data name="setrole_desc" xml:space="preserve">
<value>Sets a role for a given user. </value>
<value>Sets a role for a given user.</value>
</data>
<data name="setrole_usage" xml:space="preserve">
<value>`{0}sr @User Guest`</value>
@ -508,7 +508,7 @@
<value>removerole rr</value>
</data>
<data name="removerole_desc" xml:space="preserve">
<value>Removes a role from a given user. </value>
<value>Removes a role from a given user.</value>
</data>
<data name="removerole_usage" xml:space="preserve">
<value>`{0}rr @User Admin`</value>
@ -526,7 +526,7 @@
<value>removeallroles rar</value>
</data>
<data name="removeallroles_desc" xml:space="preserve">
<value>Removes all roles from a mentioned user. </value>
<value>Removes all roles from a mentioned user.</value>
</data>
<data name="removeallroles_usage" xml:space="preserve">
<value>`{0}rar @User`</value>
@ -535,7 +535,7 @@
<value>createrole cr</value>
</data>
<data name="createrole_desc" xml:space="preserve">
<value>Creates a role with a given name. </value>
<value>Creates a role with a given name.</value>
</data>
<data name="createrole_usage" xml:space="preserve">
<value>`{0}cr Awesome Role`</value>
@ -544,7 +544,7 @@
<value>rolecolor rc</value>
</data>
<data name="rolecolor_desc" xml:space="preserve">
<value>Set a role's color to the hex or 0-255 rgb color value provided. </value>
<value>Set a role's color to the hex or 0-255 rgb color value provided.</value>
</data>
<data name="rolecolor_usage" xml:space="preserve">
<value>`{0}rc Admin 255 200 100` or `{0}rc Admin ffba55`</value>
@ -562,7 +562,7 @@
<value>softban sb</value>
</data>
<data name="softban_desc" xml:space="preserve">
<value>Bans and then unbans a user by ID or name with an optional message. </value>
<value>Bans and then unbans a user by ID or name with an optional message.</value>
</data>
<data name="softban_usage" xml:space="preserve">
<value>`{0}sb "@some Guy" Your behaviour is toxic.`</value>
@ -571,7 +571,7 @@
<value>kick k</value>
</data>
<data name="kick_desc" xml:space="preserve">
<value>Kicks a mentioned user. </value>
<value>Kicks a mentioned user.</value>
</data>
<data name="kick_usage" xml:space="preserve">
<value>`{0}k "@some Guy" Your behaviour is toxic.`</value>
@ -589,7 +589,7 @@
<value>voiceunmute</value>
</data>
<data name="voiceunmute_desc" xml:space="preserve">
<value>Gives a previously voice-muted user a permission to speak. </value>
<value>Gives a previously voice-muted user a permission to speak.</value>
</data>
<data name="voiceunmute_usage" xml:space="preserve">
<value>`{0}voiceunmute @Someguy`</value>
@ -598,7 +598,7 @@
<value>deafen deaf</value>
</data>
<data name="deafen_desc" xml:space="preserve">
<value>Deafens mentioned user or users. </value>
<value>Deafens mentioned user or users.</value>
</data>
<data name="deafen_usage" xml:space="preserve">
<value>`{0}deaf "@Someguy"` or `{0}deaf "@Someguy" "@Someguy"`</value>
@ -607,7 +607,7 @@
<value>undeafen undef</value>
</data>
<data name="undeafen_desc" xml:space="preserve">
<value>Undeafens mentioned user or users. </value>
<value>Undeafens mentioned user or users.</value>
</data>
<data name="undeafen_usage" xml:space="preserve">
<value>`{0}undef "@Someguy"` or `{0}undef "@Someguy" "@Someguy"`</value>
@ -616,7 +616,7 @@
<value>delvoichanl dvch</value>
</data>
<data name="delvoichanl_desc" xml:space="preserve">
<value>Deletes a voice channel with a given name. </value>
<value>Deletes a voice channel with a given name.</value>
</data>
<data name="delvoichanl_usage" xml:space="preserve">
<value>`{0}dvch VoiceChannelName`</value>
@ -625,7 +625,7 @@
<value>creatvoichanl cvch</value>
</data>
<data name="creatvoichanl_desc" xml:space="preserve">
<value>Creates a new voice channel with a given name. </value>
<value>Creates a new voice channel with a given name.</value>
</data>
<data name="creatvoichanl_usage" xml:space="preserve">
<value>`{0}cvch VoiceChannelName`</value>
@ -634,7 +634,7 @@
<value>deltxtchanl dtch</value>
</data>
<data name="deltxtchanl_desc" xml:space="preserve">
<value>Deletes a text channel with a given name. </value>
<value>Deletes a text channel with a given name.</value>
</data>
<data name="deltxtchanl_usage" xml:space="preserve">
<value>`{0}dtch TextChannelName`</value>
@ -643,7 +643,7 @@
<value>creatxtchanl ctch</value>
</data>
<data name="creatxtchanl_desc" xml:space="preserve">
<value>Creates a new text channel with a given name. </value>
<value>Creates a new text channel with a given name.</value>
</data>
<data name="creatxtchanl_usage" xml:space="preserve">
<value>`{0}ctch TextChannelName`</value>
@ -652,7 +652,7 @@
<value>settopic st</value>
</data>
<data name="settopic_desc" xml:space="preserve">
<value>Sets a topic on the current channel. </value>
<value>Sets a topic on the current channel.</value>
</data>
<data name="settopic_usage" xml:space="preserve">
<value>`{0}st My new topic`</value>
@ -661,7 +661,7 @@
<value>setchanlname schn</value>
</data>
<data name="setchanlname_desc" xml:space="preserve">
<value>Changes the name of the current channel. </value>
<value>Changes the name of the current channel.</value>
</data>
<data name="setchanlname_usage" xml:space="preserve">
<value>`{0}schn NewName`</value>
@ -670,7 +670,7 @@
<value>prune clr</value>
</data>
<data name="prune_desc" xml:space="preserve">
<value>`{0}prune` removes all nadeko's messages in the last 100 messages.`{0}prune X` removes last X messages from the channel (up to 100)`{0}prune @Someone` removes all Someone's messages in the last 100 messages.`{0}prune @Someone X` removes last X 'Someone's' messages in the channel. </value>
<value>`{0}prune` removes all nadeko's messages in the last 100 messages.`{0}prune X` removes last X messages from the channel (up to 100)`{0}prune @Someone` removes all Someone's messages in the last 100 messages.`{0}prune @Someone X` removes last X 'Someone's' messages in the channel.</value>
</data>
<data name="prune_usage" xml:space="preserve">
<value>`{0}prune` or `{0}prune 5` or `{0}prune @Someone` or `{0}prune @Someone X`</value>
@ -688,7 +688,7 @@
<value>setname newnm</value>
</data>
<data name="setname_desc" xml:space="preserve">
<value>Gives the bot a new name. </value>
<value>Gives the bot a new name.</value>
</data>
<data name="setname_usage" xml:space="preserve">
<value>`{0}newnm BotName`</value>
@ -697,7 +697,7 @@
<value>setavatar setav</value>
</data>
<data name="setavatar_desc" xml:space="preserve">
<value>Sets a new avatar image for the NadekoBot. Argument is a direct link to an image. </value>
<value>Sets a new avatar image for the NadekoBot. Argument is a direct link to an image.</value>
</data>
<data name="setavatar_usage" xml:space="preserve">
<value>`{0}setav http://i.imgur.com/xTG3a1I.jpg`</value>
@ -706,7 +706,7 @@
<value>setgame</value>
</data>
<data name="setgame_desc" xml:space="preserve">
<value>Sets the bots game. </value>
<value>Sets the bots game.</value>
</data>
<data name="setgame_usage" xml:space="preserve">
<value>`{0}setgame with snakes`</value>
@ -733,7 +733,7 @@
<value>unstuck</value>
</data>
<data name="unstuck_desc" xml:space="preserve">
<value>Clears the message queue. </value>
<value>Clears the message queue.</value>
</data>
<data name="unstuck_usage" xml:space="preserve">
<value>`{0}unstuck`</value>
@ -787,7 +787,7 @@
<value>remindtemplate</value>
</data>
<data name="remindtemplate_desc" xml:space="preserve">
<value>Sets message for when the remind is triggered. Available placeholders are %user% - user who ran the command, %message% - Message specified in the remind, %target% - target channel of the remind. </value>
<value>Sets message for when the remind is triggered. Available placeholders are %user% - user who ran the command, %message% - Message specified in the remind, %target% - target channel of the remind.</value>
</data>
<data name="remindtemplate_usage" xml:space="preserve">
<value>`{0}remindtemplate %user%, you gotta do %message%!`</value>
@ -1255,7 +1255,7 @@
<value>take</value>
</data>
<data name="take_desc" xml:space="preserve">
<value>Takes a certain amount of currency from someone. </value>
<value>Takes a certain amount of currency from someone.</value>
</data>
<data name="take_usage" xml:space="preserve">
<value>`{0}take 1 "@someguy"`</value>
@ -1615,7 +1615,7 @@
<value>cleanup</value>
</data>
<data name="cleanup_desc" xml:space="preserve">
<value>Cleans up hanging voice connections. </value>
<value>Cleans up hanging voice connections.</value>
</data>
<data name="cleanup_usage" xml:space="preserve">
<value>`{0}cleanup`</value>
@ -2311,7 +2311,7 @@
<value>`{0}greetdmmsg Welcome to the server, %user%`.</value>
</data>
<data name="greetdmmsg_desc" xml:space="preserve">
<value>Sets a new join announcement message which will be sent to the user who joined. Type %user% if you want to mention the new member. Using it with no message will show the current DM greet message. </value>
<value>Sets a new join announcement message which will be sent to the user who joined. Type %user% if you want to mention the new member. Using it with no message will show the current DM greet message.</value>
</data>
<data name="cash_desc" xml:space="preserve">
<value>Check how much currency a person has. (Defaults to yourself)</value>
@ -2623,7 +2623,7 @@
<value>cleverbot</value>
</data>
<data name="cleverbot_desc" xml:space="preserve">
<value>Toggles cleverbot session. When enabled, the bot will reply to messages starting with bot mention in the channel this command is ran in. You can specify "all" parameter to enable it in the whole server. Custom reactions starting with %mention% won't work if cleverbot is enabled.' </value>
<value>Toggles cleverbot session. When enabled, the bot will reply to messages starting with bot mention in the server. Custom reactions starting with %mention% won't work if cleverbot is enabled.</value>
</data>
<data name="cleverbot_usage" xml:space="preserve">
<value>`{0}cleverbot`</value>

25
src/NadekoBot/Services/CleverBotApi/ChatterBot.cs Normal file
View File

@ -0,0 +1,25 @@
/*
ChatterBotAPI
Copyright (C) 2011 pierredavidbelanger@gmail.com
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
namespace Services.CleverBotApi
{
public interface ChatterBot
{
ChatterBotSession CreateSession();
}
}

45
src/NadekoBot/Services/CleverBotApi/ChatterBotFactory.cs Normal file
View File

@ -0,0 +1,45 @@
using System;
/*
ChatterBotAPI
Copyright (C) 2011 pierredavidbelanger@gmail.com
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
namespace Services.CleverBotApi
{
public class ChatterBotFactory
{
public static ChatterBot Create(ChatterBotType type)
{
return Create(type, null);
}
public static ChatterBot Create(ChatterBotType type, object arg)
{
switch (type)
{
case ChatterBotType.CLEVERBOT:
return new Cleverbot("http://www.cleverbot.com/", "http://www.cleverbot.com/webservicemin?uc=165", 26);
case ChatterBotType.JABBERWACKY:
return new Cleverbot("http://jabberwacky.com", "http://jabberwacky.com/webservicemin", 20);
case ChatterBotType.PANDORABOTS:
if (arg == null) throw new ArgumentException("PANDORABOTS needs a botid arg", nameof(arg));
return new Pandorabots(arg.ToString());
}
return null;
}
}
}

28
src/NadekoBot/Services/CleverBotApi/ChatterBotSession.cs Normal file
View File

@ -0,0 +1,28 @@
/*
ChatterBotAPI
Copyright (C) 2011 pierredavidbelanger@gmail.com
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
using System.Threading.Tasks;
namespace Services.CleverBotApi
{
public interface ChatterBotSession
{
Task<ChatterBotThought> Think(ChatterBotThought thought);
Task<string> Think(string text);
}
}

26
src/NadekoBot/Services/CleverBotApi/ChatterBotThought.cs Normal file
View File

@ -0,0 +1,26 @@
/*
ChatterBotAPI
Copyright (C) 2011 pierredavidbelanger@gmail.com
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
namespace Services.CleverBotApi
{
public class ChatterBotThought
{
public string[] Emotions { get; set; }
public string Text { get; set; }
}
}

27
src/NadekoBot/Services/CleverBotApi/ChatterBotType.cs Normal file
View File

@ -0,0 +1,27 @@
/*
ChatterBotAPI
Copyright (C) 2011 pierredavidbelanger@gmail.com
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
namespace Services.CleverBotApi
{
public enum ChatterBotType
{
CLEVERBOT,
JABBERWACKY,
PANDORABOTS
}
}

116
src/NadekoBot/Services/CleverBotApi/Cleverbot.cs Normal file
View File

@ -0,0 +1,116 @@
using System.Collections.Generic;
using System.Net;
using System.Threading.Tasks;
/*
ChatterBotAPI
Copyright (C) 2011 pierredavidbelanger@gmail.com
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
namespace Services.CleverBotApi
{
internal class Cleverbot : ChatterBot
{
private readonly int endIndex;
private readonly string baseUrl;
private readonly string url;
public Cleverbot(string baseUrl, string url, int endIndex)
{
this.baseUrl = baseUrl;
this.url = url;
this.endIndex = endIndex;
}
public ChatterBotSession CreateSession()
{
return new CleverbotSession(baseUrl, url, endIndex);
}
}
internal class CleverbotSession : ChatterBotSession
{
private readonly int endIndex;
private readonly string url;
private readonly IDictionary<string, string> vars;
private readonly CookieCollection cookies;
public CleverbotSession(string baseUrl, string url, int endIndex)
{
this.url = url;
this.endIndex = endIndex;
vars = new Dictionary<string, string>();
//vars["start"] = "y";
vars["stimulus"] = "";
vars["islearning"] = "1";
vars["icognoid"] = "wsf";
//vars["fno"] = "0";
//vars["sub"] = "Say";
//vars["cleanslate"] = "false";
cookies = Utils.GetCookies(baseUrl);
}
public async Task<ChatterBotThought> Think(ChatterBotThought thought)
{
vars["stimulus"] = thought.Text;
var formData = Utils.ParametersToWWWFormURLEncoded(vars);
var formDataToDigest = formData.Substring(9, endIndex);
var formDataDigest = Utils.MD5(formDataToDigest);
vars["icognocheck"] = formDataDigest;
var response = await Utils.Post(url, vars, cookies).ConfigureAwait(false);
var responseValues = response.Split('\r');
//vars[""] = Utils.StringAtIndex(responseValues, 0); ??
vars["sessionid"] = Utils.StringAtIndex(responseValues, 1);
vars["logurl"] = Utils.StringAtIndex(responseValues, 2);
vars["vText8"] = Utils.StringAtIndex(responseValues, 3);
vars["vText7"] = Utils.StringAtIndex(responseValues, 4);
vars["vText6"] = Utils.StringAtIndex(responseValues, 5);
vars["vText5"] = Utils.StringAtIndex(responseValues, 6);
vars["vText4"] = Utils.StringAtIndex(responseValues, 7);
vars["vText3"] = Utils.StringAtIndex(responseValues, 8);
vars["vText2"] = Utils.StringAtIndex(responseValues, 9);
vars["prevref"] = Utils.StringAtIndex(responseValues, 10);
//vars[""] = Utils.StringAtIndex(responseValues, 11); ??
// vars["emotionalhistory"] = Utils.StringAtIndex(responseValues, 12);
// vars["ttsLocMP3"] = Utils.StringAtIndex(responseValues, 13);
// vars["ttsLocTXT"] = Utils.StringAtIndex(responseValues, 14);
// vars["ttsLocTXT3"] = Utils.StringAtIndex(responseValues, 15);
// vars["ttsText"] = Utils.StringAtIndex(responseValues, 16);
// vars["lineRef"] = Utils.StringAtIndex(responseValues, 17);
// vars["lineURL"] = Utils.StringAtIndex(responseValues, 18);
// vars["linePOST"] = Utils.StringAtIndex(responseValues, 19);
// vars["lineChoices"] = Utils.StringAtIndex(responseValues, 20);
// vars["lineChoicesAbbrev"] = Utils.StringAtIndex(responseValues, 21);
// vars["typingData"] = Utils.StringAtIndex(responseValues, 22);
// vars["divert"] = Utils.StringAtIndex(responseValues, 23);
var responseThought = new ChatterBotThought();
responseThought.Text = Utils.StringAtIndex(responseValues, 0);
return responseThought;
}
public async Task<string> Think(string text)
{
return (await Think(new ChatterBotThought {Text = text}).ConfigureAwait(false)).Text;
}
}
}

68
src/NadekoBot/Services/CleverBotApi/Pandorabots.cs Normal file
View File

@ -0,0 +1,68 @@
using System;
using System.Collections.Generic;
using System.Threading.Tasks;
/*
ChatterBotAPI
Copyright (C) 2011 pierredavidbelanger@gmail.com
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
namespace Services.CleverBotApi
{
internal class Pandorabots : ChatterBot
{
private readonly string botid;
public Pandorabots(string botid)
{
this.botid = botid;
}
public ChatterBotSession CreateSession()
{
return new PandorabotsSession(botid);
}
}
internal class PandorabotsSession : ChatterBotSession
{
private readonly IDictionary<string, string> vars;
public PandorabotsSession(string botid)
{
vars = new Dictionary<string, string>();
vars["botid"] = botid;
vars["custid"] = Guid.NewGuid().ToString();
}
public async Task<ChatterBotThought> Think(ChatterBotThought thought)
{
vars["input"] = thought.Text;
var response = await Utils.Post("http://www.pandorabots.com/pandora/talk-xml", vars, null).ConfigureAwait(false);
var responseThought = new ChatterBotThought();
responseThought.Text = Utils.XPathSearch(response, "//result/that/text()");
return responseThought;
}
public async Task<string> Think(string text)
{
return (await Think(new ChatterBotThought {Text = text}).ConfigureAwait(false)).Text;
}
}
}

148
src/NadekoBot/Services/CleverBotApi/Utils.cs Normal file
View File

@ -0,0 +1,148 @@
using NadekoBot.Extensions;
using System;
using System.Collections.Generic;
using System.IO;
using System.Net;
using System.Net.Http;
using System.Text;
using System.Threading.Tasks;
using System.Xml.XPath;
/*
ChatterBotAPI
Copyright (C) 2011 pierredavidbelanger@gmail.com
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
namespace Services.CleverBotApi
{
internal static class Utils
{
public static string ParametersToWWWFormURLEncoded(IDictionary<string, string> parameters)
{
string wwwFormUrlEncoded = null;
foreach (var parameterKey in parameters.Keys)
{
var parameterValue = parameters[parameterKey];
var parameter = string.Format("{0}={1}", System.Uri.EscapeDataString(parameterKey), System.Uri.EscapeDataString(parameterValue));
if (wwwFormUrlEncoded == null)
{
wwwFormUrlEncoded = parameter;
}
else
{
wwwFormUrlEncoded = string.Format("{0}&{1}", wwwFormUrlEncoded, parameter);
}
}
return wwwFormUrlEncoded;
}
public static string MD5(string input)
{
// step 1, calculate MD5 hash from input
var md5 = System.Security.Cryptography.MD5.Create();
var inputBytes = Encoding.ASCII.GetBytes(input);
var hash = md5.ComputeHash(inputBytes);
// step 2, convert byte array to hex string
var sb = new StringBuilder();
for (var i = 0; i < hash.Length; i++)
{
sb.Append(hash[i].ToString("X2"));
}
return sb.ToString();
}
public static CookieCollection GetCookies(string url)
{
CookieContainer container = new CookieContainer();
HttpResponseMessage res;
using (var handler = new HttpClientHandler() { CookieContainer = container })
using (var http = new HttpClient(handler))
{
http.AddFakeHeaders();
http.DefaultRequestHeaders.Add("ContentType", "text/html");
res = http.GetAsync(url).GetAwaiter().GetResult();
}
var response = res.Content.ReadAsStringAsync().GetAwaiter().GetResult();
return container.GetCookies(res.RequestMessage.RequestUri);
}
public static async Task<string> Post(string url, IDictionary<string, string> parameters, CookieCollection cookies)
{
var postData = ParametersToWWWFormURLEncoded(parameters);
var postDataBytes = Encoding.ASCII.GetBytes(postData);
var request = (HttpWebRequest)WebRequest.Create(url);
if (cookies != null)
{
var container = new CookieContainer();
container.Add(new Uri(url), cookies);
request.CookieContainer = container;
}
request.Method = "POST";
request.ContentType = "application/x-www-form-urlencoded";
using (var outputStream = await request.GetRequestStreamAsync())
{
outputStream.Write(postDataBytes, 0, postDataBytes.Length);
outputStream.Flush();
var response = (HttpWebResponse)await request.GetResponseAsync();
using (var responseStreamReader = new StreamReader(response.GetResponseStream()))
{
return responseStreamReader.ReadToEnd().Trim();
}
}
//HttpClientHandler handler;
//var uri = new Uri(url);
//if (cookies == null)
// handler = new HttpClientHandler();
//else
//{
// var cookieContainer = new CookieContainer();
// cookieContainer.Add(uri, cookies);
// handler = new HttpClientHandler() { CookieContainer = cookieContainer };
//}
//using (handler)
//using (var http = new HttpClient(handler))
//{
// var res = await http.PostAsync(url, new FormUrlEncodedContent(parameters)).ConfigureAwait(false);
// return await res.Content.ReadAsStringAsync().ConfigureAwait(false);
//}
}
public static string XPathSearch(string input, string expression)
{
var document = new XPathDocument(new MemoryStream(Encoding.ASCII.GetBytes(input)));
var navigator = document.CreateNavigator();
return navigator.SelectSingleNode(expression).Value.Trim();
}
public static string StringAtIndex(string[] strings, int index)
{
if (index >= strings.Length) return "";
return strings[index];
}
}
}

6
src/NadekoBot/Services/Impl/BotCredentials.cs
View File

@ -26,8 +26,6 @@ namespace NadekoBot.Services.Impl
public string LoLApiKey { get; }
public string OsuApiKey { get; }
public string SoundCloudClientId { get; }
public string CleverbotApiUser { get; }
public string CleverbotApiKey { get; }
public DB Db { get; }
public int TotalShards { get; }
@ -52,8 +50,6 @@ namespace NadekoBot.Services.Impl
ClientId = cm.ClientId;
SoundCloudClientId = cm.SoundCloudClientId;
CarbonKey = cm.CarbonKey;
CleverbotApiKey = cm.CleverbotApiKey;
CleverbotApiUser = cm.CleverbotApiUser;
if (cm.Db == null)
Db = new DB("sqlite", "");
else
@ -81,8 +77,6 @@ namespace NadekoBot.Services.Impl
public string CarbonKey { get; set; } = "";
public DB Db { get; set; }
public int TotalShards { get; set; } = 1;
public string CleverbotApiUser { get; set; }
public string CleverbotApiKey { get; set; }
}
private class DbModel

4
src/NadekoBot/credentials_example.json
View File

@ -12,7 +12,5 @@
"SoundCloudClientId": "",
"CarbonKey": "",
"Db": null,
"TotalShards": 1,
"CleverbotApiUser": null,
"CleverbotApiKey": null
"TotalShards": 1
}

3
src/NadekoBot/project.json
View File

@ -41,7 +41,8 @@
},
"Discord.Net": {
"target": "project"
}
},
"System.Xml.XPath": "4.0.1"
},
"tools": {
"Microsoft.EntityFrameworkCore.Tools": "1.0.0-preview2-final"