diff --git a/.gitignore b/.gitignore
index ff2c4dd52..7cdc81825 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
-## Ignore Visual Studio temporary files, build results, and
+### Ignore Visual Studio temporary files, build results, and
## files generated by popular Visual Studio add-ons.
# User-specific files
@@ -19,10 +19,10 @@ obj/
!**/Bin/Debug/WebSocket4Net.dll
!**/Bin/Debug/sqlite3.dll
!**/Bin/Debug/credentials_example.json
-NadekoBot/bin/debug/*.*
-NadekoBot/bin/debug/data/permissions
-NadekoBot/bin/debug/data/incidents
-!NadekoBot/bin/Debug/data/currency_images/*
+WizBot/bin/debug/*.*
+WizBot/bin/debug/data/permissions
+WizBot/bin/debug/data/incidents
+!WizBot/bin/Debug/data/currency_images/*
Tests/bin
# NuGet Packages
@@ -33,6 +33,8 @@ Tests/bin
!**/packages/build/
# Uncomment if necessary however generally it will be regenerated when needed
#!**/packages/repositories.config
-NadekoBot/bin/Debug/data/nadekobot.sqlite
-NadekoBot/bin/Debug/data/config.json
-NadekoBot/bin/Debug/data/ServerSpecificConfigs.json
\ No newline at end of file
+WizBot/bin/Debug/data/WizBot.sqlite
+WizBot/bin/Debug/data/config.json
+WizBot/bin/Debug/data/ServerSpecificConfigs.json
+/BuildProcessTemplates
+/.vs/config
diff --git a/.gitmodules b/.gitmodules
index 9ff1a2975..a45a5dd4e 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
[submodule "discord.net"]
path = discord.net
- url = git://github.com/rogueexception/discord.net.git
+ url = git://github.com/rogueexception/discord.net.git
\ No newline at end of file
diff --git a/09.md b/09.md
new file mode 100644
index 000000000..b63ba696b
--- /dev/null
+++ b/09.md
@@ -0,0 +1 @@
+0.9
diff --git a/ComprehensiveGuide.md b/ComprehensiveGuide.md
index 2e5f2fee3..762e2caf3 100644
--- a/ComprehensiveGuide.md
+++ b/ComprehensiveGuide.md
@@ -2,38 +2,39 @@ ________________________________________________________________________________
*Thanks to @Flatbread for making this guide*
________________________________________________________________________________
-#### Setting Up NadekoBot v0.93.2
+#### Setting Up WizBot v0.93.2
###### Prerequisites:
1) NET Framework 4.5.2 (or 4.6)
+- Download WizBot
- Rename credentials_example.json into credentials.json. (Note: If you do not see a .json after credentials_example.json, do not add the .json. You likely have "Hide file extensions" as enabled.)
- Go to (https://discordapp.com/developers/applications/me). Log in if you have to with your Discord account. Press "New Application" and fill out an App Name and, optionally, an app description and icon. Afterwards, create the application. Once the application is created, click on "Create a Bot User" and confirm it. You will then see the bot's username, ID and token. Reveal and copy the token and the bot ID.
- Open up credentials.json. Paste the token into the Token field, between the quotes. Paste the ID into the BotID field. Leave email and password fields empty. Save and close credentials.json.
-- Go into data folder and make sure you have config.json file. If there is no config.json, rename the config_example.json to config.json.
-- Copy your CLIENT ID (that's in the same Developer page where you brought your token) and replace `12345678` in the this link:
+- Go into data folder and make sure you have config.json file. If there is no config.json, rename the config_example.json to config.json. [REFERENCE IMAGE](https://cdn.discordapp.com/attachments/117523346618318850/178813495872192513/unknown.png)
+- Copy your CLIENT ID (that's in the same Developer page where you brought your token) and replace `12345678` in this link:
https://discordapp.com/oauth2/authorize?client_id=12345678&scope=bot&permissions=66186303 with it. Go to that link and you will be able to add your bot to your server.
-- Start NadekoBot.exe. In a text channel, **not a direct message**, type in [.uid @______] without the brackets, filling in the underlined portion with your name and send the message. Your bot will reply with a number; this is your ID. Copy this ID and close NadekoBot.exe.
+- Start WizBot.exe. In a text channel, **not a direct message**, type in [.uid @______] without the brackets, filling in the underlined portion with your name and send the message. Your bot will reply with a number; this is your ID. Copy this ID and close WizBot.exe.
- Reopen credentials.json. Paste your ID into the square brackets ("OwnerIds": [1231312313]). You can add multiple owners by separating IDs with a comma. Close and save credentials.json.
________________________________________________________________________________
-#### Setting Up NadekoBot For Music
+#### Setting Up WizBot For Music
###### Prerequisites:
1) FFMPEG, Static Build Version (See below) Google Account
-2) Soundcloud Account
+2) Soundcloud Account (if you want soundcloud support)
- Download FFMPEG through the link (https://ffmpeg.zeranoe.com/builds/).
- Go to My Computer, right click and select Properties. On the left tab, select Advanced System Settings. Under the Advanced tab, select Environmental Variables near the bottom. One of the variables should be called "Path". Add a semi-colon (;) to the end followed by your FFMPEG's **bin** install location (**for example C:\\ffmpeg\\bin**). Save and close.
- Go to console.developers.google.com and log in.
- Create a new project (name does not matter). Once the project is created, go into "Enable and manage APIs."
-- Under the "Other Popular APIs" section, enable "URL Shortener API". Under the "YouTube APIs" section, enable "YouTube Data API".
+- Under the "Other Popular APIs" section, enable "URL Shortener API". Under the "YouTube APIs" section, enable "YouTube Data API". Also enable Custom Search Api.
- On the left tab, access Credentials. There will be a line saying "If you wish to skip this step and create an API key, client ID or service account." Click on API Key, and then Server Key in the new window that appears. Enter in a name for the server key. A new window will appear with your Google API key. Copy the key.
- Open up credentials.json. For "GoogleAPIKey", fill in with the new key.
- Go to (https://soundcloud.com/you/apps/new). Enter a name for the app and create it. You will see a page with the title of your app, and a field labeled Client ID. Copy the ID. In credentials.json, fill in "SoundcloudClientID" with the copied ID.
________________________________________________________________________________
-#### Setting Up NadekoBot Permissions
-###### NadekoBot's permissions can be set up to be very specific through commands in the Permissions module.
+#### Setting Up WizBot Permissions
+###### WizBot's permissions can be set up to be very specific through commands in the Permissions module.
Each command or module can be turned on or off at:
- a user level (so specific users can or cannot use a command/module)
- a role level (so only certain roles have access to certain commands/module)
@@ -75,4 +76,4 @@ Check permissions by using the letter of the level you want to check followed by
Insert an **a** before the level to edit the permission for all commands / modules for all users / roles / channels / server.
-Reference the Help command (-h) for more Permissions related commands.
+Reference the Help command (-h) for more Permissions related commands.
\ No newline at end of file
diff --git a/LinuxSetup.md b/LinuxSetup.md
new file mode 100644
index 000000000..f5c9d454b
--- /dev/null
+++ b/LinuxSetup.md
@@ -0,0 +1,256 @@
+#SETTING UP WIZBOT ON LINUX UBUNTU 14+
+
+######If you want WizBot to play music for you 24/7 without having to hosting it on your PC and want to keep it cheap, reliable and convenient as possible, you can try WizBot on Wiz VPS KVM server using the link http://wiz-vps.com/vps-hosting-plans/kvm/
+
+
+Assuming you have followed the link above to created an account in Wiz VPS and until you get the `IP address and root password (in email)` to login, its time to begin:
+
+**DOWNLOAD PuTTY**
+
+http://www.chiark.greenend.org.uk/~sgtatham/putty/download.html
+
+**DOWNLOAD and INSTALL CyberDuck** `(for accessing filesystem using SFTP)`
+
+https://cyberduck.io
+
+
+
+**Follow the steps below:**
+
+**Open PuTTY.exe** that you downloaded before, and paste or enter your `IP address` and then click **Open**
+
+If you entered your VPS IP address correctly, it should show **login as:** in a newly opened window.
+
+Now for **login as:**, type `root` and hit enter.
+
+It should then, ask for password, type the `root password` you have received in your **email address registered with Wiz VPS**, then hit Enter
+
+*(as you are running it for the first time, it will most likely to ask you to change your root password, for that, type the "password you received through email", hit Enter, enter a "new password", hit Enter and confirm that "new password" again.*
+**SAVE that new password somewhere safe not just in mind**
+
+After you done that, you are ready to write commands.
+
+**Copy and just paste** using **mouse right-click** (it should paste automatically)
+
+######MONO (Source: http://www.mono-project.com/docs/getting-started/install/linux/)
+
+**1)**
+
+sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF
+echo "deb http://download.mono-project.com/repo/debian wheezy main" | sudo tee /etc/apt/sources.list.d/mono-xamarin.list
+sudo apt-get update
+echo "deb http://download.mono-project.com/repo/debian wheezy-apache24-compat main" | sudo tee -a /etc/apt/sources.list.d/mono-xamarin.list
+echo "deb http://download.mono-project.com/repo/debian wheezy-libjpeg62-compat main" | sudo tee -a /etc/apt/sources.list.d/mono-xamarin.list
+apt-get install mono-devel
+sudo apt-get install libopus0 opus-tools
+sudo apt-get install libopus-dev
+apt-get install ffmpeg
+apt-get install ufw
+ufw status
+ufw enable
+sudo ufw allow ssh
+apt-get install unzip
+apt-get install tmux
+mozroots --import --ask-remove --machine
+certmgr --ssl https://gateway.discord.gg
+mkdir wizbot
+cd wizbot
+wget https://github.com/Wizkiller96/WizBot-Updated/releases/download/vx.xx/WizBot.vx.x.zip
+unzip WizBot.vx.x.zip
+tmux new -s wizbot
+cd wizbot
+mono WizBot.exe
+ logs = new ConcurrentDictionary();
- private readonly ConcurrentDictionary loggingPresences = new ConcurrentDictionary();
- private readonly ConcurrentDictionary voiceChannelLog = new ConcurrentDictionary();
-
- public LogCommand(DiscordModule module) : base(module)
- {
- NadekoBot.Client.MessageReceived += MsgRecivd;
- NadekoBot.Client.MessageDeleted += MsgDltd;
- NadekoBot.Client.MessageUpdated += MsgUpdtd;
- NadekoBot.Client.UserUpdated += UsrUpdtd;
- NadekoBot.Client.UserBanned += UsrBanned;
-
-
- NadekoBot.Client.MessageReceived += async (s, e) =>
- {
- if (e.Channel.IsPrivate || e.User.Id == NadekoBot.Client.CurrentUser.Id)
- return;
- if (!SpecificConfigurations.Default.Of(e.Server.Id).SendPrivateMessageOnMention) return;
- try
- {
- var usr = e.Message.MentionedUsers.FirstOrDefault(u => u != e.User);
- if (usr?.Status != UserStatus.Offline)
- return;
- await e.Channel.SendMessage($"User `{usr.Name}` is offline. PM sent.").ConfigureAwait(false);
- await usr.SendMessage(
- $"User `{e.User.Name}` mentioned you on " +
- $"`{e.Server.Name}` server while you were offline.\n" +
- $"`Message:` {e.Message.Text}").ConfigureAwait(false);
- }
- catch { }
- };
- }
-
- private async void UsrBanned(object sender, UserEventArgs e)
- {
- try
- {
- Channel ch;
- if (!logs.TryGetValue(e.Server, out ch))
- return;
- await ch.SendMessage($"`User banned:` **{e.User.Name}** ({e.User.Id})").ConfigureAwait(false);
- }
- catch { }
- }
-
- public Func DoFunc() => async e =>
- {
- Channel ch;
- if (!logs.TryRemove(e.Server, out ch))
- {
- logs.TryAdd(e.Server, e.Channel);
- await e.Channel.SendMessage($"**I WILL BEGIN LOGGING SERVER ACTIVITY IN THIS CHANNEL**").ConfigureAwait(false);
- return;
- }
-
- await e.Channel.SendMessage($"**NO LONGER LOGGING IN {ch.Mention} CHANNEL**").ConfigureAwait(false);
- };
-
- private async void MsgRecivd(object sender, MessageEventArgs e)
- {
- try
- {
- if (e.Server == null || e.Channel.IsPrivate || e.User.Id == NadekoBot.Client.CurrentUser.Id)
- return;
- Channel ch;
- if (!logs.TryGetValue(e.Server, out ch) || e.Channel == ch)
- return;
- await ch.SendMessage($"`Type:` **Message received** `Time:` **{DateTime.Now}** `Channel:` **{e.Channel.Name}**\n`{e.User}:` {e.Message.Text}").ConfigureAwait(false);
- }
- catch { }
- }
- private async void MsgDltd(object sender, MessageEventArgs e)
- {
- try
- {
- if (e.Server == null || e.Channel.IsPrivate || e.User.Id == NadekoBot.Client.CurrentUser.Id)
- return;
- Channel ch;
- if (!logs.TryGetValue(e.Server, out ch) || e.Channel == ch)
- return;
- await ch.SendMessage($"`Type:` **Message deleted** `Time:` **{DateTime.Now}** `Channel:` **{e.Channel.Name}**\n`{e.User}:` {e.Message.Text}").ConfigureAwait(false);
- }
- catch { }
- }
- private async void MsgUpdtd(object sender, MessageUpdatedEventArgs e)
- {
- try
- {
- if (e.Server == null || e.Channel.IsPrivate || e.User.Id == NadekoBot.Client.CurrentUser.Id)
- return;
- Channel ch;
- if (!logs.TryGetValue(e.Server, out ch) || e.Channel == ch)
- return;
- await ch.SendMessage($"`Type:` **Message updated** `Time:` **{DateTime.Now}** `Channel:` **{e.Channel.Name}**\n**BEFORE**: `{e.User}:` {e.Before.Text}\n---------------\n**AFTER**: `{e.User}:` {e.After.Text}").ConfigureAwait(false);
- }
- catch { }
- }
- private async void UsrUpdtd(object sender, UserUpdatedEventArgs e)
- {
- try
- {
- Channel ch;
- if (loggingPresences.TryGetValue(e.Server, out ch))
- if (e.Before.Status != e.After.Status)
- {
- await ch.SendMessage($"**{e.Before.Name}** is now **{e.After.Status}**.").ConfigureAwait(false);
- }
- }
- catch { }
-
- try
- {
- if (e.Before.VoiceChannel != null && voiceChannelLog.ContainsKey(e.Before.VoiceChannel))
- {
- if (e.After.VoiceChannel != e.Before.VoiceChannel)
- await voiceChannelLog[e.Before.VoiceChannel].SendMessage($"🎼`{e.Before.Name} has left the` {e.Before.VoiceChannel.Mention} `voice channel.`").ConfigureAwait(false);
- }
- if (e.After.VoiceChannel != null && voiceChannelLog.ContainsKey(e.After.VoiceChannel))
- {
- if (e.After.VoiceChannel != e.Before.VoiceChannel)
- await voiceChannelLog[e.After.VoiceChannel].SendMessage($"🎼`{e.After.Name} has joined the`{e.After.VoiceChannel.Mention} `voice channel.`").ConfigureAwait(false);
- }
- }
- catch { }
-
- try
- {
- Channel ch;
- if (!logs.TryGetValue(e.Server, out ch))
- return;
- string str = $"`Type:` **User updated** `Time:` **{DateTime.Now}** `User:` **{e.Before.Name}**\n";
- if (e.Before.Name != e.After.Name)
- str += $"`New name:` **{e.After.Name}**";
- else if (e.Before.AvatarUrl != e.After.AvatarUrl)
- str += $"`New Avatar:` {e.After.AvatarUrl}";
- else
- return;
- await ch.SendMessage(str).ConfigureAwait(false);
- }
- catch { }
- }
-
- internal override void Init(CommandGroupBuilder cgb)
- {
-
- cgb.CreateCommand(Module.Prefix + "spmom")
- .Description("Toggles whether mentions of other offline users on your server will send a pm to them.")
- .AddCheck(SimpleCheckers.ManageServer())
- .Do(async e =>
- {
- var specificConfig = SpecificConfigurations.Default.Of(e.Server.Id);
- specificConfig.SendPrivateMessageOnMention =
- !specificConfig.SendPrivateMessageOnMention;
- if (specificConfig.SendPrivateMessageOnMention)
- await e.Channel.SendMessage(":ok: I will send private messages " +
- "to mentioned offline users.").ConfigureAwait(false);
- else
- await e.Channel.SendMessage(":ok: I won't send private messages " +
- "to mentioned offline users anymore.").ConfigureAwait(false);
- });
-
- cgb.CreateCommand(Module.Prefix + "logserver")
- .Description("Toggles logging in this channel. Logs every message sent/deleted/edited on the server. **Owner Only!**")
- .AddCheck(SimpleCheckers.OwnerOnly())
- .AddCheck(SimpleCheckers.ManageServer())
- .Do(DoFunc());
-
- cgb.CreateCommand(Module.Prefix + "userpresence")
- .Description("Starts logging to this channel when someone from the server goes online/offline/idle. **Owner Only!**")
- .AddCheck(SimpleCheckers.OwnerOnly())
- .AddCheck(SimpleCheckers.ManageServer())
- .Do(async e =>
- {
- Channel ch;
- if (!loggingPresences.TryRemove(e.Server, out ch))
- {
- loggingPresences.TryAdd(e.Server, e.Channel);
- await e.Channel.SendMessage($"**User presence notifications enabled.**").ConfigureAwait(false);
- return;
- }
-
- await e.Channel.SendMessage($"**User presence notifications disabled.**").ConfigureAwait(false);
- });
-
- cgb.CreateCommand(Module.Prefix + "voicepresence")
- .Description("Toggles logging to this channel whenever someone joins or leaves a voice channel you are in right now. **Owner Only!**")
- .Parameter("all", ParameterType.Optional)
- .AddCheck(SimpleCheckers.OwnerOnly())
- .AddCheck(SimpleCheckers.ManageServer())
- .Do(async e =>
- {
-
- if (e.GetArg("all")?.ToLower() == "all")
- {
- foreach (var voiceChannel in e.Server.VoiceChannels)
- {
- voiceChannelLog.TryAdd(voiceChannel, e.Channel);
- }
- await e.Channel.SendMessage("Started logging user presence for **ALL** voice channels!").ConfigureAwait(false);
- return;
- }
-
- if (e.User.VoiceChannel == null)
- {
- await e.Channel.SendMessage("💢 You are not in a voice channel right now. If you are, please rejoin it.").ConfigureAwait(false);
- return;
- }
- Channel throwaway;
- if (!voiceChannelLog.TryRemove(e.User.VoiceChannel, out throwaway))
- {
- voiceChannelLog.TryAdd(e.User.VoiceChannel, e.Channel);
- await e.Channel.SendMessage($"`Logging user updates for` {e.User.VoiceChannel.Mention} `voice channel.`").ConfigureAwait(false);
- }
- else
- await e.Channel.SendMessage($"`Stopped logging user updates for` {e.User.VoiceChannel.Mention} `voice channel.`").ConfigureAwait(false);
- });
- }
- }
-}
diff --git a/NadekoBot/Modules/Help/Commands/HelpCommand.cs b/NadekoBot/Modules/Help/Commands/HelpCommand.cs
deleted file mode 100644
index 8aedcea96..000000000
--- a/NadekoBot/Modules/Help/Commands/HelpCommand.cs
+++ /dev/null
@@ -1,146 +0,0 @@
-using Discord.Commands;
-using NadekoBot.Extensions;
-using NadekoBot.Modules;
-using NadekoBot.Modules.Permissions.Classes;
-using System;
-using System.IO;
-using System.Linq;
-using System.Threading.Tasks;
-
-namespace NadekoBot.Classes.Help.Commands
-{
- internal class HelpCommand : DiscordCommand
- {
- public Func DoFunc() => async e =>
- {
- #region OldHelp
- /*
- string helpstr = "**COMMANDS DO NOT WORK IN PERSONAL MESSAGES**\nOfficial repo: **github.com/Kwoth/NadekoBot/**";
-
- string lastCategory = "";
- foreach (var com in client.GetService().AllCommands)
- {
- if (com.Category != lastCategory)
- {
- helpstr += "\n`----`**`" + com.Category + "`**`----`\n";
- lastCategory = com.Category;
- }
- helpstr += PrintCommandHelp(com);
- }
- helpstr += "\nBot Creator's server: https://discord.gg/0ehQwTK2RBhxEi0X";
- helpstr = helpstr.Replace(NadekoBot.botMention, "@BotName");
- while (helpstr.Length > 2000)
- {
- var curstr = helpstr.Substring(0, 2000);
- await e.User.Send(curstr.Substring(0, curstr.LastIndexOf("\n") + 1)).ConfigureAwait(false);
- helpstr = curstr.Substring(curstr.LastIndexOf("\n") + 1) + helpstr.Substring(2000);
- await Task.Delay(200).ConfigureAwait(false);
- }
- */
- #endregion OldHelp
-
- if (string.IsNullOrWhiteSpace(e.GetArg("command")))
- {
- await e.User.Send(HelpString).ConfigureAwait(false);
- return;
- }
- await Task.Run(async () =>
- {
- var comToFind = e.GetArg("command");
-
- var com = NadekoBot.Client.GetService().AllCommands
- .FirstOrDefault(c => c.Text.ToLower().Equals(comToFind));
- if (com != null)
- await e.Channel.SendMessage($"`Help for '{com.Text}':` **{com.Description}**").ConfigureAwait(false);
- }).ConfigureAwait(false);
- };
- public static string HelpString => (NadekoBot.IsBot
- ? $"To add me to your server, use this link** -> \n"
- : $"To invite me to your server, just send me an invite link here.") +
- $"You can use `{NadekoBot.Config.CommandPrefixes.Help}modules` command to see a list of all modules.\n" +
- $"You can use `{NadekoBot.Config.CommandPrefixes.Help}commands ModuleName`" +
- $" (for example `{NadekoBot.Config.CommandPrefixes.Help}commands Administration`) to see a list of all of the commands in that module.\n" +
- $"For a specific command help, use `{NadekoBot.Config.CommandPrefixes.Help}h \"Command name\"` (for example `-h \"!m q\"`)\n" +
- "**LIST OF COMMANDS CAN BE FOUND ON THIS LINK**\n\n ";
-
- public static string DMHelpString => NadekoBot.Config.DMHelpString;
-
- public Action DoGitFunc() => e =>
- {
- string helpstr =
-$@"######For more information and how to setup your own NadekoBot, go to: **http://github.com/Kwoth/NadekoBot/**
-######You can donate on paypal: `nadekodiscordbot@gmail.com` or Bitcoin `17MZz1JAqME39akMLrVT4XBPffQJ2n1EPa`
-
-#NadekoBot List Of Commands
-Version: `{NadekoStats.Instance.BotVersion}`";
-
-
- string lastCategory = "";
- foreach (var com in NadekoBot.Client.GetService().AllCommands)
- {
- if (com.Category != lastCategory)
- {
- helpstr += "\n### " + com.Category + " \n";
- helpstr += "Command and aliases | Description | Usage\n";
- helpstr += "----------------|--------------|-------\n";
- lastCategory = com.Category;
- }
- helpstr += PrintCommandHelp(com);
- }
- helpstr = helpstr.Replace(NadekoBot.BotMention, "@BotName");
- helpstr = helpstr.Replace("\n**Usage**:", " | ").Replace("**Usage**:", " | ").Replace("**Description:**", " | ").Replace("\n|", " | \n");
-#if DEBUG
- File.WriteAllText("../../../commandlist.md", helpstr);
-#else
- File.WriteAllText("commandlist.md", helpstr);
-#endif
- };
-
- internal override void Init(CommandGroupBuilder cgb)
- {
- cgb.CreateCommand(Module.Prefix + "h")
- .Alias(Module.Prefix + "help", NadekoBot.BotMention + " help", NadekoBot.BotMention + " h", "~h")
- .Description("Either shows a help for a single command, or PMs you help link if no arguments are specified.\n**Usage**: '-h !m q' or just '-h' ")
- .Parameter("command", ParameterType.Unparsed)
- .Do(DoFunc());
- cgb.CreateCommand(Module.Prefix + "hgit")
- .Description("Generates the commandlist.md file. **Owner Only!**")
- .AddCheck(SimpleCheckers.OwnerOnly())
- .Do(DoGitFunc());
- cgb.CreateCommand(Module.Prefix + "readme")
- .Alias(Module.Prefix + "guide")
- .Description("Sends a readme and a guide links to the channel.")
- .Do(async e =>
- await e.Channel.SendMessage(
-@"**FULL README**:
-
-**GUIDE ONLY**:
-
-**LIST OF COMMANDS**: ").ConfigureAwait(false));
-
- cgb.CreateCommand(Module.Prefix + "donate")
- .Alias("~donate")
- .Description("Instructions for helping the project!")
- .Do(async e =>
- {
- await e.Channel.SendMessage(
-$@"I've created a **paypal** email for nadeko, so if you wish to support the project, you can send your donations to `nadekodiscordbot@gmail.com`
-Don't forget to leave your discord name or id in the message, so that I can reward people who help out.
-You can join nadekobot server by typing {Module.Prefix}h and you will get an invite in a private message.
-
-*If you want to support in some other way or on a different platform, please message me*"
- ).ConfigureAwait(false);
- });
- }
-
- private static string PrintCommandHelp(Command com)
- {
- var str = "`" + com.Text + "`";
- str = com.Aliases.Aggregate(str, (current, a) => current + (", `" + a + "`"));
- str += " **Description:** " + com.Description + "\n";
- return str;
- }
-
- public HelpCommand(DiscordModule module) : base(module) { }
- }
-}
diff --git a/NadekoBot/_Models/JSONModels/Configuration.cs b/NadekoBot/_Models/JSONModels/Configuration.cs
deleted file mode 100644
index 91d866ed6..000000000
--- a/NadekoBot/_Models/JSONModels/Configuration.cs
+++ /dev/null
@@ -1,137 +0,0 @@
-using Discord;
-using Newtonsoft.Json;
-using System.Collections.Generic;
-using System.IO;
-
-namespace NadekoBot.Classes.JSONModels
-{
- public class Configuration
- {
- public bool DontJoinServers { get; set; } = false;
- public bool ForwardMessages { get; set; } = true;
- public bool IsRotatingStatus { get; set; } = false;
-
- [JsonIgnore]
- public List Quotes { get; set; } = new List();
-
- [JsonIgnore]
- public List PokemonTypes { get; set; } = new List();
-
-
- public List RotatingStatuses { get; set; } = new List();
- public CommandPrefixesModel CommandPrefixes { get; set; } = new CommandPrefixesModel();
- public HashSet ServerBlacklist { get; set; } = new HashSet();
- public HashSet ChannelBlacklist { get; set; } = new HashSet();
-
- public HashSet UserBlacklist { get; set; } = new HashSet() {
- 105309315895693312,
- 119174277298782216,
- 143515953525817344
- };
-
-
- public string[] _8BallResponses { get; set; } =
- {
- "Most definitely yes",
- "For sure",
- "As I see it, yes",
- "My sources say yes",
- "Yes",
- "Most likely",
- "Perhaps",
- "Maybe",
- "Not sure",
- "It is uncertain",
- "Ask me again later",
- "Don't count on it",
- "Probably not",
- "Very doubtful",
- "Most likely no",
- "Nope",
- "No",
- "My sources say no",
- "Dont even think about it",
- "Definitely no",
- "NO - It may cause disease contraction"
- };
-
- public string[] DisguiseResponses { get; set; } = {
- "https://cdn.discordapp.com/attachments/140007341880901632/156721710458994690/Cc5mixjUYAADgBs.jpg",
- "https://cdn.discordapp.com/attachments/140007341880901632/156721715831898113/hqdefault.jpg",
- "https://cdn.discordapp.com/attachments/140007341880901632/156721724430352385/okawari_01_haruka_weird_mask.jpg",
- "https://cdn.discordapp.com/attachments/140007341880901632/156721728763068417/mustache-best-girl.png"
- };
-
- public string[] CryResponses { get; set; } = {
- "http://i.imgur.com/Xg3i1Qy.gif",
- "http://i.imgur.com/3K8DRrU.gif",
- "http://i.imgur.com/k58BcAv.gif",
- "http://i.imgur.com/I2fLXwo.gif"
- };
-
- public string[] PatResponses { get; set; } = {
- "http://i.imgur.com/IiQwK12.gif",
- "http://i.imgur.com/JCXj8yD.gif",
- "http://i.imgur.com/qqBl2bm.gif",
- "http://i.imgur.com/eOJlnwP.gif",
- "https://45.media.tumblr.com/229ec0458891c4dcd847545c81e760a5/tumblr_mpfy232F4j1rxrpjzo1_r2_500.gif",
- "https://media.giphy.com/media/KZQlfylo73AMU/giphy.gif",
- "https://media.giphy.com/media/12hvLuZ7uzvCvK/giphy.gif",
- "http://gallery1.anivide.com/_full/65030_1382582341.gif",
- "https://49.media.tumblr.com/8e8a099c4eba22abd3ec0f70fd087cce/tumblr_nxovj9oY861ur1mffo1_500.gif ",
- };
-
- public string CurrencySign { get; set; } = "🌸";
- public string CurrencyName { get; set; } = "NadekoFlower";
- public string DMHelpString { get; set; } = "Type `-h` for help.";
- }
-
- public class CommandPrefixesModel
- {
- public string Administration { get; set; } = ".";
- public string Searches { get; set; } = "~";
- public string NSFW { get; set; } = "~";
- public string Conversations { get; set; } = "<@{0}>";
- public string ClashOfClans { get; set; } = ",";
- public string Help { get; set; } = "-";
- public string Music { get; set; } = "!m";
- public string Trello { get; set; } = "trello";
- public string Games { get; set; } = ">";
- public string Gambling { get; set; } = "$";
- public string Permissions { get; set; } = ";";
- public string Programming { get; set; } = "%";
- public string Pokemon { get; set; } = ">";
- }
-
- public static class ConfigHandler
- {
- private static readonly object configLock = new object();
- public static void SaveConfig()
- {
- lock (configLock)
- {
- File.WriteAllText("data/config.json", JsonConvert.SerializeObject(NadekoBot.Config, Formatting.Indented));
- }
- }
-
- public static bool IsBlackListed(MessageEventArgs evArgs) => IsUserBlacklisted(evArgs.User.Id) ||
- (!evArgs.Channel.IsPrivate &&
- (IsChannelBlacklisted(evArgs.Channel.Id) || IsServerBlacklisted(evArgs.Server.Id)));
-
- public static bool IsServerBlacklisted(ulong id) => NadekoBot.Config.ServerBlacklist.Contains(id);
-
- public static bool IsChannelBlacklisted(ulong id) => NadekoBot.Config.ChannelBlacklist.Contains(id);
-
- public static bool IsUserBlacklisted(ulong id) => NadekoBot.Config.UserBlacklist.Contains(id);
- }
-
- public class Quote
- {
- public string Author { get; set; }
- public string Text { get; set; }
-
- public override string ToString() =>
- $"{Text}\n\t*-{Author}*";
- }
-
-}
diff --git a/NadekoBot/_Models/JSONModels/_JSONModels.cs b/NadekoBot/_Models/JSONModels/_JSONModels.cs
deleted file mode 100644
index b8f9b086c..000000000
--- a/NadekoBot/_Models/JSONModels/_JSONModels.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-// ReSharper disable InconsistentNaming
-namespace NadekoBot.Classes.JSONModels
-{
- public class Credentials
- {
- public string Username = "myemail@email.com";
- public string Password = "xxxxxxx";
- public string Token = "";
- public ulong BotId = 1231231231231;
- public string GoogleAPIKey = "";
- public ulong[] OwnerIds = { 123123123123, 5675675679845 };
- public string TrelloAppKey = "";
- public string SoundCloudClientID = "";
- public string MashapeKey = "";
- public string LOLAPIKey = "";
- public string CarbonKey = "";
- }
-}
\ No newline at end of file
diff --git a/NadekoBot/bin/Debug/Nito.AsyncEx.Enlightenment.dll b/NadekoBot/bin/Debug/Nito.AsyncEx.Enlightenment.dll
deleted file mode 100644
index 8af5fe023..000000000
Binary files a/NadekoBot/bin/Debug/Nito.AsyncEx.Enlightenment.dll and /dev/null differ
diff --git a/NadekoBot/bin/Debug/Nito.AsyncEx.dll b/NadekoBot/bin/Debug/Nito.AsyncEx.dll
deleted file mode 100644
index d39e3fc17..000000000
Binary files a/NadekoBot/bin/Debug/Nito.AsyncEx.dll and /dev/null differ
diff --git a/NadekoBot/bin/Debug/WebSocket4Net.dll b/NadekoBot/bin/Debug/WebSocket4Net.dll
deleted file mode 100644
index ac6cbce15..000000000
Binary files a/NadekoBot/bin/Debug/WebSocket4Net.dll and /dev/null differ
diff --git a/NadekoBot/bin/Debug/data/avatar.png b/NadekoBot/bin/Debug/data/avatar.png
deleted file mode 100644
index 37862c4bc..000000000
Binary files a/NadekoBot/bin/Debug/data/avatar.png and /dev/null differ
diff --git a/NadekoBot/bin/Debug/data/config_example.json b/NadekoBot/bin/Debug/data/config_example.json
deleted file mode 100644
index 68f48c456..000000000
--- a/NadekoBot/bin/Debug/data/config_example.json
+++ /dev/null
@@ -1,77 +0,0 @@
-{
- "DontJoinServers": false,
- "ForwardMessages": true,
- "IsRotatingStatus": false,
- "RotatingStatuses": [],
- "CommandPrefixes": {
- "Administration": ".",
- "Searches": "~",
- "NSFW": "~",
- "Conversations": "<@{0}>",
- "ClashOfClans": ",",
- "Help": "-",
- "Music": "!m",
- "Trello": "trello",
- "Games": ">",
- "Gambling": "$",
- "Permissions": ";",
- "Programming": "%",
- "Pokemon": ">"
- },
- "ServerBlacklist": [],
- "ChannelBlacklist": [],
- "UserBlacklist": [
- 105309315895693312,
- 119174277298782216,
- 143515953525817344
- ],
- "_8BallResponses": [
- "Most definitely yes",
- "For sure",
- "As I see it, yes",
- "My sources say yes",
- "Yes",
- "Most likely",
- "Perhaps",
- "Maybe",
- "Not sure",
- "It is uncertain",
- "Ask me again later",
- "Don't count on it",
- "Probably not",
- "Very doubtful",
- "Most likely no",
- "Nope",
- "No",
- "My sources say no",
- "Dont even think about it",
- "Definitely no",
- "NO - It may cause disease contraction"
- ],
- "DisguiseResponses": [
- "https://cdn.discordapp.com/attachments/140007341880901632/156721710458994690/Cc5mixjUYAADgBs.jpg",
- "https://cdn.discordapp.com/attachments/140007341880901632/156721715831898113/hqdefault.jpg",
- "https://cdn.discordapp.com/attachments/140007341880901632/156721724430352385/okawari_01_haruka_weird_mask.jpg",
- "https://cdn.discordapp.com/attachments/140007341880901632/156721728763068417/mustache-best-girl.png"
- ],
- "CryResponses": [
- "http://i.imgur.com/Xg3i1Qy.gif",
- "http://i.imgur.com/3K8DRrU.gif",
- "http://i.imgur.com/k58BcAv.gif",
- "http://i.imgur.com/I2fLXwo.gif"
- ],
- "PatResponses": [
- "http://i.imgur.com/IiQwK12.gif",
- "http://i.imgur.com/JCXj8yD.gif",
- "http://i.imgur.com/qqBl2bm.gif",
- "http://i.imgur.com/eOJlnwP.gif",
- "https://45.media.tumblr.com/229ec0458891c4dcd847545c81e760a5/tumblr_mpfy232F4j1rxrpjzo1_r2_500.gif",
- "https://media.giphy.com/media/KZQlfylo73AMU/giphy.gif",
- "https://media.giphy.com/media/12hvLuZ7uzvCvK/giphy.gif",
- "http://gallery1.anivide.com/_full/65030_1382582341.gif",
- "https://49.media.tumblr.com/8e8a099c4eba22abd3ec0f70fd087cce/tumblr_nxovj9oY861ur1mffo1_500.gif "
- ],
- "CurrencySign": "🌸",
- "CurrencyName": "NadekoFlower",
- "DMHelpString": "Type `-h` for help."
-}
\ No newline at end of file
diff --git a/NadekoBot/bin/Debug/data/lol/champions/Thumbs.db b/NadekoBot/bin/Debug/data/lol/champions/Thumbs.db
deleted file mode 100644
index 828509b36..000000000
Binary files a/NadekoBot/bin/Debug/data/lol/champions/Thumbs.db and /dev/null differ
diff --git a/NadekoBot/bin/Debug/data/lol/items/Thumbs.db b/NadekoBot/bin/Debug/data/lol/items/Thumbs.db
deleted file mode 100644
index edce7e326..000000000
Binary files a/NadekoBot/bin/Debug/data/lol/items/Thumbs.db and /dev/null differ
diff --git a/NadekoBot/bin/Debug/libsodium.dll b/NadekoBot/bin/Debug/libsodium.dll
deleted file mode 100644
index a9ab5078e..000000000
Binary files a/NadekoBot/bin/Debug/libsodium.dll and /dev/null differ
diff --git a/NadekoBot/bin/Debug/opus.dll b/NadekoBot/bin/Debug/opus.dll
deleted file mode 100644
index a9eec802c..000000000
Binary files a/NadekoBot/bin/Debug/opus.dll and /dev/null differ
diff --git a/NadekoBot/bin/Debug/sqlite3.dll b/NadekoBot/bin/Debug/sqlite3.dll
deleted file mode 100644
index 59e84a1cf..000000000
Binary files a/NadekoBot/bin/Debug/sqlite3.dll and /dev/null differ
diff --git a/NadekoBot/lib/ScaredFingers.UnitsConversion.dll b/NadekoBot/lib/ScaredFingers.UnitsConversion.dll
deleted file mode 100644
index 8b1218117..000000000
Binary files a/NadekoBot/lib/ScaredFingers.UnitsConversion.dll and /dev/null differ
diff --git a/NadekoBot/lib/ScaredFingers.UnitsConversion.pdb b/NadekoBot/lib/ScaredFingers.UnitsConversion.pdb
deleted file mode 100644
index f63024ad3..000000000
Binary files a/NadekoBot/lib/ScaredFingers.UnitsConversion.pdb and /dev/null differ
diff --git a/NadekoBot/packages.config b/NadekoBot/packages.config
deleted file mode 100644
index 419ac0b02..000000000
--- a/NadekoBot/packages.config
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
\ No newline at end of file
diff --git a/NadekoBot/resources/images/cards/Thumbs.db b/NadekoBot/resources/images/cards/Thumbs.db
deleted file mode 100644
index 13a0bb6c8..000000000
Binary files a/NadekoBot/resources/images/cards/Thumbs.db and /dev/null differ
diff --git a/README.md b/README.md
index f68895ed6..adc3e9378 100644
--- a/README.md
+++ b/README.md
@@ -1,13 +1,10 @@
-# NadekoBot
+# WizBot - Outdated Version
-### [Click here to invite nadeko to your server](https://discordapp.com/oauth2/authorize?client_id=170254782546575360&scope=bot&permissions=66186303)
-[**click here for a list of commands**](https://github.com/Kwoth/NadekoBot/blob/master/commandlist.md)
-Nadeko Discord chatbot written in C# using Discord.net library.
-You might want to join my discord server where i can provide help etc. https://discord.gg/0ehQwTK2RBjAxzEY
+[**click here for a list of commands**](https://github.com/Wizkiller96/WizBot-Updated/blob/master/commandlist.md)
+WizBot Discord chatbot written in C# using Discord.net library.
-##This section will guide you through how to setup NadekoBot
-#### For easy setup and no programming knowledge, you can use [UPDATER](https://github.com/Kwoth/NadekoUpdater/releases/latest) or download release from [releases](https://github.com/Kwoth/NadekoBot/releases) and follow the comprehensive [GUIDE](https://github.com/Kwoth/NadekoBot/blob/master/ComprehensiveGuide.md)
+##This section will guide you through how to setup WizBot
In your bin/debug folder (or next to your exe if you are using release version), you must have a file called 'credentials.json' in which you will store all the necessary data to make the bot know who the owner is, and your api keys.
@@ -16,9 +13,8 @@ When you clone the project, make sure to run `git submodule init` and `git submo
**This is how the credentials.json should look like:**
```json
{
- "Username":"bot_email",
"BotId": 123123123123,
- "Password":"bot_password",
+ "Token":"Bot.Token",
"GoogleAPIKey":"google_api_key",
"OwnerIds":[123123123123, 123123123123],
"TrelloAppKey": "your_trello_app_key (optional)",
@@ -52,17 +48,16 @@ Next to your exe you must also have a data folder in which there is config.json
"UserBlacklist": []
}
```
+- http://discord.kongslien.net/guide.html <- to make a bot account and get the `Token`
- BotId and OwnerIds are **NOT** names of the owner and the bot. If you do not know the id of your bot, put 2 random numbers in those fields, run the bot and do `.uid @MyBotName` - that will give you your bot\_id, do the same for yourself `.uid @MyName` and copy the numbers in their respective fields.
-- For google api key, you need to enable URL shortner, Youtube video search **and custom search** in the [dev console](https://console.developers.google.com/).
+- For google api key, you need to enable URL shortner, Youtube data API and Custom search in the [dev console](https://console.developers.google.com/).
- For the Soundcloud Api key you need a Soundcloud account. You need to create a new app on http://soundcloud.com/you/apps/new and after that go here http://soundcloud.com/you/apps click on the name of your created your app and copy the Client ID. Paste it into credentials.json.
- For Mashape Api Key you need to create an account on their api marketplace here https://market.mashape.com/. After that you need to go to market.mashape.com/YOURNAMEHERE/applications/default-application and press GET THE KEYS in the right top corner copy paste it into your credentials.json and you are ready to race!
- If you want to have music, you need to download FFMPEG from this link http://ffmpeg.zeranoe.com/builds/ (static build version) and add ffmpeg/bin folder to your PATH environment variable. You do that by opening explorer -> right click 'This PC' -> properties -> advanced system settings -> In the top part, there is a PATH field, add `;` to the end and then your ffmpeg install location /bin (for example ;C:\ffmpeg-5.6.7\bin) and save. Open command prompt and type ffmpeg to see if you added it correctly. If it says "command not found" then you made a mistake somewhere. There are a lot of guides on the internet on how to add stuff to your PATH, check them out if you are stuck.
- **IF YOU HAVE BEEN USING THIS BOT BEFORE AND YOU HAVE DATA FROM PARSE THAT YOU WANT TO KEEP** you should export your parse data and extract it inside /data/parsedata in your bot's folder. Next time you start the bot, type `.parsetosql` and the bot will fill your local sqlite db with data from those .json files.
-
-**Nothing was buffered music error?** make sure to follow the guide on google api key and ffmpeg [here](https://www.youtube.com/watch?v=x7v02MXNLeI)
Enjoy
##List of commands
-[**click here for a list of commands**](https://github.com/Kwoth/NadekoBot/blob/master/commandlist.md)
+[**click here for a list of commands**](https://github.com/Wizkiller96/WizBot-Updated/blob/master/commandlist.md)
diff --git a/NadekoBot/SQLite.cs b/Tests/SQLite.cs
similarity index 100%
rename from NadekoBot/SQLite.cs
rename to Tests/SQLite.cs
diff --git a/NadekoBot/SQLiteAsync.cs b/Tests/SQLiteAsync.cs
similarity index 100%
rename from NadekoBot/SQLiteAsync.cs
rename to Tests/SQLiteAsync.cs
diff --git a/Tests/TestCards.cs b/Tests/TestCards.cs
index f346fc372..a17fcc948 100644
--- a/Tests/TestCards.cs
+++ b/Tests/TestCards.cs
@@ -1,6 +1,6 @@
using Microsoft.VisualStudio.TestTools.UnitTesting;
using System.Collections.Generic;
-using static NadekoBot.Modules.Gambling.Helpers.Cards;
+using static WizBot.Modules.Gambling.Helpers.Cards;
namespace Tests
{
diff --git a/Tests/Tests.csproj b/Tests/Tests.csproj
index 0ddc6cc5b..101bba320 100644
--- a/Tests/Tests.csproj
+++ b/Tests/Tests.csproj
@@ -36,7 +36,89 @@
4
+
+ ..\packages\Discord.Net.0.9.3\lib\net45\Discord.Net.dll
+ True
+
+
+ ..\packages\Discord.Net.Audio.0.9.3\lib\net45\Discord.Net.Audio.dll
+ True
+
+
+ ..\packages\Discord.Net.Commands.0.9.3\lib\net45\Discord.Net.Commands.dll
+ True
+
+
+ ..\packages\Discord.Net.Modules.0.9.3\lib\net45\Discord.Net.Modules.dll
+ True
+
+
+ ..\packages\VideoLibrary.1.3.3\lib\portable-net45+win+wpa81+MonoAndroid10+xamarinios10+MonoTouch10\libvideo.dll
+ True
+
+
+ ..\packages\Manatee.Json.4.0.1\lib\net45\Manatee.Json.dll
+ True
+
+
+ ..\packages\Manatee.StateMachine.1.1.2\lib\net45\Manatee.StateMachine.dll
+ True
+
+
+ ..\packages\Manatee.Trello.1.10.0\lib\net45\Manatee.Trello.dll
+ True
+
+
+ ..\packages\Manatee.Trello.ManateeJson.1.5.0\lib\net45\Manatee.Trello.ManateeJson.dll
+ True
+
+
+ ..\packages\Manatee.Trello.WebApi.1.0.4\lib\net45\Manatee.Trello.WebApi.dll
+ True
+
+
+ ..\packages\Newtonsoft.Json.8.0.4-beta1\lib\net45\Newtonsoft.Json.dll
+ True
+
+
+ ..\packages\Nito.AsyncEx.3.0.1\lib\net45\Nito.AsyncEx.dll
+ True
+
+
+ ..\packages\Nito.AsyncEx.3.0.1\lib\net45\Nito.AsyncEx.Concurrent.dll
+ True
+
+
+ ..\packages\Nito.AsyncEx.3.0.1\lib\net45\Nito.AsyncEx.Enlightenment.dll
+ True
+
+
+ ..\packages\taglib.2.1.0.0\lib\policy.2.0.taglib-sharp.dll
+ True
+
+
+ ..\packages\RestSharp.105.2.3\lib\net46\RestSharp.dll
+ True
+
+ ..\packages\Microsoft.AspNet.WebApi.Client.5.2.3\lib\net45\System.Net.Http.Formatting.dll
+ True
+
+
+ ..\packages\Microsoft.AspNet.WebApi.Core.5.2.3\lib\net45\System.Web.Http.dll
+ True
+
+
+ ..\packages\taglib.2.1.0.0\lib\taglib-sharp.dll
+ True
+
+
+ ..\packages\WebSocket4Net.0.14.1\lib\net45\WebSocket4Net.dll
+ True
+
@@ -51,13 +133,19 @@
+
-
+
+
+
{27a886f5-cdda-4f4a-81ee-6dafcce9de46}
- NadekoBot
+ WizBot
diff --git a/Tests/app.config b/Tests/app.config
new file mode 100644
index 000000000..de5386a47
--- /dev/null
+++ b/Tests/app.config
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Tests/packages.config b/Tests/packages.config
new file mode 100644
index 000000000..6b0ad71e0
--- /dev/null
+++ b/Tests/packages.config
@@ -0,0 +1,21 @@
+
+
+
\ No newline at end of file
diff --git a/NadekoBot.sln b/WizBot.sln
similarity index 82%
rename from NadekoBot.sln
rename to WizBot.sln
index 5e8a3b963..746913d3b 100644
--- a/NadekoBot.sln
+++ b/WizBot.sln
@@ -1,9 +1,9 @@
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 14
-VisualStudioVersion = 14.0.25008.0
+VisualStudioVersion = 14.0.25123.0
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NadekoBot", "NadekoBot\NadekoBot.csproj", "{27A886F5-CDDA-4F4A-81EE-6DAFCCE9DE46}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WizBot", "WizBot\WizBot.csproj", "{27A886F5-CDDA-4F4A-81EE-6DAFCCE9DE46}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Discord.Net.Audio", "discord.net\src\Discord.Net.Audio.Net45\Discord.Net.Audio.csproj", "{7BFEF748-B934-4621-9B11-6302E3A9F6B3}"
EndProject
@@ -26,7 +26,7 @@ Global
Debug|Any CPU = Debug|Any CPU
FullDebug|Any CPU = FullDebug|Any CPU
Release|Any CPU = Release|Any CPU
- TestResponses|Any CPU = TestResponses|Any CPU
+ WizBotRelease|Any CPU = WizBotRelease|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{27A886F5-CDDA-4F4A-81EE-6DAFCCE9DE46}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
@@ -35,48 +35,48 @@ Global
{27A886F5-CDDA-4F4A-81EE-6DAFCCE9DE46}.FullDebug|Any CPU.Build.0 = Debug|Any CPU
{27A886F5-CDDA-4F4A-81EE-6DAFCCE9DE46}.Release|Any CPU.ActiveCfg = Release|Any CPU
{27A886F5-CDDA-4F4A-81EE-6DAFCCE9DE46}.Release|Any CPU.Build.0 = Release|Any CPU
- {27A886F5-CDDA-4F4A-81EE-6DAFCCE9DE46}.TestResponses|Any CPU.ActiveCfg = PRIVATE|Any CPU
- {27A886F5-CDDA-4F4A-81EE-6DAFCCE9DE46}.TestResponses|Any CPU.Build.0 = PRIVATE|Any CPU
+ {27A886F5-CDDA-4F4A-81EE-6DAFCCE9DE46}.WizBotRelease|Any CPU.ActiveCfg = WizBotRelease|Any CPU
+ {27A886F5-CDDA-4F4A-81EE-6DAFCCE9DE46}.WizBotRelease|Any CPU.Build.0 = WizBotRelease|Any CPU
{7BFEF748-B934-4621-9B11-6302E3A9F6B3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{7BFEF748-B934-4621-9B11-6302E3A9F6B3}.Debug|Any CPU.Build.0 = Debug|Any CPU
{7BFEF748-B934-4621-9B11-6302E3A9F6B3}.FullDebug|Any CPU.ActiveCfg = Debug|Any CPU
{7BFEF748-B934-4621-9B11-6302E3A9F6B3}.FullDebug|Any CPU.Build.0 = Debug|Any CPU
{7BFEF748-B934-4621-9B11-6302E3A9F6B3}.Release|Any CPU.ActiveCfg = Release|Any CPU
{7BFEF748-B934-4621-9B11-6302E3A9F6B3}.Release|Any CPU.Build.0 = Release|Any CPU
- {7BFEF748-B934-4621-9B11-6302E3A9F6B3}.TestResponses|Any CPU.ActiveCfg = Release|Any CPU
- {7BFEF748-B934-4621-9B11-6302E3A9F6B3}.TestResponses|Any CPU.Build.0 = Release|Any CPU
+ {7BFEF748-B934-4621-9B11-6302E3A9F6B3}.WizBotRelease|Any CPU.ActiveCfg = Release|Any CPU
+ {7BFEF748-B934-4621-9B11-6302E3A9F6B3}.WizBotRelease|Any CPU.Build.0 = Release|Any CPU
{8D71A857-879A-4A10-859E-5FF824ED6688}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{8D71A857-879A-4A10-859E-5FF824ED6688}.Debug|Any CPU.Build.0 = Debug|Any CPU
{8D71A857-879A-4A10-859E-5FF824ED6688}.FullDebug|Any CPU.ActiveCfg = Debug|Any CPU
{8D71A857-879A-4A10-859E-5FF824ED6688}.FullDebug|Any CPU.Build.0 = Debug|Any CPU
{8D71A857-879A-4A10-859E-5FF824ED6688}.Release|Any CPU.ActiveCfg = Release|Any CPU
{8D71A857-879A-4A10-859E-5FF824ED6688}.Release|Any CPU.Build.0 = Release|Any CPU
- {8D71A857-879A-4A10-859E-5FF824ED6688}.TestResponses|Any CPU.ActiveCfg = TestResponses|Any CPU
- {8D71A857-879A-4A10-859E-5FF824ED6688}.TestResponses|Any CPU.Build.0 = TestResponses|Any CPU
+ {8D71A857-879A-4A10-859E-5FF824ED6688}.WizBotRelease|Any CPU.ActiveCfg = Release|Any CPU
+ {8D71A857-879A-4A10-859E-5FF824ED6688}.WizBotRelease|Any CPU.Build.0 = Release|Any CPU
{3091164F-66AE-4543-A63D-167C1116241D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{3091164F-66AE-4543-A63D-167C1116241D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{3091164F-66AE-4543-A63D-167C1116241D}.FullDebug|Any CPU.ActiveCfg = Debug|Any CPU
{3091164F-66AE-4543-A63D-167C1116241D}.FullDebug|Any CPU.Build.0 = Debug|Any CPU
{3091164F-66AE-4543-A63D-167C1116241D}.Release|Any CPU.ActiveCfg = Release|Any CPU
{3091164F-66AE-4543-A63D-167C1116241D}.Release|Any CPU.Build.0 = Release|Any CPU
- {3091164F-66AE-4543-A63D-167C1116241D}.TestResponses|Any CPU.ActiveCfg = Release|Any CPU
- {3091164F-66AE-4543-A63D-167C1116241D}.TestResponses|Any CPU.Build.0 = Release|Any CPU
+ {3091164F-66AE-4543-A63D-167C1116241D}.WizBotRelease|Any CPU.ActiveCfg = Release|Any CPU
+ {3091164F-66AE-4543-A63D-167C1116241D}.WizBotRelease|Any CPU.Build.0 = Release|Any CPU
{1B5603B4-6F8F-4289-B945-7BAAE523D740}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{1B5603B4-6F8F-4289-B945-7BAAE523D740}.Debug|Any CPU.Build.0 = Debug|Any CPU
{1B5603B4-6F8F-4289-B945-7BAAE523D740}.FullDebug|Any CPU.ActiveCfg = Debug|Any CPU
{1B5603B4-6F8F-4289-B945-7BAAE523D740}.FullDebug|Any CPU.Build.0 = Debug|Any CPU
{1B5603B4-6F8F-4289-B945-7BAAE523D740}.Release|Any CPU.ActiveCfg = Release|Any CPU
{1B5603B4-6F8F-4289-B945-7BAAE523D740}.Release|Any CPU.Build.0 = Release|Any CPU
- {1B5603B4-6F8F-4289-B945-7BAAE523D740}.TestResponses|Any CPU.ActiveCfg = Release|Any CPU
- {1B5603B4-6F8F-4289-B945-7BAAE523D740}.TestResponses|Any CPU.Build.0 = Release|Any CPU
+ {1B5603B4-6F8F-4289-B945-7BAAE523D740}.WizBotRelease|Any CPU.ActiveCfg = Release|Any CPU
+ {1B5603B4-6F8F-4289-B945-7BAAE523D740}.WizBotRelease|Any CPU.Build.0 = Release|Any CPU
{45B2545D-C612-4919-B34C-D65EA1371C51}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{45B2545D-C612-4919-B34C-D65EA1371C51}.Debug|Any CPU.Build.0 = Debug|Any CPU
{45B2545D-C612-4919-B34C-D65EA1371C51}.FullDebug|Any CPU.ActiveCfg = Debug|Any CPU
{45B2545D-C612-4919-B34C-D65EA1371C51}.FullDebug|Any CPU.Build.0 = Debug|Any CPU
{45B2545D-C612-4919-B34C-D65EA1371C51}.Release|Any CPU.ActiveCfg = Release|Any CPU
{45B2545D-C612-4919-B34C-D65EA1371C51}.Release|Any CPU.Build.0 = Release|Any CPU
- {45B2545D-C612-4919-B34C-D65EA1371C51}.TestResponses|Any CPU.ActiveCfg = Release|Any CPU
- {45B2545D-C612-4919-B34C-D65EA1371C51}.TestResponses|Any CPU.Build.0 = Release|Any CPU
+ {45B2545D-C612-4919-B34C-D65EA1371C51}.WizBotRelease|Any CPU.ActiveCfg = Release|Any CPU
+ {45B2545D-C612-4919-B34C-D65EA1371C51}.WizBotRelease|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/NadekoBot/App.config b/WizBot/App.config
similarity index 100%
rename from NadekoBot/App.config
rename to WizBot/App.config
diff --git a/NadekoBot/Classes/BombermanGame.cs b/WizBot/Classes/BombermanGame.cs
similarity index 100%
rename from NadekoBot/Classes/BombermanGame.cs
rename to WizBot/Classes/BombermanGame.cs
diff --git a/NadekoBot/Classes/DBHandler.cs b/WizBot/Classes/DBHandler.cs
similarity index 82%
rename from NadekoBot/Classes/DBHandler.cs
rename to WizBot/Classes/DBHandler.cs
index b6b85c9cf..d51f46d07 100644
--- a/NadekoBot/Classes/DBHandler.cs
+++ b/WizBot/Classes/DBHandler.cs
@@ -1,17 +1,17 @@
-using NadekoBot.DataModels;
+using WizBot.DataModels;
using SQLite;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Linq.Expressions;
-namespace NadekoBot.Classes
+namespace WizBot.Classes
{
internal class DbHandler
{
public static DbHandler Instance { get; } = new DbHandler();
- private string FilePath { get; } = "data/nadekobot.sqlite";
+ private string FilePath { get; } = "data/WizBot.sqlite";
static DbHandler() { }
public DbHandler()
@@ -158,9 +158,43 @@ internal CurrencyState GetStateByUserId(long id)
return conn.Table().Where(p).ToList().OrderBy(x => r.Next()).FirstOrDefault();
}
}
+ ///
+ ///
+ ///
+ /// GetPlaylistData(int num)
+ {
+ using (var conn = new SQLiteConnection(FilePath))
+ {
+ return conn.Query(
+@"SELECT mp.Name as 'Name',mp.Id as 'Id', mp.CreatorName as 'Creator', Count(*) as 'SongCnt' FROM MusicPlaylist as mp
+INNER JOIN PlaylistSongInfo as psi
+ON mp.Id = psi.PlaylistId
+Group BY mp.Name
+Order By mp.DateAdded desc
+Limit 20 OFFSET ?", num* 20);
+ }
+ }
+
+ internal IEnumerable GetTopRichest(int n = 10)
+ {
+ using (var conn = new SQLiteConnection(FilePath))
+ {
+ return conn.Table().Take(n).ToList().OrderBy(cs => -cs.Value);
+ }
+ }
}
}
+public class PlaylistData
+{
+ public string Name { get; set; }
+ public int Id { get; set; }
+ public string Creator { get; set; }
+ public int SongCnt { get; set; }
+}
+
public static class Queries
{
public static string TransactionTriggerQuery = @"
diff --git a/NadekoBot/Classes/Extensions.cs b/WizBot/Classes/Extensions.cs
similarity index 90%
rename from NadekoBot/Classes/Extensions.cs
rename to WizBot/Classes/Extensions.cs
index fea6b61ac..c48dece38 100644
--- a/NadekoBot/Classes/Extensions.cs
+++ b/WizBot/Classes/Extensions.cs
@@ -1,15 +1,16 @@
using Discord;
using Discord.Commands;
-using NadekoBot.Classes;
+using WizBot.Classes;
using System;
using System.Collections.Generic;
using System.Drawing;
using System.IO;
using System.Linq;
+using System.Net;
using System.Security.Cryptography;
using System.Threading.Tasks;
-namespace NadekoBot.Extensions
+namespace WizBot.Extensions
{
public static class Extensions
{
@@ -138,14 +139,21 @@ public static async Task Reply(this MessageEventArgs e, string message)
/// (this IList list)
{
+
+ // Thanks to @Joe4Evr for finding a bug in the old version of the shuffle
var provider = new RNGCryptoServiceProvider();
var n = list.Count;
while (n > 1)
{
- var box = new byte[1];
- do provider.GetBytes(box);
- while (!(box[0] < n * (byte.MaxValue / n)));
- var k = (box[0] % n);
+ var box = new byte[(n / Byte.MaxValue) + 1];
+ int boxSum;
+ do
+ {
+ provider.GetBytes(box);
+ boxSum = box.Sum(b => b);
+ }
+ while (!(boxSum < n * ((Byte.MaxValue * box.Length) / n))) ;
+ var k = (boxSum % n);
n--;
var value = list[k];
list[k] = list[n];
@@ -159,7 +167,18 @@ public static void Shuffle(this IList list)
/// ShortenUrl(this string str) => await SearchHelper.ShortenUrl(str).ConfigureAwait(false);
+ public static async Task ShortenUrl(this string str)
+ {
+ try
+ {
+ var result = await SearchHelper.ShortenUrl(str).ConfigureAwait(false);
+ return result;
+ }
+ catch (WebException ex)
+ {
+ throw new InvalidOperationException("You must enable URL shortner in google developers console.", ex);
+ }
+ }
///
/// Gets the program runtime
@@ -284,5 +303,7 @@ public static Bitmap Merge(this IEnumerable images, int reverseScaleFacto
/// Merged bitmap
public static async Task MergeAsync(this IEnumerable images, int reverseScaleFactor = 1) =>
await Task.Run(() => images.Merge(reverseScaleFactor)).ConfigureAwait(false);
+
+ public static string Unmention(this string str) => str.Replace("@", "ම");
}
}
diff --git a/NadekoBot/Classes/FlowersHandler.cs b/WizBot/Classes/FlowersHandler.cs
similarity index 88%
rename from NadekoBot/Classes/FlowersHandler.cs
rename to WizBot/Classes/FlowersHandler.cs
index f05ce4746..229623f5a 100644
--- a/NadekoBot/Classes/FlowersHandler.cs
+++ b/WizBot/Classes/FlowersHandler.cs
@@ -1,6 +1,6 @@
using System.Threading.Tasks;
-namespace NadekoBot.Classes
+namespace WizBot.Classes
{
internal static class FlowersHandler
{
@@ -21,11 +21,8 @@ await Task.Run(() =>
if (silent)
return;
- var flows = "";
- for (var i = 0; i < amount; i++)
- {
- flows += NadekoBot.Config.CurrencySign;
- }
+ var flows = amount + " " + WizBot.Config.CurrencySign;
+
await u.SendMessage("👑Congratulations!👑\nYou received: " + flows).ConfigureAwait(false);
}
diff --git a/NadekoBot/Classes/IncidentsHandler.cs b/WizBot/Classes/IncidentsHandler.cs
similarity index 94%
rename from NadekoBot/Classes/IncidentsHandler.cs
rename to WizBot/Classes/IncidentsHandler.cs
index 0791fa6cf..e289ddbdc 100644
--- a/NadekoBot/Classes/IncidentsHandler.cs
+++ b/WizBot/Classes/IncidentsHandler.cs
@@ -1,7 +1,7 @@
using System;
using System.IO;
-namespace NadekoBot.Classes {
+namespace WizBot.Classes {
internal static class IncidentsHandler {
public static void Add(ulong serverId, string text) {
Directory.CreateDirectory("data/incidents");
diff --git a/NadekoBot/Classes/SearchHelper.cs b/WizBot/Classes/SearchHelper.cs
similarity index 69%
rename from NadekoBot/Classes/SearchHelper.cs
rename to WizBot/Classes/SearchHelper.cs
index adf094a15..bd9b979b7 100644
--- a/NadekoBot/Classes/SearchHelper.cs
+++ b/WizBot/Classes/SearchHelper.cs
@@ -1,5 +1,5 @@
-using NadekoBot.Classes.JSONModels;
-using NadekoBot.Extensions;
+using WizBot.Classes.JSONModels;
+using WizBot.Extensions;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using System;
@@ -13,7 +13,7 @@
using System.Threading.Tasks;
using System.Xml.Linq;
-namespace NadekoBot.Classes
+namespace WizBot.Classes
{
public enum RequestHttpMethod
{
@@ -25,13 +25,17 @@ public static class SearchHelper
{
private static DateTime lastRefreshed = DateTime.MinValue;
private static string token { get; set; } = "";
+ private static readonly HttpClient httpClient = new HttpClient();
public static async Task GetResponseStreamAsync(string url,
IEnumerable> headers = null, RequestHttpMethod method = RequestHttpMethod.Get)
{
if (string.IsNullOrWhiteSpace(url))
throw new ArgumentNullException(nameof(url));
- var httpClient = new HttpClient();
+ //if its a post or there are no headers, use static httpclient
+ // if there are headers and it's get, it's not threadsafe
+ var cl = headers == null || method == RequestHttpMethod.Post ? httpClient : new HttpClient();
+ cl.DefaultRequestHeaders.Clear();
switch (method)
{
case RequestHttpMethod.Get:
@@ -39,17 +43,17 @@ public static async Task GetResponseStreamAsync(string url,
{
foreach (var header in headers)
{
- httpClient.DefaultRequestHeaders.TryAddWithoutValidation(header.Key, header.Value);
+ cl.DefaultRequestHeaders.TryAddWithoutValidation(header.Key, header.Value);
}
}
- return await httpClient.GetStreamAsync(url).ConfigureAwait(false);
+ return await cl.GetStreamAsync(url).ConfigureAwait(false);
case RequestHttpMethod.Post:
FormUrlEncodedContent formContent = null;
if (headers != null)
{
formContent = new FormUrlEncodedContent(headers);
}
- var message = await httpClient.PostAsync(url, formContent).ConfigureAwait(false);
+ var message = await cl.PostAsync(url, formContent).ConfigureAwait(false);
return await message.Content.ReadAsStreamAsync().ConfigureAwait(false);
default:
throw new NotImplementedException("That type of request is unsupported.");
@@ -141,7 +145,7 @@ public static async Task ValidateQuery(Discord.Channel ch, string query)
public static async Task FindYoutubeUrlByKeywords(string keywords)
{
- if (string.IsNullOrWhiteSpace(NadekoBot.Creds.GoogleAPIKey))
+ if (string.IsNullOrWhiteSpace(WizBot.Creds.GoogleAPIKey))
throw new InvalidCredentialException("Google API Key is missing.");
if (string.IsNullOrWhiteSpace(keywords))
throw new ArgumentNullException(nameof(keywords), "Query not specified.");
@@ -152,51 +156,78 @@ public static async Task FindYoutubeUrlByKeywords(string keywords)
var match = new Regex("(?:youtu\\.be\\/|v=)(?[\\da-zA-Z\\-_]*)").Match(keywords);
if (match.Length > 1)
{
- return $"http://www.youtube.com?v={match.Groups["id"].Value}";
+ return $"https://www.youtube.com/watch?v={match.Groups["id"].Value}";
}
var response = await GetResponseStringAsync(
$"https://www.googleapis.com/youtube/v3/search?" +
$"part=snippet&maxResults=1" +
$"&q={Uri.EscapeDataString(keywords)}" +
- $"&key={NadekoBot.Creds.GoogleAPIKey}").ConfigureAwait(false);
- dynamic obj = JObject.Parse(response);
- return "http://www.youtube.com/watch?v=" + obj.items[0].id.videoId.ToString();
+ $"&key={WizBot.Creds.GoogleAPIKey}").ConfigureAwait(false);
+ JObject obj = JObject.Parse(response);
+
+ var data = JsonConvert.DeserializeObject(response);
+
+ if (data.items.Length > 0)
+ {
+ var toReturn = "http://www.youtube.com/watch?v=" + data.items[0].id.videoId.ToString();
+ return toReturn;
+ }
+ else
+ return null;
}
public static async Task GetPlaylistIdByKeyword(string query)
{
- if (string.IsNullOrWhiteSpace(NadekoBot.Creds.GoogleAPIKey))
+ if (string.IsNullOrWhiteSpace(WizBot.Creds.GoogleAPIKey))
throw new ArgumentNullException(nameof(query));
-
+ var match = new Regex("(?:youtu\\.be\\/|list=)(?[\\da-zA-Z\\-_]*)").Match(query);
+ if (match.Length > 1)
+ {
+ return match.Groups["id"].Value.ToString();
+ }
var link = "https://www.googleapis.com/youtube/v3/search?part=snippet" +
"&maxResults=1&type=playlist" +
$"&q={Uri.EscapeDataString(query)}" +
- $"&key={NadekoBot.Creds.GoogleAPIKey}";
+ $"&key={WizBot.Creds.GoogleAPIKey}";
var response = await GetResponseStringAsync(link).ConfigureAwait(false);
- dynamic obj = JObject.Parse(response);
+ var data = JsonConvert.DeserializeObject(response);
+ JObject obj = JObject.Parse(response);
- return obj.items[0].id.playlistId.ToString();
+ return data.items.Length > 0 ? data.items[0].id.playlistId.ToString() : null;
}
- public static async Task> GetVideoIDs(string playlist, int number = 30)
+ public static async Task> GetVideoIDs(string playlist, int number = 50)
{
- if (string.IsNullOrWhiteSpace(NadekoBot.Creds.GoogleAPIKey))
+ if (string.IsNullOrWhiteSpace(WizBot.Creds.GoogleAPIKey))
{
throw new ArgumentNullException(nameof(playlist));
}
- if (number < 1 || number > 100)
+ if (number < 1)
throw new ArgumentOutOfRangeException();
- var link =
- $"https://www.googleapis.com/youtube/v3/playlistItems?part=contentDetails" +
- $"&maxResults={30}" +
- $"&playlistId={playlist}" +
- $"&key={NadekoBot.Creds.GoogleAPIKey}";
- var response = await GetResponseStringAsync(link).ConfigureAwait(false);
- var obj = await Task.Run(() => JObject.Parse(response)).ConfigureAwait(false);
+ string nextPageToken = null;
- return obj["items"].Select(item => "http://www.youtube.com/watch?v=" + item["contentDetails"]["videoId"]);
+ List toReturn = new List();
+
+ do
+ {
+ var toGet = number > 50 ? 50 : number;
+ number -= toGet;
+ var link =
+ $"https://www.googleapis.com/youtube/v3/playlistItems?part=contentDetails" +
+ $"&maxResults={toGet}" +
+ $"&playlistId={playlist}" +
+ $"&key={WizBot.Creds.GoogleAPIKey}";
+ if (!string.IsNullOrWhiteSpace(nextPageToken))
+ link += $"&pageToken={nextPageToken}";
+ var response = await GetResponseStringAsync(link).ConfigureAwait(false);
+ var data = await Task.Run(() => JsonConvert.DeserializeObject(response)).ConfigureAwait(false);
+ nextPageToken = data.nextPageToken;
+ toReturn.AddRange(data.items.Select(i => i.contentDetails.videoId));
+ } while (number > 0 && !string.IsNullOrWhiteSpace(nextPageToken));
+
+ return toReturn;
}
@@ -215,18 +246,24 @@ public static async Task GetDanbooruImageLink(string tag)
var webpage = await GetResponseStringAsync(link).ConfigureAwait(false);
var matches = Regex.Matches(webpage, "data-large-file-url=\"(?.*?)\"");
+ if (matches.Count == 0)
+ return null;
return $"http://danbooru.donmai.us" +
$"{matches[rng.Next(0, matches.Count)].Groups["id"].Value}";
}
public static async Task GetGelbooruImageLink(string tag)
{
+ var headers = new Dictionary() {
+ {"User-Agent", "Mozilla/5.0 (Windows NT 6.1) AppleWebKit/535.1 (KHTML, like Gecko) Chrome/14.0.835.202 Safari/535.1"},
+ {"Accept", "text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8" },
+ };
var url =
- $"http://gelbooru.com/index.php?page=dapi&s=post&q=index&limit=100&tags={tag.Replace(" ", "_")}";
- var webpage = await GetResponseStringAsync(url).ConfigureAwait(false);
+ $"http://gelbooru.com/index.php?page=dapi&s=post&q=index&limit=100&tags={tag.Replace(" ", "_")}";
+ var webpage = await GetResponseStringAsync(url, headers).ConfigureAwait(false);
var matches = Regex.Matches(webpage, "file_url=\"(?.*?)\"");
if (matches.Count == 0)
- throw new FileNotFoundException();
+ return null;
var rng = new Random();
var match = matches[rng.Next(0, matches.Count)];
return matches[rng.Next(0, matches.Count)].Groups["url"].Value;
@@ -240,7 +277,7 @@ public static async Task GetSafebooruImageLink(string tag)
var webpage = await GetResponseStringAsync(url).ConfigureAwait(false);
var matches = Regex.Matches(webpage, "file_url=\"(?.*?)\"");
if (matches.Count == 0)
- throw new FileNotFoundException();
+ return null;
var match = matches[rng.Next(0, matches.Count)];
return matches[rng.Next(0, matches.Count)].Groups["url"].Value;
}
@@ -253,7 +290,7 @@ public static async Task GetRule34ImageLink(string tag)
var webpage = await GetResponseStringAsync(url).ConfigureAwait(false);
var matches = Regex.Matches(webpage, "file_url=\"(?.*?)\"");
if (matches.Count == 0)
- throw new FileNotFoundException();
+ return null;
var match = matches[rng.Next(0, matches.Count)];
return "http:" + matches[rng.Next(0, matches.Count)].Groups["url"].Value;
}
@@ -263,24 +300,31 @@ internal static async Task GetE621ImageLink(string tags)
{
try
{
- XDocument doc = await Task.Run(() => XDocument.Load(" http://e621.net/post/index.xml?tags=" + Uri.EscapeUriString(tags) + "%20order:random&limit=1"));
- int id = Convert.ToInt32(doc.Root.Element("post").Element("id").Value);
- return (doc.Root.Element("post").Element("file_url").Value);
+ var headers = new Dictionary() {
+ {"User-Agent", "Mozilla/5.0 (Windows NT 6.1) AppleWebKit/535.1 (KHTML, like Gecko) Chrome/14.0.835.202 Safari/535.1"},
+ {"Accept", "text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8" },
+ };
+ var data = await GetResponseStreamAsync(
+ "http://e621.net/post/index.xml?tags=" + Uri.EscapeUriString(tags) + "%20order:random&limit=1",
+ headers);
+ var doc = XDocument.Load(data);
+ return doc.Descendants("file_url").FirstOrDefault().Value;
}
- catch (Exception)
+ catch (Exception ex)
{
+ Console.WriteLine("Error in e621 search: \n" + ex);
return "Error, do you have too many tags?";
}
}
public static async Task ShortenUrl(string url)
{
- if (string.IsNullOrWhiteSpace(NadekoBot.Creds.GoogleAPIKey)) return url;
+ if (string.IsNullOrWhiteSpace(WizBot.Creds.GoogleAPIKey)) return url;
try
{
var httpWebRequest =
(HttpWebRequest)WebRequest.Create("https://www.googleapis.com/urlshortener/v1/url?key=" +
- NadekoBot.Creds.GoogleAPIKey);
+ WizBot.Creds.GoogleAPIKey);
httpWebRequest.ContentType = "application/json";
httpWebRequest.Method = "POST";
@@ -307,4 +351,4 @@ public static async Task ShortenUrl(string url)
}
}
}
-}
+}
\ No newline at end of file
diff --git a/NadekoBot/Classes/ServerSpecificConfig.cs b/WizBot/Classes/ServerSpecificConfig.cs
similarity index 92%
rename from NadekoBot/Classes/ServerSpecificConfig.cs
rename to WizBot/Classes/ServerSpecificConfig.cs
index a7615b561..e68c76f36 100644
--- a/NadekoBot/Classes/ServerSpecificConfig.cs
+++ b/WizBot/Classes/ServerSpecificConfig.cs
@@ -7,7 +7,7 @@
using System.IO;
using System.Runtime.CompilerServices;
-namespace NadekoBot.Classes
+namespace WizBot.Classes
{
internal class SpecificConfigurations
{
@@ -95,6 +95,19 @@ public ObservableCollection ListOfSelfAssignableRoles {
}
}
+ [JsonIgnore]
+ private ulong autoAssignedRole = 0;
+ public ulong AutoAssignedRole
+ {
+ get { return autoAssignedRole; }
+ set
+ {
+ autoAssignedRole = value;
+ if (!SpecificConfigurations.Instantiated) return;
+ OnPropertyChanged();
+ }
+ }
+
[JsonIgnore]
private ObservableCollection observingStreams;
public ObservableCollection ObservingStreams {
@@ -120,7 +133,7 @@ public ServerSpecificConfig()
private void OnPropertyChanged([CallerMemberName] string propertyName = null)
{
- Console.WriteLine("property changed");
+
PropertyChanged(this, new PropertyChangedEventArgs(propertyName));
}
}
diff --git a/NadekoBot/Classes/NadekoStats.cs b/WizBot/Classes/WizStats.cs
similarity index 75%
rename from NadekoBot/Classes/NadekoStats.cs
rename to WizBot/Classes/WizStats.cs
index 69dcdf703..07c8f5ca3 100644
--- a/NadekoBot/Classes/NadekoStats.cs
+++ b/WizBot/Classes/WizStats.cs
@@ -1,8 +1,8 @@
using Discord;
using Discord.Commands;
-using NadekoBot.Extensions;
-using NadekoBot.Modules.Administration.Commands;
-using NadekoBot.Modules.Music;
+using WizBot.Extensions;
+using WizBot.Modules.Administration.Commands;
+using WizBot.Modules.Music;
using System;
using System.Collections.Generic;
using System.Diagnostics;
@@ -12,11 +12,11 @@
using System.Threading.Tasks;
using System.Timers;
-namespace NadekoBot
+namespace WizBot
{
- public class NadekoStats
+ public class WizStats
{
- public static NadekoStats Instance { get; } = new NadekoStats();
+ public static WizStats Instance { get; } = new WizStats();
public string BotVersion => $"{Assembly.GetExecutingAssembly().GetName().Name} v{Assembly.GetExecutingAssembly().GetName().Version}";
@@ -31,11 +31,14 @@ public class NadekoStats
private readonly Timer commandLogTimer = new Timer() { Interval = 10000 };
private readonly Timer carbonStatusTimer = new Timer() { Interval = 3600000 };
- static NadekoStats() { }
+ private static ulong messageCounter = 0;
+ public static ulong MessageCounter => messageCounter;
- private NadekoStats()
+ static WizStats() { }
+
+ private WizStats()
{
- var commandService = NadekoBot.Client.GetService();
+ var commandService = WizBot.Client.GetService();
statsStopwatch.Start();
commandService.CommandExecuted += StatsCollector_RanCommand;
@@ -44,13 +47,15 @@ private NadekoStats()
commandLogTimer.Start();
- ServerCount = NadekoBot.Client.Servers.Count();
- var channels = NadekoBot.Client.Servers.SelectMany(s => s.AllChannels);
+ ServerCount = WizBot.Client.Servers.Count();
+ var channels = WizBot.Client.Servers.SelectMany(s => s.AllChannels);
var channelsArray = channels as Channel[] ?? channels.ToArray();
TextChannelsCount = channelsArray.Count(c => c.Type == ChannelType.Text);
VoiceChannelsCount = channelsArray.Count() - TextChannelsCount;
- NadekoBot.Client.JoinedServer += (s, e) =>
+ WizBot.Client.MessageReceived += (s, e) => messageCounter++;
+
+ WizBot.Client.JoinedServer += (s, e) =>
{
try
{
@@ -61,7 +66,7 @@ private NadekoStats()
}
catch { }
};
- NadekoBot.Client.LeftServer += (s, e) =>
+ WizBot.Client.LeftServer += (s, e) =>
{
try
{
@@ -72,7 +77,7 @@ private NadekoStats()
}
catch { }
};
- NadekoBot.Client.ChannelCreated += (s, e) =>
+ WizBot.Client.ChannelCreated += (s, e) =>
{
try
{
@@ -85,7 +90,7 @@ private NadekoStats()
}
catch { }
};
- NadekoBot.Client.ChannelDestroyed += (s, e) =>
+ WizBot.Client.ChannelDestroyed += (s, e) =>
{
try
{
@@ -104,13 +109,13 @@ private NadekoStats()
HttpClient carbonClient = new HttpClient();
private async Task SendUpdateToCarbon()
{
- if (string.IsNullOrWhiteSpace(NadekoBot.Creds.CarbonKey))
+ if (string.IsNullOrWhiteSpace(WizBot.Creds.CarbonKey))
return;
try
{
using (var content = new FormUrlEncodedContent(new Dictionary {
- { "servercount", NadekoBot.Client.Servers.Count().ToString() },
- { "key", NadekoBot.Creds.CarbonKey }
+ { "servercount", WizBot.Client.Servers.Count().ToString() },
+ { "key", WizBot.Creds.CarbonKey }
}))
{
content.Headers.Clear();
@@ -131,7 +136,7 @@ public TimeSpan GetUptime() =>
public string GetUptimeString()
{
- var time = (DateTime.Now - Process.GetCurrentProcess().StartTime);
+ var time = GetUptime();
return time.Days + " days, " + time.Hours + " hours, and " + time.Minutes + " minutes.";
}
@@ -140,21 +145,21 @@ public Task LoadStats() =>
{
var songs = MusicModule.MusicPlayers.Count(mp => mp.Value.CurrentSong != null);
var sb = new System.Text.StringBuilder();
- sb.AppendLine("`Author: Kwoth` `Library: Discord.Net`");
+ sb.AppendLine("`Author: Kwoth & Wizkiller96` `Library: Discord.Net`");
sb.AppendLine($"`Bot Version: {BotVersion}`");
- sb.AppendLine($"`Bot id: {NadekoBot.Client.CurrentUser.Id}`");
+ sb.AppendLine($"`Bot id: {WizBot.Client.CurrentUser.Id}`");
sb.Append("`Owners' Ids:` ");
- sb.AppendLine("`" + String.Join(", ", NadekoBot.Creds.OwnerIds) + "`");
+ sb.AppendLine("`" + String.Join(", ", WizBot.Creds.OwnerIds) + "`");
sb.AppendLine($"`Uptime: {GetUptimeString()}`");
sb.Append($"`Servers: {ServerCount}");
sb.Append($" | TextChannels: {TextChannelsCount}");
sb.AppendLine($" | VoiceChannels: {VoiceChannelsCount}`");
sb.AppendLine($"`Commands Ran this session: {commandsRan}`");
- sb.AppendLine($"`Message queue size: {NadekoBot.Client.MessageQueue.Count}`");
+ sb.AppendLine($"`Message queue size: {WizBot.Client.MessageQueue.Count}`");
sb.Append($"`Greeted {ServerGreetCommand.Greeted} times.`");
sb.AppendLine($" `| Playing {songs} songs, ".SnPl(songs) +
$"{MusicModule.MusicPlayers.Sum(kvp => kvp.Value.Playlist.Count)} queued.`");
- sb.AppendLine($"`Heap: {Heap(false)}`");
+ sb.AppendLine($"`Messages: {messageCounter} ({messageCounter / (double)GetUptime().TotalSeconds:F2}/sec)` `Heap: {Heap(false)}`");
statsCache = sb.ToString();
});
@@ -176,11 +181,11 @@ private async Task StartCollecting()
await Task.Delay(new TimeSpan(0, 30, 0)).ConfigureAwait(false);
try
{
- var onlineUsers = await Task.Run(() => NadekoBot.Client.Servers.Sum(x => x.Users.Count())).ConfigureAwait(false);
- var realOnlineUsers = await Task.Run(() => NadekoBot.Client.Servers
+ var onlineUsers = await Task.Run(() => WizBot.Client.Servers.Sum(x => x.Users.Count())).ConfigureAwait(false);
+ var realOnlineUsers = await Task.Run(() => WizBot.Client.Servers
.Sum(x => x.Users.Count(u => u.Status == UserStatus.Online)))
.ConfigureAwait(false);
- var connectedServers = NadekoBot.Client.Servers.Count();
+ var connectedServers = WizBot.Client.Servers.Count();
Classes.DbHandler.Instance.InsertData(new DataModels.Stats
{
@@ -209,19 +214,20 @@ await Task.Run(() =>
commandsRan++;
Classes.DbHandler.Instance.InsertData(new DataModels.Command
{
- ServerId = (long)e.Server.Id,
- ServerName = e.Server.Name,
+ ServerId = (long)(e.Server?.Id ?? 0),
+ ServerName = e.Server?.Name ?? "--Direct Message--",
ChannelId = (long)e.Channel.Id,
- ChannelName = e.Channel.Name,
+ ChannelName = e.Channel.IsPrivate ? "--Direct Message" : e.Channel.Name,
UserId = (long)e.User.Id,
UserName = e.User.Name,
CommandName = e.Command.Text,
DateAdded = DateTime.Now
});
}
- catch
+ catch (Exception ex)
{
- Console.WriteLine("Error in ran command DB write.");
+ Console.WriteLine("Probably unimportant error in ran command DB write.");
+ Console.WriteLine(ex);
}
}).ConfigureAwait(false);
}
diff --git a/NadekoBot/Modules/Administration/AdministrationModule.cs b/WizBot/Modules/Administration/AdministrationModule.cs
similarity index 73%
rename from NadekoBot/Modules/Administration/AdministrationModule.cs
rename to WizBot/Modules/Administration/AdministrationModule.cs
index 04452192f..222de5777 100644
--- a/NadekoBot/Modules/Administration/AdministrationModule.cs
+++ b/WizBot/Modules/Administration/AdministrationModule.cs
@@ -1,18 +1,18 @@
using Discord;
using Discord.Commands;
using Discord.Modules;
-using NadekoBot.Classes;
-using NadekoBot.DataModels;
-using NadekoBot.Extensions;
-using NadekoBot.Modules.Administration.Commands;
-using NadekoBot.Modules.Permissions.Classes;
+using WizBot.Classes;
+using WizBot.DataModels;
+using WizBot.Extensions;
+using WizBot.Modules.Administration.Commands;
+using WizBot.Modules.Permissions.Classes;
using Newtonsoft.Json.Linq;
using System;
using System.IO;
using System.Linq;
using System.Threading.Tasks;
-namespace NadekoBot.Modules.Administration
+namespace WizBot.Modules.Administration
{
internal class AdministrationModule : DiscordModule
{
@@ -28,9 +28,11 @@ public AdministrationModule()
commands.Add(new SelfAssignedRolesCommand(this));
commands.Add(new Remind(this));
commands.Add(new InfoCommands(this));
+ commands.Add(new CustomReactionsCommands(this));
+ commands.Add(new AutoAssignRole(this));
}
- public override string Prefix { get; } = NadekoBot.Config.CommandPrefixes.Administration;
+ public override string Prefix { get; } = WizBot.Config.CommandPrefixes.Administration;
public override void Install(ModuleManager manager)
{
@@ -43,6 +45,17 @@ public override void Install(ModuleManager manager)
commands.ForEach(cmd => cmd.Init(cgb));
+ cgb.CreateCommand(Prefix + "restart")
+ .Description("Restarts the bot. Might not work.")
+ .AddCheck(SimpleCheckers.OwnerOnly())
+ .Do(async e =>
+ {
+ await e.Channel.SendMessage("`Restarting in 2 seconds...`");
+ await Task.Delay(2000);
+ System.Diagnostics.Process.Start(System.Reflection.Assembly.GetExecutingAssembly().Location);
+ Environment.Exit(0);
+ });
+
cgb.CreateCommand(Prefix + "sr").Alias(Prefix + "setrole")
.Description("Sets a role for a given user.\n**Usage**: .sr @User Guest")
.Parameter("user_name", ParameterType.Required)
@@ -123,8 +136,68 @@ public override void Install(ModuleManager manager)
}
});
+ cgb.CreateCommand(Prefix + "renr")
+ .Alias(Prefix + "renamerole")
+ .Description($"Renames a role. Role you are renaming must be lower than bot's highest role.\n**Usage**: `{Prefix}renr \"First role\" SecondRole`")
+ .Parameter("r1", ParameterType.Required)
+ .Parameter("r2", ParameterType.Required)
+ .AddCheck(new SimpleCheckers.ManageRoles())
+ .Do(async e =>
+ {
+ var r1 = e.GetArg("r1").Trim();
+ var r2 = e.GetArg("r2").Trim();
+
+ var roleToEdit = e.Server.FindRoles(r1).FirstOrDefault();
+ if (roleToEdit == null)
+ {
+ await e.Channel.SendMessage("Can't find that role.");
+ return;
+ }
+
+ try
+ {
+ if (roleToEdit.Position > e.Server.CurrentUser.Roles.Max(r => r.Position))
+ {
+ await e.Channel.SendMessage("I can't edit roles higher than my highest role.");
+ return;
+ }
+ await roleToEdit.Edit(r2);
+ await e.Channel.SendMessage("Role renamed.");
+ }
+ catch (Exception)
+ {
+ await e.Channel.SendMessage("Failed to rename role. Probably insufficient permissions.");
+ }
+ });
+
+ cgb.CreateCommand(Prefix + "rar").Alias(Prefix + "removeallroles")
+ .Description("Removes all roles from a mentioned user.\n**Usage**: .rar @User")
+ .Parameter("user_name", ParameterType.Unparsed)
+ .AddCheck(SimpleCheckers.CanManageRoles)
+ .Do(async e =>
+ {
+ var userName = e.GetArg("user_name");
+
+ var usr = e.Server.FindUsers(userName).FirstOrDefault();
+ if (usr == null)
+ {
+ await e.Channel.SendMessage("You failed to supply a valid username").ConfigureAwait(false);
+ return;
+ }
+
+ try
+ {
+ await usr.RemoveRoles(usr.Roles.ToArray()).ConfigureAwait(false);
+ await e.Channel.SendMessage($"Successfully removed **all** roles from user **{usr.Name}**").ConfigureAwait(false);
+ }
+ catch
+ {
+ await e.Channel.SendMessage("Failed to remove roles. Most likely reason: Insufficient permissions.").ConfigureAwait(false);
+ }
+ });
+
cgb.CreateCommand(Prefix + "r").Alias(Prefix + "role").Alias(Prefix + "cr")
- .Description("Creates a role with a given name.**Usage**: .r Awesome Role")
+ .Description("Creates a role with a given name.**Usage**: `.r Awesome Role`")
.Parameter("role_name", ParameterType.Unparsed)
.AddCheck(SimpleCheckers.CanManageRoles)
.Do(async e =>
@@ -147,7 +220,7 @@ public override void Install(ModuleManager manager)
.Parameter("r", ParameterType.Optional)
.Parameter("g", ParameterType.Optional)
.Parameter("b", ParameterType.Optional)
- .Description("Set a role's color to the hex or 0-255 rgb color value provided.\n**Usage**: .color Admin 255 200 100 or .color Admin ffba55")
+ .Description("Set a role's color to the hex or 0-255 rgb color value provided.\n**Usage**: `.color Admin 255 200 100` or `.color Admin ffba55`")
.Do(async e =>
{
if (!e.User.ServerPermissions.ManageRoles)
@@ -174,10 +247,11 @@ public override void Install(ModuleManager manager)
try
{
var rgb = args.Count() == 4;
+ var arg1 = e.Args[1].Replace("#", "");
- var red = Convert.ToByte(rgb ? int.Parse(e.Args[1]) : Convert.ToInt32(e.Args[1].Substring(0, 2), 16));
- var green = Convert.ToByte(rgb ? int.Parse(e.Args[2]) : Convert.ToInt32(e.Args[1].Substring(2, 2), 16));
- var blue = Convert.ToByte(rgb ? int.Parse(e.Args[3]) : Convert.ToInt32(e.Args[1].Substring(4, 2), 16));
+ var red = Convert.ToByte(rgb ? int.Parse(arg1) : Convert.ToInt32(arg1.Substring(0, 2), 16));
+ var green = Convert.ToByte(rgb ? int.Parse(e.Args[2]) : Convert.ToInt32(arg1.Substring(2, 2), 16));
+ var blue = Convert.ToByte(rgb ? int.Parse(e.Args[3]) : Convert.ToInt32(arg1.Substring(4, 2), 16));
await role.Edit(color: new Color(red, green, blue)).ConfigureAwait(false);
await e.Channel.SendMessage($"Role {role.Name}'s color has been changed.").ConfigureAwait(false);
@@ -228,7 +302,7 @@ await usr.SendMessage($"**You have been BANNED from `{e.Server.Name}` server.**\
}
try
{
- await e.Server.Ban(usr).ConfigureAwait(false);
+ await e.Server.Ban(usr, 7).ConfigureAwait(false);
await e.Channel.SendMessage("Banned user " + usr.Name + " Id: " + usr.Id).ConfigureAwait(false);
}
@@ -461,18 +535,30 @@ await usr.SendMessage($"**You have been KICKED from `{e.Server.Name}` server.**\
cgb.CreateCommand(Prefix + "st").Alias(Prefix + "settopic")
.Alias(Prefix + "topic")
- .Description("Sets a topic on the current channel.")
+ .Description($"Sets a topic on the current channel.\n**Usage**: `{Prefix}st My new topic`")
.AddCheck(SimpleCheckers.ManageChannels())
.Parameter("topic", ParameterType.Unparsed)
.Do(async e =>
{
- var topic = e.GetArg("topic");
- if (string.IsNullOrWhiteSpace(topic))
- return;
+ var topic = e.GetArg("topic")?.Trim() ?? "";
await e.Channel.Edit(topic: topic).ConfigureAwait(false);
await e.Channel.SendMessage(":ok: **New channel topic set.**").ConfigureAwait(false);
});
+ cgb.CreateCommand(Prefix + "schn").Alias(Prefix + "setchannelname")
+ .Alias(Prefix + "topic")
+ .Description("Changed the name of the current channel.")
+ .AddCheck(SimpleCheckers.ManageChannels())
+ .Parameter("name", ParameterType.Unparsed)
+ .Do(async e =>
+ {
+ var name = e.GetArg("name");
+ if (string.IsNullOrWhiteSpace(name))
+ return;
+ await e.Channel.Edit(name: name).ConfigureAwait(false);
+ await e.Channel.SendMessage(":ok: **New channel name set.**").ConfigureAwait(false);
+ });
+
cgb.CreateCommand(Prefix + "uid").Alias(Prefix + "userid")
.Description("Shows user ID.")
.Parameter("user", ParameterType.Unparsed)
@@ -494,17 +580,17 @@ await usr.SendMessage($"**You have been KICKED from `{e.Server.Name}` server.**\
.Do(async e => await e.Channel.SendMessage("This server's ID is " + e.Server.Id).ConfigureAwait(false));
cgb.CreateCommand(Prefix + "stats")
- .Description("Shows some basic stats for Nadeko.")
+ .Description("Shows some basic stats for WizBot.")
.Do(async e =>
{
- await e.Channel.SendMessage(await NadekoStats.Instance.GetStats());
+ await e.Channel.SendMessage(await WizStats.Instance.GetStats());
});
cgb.CreateCommand(Prefix + "dysyd")
- .Description("Shows some basic stats for Nadeko.")
+ .Description("Shows some basic stats for WizBot.")
.Do(async e =>
{
- await e.Channel.SendMessage((await NadekoStats.Instance.GetStats()).Matrix().TrimTo(1990)).ConfigureAwait(false);
+ await e.Channel.SendMessage((await WizStats.Instance.GetStats()).Matrix().TrimTo(1990)).ConfigureAwait(false);
});
cgb.CreateCommand(Prefix + "heap")
@@ -512,54 +598,67 @@ await usr.SendMessage($"**You have been KICKED from `{e.Server.Name}` server.**\
.AddCheck(SimpleCheckers.OwnerOnly())
.Do(async e =>
{
- var heap = await Task.Run(() => NadekoStats.Instance.Heap()).ConfigureAwait(false);
+ var heap = await Task.Run(() => WizStats.Instance.Heap()).ConfigureAwait(false);
await e.Channel.SendMessage($"`Heap Size:` {heap}").ConfigureAwait(false);
});
+
cgb.CreateCommand(Prefix + "prune")
- .Parameter("num", ParameterType.Required)
- .Description("Prunes a number of messages from the current channel.\n**Usage**: .prune 5")
+ .Alias(".clr")
+ .Description(
+ "`.prune` removes all WizBot's messages in the last 100 messages.`.prune X` removes last X messages from the channel (up to 100)`.prune @Someone` removes all Someone's messages in the last 100 messages.`.prune @Someone X` removes last X 'Someone's' messages in the channel.\n**Usage**: `.prune` or `.prune 5` or `.prune @Someone` or `.prune @Someone X`")
+ .Parameter("user_or_num", ParameterType.Optional)
+ .Parameter("num", ParameterType.Optional)
.Do(async e =>
{
- if (!e.User.ServerPermissions.ManageMessages) return;
- int val;
- if (string.IsNullOrWhiteSpace(e.GetArg("num")) || !int.TryParse(e.GetArg("num"), out val) || val < 0)
- return;
-
- foreach (var msg in await e.Channel.DownloadMessages(val).ConfigureAwait(false))
+ if (string.IsNullOrWhiteSpace(e.GetArg("user_or_num"))) // if nothing is set, clear WizBot's messages, no permissions required
{
- await msg.Delete().ConfigureAwait(false);
- await Task.Delay(100).ConfigureAwait(false);
- }
- });
+ await Task.Run(async () =>
+ {
+ var msgs = (await e.Channel.DownloadMessages(100).ConfigureAwait(false)).Where(m => m.User.Id == e.Server.CurrentUser.Id);
+ foreach (var m in msgs)
+ {
+ try
+ {
+ await m.Delete().ConfigureAwait(false);
+ }
+ catch { }
+ await Task.Delay(100).ConfigureAwait(false);
+ }
- cgb.CreateCommand(Prefix + "die")
- .Alias(Prefix + "graceful")
- .Description("Shuts the bot down and notifies users about the restart. **Owner Only!**")
- .Do(async e =>
- {
- if (NadekoBot.IsOwner(e.User.Id))
+ }).ConfigureAwait(false);
+ return;
+ }
+ if (!e.User.GetPermissions(e.Channel).ManageMessages)
+ return;
+ else if (!e.Server.CurrentUser.GetPermissions(e.Channel).ManageMessages)
{
- await e.Channel.SendMessage("`Shutting down.`").ConfigureAwait(false);
- await Task.Delay(2000).ConfigureAwait(false);
- Environment.Exit(0);
+ await e.Channel.SendMessage("💢I don't have the permission to manage messages.");
+ return;
}
- });
-
- cgb.CreateCommand(Prefix + "clr")
- .Description("Clears some of Nadeko's messages from the current channel. If given a user, will clear the user's messages from the current channel (**Owner Only!**) \n**Usage**: .clr @X")
- .Parameter("user", ParameterType.Unparsed)
- .Do(async e =>
- {
- var usrId = NadekoBot.Client.CurrentUser.Id;
- if (!string.IsNullOrWhiteSpace(e.GetArg("user")) && e.User.ServerPermissions.ManageMessages)
+ int val;
+ if (int.TryParse(e.GetArg("user_or_num"), out val)) // if num is set in the first argument,
+ //delete that number of messages.
{
- var usr = e.Server.FindUsers(e.GetArg("user")).FirstOrDefault();
- if (usr != null)
- usrId = usr.Id;
+ if (val <= 0)
+ return;
+ val++;
+ foreach (var msg in await e.Channel.DownloadMessages(val).ConfigureAwait(false))
+ {
+ await msg.Delete().ConfigureAwait(false);
+ await Task.Delay(100).ConfigureAwait(false);
+ }
+ return;
}
+ //else if first argument is user
+ var usr = e.Server.FindUsers(e.GetArg("user_or_num")).FirstOrDefault();
+ if (usr == null)
+ return;
+ val = 100;
+ if (!int.TryParse(e.GetArg("num"), out val))
+ val = 100;
await Task.Run(async () =>
{
- var msgs = (await e.Channel.DownloadMessages(100).ConfigureAwait(false)).Where(m => m.User.Id == usrId);
+ var msgs = (await e.Channel.DownloadMessages(100).ConfigureAwait(false)).Where(m => m.User.Id == usr.Id).Take(val);
foreach (var m in msgs)
{
try
@@ -567,30 +666,55 @@ await Task.Run(async () =>
await m.Delete().ConfigureAwait(false);
}
catch { }
- await Task.Delay(200).ConfigureAwait(false);
+ await Task.Delay(100).ConfigureAwait(false);
}
}).ConfigureAwait(false);
});
+ cgb.CreateCommand(Prefix + "die")
+ .Alias(Prefix + "graceful")
+ .Description("Shuts the bot down and notifies users about the restart. **Owner Only!**")
+ .AddCheck(SimpleCheckers.OwnerOnly())
+ .Do(async e =>
+ {
+ await e.Channel.SendMessage("`Shutting down.`").ConfigureAwait(false);
+ await Task.Delay(2000).ConfigureAwait(false);
+ Environment.Exit(0);
+ });
+
+ //cgb.CreateCommand(Prefix + "newnick")
+ // .Alias(Prefix + "setnick")
+ // .Description("Give the bot a new nickname. You need manage server permissions.")
+ // .Parameter("new_nick", ParameterType.Unparsed)
+ // .AddCheck(SimpleCheckers.ManageServer())
+ // .Do(async e =>
+ // {
+ // if (e.GetArg("new_nick") == null) return;
+
+ // await client.CurrentUser.Edit(WizBot.Creds.Password, e.GetArg("new_nick")).ConfigureAwait(false);
+ // });
+
cgb.CreateCommand(Prefix + "newname")
.Alias(Prefix + "setname")
.Description("Give the bot a new name. **Owner Only!**")
.Parameter("new_name", ParameterType.Unparsed)
+ .AddCheck(SimpleCheckers.OwnerOnly())
.Do(async e =>
{
- if (!NadekoBot.IsOwner(e.User.Id) || e.GetArg("new_name") == null) return;
+ if (e.GetArg("new_name") == null) return;
- await client.CurrentUser.Edit(NadekoBot.Creds.Password, e.GetArg("new_name")).ConfigureAwait(false);
+ await client.CurrentUser.Edit(WizBot.Creds.Password, e.GetArg("new_name")).ConfigureAwait(false);
});
cgb.CreateCommand(Prefix + "newavatar")
.Alias(Prefix + "setavatar")
- .Description("Sets a new avatar image for the NadekoBot. **Owner Only!**")
+ .Description("Sets a new avatar image for the WizBot. **Owner Only!**")
.Parameter("img", ParameterType.Unparsed)
+ .AddCheck(SimpleCheckers.OwnerOnly())
.Do(async e =>
{
- if (!NadekoBot.IsOwner(e.User.Id) || string.IsNullOrWhiteSpace(e.GetArg("img")))
+ if (string.IsNullOrWhiteSpace(e.GetArg("img")))
return;
// Gather user provided URL.
var avatarAddress = e.GetArg("img");
@@ -598,7 +722,7 @@ await Task.Run(async () =>
var image = System.Drawing.Image.FromStream(imageStream);
// Save the image to disk.
image.Save("data/avatar.png", System.Drawing.Imaging.ImageFormat.Png);
- await client.CurrentUser.Edit(NadekoBot.Creds.Password, avatar: image.ToStream()).ConfigureAwait(false);
+ await client.CurrentUser.Edit(WizBot.Creds.Password, avatar: image.ToStream()).ConfigureAwait(false);
// Send confirm.
await e.Channel.SendMessage("New avatar set.").ConfigureAwait(false);
});
@@ -608,7 +732,7 @@ await Task.Run(async () =>
.Parameter("set_game", ParameterType.Unparsed)
.Do(e =>
{
- if (!NadekoBot.IsOwner(e.User.Id) || e.GetArg("set_game") == null) return;
+ if (!WizBot.IsOwner(e.User.Id) || e.GetArg("set_game") == null) return;
client.SetGame(e.GetArg("set_game"));
});
@@ -633,9 +757,9 @@ await Task.Run(async () =>
cgb.CreateCommand(Prefix + "commsuser")
.Description("Sets a user for through-bot communication. Only works if server is set. Resets commschannel. **Owner Only!**")
.Parameter("name", ParameterType.Unparsed)
+ .AddCheck(SimpleCheckers.OwnerOnly())
.Do(async e =>
{
- if (!NadekoBot.IsOwner(e.User.Id)) return;
commsUser = commsServer?.FindUsers(e.GetArg("name")).FirstOrDefault();
if (commsUser != null)
{
@@ -649,9 +773,9 @@ await Task.Run(async () =>
cgb.CreateCommand(Prefix + "commsserver")
.Description("Sets a server for through-bot communication. **Owner Only!**")
.Parameter("server", ParameterType.Unparsed)
+ .AddCheck(SimpleCheckers.OwnerOnly())
.Do(async e =>
{
- if (!NadekoBot.IsOwner(e.User.Id)) return;
commsServer = client.FindServers(e.GetArg("server")).FirstOrDefault();
if (commsServer != null)
await e.Channel.SendMessage("Server for comms set.").ConfigureAwait(false);
@@ -662,9 +786,9 @@ await Task.Run(async () =>
cgb.CreateCommand(Prefix + "commschannel")
.Description("Sets a channel for through-bot communication. Only works if server is set. Resets commsuser. **Owner Only!**")
.Parameter("ch", ParameterType.Unparsed)
+ .AddCheck(SimpleCheckers.OwnerOnly())
.Do(async e =>
{
- if (!NadekoBot.IsOwner(e.User.Id)) return;
commsChannel = commsServer?.FindChannels(e.GetArg("ch"), ChannelType.Text).FirstOrDefault();
if (commsChannel != null)
{
@@ -676,11 +800,11 @@ await Task.Run(async () =>
});
cgb.CreateCommand(Prefix + "send")
- .Description("Send a message to someone on a different server through the bot. **Owner Only!**\n **Usage**: .send Message text multi word!")
+ .Description("Send a message to someone on a different server through the bot. **Owner Only!**\n**Usage**: .send Message text multi word!")
.Parameter("msg", ParameterType.Unparsed)
+ .AddCheck(SimpleCheckers.OwnerOnly())
.Do(async e =>
{
- if (!NadekoBot.IsOwner(e.User.Id)) return;
if (commsUser != null)
await commsUser.SendMessage(e.GetArg("msg")).ConfigureAwait(false);
else if (commsChannel != null)
@@ -721,12 +845,42 @@ await Task.Run(async () =>
}).ConfigureAwait(false);
});
+ cgb.CreateCommand(Prefix + "inrole")
+ .Description("Lists every person from the provided role or roles (separated by a ',') on this server.")
+ .Parameter("roles", ParameterType.Unparsed)
+ .Do(async e =>
+ {
+ await Task.Run(async () =>
+ {
+ if (!e.User.ServerPermissions.MentionEveryone) return;
+ var arg = e.GetArg("roles").Split(',').Select(r => r.Trim());
+ string send = $"`Here is a list of users in a specfic role:`";
+ foreach (var roleStr in arg.Where(str => !string.IsNullOrWhiteSpace(str)))
+ {
+ var role = e.Server.FindRoles(roleStr).FirstOrDefault();
+ if (role == null) continue;
+ send += $"\n`{role.Name}`\n";
+ send += string.Join(", ", role.Members.Select(r => "**" + r.Name + "**#" + r.Discriminator));
+ }
+
+ while (send.Length > 2000)
+ {
+ var curstr = send.Substring(0, 2000);
+ await
+ e.Channel.Send(curstr.Substring(0,
+ curstr.LastIndexOf(", ", StringComparison.Ordinal) + 1)).ConfigureAwait(false);
+ send = curstr.Substring(curstr.LastIndexOf(", ", StringComparison.Ordinal) + 1) +
+ send.Substring(2000);
+ }
+ await e.Channel.Send(send).ConfigureAwait(false);
+ }).ConfigureAwait(false);
+ });
+
cgb.CreateCommand(Prefix + "parsetosql")
.Description("Loads exported parsedata from /data/parsedata/ into sqlite database.")
+ .AddCheck(SimpleCheckers.OwnerOnly())
.Do(async e =>
{
- if (!NadekoBot.IsOwner(e.User.Id))
- return;
await Task.Run(() =>
{
SaveParseToDb("data/parsedata/Announcements.json");
@@ -742,7 +896,7 @@ await Task.Run(() =>
.AddCheck(SimpleCheckers.OwnerOnly())
.Do(e =>
{
- NadekoBot.Client.MessageQueue.Clear();
+ WizBot.Client.MessageQueue.Clear();
});
cgb.CreateCommand(Prefix + "donators")
@@ -770,8 +924,6 @@ await Task.Run(async () =>
{
await Task.Run(() =>
{
- if (!NadekoBot.IsOwner(e.User.Id))
- return;
var donator = e.Server.FindUsers(e.GetArg("donator")).FirstOrDefault();
var amount = int.Parse(e.GetArg("amount"));
if (donator == null) return;
@@ -781,7 +933,7 @@ await Task.Run(() =>
{
Amount = amount,
UserName = donator.Name,
- UserId = (long)e.User.Id
+ UserId = (long)donator.Id
});
e.Channel.SendMessage("Successfuly added a new donator. 👑");
}
@@ -817,13 +969,42 @@ await Task.Run(() =>
.AddCheck(SimpleCheckers.OwnerOnly())
.Do(async e =>
{
- foreach (var ch in NadekoBot.Client.Servers.Select(s => s.DefaultChannel))
+ foreach (var ch in WizBot.Client.Servers.Select(s => s.DefaultChannel))
{
await ch.SendMessage(e.GetArg("msg"));
}
await e.Channel.SendMessage(":ok:");
});
+
+ cgb.CreateCommand(Prefix + "whoplays")
+ .Description("Shows a list of users who are playing the specified game.")
+ .Parameter("game", ParameterType.Unparsed)
+ .Do(async e =>
+ {
+ var game = e.GetArg("game")?.Trim().ToUpperInvariant();
+ if (string.IsNullOrWhiteSpace(game))
+ return;
+ var en = e.Server.Users
+ .Where(u => u.CurrentGame?.Name.ToUpperInvariant() == game)
+ .Select(u => $"{u.Name}");
+
+ var arr = en as string[] ?? en.ToArray();
+
+ if (arr.Length == 0)
+ await e.Channel.SendMessage("Nobody. (not 100% sure)");
+ else
+ await e.Channel.SendMessage("• " + string.Join("\n• ", arr));
+ });
+
+ cgb.CreateCommand(Prefix + "updates")
+ .Alias(Prefix + "unotes")
+ .Description("Shows updates that have been done to WizBot.")
+ .Do(async e =>
+ {
+ await e.Channel.SendMessage(" **WizBot Update Notes**\n\n").ConfigureAwait(false);
+ });
+
});
}
@@ -841,4 +1022,4 @@ public void SaveParseToDb(string where) where T : IDataModel
catch { }
}
}
-}
+}
\ No newline at end of file
diff --git a/WizBot/Modules/Administration/Commands/AutoAssignRole.cs b/WizBot/Modules/Administration/Commands/AutoAssignRole.cs
new file mode 100644
index 000000000..d3c2ae8ee
--- /dev/null
+++ b/WizBot/Modules/Administration/Commands/AutoAssignRole.cs
@@ -0,0 +1,71 @@
+using Discord.Commands;
+using WizBot.Classes;
+using WizBot.Modules.Permissions.Classes;
+using System;
+using System.Linq;
+
+namespace WizBot.Modules.Administration.Commands
+{
+ class AutoAssignRole : DiscordCommand
+ {
+ public AutoAssignRole(DiscordModule module) : base(module)
+ {
+ WizBot.Client.UserJoined += (s, e) =>
+ {
+ try
+ {
+ var config = SpecificConfigurations.Default.Of(e.Server.Id);
+
+ var role = e.Server.Roles.Where(r => r.Id == config.AutoAssignedRole).FirstOrDefault();
+
+ if (role == null)
+ return;
+
+ e.User.AddRoles(role);
+ }
+ catch (Exception ex)
+ {
+ Console.WriteLine($"aar exception. {ex}");
+ }
+ };
+ }
+
+ internal override void Init(CommandGroupBuilder cgb)
+ {
+ cgb.CreateCommand(Module.Prefix + "aar")
+ .Alias(Module.Prefix + "autoassignrole")
+ .Description($"Automaticaly assigns a specified role to every user who joins the server. Type `.aar` to disable, `.aar Role Name` to enable")
+ .Parameter("role", ParameterType.Unparsed)
+ .AddCheck(new SimpleCheckers.ManageRoles())
+ .Do(async e =>
+ {
+ if (!e.Server.CurrentUser.ServerPermissions.ManageRoles)
+ {
+ await e.Channel.SendMessage("I do not have the permission to manage roles.");
+ }
+ var r = e.GetArg("role")?.Trim();
+
+ var config = SpecificConfigurations.Default.Of(e.Server.Id);
+
+ if (string.IsNullOrWhiteSpace(r)) //if role is not specified, disable
+ {
+ config.AutoAssignedRole = 0;
+
+ await e.Channel.SendMessage("`Auto assign role on user join is now disabled.`");
+ return;
+ }
+ var role = e.Server.FindRoles(r).FirstOrDefault();
+
+ if (role == null)
+ {
+ await e.Channel.SendMessage("💢 `Role not found.`");
+ return;
+ }
+
+ config.AutoAssignedRole = role.Id;
+ await e.Channel.SendMessage("`Auto assigned role is set.`");
+
+ });
+ }
+ }
+}
\ No newline at end of file
diff --git a/NadekoBot/Modules/Administration/Commands/CrossServerTextChannel.cs b/WizBot/Modules/Administration/Commands/CrossServerTextChannel.cs
similarity index 91%
rename from NadekoBot/Modules/Administration/Commands/CrossServerTextChannel.cs
rename to WizBot/Modules/Administration/Commands/CrossServerTextChannel.cs
index 0d2a3fe74..3dece8a17 100644
--- a/NadekoBot/Modules/Administration/Commands/CrossServerTextChannel.cs
+++ b/WizBot/Modules/Administration/Commands/CrossServerTextChannel.cs
@@ -1,23 +1,23 @@
using Discord;
using Discord.Commands;
-using NadekoBot.Classes;
-using NadekoBot.Modules.Permissions.Classes;
+using WizBot.Classes;
+using WizBot.Modules.Permissions.Classes;
using System;
using System.Collections.Concurrent;
using System.Collections.Generic;
using System.Linq;
-namespace NadekoBot.Modules.Administration.Commands
+namespace WizBot.Modules.Administration.Commands
{
class CrossServerTextChannel : DiscordCommand
{
public CrossServerTextChannel(DiscordModule module) : base(module)
{
- NadekoBot.Client.MessageReceived += async (s, e) =>
+ WizBot.Client.MessageReceived += async (s, e) =>
{
try
{
- if (e.User.Id == NadekoBot.Client.CurrentUser.Id) return;
+ if (e.User.Id == WizBot.Client.CurrentUser.Id) return;
foreach (var subscriber in Subscribers)
{
var set = subscriber.Value;
@@ -31,11 +31,11 @@ public CrossServerTextChannel(DiscordModule module) : base(module)
}
catch { }
};
- NadekoBot.Client.MessageUpdated += async (s, e) =>
+ WizBot.Client.MessageUpdated += async (s, e) =>
{
try
{
- if (e.After?.User?.Id == null || e.After.User.Id == NadekoBot.Client.CurrentUser.Id) return;
+ if (e.After?.User?.Id == null || e.After.User.Id == WizBot.Client.CurrentUser.Id) return;
foreach (var subscriber in Subscribers)
{
var set = subscriber.Value;
diff --git a/WizBot/Modules/Administration/Commands/CustomReactionsCommands.cs b/WizBot/Modules/Administration/Commands/CustomReactionsCommands.cs
new file mode 100644
index 000000000..8739d8206
--- /dev/null
+++ b/WizBot/Modules/Administration/Commands/CustomReactionsCommands.cs
@@ -0,0 +1,133 @@
+using Discord;
+using Discord.Commands;
+using WizBot.Classes;
+using WizBot.Modules.Permissions.Classes;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace WizBot.Modules.Administration.Commands
+{
+ class CustomReactionsCommands : DiscordCommand
+ {
+ public CustomReactionsCommands(DiscordModule module) : base(module)
+ {
+
+ }
+
+ internal override void Init(CommandGroupBuilder cgb)
+ {
+ var Prefix = Module.Prefix;
+
+ cgb.CreateCommand(Prefix + "addcustomreaction")
+ .Alias(Prefix + "acr")
+ .Description($"Add a custom reaction. Guide here: **Owner Only!** \n**Usage**: {Prefix}acr \"hello\" I love saying hello to %user%")
+ .AddCheck(SimpleCheckers.OwnerOnly())
+ .Parameter("name", ParameterType.Required)
+ .Parameter("message", ParameterType.Unparsed)
+ .Do(async e =>
+ {
+ var name = e.GetArg("name");
+ var message = e.GetArg("message")?.Trim();
+ if (string.IsNullOrWhiteSpace(message))
+ {
+ await e.Channel.SendMessage($"Incorrect command usage. See -h {Prefix}acr for correct formatting").ConfigureAwait(false);
+ return;
+ }
+ if (WizBot.Config.CustomReactions.ContainsKey(name))
+ WizBot.Config.CustomReactions[name].Add(message);
+ else
+ WizBot.Config.CustomReactions.Add(name, new System.Collections.Generic.List() { message });
+ await Task.Run(() => Classes.JSONModels.ConfigHandler.SaveConfig());
+ await e.Channel.SendMessage($"Added {name} : {message}").ConfigureAwait(false);
+
+ });
+
+ cgb.CreateCommand(Prefix + "listcustomreactions")
+ .Alias(Prefix + "lcr")
+ .Description($"Lists all current custom reactions (paginated with 5 commands per page).\n**Usage**:{Prefix}lcr 1")
+ .Parameter("num", ParameterType.Required)
+ .Do(async e =>
+ {
+ int num;
+ if (!int.TryParse(e.GetArg("num"), out num) || num <= 0) return;
+ string result = GetCustomsOnPage(num - 1); //People prefer starting with 1
+ await e.Channel.SendMessage(result);
+ });
+
+ cgb.CreateCommand(Prefix + "deletecustomreaction")
+ .Alias(Prefix + "dcr")
+ .Description("Deletes a custom reaction with given name (and index)")
+ .Parameter("name", ParameterType.Required)
+ .Parameter("index", ParameterType.Optional)
+ .AddCheck(SimpleCheckers.OwnerOnly())
+ .Do(async e =>
+ {
+ var name = e.GetArg("name")?.Trim();
+ if (string.IsNullOrWhiteSpace(name))
+ return;
+ if (!WizBot.Config.CustomReactions.ContainsKey(name))
+ {
+ await e.Channel.SendMessage("Could not find given commandname");
+ return;
+ }
+ string message = "";
+ int index;
+ if (int.TryParse(e.GetArg("index")?.Trim() ?? "", out index))
+ {
+ index = index - 1;
+ if (index < 0 || index > WizBot.Config.CustomReactions[name].Count)
+ {
+ await e.Channel.SendMessage("Given index was out of range").ConfigureAwait(false);
+ return;
+
+ }
+ WizBot.Config.CustomReactions[name].RemoveAt(index);
+ if (!WizBot.Config.CustomReactions[name].Any())
+ {
+ WizBot.Config.CustomReactions.Remove(name);
+ }
+ message = $"Deleted response #{index + 1} from `{name}`";
+ }
+ else
+ {
+ WizBot.Config.CustomReactions.Remove(name);
+ message = $"Deleted custom reaction: `{name}`";
+ }
+ await Task.Run(() => Classes.JSONModels.ConfigHandler.SaveConfig());
+ await e.Channel.SendMessage(message);
+ });
+ }
+
+ private readonly int ItemsPerPage = 5;
+
+ private string GetCustomsOnPage(int page)
+ {
+ var items = WizBot.Config.CustomReactions.Skip(page * ItemsPerPage).Take(ItemsPerPage);
+ if (!items.Any())
+ {
+ return $"No items on page {page + 1}.";
+ }
+ var message = new StringBuilder($"--- Custom reactions - page {page + 1} ---\n");
+ foreach (var cr in items)
+ {
+ message.Append($"{ Format.Code(cr.Key)}\n");
+ int i = 1;
+ var last = cr.Value.Last();
+ foreach (var reaction in cr.Value)
+ {
+ if (last != reaction)
+ message.AppendLine(" `├" + i++ + "─`" + Format.Bold(reaction));
+ else
+ message.AppendLine(" `└" + i++ + "─`" + Format.Bold(reaction));
+ }
+ }
+ return message.ToString() + "\n";
+ }
+ }
+}
+// zeta is a god
+//├
+//─
+//│
+//└
\ No newline at end of file
diff --git a/NadekoBot/Modules/Administration/Commands/InfoCommands.cs b/WizBot/Modules/Administration/Commands/InfoCommands.cs
similarity index 89%
rename from NadekoBot/Modules/Administration/Commands/InfoCommands.cs
rename to WizBot/Modules/Administration/Commands/InfoCommands.cs
index be6e5ec1c..cd13c3f17 100644
--- a/NadekoBot/Modules/Administration/Commands/InfoCommands.cs
+++ b/WizBot/Modules/Administration/Commands/InfoCommands.cs
@@ -1,12 +1,12 @@
using Discord;
using Discord.Commands;
-using NadekoBot.Classes;
-using NadekoBot.Extensions;
+using WizBot.Classes;
+using WizBot.Extensions;
using System;
using System.Linq;
using System.Text;
-namespace NadekoBot.Modules.Administration.Commands
+namespace WizBot.Modules.Administration.Commands
{
class InfoCommands : DiscordCommand
{
@@ -25,7 +25,7 @@ internal override void Init(CommandGroupBuilder cgb)
var servText = e.GetArg("server")?.Trim();
var server = string.IsNullOrWhiteSpace(servText)
? e.Server
- : NadekoBot.Client.FindServers(servText).FirstOrDefault();
+ : WizBot.Client.FindServers(servText).FirstOrDefault();
if (server == null)
return;
var createdAt = new DateTime(2015, 1, 1, 0, 0, 0, 0, DateTimeKind.Utc).AddMilliseconds(server.Id >> 22);
@@ -83,8 +83,12 @@ internal override void Init(CommandGroupBuilder cgb)
return;
var sb = new StringBuilder();
sb.AppendLine($"`Name#Discrim:` **#{user.Name}#{user.Discriminator}**");
+ if (!string.IsNullOrWhiteSpace(user.Nickname))
+ sb.AppendLine($"`Nickname:` **{user.Nickname}**");
sb.AppendLine($"`Id:` **{user.Id}**");
- sb.AppendLine($"`Current Game:` **{(string.IsNullOrWhiteSpace(user.CurrentGame) ? "-" : user.CurrentGame)}**");
+ sb.AppendLine($"`Current Game:` **{(user.CurrentGame?.Name == null ? "-" : user.CurrentGame.Value.Name)}**");
+ if (user.LastOnlineAt != null)
+ sb.AppendLine($"`Last Online:` **{user.LastOnlineAt:HH:mm:ss}**");
sb.AppendLine($"`Joined At:` **{user.JoinedAt}**");
sb.AppendLine($"`Roles:` **({user.Roles.Count()}) - {string.Join(", ", user.Roles.Select(r => r.Name))}**");
sb.AppendLine($"`AvatarUrl:` **{await user.AvatarUrl.ShortenUrl().ConfigureAwait(false)}**");
@@ -92,4 +96,4 @@ internal override void Init(CommandGroupBuilder cgb)
});
}
}
-}
+}
\ No newline at end of file
diff --git a/WizBot/Modules/Administration/Commands/LogCommand.cs b/WizBot/Modules/Administration/Commands/LogCommand.cs
new file mode 100644
index 000000000..68b7510ce
--- /dev/null
+++ b/WizBot/Modules/Administration/Commands/LogCommand.cs
@@ -0,0 +1,368 @@
+using Discord;
+using Discord.Commands;
+using WizBot.Classes;
+using WizBot.Extensions;
+using WizBot.Modules.Permissions.Classes;
+using System;
+using System.Collections.Concurrent;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace WizBot.Modules.Administration.Commands
+{
+ internal class LogCommand : DiscordCommand
+ {
+
+ private readonly ConcurrentDictionary logs = new ConcurrentDictionary();
+ private readonly ConcurrentDictionary loggingPresences = new ConcurrentDictionary();
+ private readonly ConcurrentDictionary voiceChannelLog = new ConcurrentDictionary();
+
+ private string prettyCurrentTime => $"【{DateTime.Now:HH:mm:ss}】";
+
+ public LogCommand(DiscordModule module) : base(module)
+ {
+ WizBot.Client.MessageReceived += MsgRecivd;
+ WizBot.Client.MessageDeleted += MsgDltd;
+ WizBot.Client.MessageUpdated += MsgUpdtd;
+ WizBot.Client.UserUpdated += UsrUpdtd;
+ WizBot.Client.UserBanned += UsrBanned;
+ WizBot.Client.UserLeft += UsrLeft;
+ WizBot.Client.UserJoined += UsrJoined;
+ WizBot.Client.UserUnbanned += UsrUnbanned;
+ WizBot.Client.ChannelCreated += ChannelCreated;
+ WizBot.Client.ChannelDestroyed += ChannelDestroyed;
+ WizBot.Client.ChannelUpdated += ChannelUpdated;
+
+
+ WizBot.Client.MessageReceived += async (s, e) =>
+ {
+ if (e.Channel.IsPrivate || e.User.Id == WizBot.Client.CurrentUser.Id)
+ return;
+ if (!SpecificConfigurations.Default.Of(e.Server.Id).SendPrivateMessageOnMention) return;
+ try
+ {
+ var usr = e.Message.MentionedUsers.FirstOrDefault(u => u != e.User);
+ if (usr?.Status != UserStatus.Offline)
+ return;
+ await e.Channel.SendMessage($"User `{usr.Name}` is offline. PM sent.").ConfigureAwait(false);
+ await usr.SendMessage(
+ $"User `{e.User.Name}` mentioned you on " +
+ $"`{e.Server.Name}` server while you were offline.\n" +
+ $"`Message:` {e.Message.Text}").ConfigureAwait(false);
+ }
+ catch { }
+ };
+ }
+
+ private async void ChannelUpdated(object sender, ChannelUpdatedEventArgs e)
+ {
+ try
+ {
+ Channel ch;
+ if (!logs.TryGetValue(e.Server, out ch))
+ return;
+ if (e.Before.Name != e.After.Name)
+ await ch.SendMessage($@"`{prettyCurrentTime}` **Channel Name Changed** `#{e.Before.Name}` (*{e.After.Id}*)
+ `New:` {e.After.Name}").ConfigureAwait(false);
+ else if (e.Before.Topic != e.After.Topic)
+ await ch.SendMessage($@"`{prettyCurrentTime}` **Channel Topic Changed** `#{e.After.Name}` (*{e.After.Id}*)
+ `Old:` {e.Before.Topic}
+ `New:` {e.After.Topic}").ConfigureAwait(false);
+ }
+ catch { }
+ }
+
+ private async void ChannelDestroyed(object sender, ChannelEventArgs e)
+ {
+ try
+ {
+ Channel ch;
+ if (!logs.TryGetValue(e.Server, out ch))
+ return;
+ await ch.SendMessage($"❗`{prettyCurrentTime}`❗`Channel Deleted:` #{e.Channel.Name} (*{e.Channel.Id}*)").ConfigureAwait(false);
+ }
+ catch { }
+ }
+
+ private async void ChannelCreated(object sender, ChannelEventArgs e)
+ {
+ try
+ {
+ Channel ch;
+ if (!logs.TryGetValue(e.Server, out ch))
+ return;
+ await ch.SendMessage($"`{prettyCurrentTime}`🆕`Channel Created:` #{e.Channel.Mention} (*{e.Channel.Id}*)").ConfigureAwait(false);
+ }
+ catch { }
+ }
+
+ private async void UsrUnbanned(object sender, UserEventArgs e)
+ {
+ try
+ {
+ Channel ch;
+ if (!logs.TryGetValue(e.Server, out ch))
+ return;
+ await ch.SendMessage($"`{prettyCurrentTime}`♻`User was unbanned:` **{e.User.Name}** ({e.User.Id})").ConfigureAwait(false);
+ }
+ catch { }
+ }
+
+ private async void UsrJoined(object sender, UserEventArgs e)
+ {
+ try
+ {
+ Channel ch;
+ if (!logs.TryGetValue(e.Server, out ch))
+ return;
+ await ch.SendMessage($"`{prettyCurrentTime}`✅`User joined:` **{e.User.Name}** ({e.User.Id})").ConfigureAwait(false);
+ }
+ catch { }
+ }
+
+ private async void UsrLeft(object sender, UserEventArgs e)
+ {
+ try
+ {
+ Channel ch;
+ if (!logs.TryGetValue(e.Server, out ch))
+ return;
+ await ch.SendMessage($"`{prettyCurrentTime}`❗`User left:` **{e.User.Name}** ({e.User.Id})").ConfigureAwait(false);
+ }
+ catch { }
+ }
+
+ private async void UsrBanned(object sender, UserEventArgs e)
+ {
+ try
+ {
+ Channel ch;
+ if (!logs.TryGetValue(e.Server, out ch))
+ return;
+ await ch.SendMessage($"❗`{prettyCurrentTime}`❌`User banned:` **{e.User.Name}** ({e.User.Id})").ConfigureAwait(false);
+ }
+ catch { }
+ }
+
+ public Func DoFunc() => async e =>
+ {
+ Channel ch;
+ if (!logs.TryRemove(e.Server, out ch))
+ {
+ logs.TryAdd(e.Server, e.Channel);
+ await e.Channel.SendMessage($"❗**I WILL BEGIN LOGGING SERVER ACTIVITY IN THIS CHANNEL**❗").ConfigureAwait(false);
+ return;
+ }
+
+ await e.Channel.SendMessage($"❗**NO LONGER LOGGING IN {ch.Mention} CHANNEL**❗").ConfigureAwait(false);
+ };
+
+ private async void MsgRecivd(object sender, MessageEventArgs e)
+ {
+ try
+ {
+ if (e.Server == null || e.Channel.IsPrivate || e.User.Id == WizBot.Client.CurrentUser.Id)
+ return;
+ Channel ch;
+ if (!logs.TryGetValue(e.Server, out ch) || e.Channel == ch)
+ return;
+ await ch.SendMessage(
+$@"🕔`{prettyCurrentTime}` **New Message** `#{e.Channel.Name}`
+👤`{e.User?.ToString() ?? ("NULL")}` {e.Message.Text.Unmention()}").ConfigureAwait(false);
+ }
+ catch { }
+ }
+ private async void MsgDltd(object sender, MessageEventArgs e)
+ {
+ try
+ {
+ if (e.Server == null || e.Channel.IsPrivate || e.User?.Id == WizBot.Client.CurrentUser.Id)
+ return;
+ Channel ch;
+ if (!logs.TryGetValue(e.Server, out ch) || e.Channel == ch)
+ return;
+ await ch.SendMessage(
+$@"🕔`{prettyCurrentTime}` **Message** 🚮 `#{e.Channel.Name}`
+👤`{e.User?.ToString() ?? ("NULL")}` {e.Message.Text.Unmention()}").ConfigureAwait(false);
+ }
+ catch { }
+ }
+ private async void MsgUpdtd(object sender, MessageUpdatedEventArgs e)
+ {
+ try
+ {
+ if (e.Server == null || e.Channel.IsPrivate || e.User?.Id == WizBot.Client.CurrentUser.Id)
+ return;
+ Channel ch;
+ if (!logs.TryGetValue(e.Server, out ch) || e.Channel == ch)
+ return;
+ await ch.SendMessage(
+$@"🕔`{prettyCurrentTime}` **Message** 📝 `#{e.Channel.Name}`
+👤`{e.User?.ToString() ?? ("NULL")}`
+ `Old:` {e.Before.Text.Unmention()}
+ `New:` {e.After.Text.Unmention()}").ConfigureAwait(false);
+ }
+ catch { }
+ }
+ private async void UsrUpdtd(object sender, UserUpdatedEventArgs e)
+ {
+ try
+ {
+ Channel ch;
+ if (loggingPresences.TryGetValue(e.Server, out ch))
+ if (e.Before.Status != e.After.Status)
+ {
+ await ch.SendMessage($"`{prettyCurrentTime}`**{e.Before.Name}** is now **{e.After.Status}**.").ConfigureAwait(false);
+ }
+ }
+ catch { }
+
+ try
+ {
+ Channel notifyChBefore = null;
+ Channel notifyChAfter = null;
+ var beforeVch = e.Before.VoiceChannel;
+ var afterVch = e.After.VoiceChannel;
+ var notifyLeave = false;
+ var notifyJoin = false;
+ if ((beforeVch != null || afterVch != null) && (beforeVch != afterVch)) // this means we need to notify for sure.
+ {
+ if (beforeVch != null && voiceChannelLog.TryGetValue(beforeVch, out notifyChBefore))
+ {
+ notifyLeave = true;
+ }
+ if (afterVch != null && voiceChannelLog.TryGetValue(afterVch, out notifyChAfter))
+ {
+ notifyJoin = true;
+ }
+ if ((notifyLeave && notifyJoin) && (notifyChAfter == notifyChBefore))
+ {
+ await notifyChAfter.SendMessage($"🎼`{prettyCurrentTime}` {e.Before.Name} moved from **{beforeVch.Mention}** to **{afterVch.Mention}** voice channel.").ConfigureAwait(false);
+ }
+ else if (notifyJoin)
+ {
+ await notifyChAfter.SendMessage($"🎼`{prettyCurrentTime}` {e.Before.Name} has joined **{afterVch.Mention}** voice channel.").ConfigureAwait(false);
+ }
+ else if (notifyLeave)
+ {
+ await notifyChBefore.SendMessage($"🎼`{prettyCurrentTime}` {e.Before.Name} has left **{beforeVch.Mention}** voice channel.").ConfigureAwait(false);
+ }
+ }
+ }
+ catch { }
+
+ try
+ {
+ Channel ch;
+ if (!logs.TryGetValue(e.Server, out ch))
+ return;
+ string str = $"🕔`{prettyCurrentTime}`";
+ if (e.Before.Name != e.After.Name)
+ str += $"**Name Changed**👤`{e.Before?.ToString()}`\n\t\t`New:`{e.After.ToString()}`";
+ else if (e.Before.Nickname != e.After.Nickname)
+ str += $"**Nickname Changed**👤`{e.Before?.ToString()}`\n\t\t`Old:` {e.Before.Nickname}#{e.Before.Discriminator}\n\t\t`New:` {e.After.Nickname}#{e.After.Discriminator}";
+ else if (e.Before.AvatarUrl != e.After.AvatarUrl)
+ str += $"**Avatar Changed**👤`{e.Before?.ToString()}`\n\t {await e.Before.AvatarUrl.ShortenUrl()} `=>` {await e.After.AvatarUrl.ShortenUrl()}";
+ else if (!e.Before.Roles.SequenceEqual(e.After.Roles))
+ {
+ if (e.Before.Roles.Count() < e.After.Roles.Count())
+ {
+ var diffRoles = e.After.Roles.Where(r => !e.Before.Roles.Contains(r)).Select(r => "`" + r.Name + "`");
+ str += $"**User's Roles changed ⚔➕**👤`{e.Before?.ToString()}`\n\tNow has {string.Join(", ", diffRoles)} role.";
+ }
+ else if (e.Before.Roles.Count() > e.After.Roles.Count())
+ {
+ var diffRoles = e.Before.Roles.Where(r => !e.After.Roles.Contains(r)).Select(r => "`" + r.Name + "`");
+ str += $"**User's Roles changed ⚔➖**👤`{e.Before?.ToString()}`\n\tNo longer has {string.Join(", ", diffRoles)} role.";
+ }
+ else
+ {
+ Console.WriteLine("SEQUENCE NOT EQUAL BUT NO DIFF ROLES - REPORT TO KWOTH on #WizLOG server");
+ return;
+ }
+
+ }
+ else
+ return;
+ await ch.SendMessage(str).ConfigureAwait(false);
+ }
+ catch { }
+ }
+
+ internal override void Init(CommandGroupBuilder cgb)
+ {
+
+ cgb.CreateCommand(Module.Prefix + "spmom")
+ .Description("Toggles whether mentions of other offline users on your server will send a pm to them.")
+ .AddCheck(SimpleCheckers.ManageServer())
+ .Do(async e =>
+ {
+ var specificConfig = SpecificConfigurations.Default.Of(e.Server.Id);
+ specificConfig.SendPrivateMessageOnMention =
+ !specificConfig.SendPrivateMessageOnMention;
+ if (specificConfig.SendPrivateMessageOnMention)
+ await e.Channel.SendMessage(":ok: I will send private messages " +
+ "to mentioned offline users.").ConfigureAwait(false);
+ else
+ await e.Channel.SendMessage(":ok: I won't send private messages " +
+ "to mentioned offline users anymore.").ConfigureAwait(false);
+ });
+
+ cgb.CreateCommand(Module.Prefix + "logserver")
+ .Description("Toggles logging in this channel. Logs every message sent/deleted/edited on the server. **Owner Only!**")
+ .AddCheck(SimpleCheckers.OwnerOnly())
+ .AddCheck(SimpleCheckers.ManageServer())
+ .Do(DoFunc());
+
+ cgb.CreateCommand(Module.Prefix + "userpresence")
+ .Description("Starts logging to this channel when someone from the server goes online/offline/idle. **Owner Only!**")
+ .AddCheck(SimpleCheckers.OwnerOnly())
+ .AddCheck(SimpleCheckers.ManageServer())
+ .Do(async e =>
+ {
+ Channel ch;
+ if (!loggingPresences.TryRemove(e.Server, out ch))
+ {
+ loggingPresences.TryAdd(e.Server, e.Channel);
+ await e.Channel.SendMessage($"**User presence notifications enabled.**").ConfigureAwait(false);
+ return;
+ }
+
+ await e.Channel.SendMessage($"**User presence notifications disabled.**").ConfigureAwait(false);
+ });
+
+ cgb.CreateCommand(Module.Prefix + "voicepresence")
+ .Description("Toggles logging to this channel whenever someone joins or leaves a voice channel you are in right now. **Owner Only!**")
+ .Parameter("all", ParameterType.Optional)
+ .AddCheck(SimpleCheckers.OwnerOnly())
+ .AddCheck(SimpleCheckers.ManageServer())
+ .Do(async e =>
+ {
+
+ if (e.GetArg("all")?.ToLower() == "all")
+ {
+ foreach (var voiceChannel in e.Server.VoiceChannels)
+ {
+ voiceChannelLog.TryAdd(voiceChannel, e.Channel);
+ }
+ await e.Channel.SendMessage("Started logging user presence for **ALL** voice channels!").ConfigureAwait(false);
+ return;
+ }
+
+ if (e.User.VoiceChannel == null)
+ {
+ await e.Channel.SendMessage("💢 You are not in a voice channel right now. If you are, please rejoin it.").ConfigureAwait(false);
+ return;
+ }
+ Channel throwaway;
+ if (!voiceChannelLog.TryRemove(e.User.VoiceChannel, out throwaway))
+ {
+ voiceChannelLog.TryAdd(e.User.VoiceChannel, e.Channel);
+ await e.Channel.SendMessage($"`Logging user updates for` {e.User.VoiceChannel.Mention} `voice channel.`").ConfigureAwait(false);
+ }
+ else
+ await e.Channel.SendMessage($"`Stopped logging user updates for` {e.User.VoiceChannel.Mention} `voice channel.`").ConfigureAwait(false);
+ });
+ }
+ }
+}
\ No newline at end of file
diff --git a/NadekoBot/Modules/Administration/Commands/MessageRepeater.cs b/WizBot/Modules/Administration/Commands/MessageRepeater.cs
similarity index 69%
rename from NadekoBot/Modules/Administration/Commands/MessageRepeater.cs
rename to WizBot/Modules/Administration/Commands/MessageRepeater.cs
index ca41ad412..681c1f268 100644
--- a/NadekoBot/Modules/Administration/Commands/MessageRepeater.cs
+++ b/WizBot/Modules/Administration/Commands/MessageRepeater.cs
@@ -1,12 +1,13 @@
using Discord;
using Discord.Commands;
-using NadekoBot.Classes;
-using NadekoBot.Modules.Permissions.Classes;
+using WizBot.Classes;
+using WizBot.Modules.Permissions.Classes;
using System;
using System.Collections.Concurrent;
+using System.Threading.Tasks;
using System.Timers;
-namespace NadekoBot.Modules.Administration.Commands
+namespace WizBot.Modules.Administration.Commands
{
class MessageRepeater : DiscordCommand
{
@@ -27,34 +28,52 @@ private class Repeater
public Repeater Start()
{
MessageTimer = new Timer { Interval = Interval };
- MessageTimer.Elapsed += async (s, e) =>
+ MessageTimer.Elapsed += async (s, e) => await Invoke();
+ return this;
+ }
+
+ public async Task Invoke()
+ {
+ var ch = RepeatingChannel;
+ var msg = RepeatingMessage;
+ if (ch != null && !string.IsNullOrWhiteSpace(msg))
{
- var ch = RepeatingChannel;
- var msg = RepeatingMessage;
- if (ch != null && !string.IsNullOrWhiteSpace(msg))
+ try
{
- try
- {
- if (lastMessage != null)
- await lastMessage.Delete().ConfigureAwait(false);
- }
- catch { }
- try
- {
- lastMessage = await ch.SendMessage(msg).ConfigureAwait(false);
- }
- catch { }
+ if (lastMessage != null)
+ await lastMessage.Delete().ConfigureAwait(false);
}
- };
- return this;
+ catch { }
+ try
+ {
+ lastMessage = await ch.SendMessage(msg).ConfigureAwait(false);
+ }
+ catch { }
+ }
}
}
internal override void Init(CommandGroupBuilder cgb)
{
+ cgb.CreateCommand(Module.Prefix + "repeatinvoke")
+ .Alias(Module.Prefix + "repinv")
+ .Description("Immediately shows the repeat message and restarts the timer.")
+ .AddCheck(SimpleCheckers.ManageMessages())
+ .Do(async e =>
+ {
+ Repeater rep;
+ if (!repeaters.TryGetValue(e.Server, out rep))
+ {
+ await e.Channel.SendMessage("`No repeating message found on this server.`");
+ return;
+ }
+
+ await rep.Invoke();
+ });
+
cgb.CreateCommand(Module.Prefix + "repeat")
.Description("Repeat a message every X minutes. If no parameters are specified, " +
- "repeat is disabled. Requires manage messages.")
+ "repeat is disabled. Requires manage messages.\n**Usage**:`.repeat 5 Hello there`")
.Parameter("minutes", ParameterType.Optional)
.Parameter("msg", ParameterType.Unparsed)
.AddCheck(SimpleCheckers.ManageMessages())
@@ -73,7 +92,7 @@ internal override void Init(CommandGroupBuilder cgb)
return;
}
int minutes;
- if (!int.TryParse(minutesStr, out minutes) || minutes < 1 || minutes > 720)
+ if (!int.TryParse(minutesStr, out minutes) || minutes < 1 || minutes > 1440)
{
await e.Channel.SendMessage("Invalid value").ConfigureAwait(false);
return;
@@ -105,4 +124,4 @@ await e.Channel.SendMessage(String.Format("👌 Repeating `{0}` every " +
public MessageRepeater(DiscordModule module) : base(module) { }
}
-}
+}
\ No newline at end of file
diff --git a/NadekoBot/Modules/Administration/Commands/PlayingRotate.cs b/WizBot/Modules/Administration/Commands/PlayingRotate.cs
similarity index 79%
rename from NadekoBot/Modules/Administration/Commands/PlayingRotate.cs
rename to WizBot/Modules/Administration/Commands/PlayingRotate.cs
index 90ca7c209..01788a7ba 100644
--- a/NadekoBot/Modules/Administration/Commands/PlayingRotate.cs
+++ b/WizBot/Modules/Administration/Commands/PlayingRotate.cs
@@ -1,8 +1,8 @@
using Discord.Commands;
-using NadekoBot.Classes;
-using NadekoBot.Classes.JSONModels;
-using NadekoBot.Modules.Music;
-using NadekoBot.Modules.Permissions.Classes;
+using WizBot.Classes;
+using WizBot.Classes.JSONModels;
+using WizBot.Modules.Music;
+using WizBot.Modules.Permissions.Classes;
using System;
using System.Collections.Generic;
using System.Linq;
@@ -10,7 +10,7 @@
using System.Threading.Tasks;
using System.Timers;
-namespace NadekoBot.Modules.Administration.Commands
+namespace WizBot.Modules.Administration.Commands
{
internal class PlayingRotate : DiscordCommand
{
@@ -18,8 +18,8 @@ internal class PlayingRotate : DiscordCommand
public static Dictionary> PlayingPlaceholders { get; } =
new Dictionary> {
- {"%servers%", () => NadekoBot.Client.Servers.Count().ToString()},
- {"%users%", () => NadekoBot.Client.Servers.SelectMany(s => s.Users).Count().ToString()},
+ {"%servers%", () => WizBot.Client.Servers.Count().ToString()},
+ {"%users%", () => WizBot.Client.Servers.SelectMany(s => s.Users).Count().ToString()},
{"%playing%", () => {
var cnt = MusicModule.MusicPlayers.Count(kvp => kvp.Value.CurrentSong != null);
if (cnt != 1) return cnt.ToString();
@@ -49,25 +49,26 @@ public PlayingRotate(DiscordModule module) : base(module)
var status = "";
lock (playingPlaceholderLock)
{
- if (PlayingPlaceholders.Count == 0)
- return;
- if (i >= PlayingPlaceholders.Count)
+ if (PlayingPlaceholders.Count == 0
+ || WizBot.Config.RotatingStatuses.Count == 0
+ || i >= PlayingPlaceholders.Count
+ || i >= WizBot.Config.RotatingStatuses.Count)
{
i = -1;
return;
}
- status = NadekoBot.Config.RotatingStatuses[i];
+ status = WizBot.Config.RotatingStatuses[i];
status = PlayingPlaceholders.Aggregate(status,
(current, kvp) => current.Replace(kvp.Key, kvp.Value()));
}
if (string.IsNullOrWhiteSpace(status))
return;
- Task.Run(() => { NadekoBot.Client.SetGame(status); });
+ Task.Run(() => { WizBot.Client.SetGame(status); });
}
catch { }
};
- timer.Enabled = NadekoBot.Config.IsRotatingStatus;
+ timer.Enabled = WizBot.Config.IsRotatingStatus;
}
public Func DoFunc() => async e =>
@@ -78,7 +79,7 @@ public Func DoFunc() => async e =>
timer.Stop();
else
timer.Start();
- NadekoBot.Config.IsRotatingStatus = timer.Enabled;
+ WizBot.Config.IsRotatingStatus = timer.Enabled;
ConfigHandler.SaveConfig();
}
await e.Channel.SendMessage($"❗`Rotating playing status has been {(timer.Enabled ? "enabled" : "disabled")}.`").ConfigureAwait(false);
@@ -105,7 +106,7 @@ internal override void Init(CommandGroupBuilder cgb)
return;
lock (playingPlaceholderLock)
{
- NadekoBot.Config.RotatingStatuses.Add(arg);
+ WizBot.Config.RotatingStatuses.Add(arg);
ConfigHandler.SaveConfig();
}
await e.Channel.SendMessage("🆗 `Added a new playing string.`").ConfigureAwait(false);
@@ -117,13 +118,13 @@ internal override void Init(CommandGroupBuilder cgb)
.AddCheck(SimpleCheckers.OwnerOnly())
.Do(async e =>
{
- if (NadekoBot.Config.RotatingStatuses.Count == 0)
+ if (WizBot.Config.RotatingStatuses.Count == 0)
await e.Channel.SendMessage("`There are no playing strings. " +
"Add some with .addplaying [text] command.`").ConfigureAwait(false);
var sb = new StringBuilder();
- for (var i = 0; i < NadekoBot.Config.RotatingStatuses.Count; i++)
+ for (var i = 0; i < WizBot.Config.RotatingStatuses.Count; i++)
{
- sb.AppendLine($"`{i + 1}.` {NadekoBot.Config.RotatingStatuses[i]}");
+ sb.AppendLine($"`{i + 1}.` {WizBot.Config.RotatingStatuses[i]}");
}
await e.Channel.SendMessage(sb.ToString()).ConfigureAwait(false);
});
@@ -140,10 +141,10 @@ await e.Channel.SendMessage("`There are no playing strings. " +
string str;
lock (playingPlaceholderLock)
{
- if (!int.TryParse(arg.Trim(), out num) || num <= 0 || num > NadekoBot.Config.RotatingStatuses.Count)
+ if (!int.TryParse(arg.Trim(), out num) || num <= 0 || num > WizBot.Config.RotatingStatuses.Count)
return;
- str = NadekoBot.Config.RotatingStatuses[num - 1];
- NadekoBot.Config.RotatingStatuses.RemoveAt(num - 1);
+ str = WizBot.Config.RotatingStatuses[num - 1];
+ WizBot.Config.RotatingStatuses.RemoveAt(num - 1);
ConfigHandler.SaveConfig();
}
await e.Channel.SendMessage($"🆗 `Removed playing string #{num}`({str})").ConfigureAwait(false);
diff --git a/NadekoBot/Modules/Administration/Commands/RatelimitCommand.cs b/WizBot/Modules/Administration/Commands/RatelimitCommand.cs
similarity index 90%
rename from NadekoBot/Modules/Administration/Commands/RatelimitCommand.cs
rename to WizBot/Modules/Administration/Commands/RatelimitCommand.cs
index d300e29af..a4860c816 100644
--- a/NadekoBot/Modules/Administration/Commands/RatelimitCommand.cs
+++ b/WizBot/Modules/Administration/Commands/RatelimitCommand.cs
@@ -1,10 +1,10 @@
using Discord.Commands;
-using NadekoBot.Classes;
-using NadekoBot.Modules.Permissions.Classes;
+using WizBot.Classes;
+using WizBot.Modules.Permissions.Classes;
using System;
using System.Collections.Concurrent;
-namespace NadekoBot.Modules.Administration.Commands
+namespace WizBot.Modules.Administration.Commands
{
internal class RatelimitCommand : DiscordCommand
{
@@ -15,9 +15,9 @@ internal class RatelimitCommand : DiscordCommand
public RatelimitCommand(DiscordModule module) : base(module)
{
- NadekoBot.Client.MessageReceived += async (s, e) =>
+ WizBot.Client.MessageReceived += async (s, e) =>
{
- if (e.Channel.IsPrivate || e.User.Id == NadekoBot.Client.CurrentUser.Id)
+ if (e.Channel.IsPrivate || e.User.Id == WizBot.Client.CurrentUser.Id)
return;
ConcurrentDictionary userTimePair;
if (!RatelimitingChannels.TryGetValue(e.Channel.Id, out userTimePair)) return;
diff --git a/NadekoBot/Modules/Administration/Commands/Remind.cs b/WizBot/Modules/Administration/Commands/Remind.cs
similarity index 77%
rename from NadekoBot/Modules/Administration/Commands/Remind.cs
rename to WizBot/Modules/Administration/Commands/Remind.cs
index 51741198b..fabbc6467 100644
--- a/NadekoBot/Modules/Administration/Commands/Remind.cs
+++ b/WizBot/Modules/Administration/Commands/Remind.cs
@@ -1,14 +1,15 @@
using Discord;
using Discord.Commands;
-using NadekoBot.Classes;
-using NadekoBot.DataModels;
+using WizBot.Classes;
+using WizBot.DataModels;
+using WizBot.Modules.Permissions.Classes;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text.RegularExpressions;
using System.Timers;
-namespace NadekoBot.Modules.Administration.Commands
+namespace WizBot.Modules.Administration.Commands
{
class Remind : DiscordCommand
{
@@ -18,6 +19,13 @@ class Remind : DiscordCommand
List reminders = new List();
+ IDictionary> replacements = new Dictionary>
+ {
+ { "%message%" , (r) => r.Message },
+ { "%user%", (r) => $"<@!{r.UserId}>" },
+ { "%target%", (r) => r.IsPrivate? "Direct Message" : $"<#{r.ChannelId}>"}
+ };
+
public Remind(DiscordModule module) : base(module)
{
var remList = DbHandler.Instance.GetAllRows();
@@ -43,17 +51,21 @@ private Timer StartNewReminder(Reminder r)
Channel ch;
if (r.IsPrivate)
{
- ch = NadekoBot.Client.PrivateChannels.FirstOrDefault(c => (long)c.Id == r.ChannelId);
+ ch = WizBot.Client.PrivateChannels.FirstOrDefault(c => (long)c.Id == r.ChannelId);
if (ch == null)
- ch = await NadekoBot.Client.CreatePrivateChannel((ulong)r.ChannelId).ConfigureAwait(false);
+ ch = await WizBot.Client.CreatePrivateChannel((ulong)r.ChannelId).ConfigureAwait(false);
}
else
- ch = NadekoBot.Client.GetServer((ulong)r.ServerId)?.GetChannel((ulong)r.ChannelId);
+ ch = WizBot.Client.GetServer((ulong)r.ServerId)?.GetChannel((ulong)r.ChannelId);
if (ch == null)
return;
- await ch.SendMessage($"❗⏰**I've been told to remind you to '{r.Message}' now by <@{r.UserId}>.**⏰❗").ConfigureAwait(false);
+ await ch.SendMessage(
+ replacements.Aggregate(WizBot.Config.RemindMessageFormat,
+ (cur, replace) => cur.Replace(replace.Key, replace.Value(r)))
+ ).ConfigureAwait(false); //it works trust me
+
}
catch (Exception ex)
{
@@ -163,8 +175,23 @@ internal override void Init(CommandGroupBuilder cgb)
reminders.Add(StartNewReminder(rem));
- await e.Channel.SendMessage($"⏰ I will remind \"{ch.Name}\" to \"{e.GetArg("message").ToString()}\" in {output}. ({time:d.M.yyyy.} at {time:HH:m})").ConfigureAwait(false);
+ await e.Channel.SendMessage($"⏰ I will remind \"{ch.Name}\" to \"{e.GetArg("message").ToString()}\" in {output}. ({time:d.M.yyyy.} at {time:HH:mm})").ConfigureAwait(false);
});
+ cgb.CreateCommand(Module.Prefix + "remindmsg")
+ .Description("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. **Owner only!**")
+ .Parameter("msg", ParameterType.Unparsed)
+ .AddCheck(SimpleCheckers.OwnerOnly())
+ .Do(async e =>
+ {
+ var arg = e.GetArg("msg")?.Trim();
+ if (string.IsNullOrWhiteSpace(arg))
+ return;
+
+ WizBot.Config.RemindMessageFormat = arg;
+ await e.Channel.SendMessage("`New remind message set.`");
+ });
}
}
}
diff --git a/NadekoBot/Modules/Administration/Commands/SelfAssignedRolesCommand.cs b/WizBot/Modules/Administration/Commands/SelfAssignedRolesCommand.cs
similarity index 92%
rename from NadekoBot/Modules/Administration/Commands/SelfAssignedRolesCommand.cs
rename to WizBot/Modules/Administration/Commands/SelfAssignedRolesCommand.cs
index f61dc35d0..1affa6459 100644
--- a/NadekoBot/Modules/Administration/Commands/SelfAssignedRolesCommand.cs
+++ b/WizBot/Modules/Administration/Commands/SelfAssignedRolesCommand.cs
@@ -1,11 +1,12 @@
using Discord.Commands;
-using NadekoBot.Classes;
-using NadekoBot.Modules.Permissions.Classes;
+using WizBot.Classes;
+using WizBot.Modules.Permissions.Classes;
using System.Collections.Generic;
using System.Linq;
using System.Text;
+using System.Threading.Tasks;
-namespace NadekoBot.Modules.Administration.Commands
+namespace WizBot.Modules.Administration.Commands
{
internal class SelfAssignedRolesCommand : DiscordCommand
{
@@ -120,8 +121,15 @@ internal override void Init(CommandGroupBuilder cgb)
await e.Channel.SendMessage($":anger:You already have {role.Name} role.").ConfigureAwait(false);
return;
}
- await e.User.AddRoles(role).ConfigureAwait(false);
- await e.Channel.SendMessage($":ok:You now have {role.Name} role.").ConfigureAwait(false);
+ await e.User.AddRoles(role).ConfigureAwait(false);
+ var msg = await e.Channel.SendMessage($":ok:You now have {role.Name} role.").ConfigureAwait(false);
+ await Task.Delay(3000);
+ await msg.Delete();
+ try
+ {
+ await e.Message.Delete();
+ }
+ catch { }
});
cgb.CreateCommand(".iamn")
diff --git a/NadekoBot/Modules/Administration/Commands/ServerGreetCommand.cs b/WizBot/Modules/Administration/Commands/ServerGreetCommand.cs
similarity index 68%
rename from NadekoBot/Modules/Administration/Commands/ServerGreetCommand.cs
rename to WizBot/Modules/Administration/Commands/ServerGreetCommand.cs
index de915b73f..fe7449dd6 100644
--- a/NadekoBot/Modules/Administration/Commands/ServerGreetCommand.cs
+++ b/WizBot/Modules/Administration/Commands/ServerGreetCommand.cs
@@ -1,6 +1,6 @@
using Discord;
using Discord.Commands;
-using NadekoBot.Classes;
+using WizBot.Classes;
using System.Collections.Concurrent;
using System.Linq;
using System.Threading.Tasks;
@@ -10,15 +10,13 @@ public class AsyncLazy : Lazy>
{
public AsyncLazy(Func valueFactory) :
base(() => Task.Factory.StartNew(valueFactory)) { }
-
public AsyncLazy(Func> taskFactory) :
base(() => Task.Factory.StartNew(() => taskFactory()).Unwrap()) { }
-
public TaskAwaiter GetAwaiter() { return Value.GetAwaiter(); }
}
*/
-namespace NadekoBot.Modules.Administration.Commands
+namespace WizBot.Modules.Administration.Commands
{
internal class ServerGreetCommand : DiscordCommand
{
@@ -31,8 +29,8 @@ public ServerGreetCommand(DiscordModule module) : base(module)
{
AnnouncementsDictionary = new ConcurrentDictionary();
- NadekoBot.Client.UserJoined += UserJoined;
- NadekoBot.Client.UserLeft += UserLeft;
+ WizBot.Client.UserJoined += UserJoined;
+ WizBot.Client.UserLeft += UserLeft;
var data = Classes.DbHandler.Instance.GetAllRows();
@@ -49,7 +47,7 @@ private async void UserLeft(object sender, UserEventArgs e)
!AnnouncementsDictionary[e.Server.Id].Bye) return;
var controls = AnnouncementsDictionary[e.Server.Id];
- var channel = NadekoBot.Client.GetChannel(controls.ByeChannel);
+ var channel = WizBot.Client.GetChannel(controls.ByeChannel);
var msg = controls.ByeText.Replace("%user%", "**" + e.User.Name + "**").Trim();
if (string.IsNullOrEmpty(msg))
return;
@@ -69,9 +67,9 @@ private async void UserLeft(object sender, UserEventArgs e)
if (channel == null) return;
Greeted++;
var toDelete = await channel.SendMessage(msg).ConfigureAwait(false);
- if (e.Server.CurrentUser.GetPermissions(channel).ManageMessages)
+ if (e.Server.CurrentUser.GetPermissions(channel).ManageMessages && controls.DeleteGreetMessages)
{
- await Task.Delay(300000).ConfigureAwait(false); // 5 minutes
+ await Task.Delay(30000).ConfigureAwait(false); // 5 minutes
await toDelete.Delete().ConfigureAwait(false);
}
}
@@ -87,7 +85,7 @@ private async void UserJoined(object sender, Discord.UserEventArgs e)
!AnnouncementsDictionary[e.Server.Id].Greet) return;
var controls = AnnouncementsDictionary[e.Server.Id];
- var channel = NadekoBot.Client.GetChannel(controls.GreetChannel);
+ var channel = WizBot.Client.GetChannel(controls.GreetChannel);
var msg = controls.GreetText.Replace("%user%", e.User.Mention).Trim();
if (string.IsNullOrEmpty(msg))
@@ -102,9 +100,9 @@ private async void UserJoined(object sender, Discord.UserEventArgs e)
if (channel == null) return;
Greeted++;
var toDelete = await channel.SendMessage(msg).ConfigureAwait(false);
- if (e.Server.CurrentUser.GetPermissions(channel).ManageMessages)
+ if (e.Server.CurrentUser.GetPermissions(channel).ManageMessages && controls.DeleteGreetMessages)
{
- await Task.Delay(300000).ConfigureAwait(false); // 5 minutes
+ await Task.Delay(30000).ConfigureAwait(false); // 5 minutes
await toDelete.Delete().ConfigureAwait(false);
}
}
@@ -116,50 +114,71 @@ public class AnnounceControls
{
private DataModels.Announcement _model { get; }
- public bool Greet {
+ public bool Greet
+ {
get { return _model.Greet; }
set { _model.Greet = value; Save(); }
}
- public ulong GreetChannel {
+ public ulong GreetChannel
+ {
get { return (ulong)_model.GreetChannelId; }
set { _model.GreetChannelId = (long)value; Save(); }
}
- public bool GreetPM {
+ public bool GreetPM
+ {
get { return _model.GreetPM; }
set { _model.GreetPM = value; Save(); }
}
- public bool ByePM {
+ public bool ByePM
+ {
get { return _model.ByePM; }
set { _model.ByePM = value; Save(); }
}
- public string GreetText {
+ public string GreetText
+ {
get { return _model.GreetText; }
set { _model.GreetText = value; Save(); }
}
- public bool Bye {
+ public bool Bye
+ {
get { return _model.Bye; }
set { _model.Bye = value; Save(); }
}
- public ulong ByeChannel {
+ public ulong ByeChannel
+ {
get { return (ulong)_model.ByeChannelId; }
set { _model.ByeChannelId = (long)value; Save(); }
}
- public string ByeText {
+ public string ByeText
+ {
get { return _model.ByeText; }
set { _model.ByeText = value; Save(); }
}
- public ulong ServerId {
+ public ulong ServerId
+ {
get { return (ulong)_model.ServerId; }
set { _model.ServerId = (long)value; }
}
+ public bool DeleteGreetMessages
+ {
+ get
+ {
+ return _model.DeleteGreetMessages;
+ }
+ set
+ {
+ _model.DeleteGreetMessages = value; Save();
+ }
+ }
+
public AnnounceControls(DataModels.Announcement model)
{
this._model = model;
@@ -196,6 +215,8 @@ internal bool ToggleGreet(ulong id)
return Greet = true;
}
}
+
+ internal bool ToggleDelete() => DeleteGreetMessages = !DeleteGreetMessages;
internal bool ToggleGreetPM() => GreetPM = !GreetPM;
internal bool ToggleByePM() => ByePM = !ByePM;
@@ -207,68 +228,80 @@ private void Save()
internal override void Init(CommandGroupBuilder cgb)
{
+ cgb.CreateCommand(Module.Prefix + "grdel")
+ .Description("Toggles automatic deletion of greet and bye messages.")
+ .Do(async e =>
+ {
+ if (!e.User.ServerPermissions.ManageServer) return;
+ var ann = AnnouncementsDictionary.GetOrAdd(e.Server.Id, new AnnounceControls(e.Server.Id));
+
+ if (ann.ToggleDelete())
+ await e.Channel.SendMessage("`Automatic deletion of greet and bye messages has been enabled.`").ConfigureAwait(false);
+ else
+ await e.Channel.SendMessage("`Automatic deletion of greet and bye messages has been disabled.`").ConfigureAwait(false);
+ });
cgb.CreateCommand(Module.Prefix + "greet")
- .Description("Enables or Disables anouncements on the current channel when someone joins the server.")
+ .Description("Toggles announcements on the current channel when someone joins the server.")
.Do(async e =>
{
if (!e.User.ServerPermissions.ManageServer) return;
- if (!AnnouncementsDictionary.ContainsKey(e.Server.Id))
- AnnouncementsDictionary.TryAdd(e.Server.Id, new AnnounceControls(e.Server.Id));
-
- var controls = AnnouncementsDictionary[e.Server.Id];
+ var ann = AnnouncementsDictionary.GetOrAdd(e.Server.Id, new AnnounceControls(e.Server.Id));
- if (controls.ToggleGreet(e.Channel.Id))
+ if (ann.ToggleGreet(e.Channel.Id))
await e.Channel.SendMessage("Greet announcements enabled on this channel.").ConfigureAwait(false);
else
await e.Channel.SendMessage("Greet announcements disabled.").ConfigureAwait(false);
});
cgb.CreateCommand(Module.Prefix + "greetmsg")
- .Description("Sets a new announce message. Type %user% if you want to mention the new member.\n**Usage**: .greetmsg Welcome to the server, %user%.")
+ .Description("Sets a new join announcement message. Type %user% if you want to mention the new member. Using it with no message will show the current greet message.\n**Usage**: .greetmsg Welcome to the server, %user%.")
.Parameter("msg", ParameterType.Unparsed)
.Do(async e =>
{
if (!e.User.ServerPermissions.ManageServer) return;
- if (e.GetArg("msg") == null) return;
- if (!AnnouncementsDictionary.ContainsKey(e.Server.Id))
- AnnouncementsDictionary.TryAdd(e.Server.Id, new AnnounceControls(e.Server.Id));
-
- AnnouncementsDictionary[e.Server.Id].GreetText = e.GetArg("msg");
+ var ann = AnnouncementsDictionary.GetOrAdd(e.Server.Id, new AnnounceControls(e.Server.Id));
+ if (string.IsNullOrWhiteSpace(e.GetArg("msg")))
+ {
+ await e.Channel.SendMessage("`Current greet message:` " + ann.GreetText);
+ return;
+ }
+
+ ann.GreetText = e.GetArg("msg");
await e.Channel.SendMessage("New greet message set.").ConfigureAwait(false);
- if (!AnnouncementsDictionary[e.Server.Id].Greet)
+ if (!ann.Greet)
await e.Channel.SendMessage("Enable greet messsages by typing `.greet`").ConfigureAwait(false);
});
cgb.CreateCommand(Module.Prefix + "bye")
- .Description("Enables or Disables anouncements on the current channel when someone leaves the server.")
+ .Description("Toggles anouncements on the current channel when someone leaves the server.")
.Do(async e =>
{
if (!e.User.ServerPermissions.ManageServer) return;
- if (!AnnouncementsDictionary.ContainsKey(e.Server.Id))
- AnnouncementsDictionary.TryAdd(e.Server.Id, new AnnounceControls(e.Server.Id));
-
- var controls = AnnouncementsDictionary[e.Server.Id];
+ var ann = AnnouncementsDictionary.GetOrAdd(e.Server.Id, new AnnounceControls(e.Server.Id));
- if (controls.ToggleBye(e.Channel.Id))
+ if (ann.ToggleBye(e.Channel.Id))
await e.Channel.SendMessage("Bye announcements enabled on this channel.").ConfigureAwait(false);
else
await e.Channel.SendMessage("Bye announcements disabled.").ConfigureAwait(false);
});
cgb.CreateCommand(Module.Prefix + "byemsg")
- .Description("Sets a new announce leave message. Type %user% if you want to mention the new member.\n**Usage**: .byemsg %user% has left the server.")
+ .Description("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.\n**Usage**: .byemsg %user% has left the server.")
.Parameter("msg", ParameterType.Unparsed)
.Do(async e =>
{
if (!e.User.ServerPermissions.ManageServer) return;
- if (e.GetArg("msg") == null) return;
- if (!AnnouncementsDictionary.ContainsKey(e.Server.Id))
- AnnouncementsDictionary.TryAdd(e.Server.Id, new AnnounceControls(e.Server.Id));
-
- AnnouncementsDictionary[e.Server.Id].ByeText = e.GetArg("msg");
+ var ann = AnnouncementsDictionary.GetOrAdd(e.Server.Id, new AnnounceControls(e.Server.Id));
+ if (string.IsNullOrWhiteSpace(e.GetArg("msg")))
+ {
+ await e.Channel.SendMessage("`Current bye message:` " + ann.ByeText);
+ return;
+ }
+
+ ann.ByeText = e.GetArg("msg");
await e.Channel.SendMessage("New bye message set.").ConfigureAwait(false);
- if (!AnnouncementsDictionary[e.Server.Id].Bye)
+ if (!ann.Bye)
await e.Channel.SendMessage("Enable bye messsages by typing `.bye`.").ConfigureAwait(false);
});
@@ -277,15 +310,14 @@ internal override void Init(CommandGroupBuilder cgb)
.Do(async e =>
{
if (!e.User.ServerPermissions.ManageServer) return;
- if (!AnnouncementsDictionary.ContainsKey(e.Server.Id))
- AnnouncementsDictionary.TryAdd(e.Server.Id, new AnnounceControls(e.Server.Id));
+ var ann = AnnouncementsDictionary.GetOrAdd(e.Server.Id, new AnnounceControls(e.Server.Id));
+
- AnnouncementsDictionary[e.Server.Id].ToggleByePM();
- if (AnnouncementsDictionary[e.Server.Id].ByePM)
+ if (ann.ToggleByePM())
await e.Channel.SendMessage("Bye messages will be sent in a PM from now on.\n ⚠ Keep in mind this might fail if the user and the bot have no common servers after the user leaves.").ConfigureAwait(false);
else
await e.Channel.SendMessage("Bye messages will be sent in a bound channel from now on.").ConfigureAwait(false);
- if (!AnnouncementsDictionary[e.Server.Id].Bye)
+ if (!ann.Bye)
await e.Channel.SendMessage("Enable bye messsages by typing `.bye`, and set the bye message using `.byemsg`").ConfigureAwait(false);
});
@@ -294,17 +326,16 @@ internal override void Init(CommandGroupBuilder cgb)
.Do(async e =>
{
if (!e.User.ServerPermissions.ManageServer) return;
- if (!AnnouncementsDictionary.ContainsKey(e.Server.Id))
- AnnouncementsDictionary.TryAdd(e.Server.Id, new AnnounceControls(e.Server.Id));
- AnnouncementsDictionary[e.Server.Id].ToggleGreetPM();
- if (AnnouncementsDictionary[e.Server.Id].GreetPM)
+ var ann = AnnouncementsDictionary.GetOrAdd(e.Server.Id, new AnnounceControls(e.Server.Id));
+
+ if (ann.ToggleGreetPM())
await e.Channel.SendMessage("Greet messages will be sent in a PM from now on.").ConfigureAwait(false);
else
await e.Channel.SendMessage("Greet messages will be sent in a bound channel from now on.").ConfigureAwait(false);
- if (!AnnouncementsDictionary[e.Server.Id].Greet)
+ if (!ann.Greet)
await e.Channel.SendMessage("Enable greet messsages by typing `.greet`, and set the greet message using `.greetmsg`").ConfigureAwait(false);
});
}
}
-}
+}
\ No newline at end of file
diff --git a/NadekoBot/Modules/Administration/Commands/VoiceNotificationCommand.cs b/WizBot/Modules/Administration/Commands/VoiceNotificationCommand.cs
similarity index 95%
rename from NadekoBot/Modules/Administration/Commands/VoiceNotificationCommand.cs
rename to WizBot/Modules/Administration/Commands/VoiceNotificationCommand.cs
index b17fd1a98..421bc4ae5 100644
--- a/NadekoBot/Modules/Administration/Commands/VoiceNotificationCommand.cs
+++ b/WizBot/Modules/Administration/Commands/VoiceNotificationCommand.cs
@@ -1,12 +1,12 @@
using Discord;
using Discord.Commands;
-using NadekoBot.Classes;
+using WizBot.Classes;
using System;
using System.Collections.Concurrent;
using System.Linq;
using System.Threading.Tasks;
-namespace NadekoBot.Modules.Administration.Commands
+namespace WizBot.Modules.Administration.Commands
{
internal class VoiceNotificationCommand : DiscordCommand
{
diff --git a/NadekoBot/Modules/Administration/Commands/VoicePlusTextCommand.cs b/WizBot/Modules/Administration/Commands/VoicePlusTextCommand.cs
similarity index 75%
rename from NadekoBot/Modules/Administration/Commands/VoicePlusTextCommand.cs
rename to WizBot/Modules/Administration/Commands/VoicePlusTextCommand.cs
index a1e1df949..be245aa88 100644
--- a/NadekoBot/Modules/Administration/Commands/VoicePlusTextCommand.cs
+++ b/WizBot/Modules/Administration/Commands/VoicePlusTextCommand.cs
@@ -1,20 +1,23 @@
using Discord;
using Discord.Commands;
-using NadekoBot.Classes;
-using NadekoBot.Modules.Permissions.Classes;
+using WizBot.Classes;
+using WizBot.Extensions;
+using WizBot.Modules.Permissions.Classes;
using System;
using System.Linq;
+using System.Text.RegularExpressions;
+using System.Threading.Tasks;
using ChPermOverride = Discord.ChannelPermissionOverrides;
-namespace NadekoBot.Modules.Administration.Commands
+namespace WizBot.Modules.Administration.Commands
{
internal class VoicePlusTextCommand : DiscordCommand
{
-
+ Regex channelNameRegex = new Regex(@"[^a-zA-Z0-9 -]", RegexOptions.Compiled);
public VoicePlusTextCommand(DiscordModule module) : base(module)
{
// changing servers may cause bugs
- NadekoBot.Client.UserUpdated += async (sender, e) =>
+ WizBot.Client.UserUpdated += async (sender, e) =>
{
try
{
@@ -24,7 +27,7 @@ public VoicePlusTextCommand(DiscordModule module) : base(module)
if (e.Before.VoiceChannel == e.After.VoiceChannel) return;
if (!config.VoicePlusTextEnabled)
return;
- var serverPerms = e.Server.GetUser(NadekoBot.Client.CurrentUser.Id)?.ServerPermissions;
+ var serverPerms = e.Server.GetUser(WizBot.Client.CurrentUser.Id)?.ServerPermissions;
if (serverPerms == null)
return;
if (!serverPerms.Value.ManageChannels || !serverPerms.Value.ManageRoles)
@@ -79,10 +82,41 @@ await textChannel.AddPermissionsRule(e.After,
}
private string GetChannelName(string voiceName) =>
- voiceName.Replace(" ", "-").Trim() + "-voice";
+ channelNameRegex.Replace(voiceName, "").Trim().Replace(" ", "-").TrimTo(90, true) + "-voice";
internal override void Init(CommandGroupBuilder cgb)
{
+ cgb.CreateCommand(Module.Prefix + "cleanv+t")
+ .Description("Deletes all text channels ending in `-voice` for which voicechannels are not found. **Use at your own risk.**")
+ .AddCheck(SimpleCheckers.CanManageRoles)
+ .AddCheck(SimpleCheckers.ManageChannels())
+ .Do(async e =>
+ {
+ if (!e.Server.CurrentUser.ServerPermissions.ManageChannels)
+ {
+ await e.Channel.SendMessage("`I have insufficient permission to do that.`");
+ return;
+ }
+
+ var allTxtChannels = e.Server.TextChannels.Where(c => c.Name.EndsWith("-voice"));
+ var validTxtChannelNames = e.Server.VoiceChannels.Select(c => GetChannelName(c.Name));
+
+ var invalidTxtChannels = allTxtChannels.Where(c => !validTxtChannelNames.Contains(c.Name));
+
+ foreach (var c in invalidTxtChannels)
+ {
+ try
+ {
+ await c.Delete();
+ }
+ catch { }
+ await Task.Delay(500);
+ }
+
+ await e.Channel.SendMessage("`Done.`");
+ });
+
+
cgb.CreateCommand(Module.Prefix + "v+t")
.Alias(Module.Prefix + "voice+text")
.Description("Creates a text channel for each voice channel only users in that voice channel can see." +
diff --git a/NadekoBot/Modules/ClashOfClans/ClashOfClans.cs b/WizBot/Modules/ClashOfClans/ClashOfClans.cs
similarity index 99%
rename from NadekoBot/Modules/ClashOfClans/ClashOfClans.cs
rename to WizBot/Modules/ClashOfClans/ClashOfClans.cs
index 851689715..74ea9089b 100644
--- a/NadekoBot/Modules/ClashOfClans/ClashOfClans.cs
+++ b/WizBot/Modules/ClashOfClans/ClashOfClans.cs
@@ -5,7 +5,7 @@
using System.Threading;
using System.Threading.Tasks;
-namespace NadekoBot.Classes.ClashOfClans
+namespace WizBot.Classes.ClashOfClans
{
internal class Caller
{
diff --git a/NadekoBot/Modules/ClashOfClans/ClashOfClansModule.cs b/WizBot/Modules/ClashOfClans/ClashOfClansModule.cs
similarity index 98%
rename from NadekoBot/Modules/ClashOfClans/ClashOfClansModule.cs
rename to WizBot/Modules/ClashOfClans/ClashOfClansModule.cs
index 026d2eca5..1731a7299 100644
--- a/NadekoBot/Modules/ClashOfClans/ClashOfClansModule.cs
+++ b/WizBot/Modules/ClashOfClans/ClashOfClansModule.cs
@@ -1,16 +1,16 @@
using Discord.Commands;
using Discord.Modules;
-using NadekoBot.Classes.ClashOfClans;
+using WizBot.Classes.ClashOfClans;
using System;
using System.Collections.Concurrent;
using System.Collections.Generic;
using System.Text;
-namespace NadekoBot.Modules.ClashOfClans
+namespace WizBot.Modules.ClashOfClans
{
internal class ClashOfClansModule : DiscordModule
{
- public override string Prefix { get; } = NadekoBot.Config.CommandPrefixes.ClashOfClans;
+ public override string Prefix { get; } = WizBot.Config.CommandPrefixes.ClashOfClans;
public static ConcurrentDictionary> ClashWars { get; } = new ConcurrentDictionary>();
diff --git a/NadekoBot/Modules/Conversations/Commands/CopyCommand.cs b/WizBot/Modules/Conversations/Commands/CopyCommand.cs
similarity index 81%
rename from NadekoBot/Modules/Conversations/Commands/CopyCommand.cs
rename to WizBot/Modules/Conversations/Commands/CopyCommand.cs
index 48ef01f4d..0a1efda9f 100644
--- a/NadekoBot/Modules/Conversations/Commands/CopyCommand.cs
+++ b/WizBot/Modules/Conversations/Commands/CopyCommand.cs
@@ -1,10 +1,10 @@
using Discord.Commands;
-using NadekoBot.Modules;
+using WizBot.Modules;
using System;
using System.Collections.Generic;
using System.Threading.Tasks;
-namespace NadekoBot.Classes.Conversations.Commands
+namespace WizBot.Classes.Conversations.Commands
{
internal class CopyCommand : DiscordCommand
{
@@ -12,12 +12,12 @@ internal class CopyCommand : DiscordCommand
public CopyCommand(DiscordModule module) : base(module)
{
- NadekoBot.Client.MessageReceived += Client_MessageReceived;
+ WizBot.Client.MessageReceived += Client_MessageReceived;
}
private async void Client_MessageReceived(object sender, Discord.MessageEventArgs e)
{
- if (e.User.Id == NadekoBot.Client.CurrentUser.Id) return;
+ if (e.User.Id == WizBot.Client.CurrentUser.Id) return;
try
{
if (string.IsNullOrWhiteSpace(e.Message.Text))
@@ -42,12 +42,12 @@ internal override void Init(CommandGroupBuilder cgb)
{
cgb.CreateCommand("copyme")
.Alias("cm")
- .Description("Nadeko starts copying everything you say. Disable with cs")
+ .Description("Wiz Bot starts copying everything you say. Disable with cs")
.Do(DoFunc());
cgb.CreateCommand("cs")
.Alias("copystop")
- .Description("Nadeko stops copying you")
+ .Description("Wiz Bot stops copying you")
.Do(StopCopy());
}
diff --git a/NadekoBot/Modules/Conversations/Commands/RequestsCommand.cs b/WizBot/Modules/Conversations/Commands/RequestsCommand.cs
similarity index 57%
rename from NadekoBot/Modules/Conversations/Commands/RequestsCommand.cs
rename to WizBot/Modules/Conversations/Commands/RequestsCommand.cs
index dfaa49193..a92bff20a 100644
--- a/NadekoBot/Modules/Conversations/Commands/RequestsCommand.cs
+++ b/WizBot/Modules/Conversations/Commands/RequestsCommand.cs
@@ -1,10 +1,11 @@
using Discord.Commands;
-using NadekoBot.Extensions;
-using NadekoBot.Modules;
+using WizBot.Extensions;
+using WizBot.Modules;
+using WizBot.Modules.Permissions.Classes;
using System;
using System.Threading.Tasks;
-namespace NadekoBot.Classes.Conversations.Commands
+namespace WizBot.Classes.Conversations.Commands
{
internal class RequestsCommand : DiscordCommand
{
@@ -25,13 +26,13 @@ public string GetRequests()
{
var task = DbHandler.Instance.GetAllRows();
- var str = "Here are all current requests for NadekoBot:\n\n";
+ var str = "Here are all current requests for WizBot:\n\n";
foreach (var reqObj in task)
{
str += $"{reqObj.Id}. by **{reqObj.UserName}** from **{reqObj.ServerName}** at {reqObj.DateAdded.ToLocalTime()}\n" +
$"**{reqObj.RequestText}**\n----------\n";
}
- return str + "\n__Type [@NadekoBot clr] to clear all of my messages.__";
+ return str + "\n__Type [@WizBot clr] to clear all of my messages.__";
}
public bool DeleteRequest(int requestNumber) =>
@@ -49,7 +50,7 @@ internal override void Init(CommandGroupBuilder cgb)
cgb.CreateCommand("req")
.Alias("request")
- .Description("Requests a feature for nadeko.\n**Usage**: @NadekoBot req new_feature")
+ .Description("Requests a feature for WizBot.\n**Usage**: @WizBot req new_feature")
.Parameter("all", ParameterType.Unparsed)
.Do(async e =>
{
@@ -68,7 +69,7 @@ internal override void Init(CommandGroupBuilder cgb)
});
cgb.CreateCommand("lr")
- .Description("PMs the user all current nadeko requests.")
+ .Description("PMs the user all current WizBot requests.")
.Do(async e =>
{
var str = await Task.Run(() => GetRequests()).ConfigureAwait(false);
@@ -79,60 +80,54 @@ internal override void Init(CommandGroupBuilder cgb)
});
cgb.CreateCommand("dr")
- .Description("Deletes a request. Only owner is able to do this.")
+ .Description("Deletes a request. **Owner Only!**")
.Parameter("reqNumber", ParameterType.Required)
+ .AddCheck(SimpleCheckers.OwnerOnly())
.Do(async e =>
{
- if (NadekoBot.IsOwner(e.User.Id))
+ try
{
- try
+ if (DeleteRequest(int.Parse(e.Args[0])))
{
- if (DeleteRequest(int.Parse(e.Args[0])))
- {
- await e.Channel.SendMessage(e.User.Mention + " Request deleted.").ConfigureAwait(false);
- }
- else
- {
- await e.Channel.SendMessage("No request on that number.").ConfigureAwait(false);
- }
+ await e.Channel.SendMessage(e.User.Mention + " Request deleted.").ConfigureAwait(false);
}
- catch
+ else
{
- await e.Channel.SendMessage("Error deleting request, probably NaN error.").ConfigureAwait(false);
+ await e.Channel.SendMessage("No request on that number.").ConfigureAwait(false);
}
}
- else await e.Channel.SendMessage("You don't have permission to do that.").ConfigureAwait(false);
+ catch
+ {
+ await e.Channel.SendMessage("Error deleting request, probably NaN error.").ConfigureAwait(false);
+ }
});
cgb.CreateCommand("rr")
- .Description("Resolves a request. Only owner is able to do this.")
+ .Description("Resolves a request. **Owner Only!**")
.Parameter("reqNumber", ParameterType.Required)
+ .AddCheck(SimpleCheckers.OwnerOnly())
.Do(async e =>
{
- if (NadekoBot.IsOwner(e.User.Id))
+ try
{
- try
+ var sc = ResolveRequest(int.Parse(e.Args[0]));
+ if (sc != null)
{
- var sc = ResolveRequest(int.Parse(e.Args[0]));
- if (sc != null)
- {
- await e.Channel.SendMessage(e.User.Mention + " Request resolved, notice sent.").ConfigureAwait(false);
- await NadekoBot.Client.GetServer((ulong)sc.ServerId).GetUser((ulong)sc.UserId).Send("**This request of yours has been resolved:**\n" + sc.RequestText).ConfigureAwait(false);
- }
- else
- {
- await e.Channel.SendMessage("No request on that number.").ConfigureAwait(false);
- }
+ await e.Channel.SendMessage(e.User.Mention + " Request resolved, notice sent.").ConfigureAwait(false);
+ await WizBot.Client.GetServer((ulong)sc.ServerId).GetUser((ulong)sc.UserId).Send("**This request of yours has been resolved:**\n" + sc.RequestText).ConfigureAwait(false);
}
- catch
+ else
{
- await e.Channel.SendMessage("Error resolving request, probably NaN error.").ConfigureAwait(false);
+ await e.Channel.SendMessage("No request on that number.").ConfigureAwait(false);
}
}
- else await e.Channel.SendMessage("You don't have permission to do that.").ConfigureAwait(false);
+ catch
+ {
+ await e.Channel.SendMessage("Error resolving request, probably NaN error.").ConfigureAwait(false);
+ }
});
}
public RequestsCommand(DiscordModule module) : base(module) { }
}
-}
+}
\ No newline at end of file
diff --git a/NadekoBot/Modules/Conversations/Conversations.cs b/WizBot/Modules/Conversations/Conversations.cs
similarity index 53%
rename from NadekoBot/Modules/Conversations/Conversations.cs
rename to WizBot/Modules/Conversations/Conversations.cs
index f01b2ac65..6b2123b9e 100644
--- a/NadekoBot/Modules/Conversations/Conversations.cs
+++ b/WizBot/Modules/Conversations/Conversations.cs
@@ -1,10 +1,11 @@
using Discord;
using Discord.Commands;
using Discord.Modules;
-using NadekoBot.Classes.Conversations.Commands;
-using NadekoBot.Extensions;
-using NadekoBot.Modules.Permissions.Classes;
-using NadekoBot.Properties;
+using WizBot.Classes.Conversations.Commands;
+using WizBot.DataModels;
+using WizBot.Extensions;
+using WizBot.Modules.Permissions.Classes;
+using WizBot.Properties;
using System;
using System.Diagnostics;
using System.Drawing;
@@ -13,7 +14,7 @@
using System.Linq;
using System.Threading.Tasks;
-namespace NadekoBot.Modules.Conversations
+namespace WizBot.Modules.Conversations
{
internal class Conversations : DiscordModule
{
@@ -24,7 +25,7 @@ public Conversations()
commands.Add(new RequestsCommand(this));
}
- public override string Prefix { get; } = String.Format(NadekoBot.Config.CommandPrefixes.Conversations, NadekoBot.Creds.BotId);
+ public override string Prefix { get; } = String.Format(WizBot.Config.CommandPrefixes.Conversations, WizBot.Creds.BotId);
public override void Install(ModuleManager manager)
{
@@ -34,47 +35,6 @@ public override void Install(ModuleManager manager)
{
cgb.AddCheck(PermissionChecker.Instance);
- cgb.CreateCommand("e")
- .Description("You did it. Or someone else!")
- .Parameter("other", ParameterType.Unparsed)
- .Do(async e =>
- {
- var other = e.GetArg("other");
- if (string.IsNullOrWhiteSpace(other))
- await e.Channel.SendMessage($"{e.User.Name} did it. 😒 🔫").ConfigureAwait(false);
- else
- await e.Channel.SendMessage($"{other} did it. 😒 🔫").ConfigureAwait(false);
- });
-
- cgb.CreateCommand("comeatmebro")
- .Description("Come at me bro (ง’̀-‘́)ง \n**Usage**: comeatmebro {target}")
- .Parameter("target", ParameterType.Optional)
- .Do(async e =>
- {
- var usr = e.Server.FindUsers(e.GetArg("target")).FirstOrDefault();
- if (usr == null)
- {
- await e.Channel.SendMessage("(ง’̀-‘́)ง").ConfigureAwait(false);
- return;
- }
- await e.Channel.SendMessage($"{usr.Mention} (ง’̀-‘́)ง").ConfigureAwait(false);
- });
-
-
- cgb.CreateCommand("\\o\\")
- .Description("Nadeko replies with /o/")
- .Do(async e => await e.Channel.SendMessage(e.User.Mention + "/o/").ConfigureAwait(false));
-
- cgb.CreateCommand("/o/")
- .Description("Nadeko replies with \\o\\")
- .Do(async e => await e.Channel.SendMessage(e.User.Mention + "\\o\\").ConfigureAwait(false));
-
- cgb.CreateCommand("moveto")
- .Description("Suggests moving the conversation.\n**Usage**: moveto #spam")
- .Parameter("target", ParameterType.Unparsed)
- .Do(async e => await e.Channel.SendMessage($"(👉 ͡° ͜ʖ ͡°)👉 {e.GetArg("target")}"));
-
-
cgb.CreateCommand("..")
.Description("Adds a new quote with the specified name (single word) and message (no limit).\n**Usage**: .. abc My message")
.Parameter("keyword", ParameterType.Required)
@@ -114,9 +74,29 @@ await Task.Run(() =>
else
await e.Channel.SendMessage("💢`No quote found.`").ConfigureAwait(false);
});
+
+ cgb.CreateCommand("..qdel")
+ .Alias("..quotedelete")
+ .Description("Deletes all quotes with the specified keyword. You have to either be bot owner or the creator of the quote to delete it.\n**Usage**: `..qdel abc`")
+ .Parameter("quote", ParameterType.Required)
+ .Do(async e =>
+ {
+ var text = e.GetArg("quote")?.Trim();
+ if (string.IsNullOrWhiteSpace(text))
+ return;
+ await Task.Run(() =>
+ {
+ if (WizBot.IsOwner(e.User.Id))
+ Classes.DbHandler.Instance.DeleteWhere(uq => uq.Keyword == text);
+ else
+ Classes.DbHandler.Instance.DeleteWhere(uq => uq.Keyword == text && uq.UserName == e.User.Name);
+ }).ConfigureAwait(false);
+
+ await e.Channel.SendMessage("`Done.`").ConfigureAwait(false);
+ });
});
- manager.CreateCommands(NadekoBot.BotMention, cgb =>
+ manager.CreateCommands(WizBot.BotMention, cgb =>
{
var client = manager.Client;
@@ -125,7 +105,7 @@ await Task.Run(() =>
commands.ForEach(cmd => cmd.Init(cgb));
cgb.CreateCommand("uptime")
- .Description("Shows how long Nadeko has been running for.")
+ .Description("Shows how long WizBot has been running for.")
.Do(async e =>
{
var time = (DateTime.Now - Process.GetCurrentProcess().StartTime);
@@ -137,7 +117,7 @@ await Task.Run(() =>
.Description("Works only for the owner. Shuts the bot down.")
.Do(async e =>
{
- if (NadekoBot.IsOwner(e.User.Id))
+ if (WizBot.IsOwner(e.User.Id))
{
await e.Channel.SendMessage(e.User.Mention + ", Yes, my love.").ConfigureAwait(false);
await Task.Delay(5000).ConfigureAwait(false);
@@ -154,7 +134,7 @@ await Task.Run(() =>
.Description("Replies with positive answer only to the bot owner.")
.Do(async e =>
{
- if (NadekoBot.IsOwner(e.User.Id))
+ if (WizBot.IsOwner(e.User.Id))
await e.Channel.SendMessage(e.User.Mention + ", Of course I do, my Master.").ConfigureAwait(false);
else
await e.Channel.SendMessage(e.User.Mention + ", Don't be silly.").ConfigureAwait(false);
@@ -165,12 +145,12 @@ await Task.Run(() =>
.Description("Replies positive only if bot owner is online.")
.Do(async e =>
{
- if (NadekoBot.IsOwner(e.User.Id))
+ if (WizBot.IsOwner(e.User.Id))
{
await e.Channel.SendMessage(e.User.Mention + " I am great as long as you are here.").ConfigureAwait(false);
return;
}
- var kw = e.Server.GetUser(NadekoBot.Creds.OwnerIds[0]);
+ var kw = e.Server.GetUser(WizBot.Creds.OwnerIds[0]);
if (kw != null && kw.Status == UserStatus.Online)
{
await e.Channel.SendMessage(e.User.Mention + " I am great as long as " + kw.Mention + " is with me.").ConfigureAwait(false);
@@ -181,125 +161,8 @@ await Task.Run(() =>
}
});
- cgb.CreateCommand("insult")
- .Parameter("mention", ParameterType.Required)
- .Description("Insults @X person.\n**Usage**: @NadekoBot insult @X.")
- .Do(async e =>
- {
- var u = e.Channel.FindUsers(e.GetArg("mention")).FirstOrDefault();
- if (u == null)
- {
- await e.Channel.SendMessage("Invalid user specified.").ConfigureAwait(false);
- return;
- }
-
- if (NadekoBot.IsOwner(u.Id))
- {
- await e.Channel.SendMessage("I would never insult my master <3").ConfigureAwait(false);
- return;
- }
- await e.Channel.SendMessage(u.Mention + NadekoBot.Locale.Insults[rng.Next(0, NadekoBot.Locale.Insults.Length)]).ConfigureAwait(false);
- });
-
- cgb.CreateCommand("praise")
- .Description("Praises @X person.\n**Usage**: @NadekoBot praise @X.")
- .Parameter("mention", ParameterType.Required)
- .Do(async e =>
- {
- var u = e.Channel.FindUsers(e.GetArg("mention")).FirstOrDefault();
-
- if (u == null)
- {
- await e.Channel.SendMessage("Invalid user specified.").ConfigureAwait(false);
- return;
- }
-
- if (NadekoBot.IsOwner(u.Id))
- {
- await e.Channel.SendMessage(e.User.Mention + " I don't need your permission to praise my beloved Master <3").ConfigureAwait(false);
- return;
- }
- await e.Channel.SendMessage(u.Mention + NadekoBot.Locale.Praises[rng.Next(0, NadekoBot.Locale.Praises.Length)]).ConfigureAwait(false);
- });
-
- cgb.CreateCommand("pat")
- .Description("Pat someone ^_^")
- .Parameter("user", ParameterType.Unparsed)
- .Do(async e =>
- {
- var userStr = e.GetArg("user");
- if (string.IsNullOrWhiteSpace(userStr) || !e.Message.MentionedUsers.Any()) return;
- var user = e.Server.FindUsers(userStr).FirstOrDefault();
- if (user == null)
- return;
- try
- {
- await e.Channel.SendMessage(
- $"{user.Mention} " +
- $"{NadekoBot.Config.PatResponses[rng.Next(0, NadekoBot.Config.PatResponses.Length)]}")
- .ConfigureAwait(false);
- }
- catch
- {
- await e.Channel.SendMessage("Error while handling PatResponses check your data/config.json").ConfigureAwait(false);
- }
- });
-
- cgb.CreateCommand("cry")
- .Description("Tell Nadeko to cry. You are a heartless monster if you use this command.")
- .Do(async e =>
- {
- try
- {
- await
- e.Channel.SendMessage(
- $"(•̥́ _•ૅ｡)\n{NadekoBot.Config.CryResponses[rng.Next(0, NadekoBot.Config.CryResponses.Length)]}")
- .ConfigureAwait(false);
- }
- catch
- {
- await e.Channel.SendMessage("Error while handling CryResponses check your data/config.json").ConfigureAwait(false);
- }
- });
-
- cgb.CreateCommand("disguise")
- .Description("Tell Nadeko to disguise herself.")
- .Do(async e =>
- {
- try
- {
- await
- e.Channel.SendMessage(
- $"{NadekoBot.Config.DisguiseResponses[rng.Next(0, NadekoBot.Config.DisguiseResponses.Length)]}")
- .ConfigureAwait(false);
- }
- catch
- {
- await e.Channel.SendMessage("Error while handling DisguiseResponses check your data/config.json")
- .ConfigureAwait(false);
- }
- });
-
- cgb.CreateCommand("are you real")
- .Description("Useless.")
- .Do(async e =>
- {
- await e.Channel.SendMessage(e.User.Mention + " I will be soon.").ConfigureAwait(false);
- });
-
- cgb.CreateCommand("are you there")
- .Description("Checks if Nadeko is operational.")
- .Alias("!", "?")
- .Do(SayYes());
-
- cgb.CreateCommand("draw")
- .Description("Nadeko instructs you to type $draw. Gambling functions start with $")
- .Do(async e =>
- {
- await e.Channel.SendMessage("Sorry, I don't gamble, type $draw for that function.").ConfigureAwait(false);
- });
cgb.CreateCommand("fire")
- .Description("Shows a unicode fire message. Optional parameter [x] tells her how many times to repeat the fire.\n**Usage**: @NadekoBot fire [x]")
+ .Description("Shows a unicode fire message. Optional parameter [x] tells her how many times to repeat the fire.\n**Usage**: @Wiz-Bot fire [x]")
.Parameter("times", ParameterType.Optional)
.Do(async e =>
{
@@ -322,7 +185,7 @@ await e.Channel.SendMessage(
});
cgb.CreateCommand("rip")
- .Description("Shows a grave image of someone with a start year\n**Usage**: @NadekoBot rip @Someone 2000")
+ .Description("Shows a grave image of someone with a start year\n**Usage**: @Wiz-Bot rip @Someone 2000")
.Parameter("user", ParameterType.Required)
.Parameter("year", ParameterType.Optional)
.Do(async e =>
@@ -338,7 +201,7 @@ await e.Channel.SendFile("ripzor_m8.png",
: e.GetArg("year")))
.ConfigureAwait(false);
});
- if (!NadekoBot.Config.DontJoinServers)
+ if (!WizBot.Config.DontJoinServers)
{
cgb.CreateCommand("j")
.Description("Joins a server using a code.")
@@ -363,77 +226,56 @@ await e.Channel.SendFile("ripzor_m8.png",
});
}
- cgb.CreateCommand("slm")
- .Description("Shows the message where you were last mentioned in this channel (checks last 10k messages)")
- .Do(async e =>
- {
-
- Message msg = null;
- var msgs = (await e.Channel.DownloadMessages(100).ConfigureAwait(false))
- .Where(m => m.MentionedUsers.Contains(e.User))
- .OrderByDescending(m => m.Timestamp);
- if (msgs.Any())
- msg = msgs.First();
- else
+ cgb.CreateCommand("slm")
+ .Description("Shows the message where you were last mentioned in this channel (checks last 10k messages)")
+ .Do(async e =>
{
- var attempt = 0;
- Message lastMessage = null;
- while (msg == null && attempt++ < 5)
+
+ Message msg = null;
+ var msgs = (await e.Channel.DownloadMessages(100).ConfigureAwait(false))
+ .Where(m => m.MentionedUsers.Contains(e.User))
+ .OrderByDescending(m => m.Timestamp);
+ if (msgs.Any())
+ msg = msgs.First();
+ else
{
- var msgsarr = await e.Channel.DownloadMessages(100, lastMessage?.Id).ConfigureAwait(false);
- msg = msgsarr
- .Where(m => m.MentionedUsers.Contains(e.User))
- .OrderByDescending(m => m.Timestamp)
- .FirstOrDefault();
- lastMessage = msgsarr.OrderBy(m => m.Timestamp).First();
+ var attempt = 0;
+ Message lastMessage = null;
+ while (msg == null && attempt++ < 5)
+ {
+ var msgsarr = await e.Channel.DownloadMessages(100, lastMessage?.Id).ConfigureAwait(false);
+ msg = msgsarr
+ .Where(m => m.MentionedUsers.Contains(e.User))
+ .OrderByDescending(m => m.Timestamp)
+ .FirstOrDefault();
+ lastMessage = msgsarr.OrderBy(m => m.Timestamp).First();
+ }
}
- }
- if (msg != null)
- await e.Channel.SendMessage($"Last message mentioning you was at {msg.Timestamp}\n**Message from {msg.User.Name}:** {msg.RawText}")
- .ConfigureAwait(false);
- else
- await e.Channel.SendMessage("I can't find a message mentioning you.").ConfigureAwait(false);
- });
-
- cgb.CreateCommand("bb")
- .Description("Says bye to someone.\n**Usage**: @NadekoBot bb @X")
- .Parameter("ppl", ParameterType.Unparsed)
- .Do(async e =>
- {
- var str = "Bye";
- foreach (var u in e.Message.MentionedUsers)
- {
- if (u.Id != NadekoBot.Client.CurrentUser.Id)
- str += " " + u.Mention;
- }
- await e.Channel.SendMessage(str).ConfigureAwait(false);
- });
+ if (msg != null)
+ await e.Channel.SendMessage($"Last message mentioning you was at {msg.Timestamp}\n**Message from {msg.User.Name}:** {msg.RawText}")
+ .ConfigureAwait(false);
+ else
+ await e.Channel.SendMessage("I can't find a message mentioning you.").ConfigureAwait(false);
+ });
- cgb.CreateCommand("call")
- .Description("Useless. Writes calling @X to chat.\n**Usage**: @NadekoBot call @X ")
- .Parameter("who", ParameterType.Required)
- .Do(async e =>
- {
- await e.Channel.SendMessage("Calling " + e.Args[0] + "...").ConfigureAwait(false);
- });
cgb.CreateCommand("hide")
- .Description("Hides Nadeko in plain sight!11!!")
+ .Description("Hides WizBot in plain sight!11!!")
.Do(async e =>
{
using (var ms = Resources.hidden.ToStream(ImageFormat.Png))
{
- await client.CurrentUser.Edit(NadekoBot.Creds.Password, avatar: ms).ConfigureAwait(false);
+ await client.CurrentUser.Edit(WizBot.Creds.Password, avatar: ms).ConfigureAwait(false);
}
await e.Channel.SendMessage("*hides*").ConfigureAwait(false);
});
cgb.CreateCommand("unhide")
- .Description("Unhides Nadeko in plain sight!1!!1")
+ .Description("Unhides WizBot in plain sight!1!!1")
.Do(async e =>
{
using (var fs = new FileStream("data/avatar.png", FileMode.Open))
{
- await client.CurrentUser.Edit(NadekoBot.Creds.Password, avatar: fs).ConfigureAwait(false);
+ await client.CurrentUser.Edit(WizBot.Creds.Password, avatar: fs).ConfigureAwait(false);
}
await e.Channel.SendMessage("*unhides*").ConfigureAwait(false);
});
@@ -442,7 +284,7 @@ await e.Channel.SendMessage($"Last message mentioning you was at {msg.Timestamp}
.Description("Dumps all of the invites it can to dump.txt.** Owner Only.**")
.Do(async e =>
{
- if (!NadekoBot.IsOwner(e.User.Id)) return;
+ if (!WizBot.IsOwner(e.User.Id)) return;
var i = 0;
var j = 0;
var invites = "";
@@ -479,7 +321,8 @@ await e.Channel.SendMessage($"Last message mentioning you was at {msg.Timestamp}
await e.Channel.SendMessage(construct).ConfigureAwait(false);
});
- cgb.CreateCommand("av").Alias("avatar")
+ cgb.CreateCommand("av")
+ .Alias("avatar")
.Parameter("mention", ParameterType.Required)
.Description("Shows a mentioned person's avatar.\n**Usage**: ~av @X")
.Do(async e =>
@@ -522,4 +365,4 @@ public Stream RipName(string name, string year = null)
private static Func SayYes()
=> async e => await e.Channel.SendMessage("Yes. :)").ConfigureAwait(false);
}
-}
+}
\ No newline at end of file
diff --git a/WizBot/Modules/CustomReactions/CustomReactions.cs b/WizBot/Modules/CustomReactions/CustomReactions.cs
new file mode 100644
index 000000000..69617062e
--- /dev/null
+++ b/WizBot/Modules/CustomReactions/CustomReactions.cs
@@ -0,0 +1,58 @@
+using Discord.Commands;
+using Discord.Modules;
+using WizBot.Extensions;
+using WizBot.Modules.Permissions.Classes;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace WizBot.Modules.CustomReactions
+{
+ class CustomReactionsModule : DiscordModule
+ {
+ public override string Prefix { get; } = "";
+
+ Random rng = new Random();
+
+ private Dictionary> commandFuncs;
+
+ public CustomReactionsModule()
+ {
+ commandFuncs = new Dictionary>
+ {
+ {"%rng%", (e) => rng.Next().ToString()},
+ {"%mention%", (e) => WizBot.BotMention },
+ {"%user%", e => e.User.Mention },
+ {"%target%", e => e.GetArg("args")?.Trim() ?? "" },
+ };
+ }
+
+ public override void Install(ModuleManager manager)
+ {
+
+ manager.CreateCommands("", cgb =>
+ {
+
+ cgb.AddCheck(PermissionChecker.Instance);
+
+ foreach (var command in WizBot.Config.CustomReactions)
+ {
+ var commandName = command.Key.Replace("%mention%", WizBot.BotMention);
+
+ var c = cgb.CreateCommand(commandName);
+ if (commandName.Contains(WizBot.BotMention))
+ c.Alias(commandName.Replace("<@", "<@!"));
+ c.Description($"Custom reaction.\n**Usage**:{command.Key}")
+ .Parameter("args", ParameterType.Unparsed)
+ .Do(async e =>
+ {
+ string str = command.Value[rng.Next(0, command.Value.Count())];
+ commandFuncs.Keys.ForEach(k => str = str.Replace(k, commandFuncs[k](e)));
+ await e.Channel.SendMessage(str).ConfigureAwait(false);
+ });
+ }
+
+ });
+ }
+ }
+}
\ No newline at end of file
diff --git a/NadekoBot/Modules/DiscordCommand.cs b/WizBot/Modules/DiscordCommand.cs
similarity index 94%
rename from NadekoBot/Modules/DiscordCommand.cs
rename to WizBot/Modules/DiscordCommand.cs
index c6fa8b781..fde5aec75 100644
--- a/NadekoBot/Modules/DiscordCommand.cs
+++ b/WizBot/Modules/DiscordCommand.cs
@@ -1,7 +1,7 @@
using Discord.Commands;
-using NadekoBot.Modules;
+using WizBot.Modules;
-namespace NadekoBot.Classes
+namespace WizBot.Classes
{
///
/// Base DiscordCommand Class.
diff --git a/NadekoBot/Modules/DiscordModule.cs b/WizBot/Modules/DiscordModule.cs
similarity index 85%
rename from NadekoBot/Modules/DiscordModule.cs
rename to WizBot/Modules/DiscordModule.cs
index 484277321..57962978d 100644
--- a/NadekoBot/Modules/DiscordModule.cs
+++ b/WizBot/Modules/DiscordModule.cs
@@ -1,8 +1,8 @@
using Discord.Modules;
using System.Collections.Generic;
-using NadekoBot.Classes;
+using WizBot.Classes;
-namespace NadekoBot.Modules {
+namespace WizBot.Modules {
internal abstract class DiscordModule : IModule {
protected readonly HashSet commands = new HashSet();
diff --git a/NadekoBot/Modules/Gambling/DiceRollCommand.cs b/WizBot/Modules/Gambling/DiceRollCommand.cs
similarity index 98%
rename from NadekoBot/Modules/Gambling/DiceRollCommand.cs
rename to WizBot/Modules/Gambling/DiceRollCommand.cs
index 2724d3ab6..c78996c6b 100644
--- a/NadekoBot/Modules/Gambling/DiceRollCommand.cs
+++ b/WizBot/Modules/Gambling/DiceRollCommand.cs
@@ -1,6 +1,6 @@
using Discord.Commands;
-using NadekoBot.Classes;
-using NadekoBot.Extensions;
+using WizBot.Classes;
+using WizBot.Extensions;
using System;
using System.Collections.Generic;
using System.Drawing;
@@ -9,7 +9,7 @@
using System.Text.RegularExpressions;
using System.Threading.Tasks;
-namespace NadekoBot.Modules.Gambling
+namespace WizBot.Modules.Gambling
{
internal class DiceRollCommand : DiscordCommand
{
diff --git a/NadekoBot/Modules/Gambling/DrawCommand.cs b/WizBot/Modules/Gambling/DrawCommand.cs
similarity index 96%
rename from NadekoBot/Modules/Gambling/DrawCommand.cs
rename to WizBot/Modules/Gambling/DrawCommand.cs
index 2d3116ee0..bc41eb881 100644
--- a/NadekoBot/Modules/Gambling/DrawCommand.cs
+++ b/WizBot/Modules/Gambling/DrawCommand.cs
@@ -1,14 +1,14 @@
using Discord.Commands;
-using NadekoBot.Classes;
-using NadekoBot.Extensions;
-using NadekoBot.Modules.Gambling.Helpers;
+using WizBot.Classes;
+using WizBot.Extensions;
+using WizBot.Modules.Gambling.Helpers;
using System;
using System.Collections.Concurrent;
using System.Collections.Generic;
using System.Drawing;
using System.Threading.Tasks;
-namespace NadekoBot.Modules.Gambling
+namespace WizBot.Modules.Gambling
{
internal class DrawCommand : DiscordCommand
{
diff --git a/NadekoBot/Modules/Gambling/FlipCoinCommand.cs b/WizBot/Modules/Gambling/FlipCoinCommand.cs
similarity index 95%
rename from NadekoBot/Modules/Gambling/FlipCoinCommand.cs
rename to WizBot/Modules/Gambling/FlipCoinCommand.cs
index 5c23cd5b2..97797461a 100644
--- a/NadekoBot/Modules/Gambling/FlipCoinCommand.cs
+++ b/WizBot/Modules/Gambling/FlipCoinCommand.cs
@@ -1,11 +1,11 @@
using Discord.Commands;
-using NadekoBot.Classes;
-using NadekoBot.Extensions;
+using WizBot.Classes;
+using WizBot.Extensions;
using System;
using System.Drawing;
using System.Threading.Tasks;
-namespace NadekoBot.Modules.Gambling
+namespace WizBot.Modules.Gambling
{
internal class FlipCoinCommand : DiscordCommand
{
diff --git a/NadekoBot/Modules/Gambling/GamblingModule.cs b/WizBot/Modules/Gambling/GamblingModule.cs
similarity index 65%
rename from NadekoBot/Modules/Gambling/GamblingModule.cs
rename to WizBot/Modules/Gambling/GamblingModule.cs
index ae8c1cf0b..c81f23517 100644
--- a/NadekoBot/Modules/Gambling/GamblingModule.cs
+++ b/WizBot/Modules/Gambling/GamblingModule.cs
@@ -1,14 +1,15 @@
using Discord;
using Discord.Commands;
using Discord.Modules;
-using NadekoBot.Classes;
-using NadekoBot.Extensions;
-using NadekoBot.Modules.Permissions.Classes;
+using WizBot.Classes;
+using WizBot.DataModels;
+using WizBot.Extensions;
+using WizBot.Modules.Permissions.Classes;
using System;
using System.Linq;
-using System.Threading.Tasks;
+using System.Text;
-namespace NadekoBot.Modules.Gambling
+namespace WizBot.Modules.Gambling
{
internal class GamblingModule : DiscordModule
{
@@ -20,7 +21,7 @@ public GamblingModule()
commands.Add(new DiceRollCommand(this));
}
- public override string Prefix { get; } = NadekoBot.Config.CommandPrefixes.Gambling;
+ public override string Prefix { get; } = WizBot.Config.CommandPrefixes.Gambling;
public override void Install(ModuleManager manager)
{
@@ -33,14 +34,35 @@ public override void Install(ModuleManager manager)
cgb.CreateCommand(Prefix + "raffle")
.Description("Prints a name and ID of a random user from the online list from the (optional) role.")
.Parameter("role", ParameterType.Optional)
- .Do(RaffleFunc());
+ .Do(async e =>
+ {
+ var arg = string.IsNullOrWhiteSpace(e.GetArg("role")) ? "@everyone" : e.GetArg("role");
+ var role = e.Server.FindRoles(arg).FirstOrDefault();
+ if (role == null)
+ {
+ await e.Channel.SendMessage("💢 Role not found.").ConfigureAwait(false);
+ return;
+ }
+ var members = role.Members.Where(u => u.Status == UserStatus.Online); // only online
+ var membersArray = members as User[] ?? members.ToArray();
+ var usr = membersArray[new Random().Next(0, membersArray.Length)];
+ await e.Channel.SendMessage($"**Raffled user:** {usr.Name} (id: {usr.Id})").ConfigureAwait(false);
+ });
- cgb.CreateCommand(Prefix + "$$")
- .Description(string.Format("Check how much {0}s you have.", NadekoBot.Config.CurrencyName))
- .Do(NadekoFlowerCheckFunc());
+ cgb.CreateCommand(Prefix + "$$")
+ .Description(string.Format("Check how much {0}s a person has. (Defaults to yourself)\n**Usage**:`{1}$$` or `{1}$$ @Someone`",
+ WizBot.Config.CurrencyName, Prefix))
+ .Parameter("all", ParameterType.Unparsed)
+ .Do(async e =>
+ {
+ var usr = e.Message.MentionedUsers.FirstOrDefault() ?? e.User;
+ var pts = GetUserFlowers(usr.Id);
+ var str = $"{usr.Name} has {pts} {WizBot.Config.CurrencySign}";
+ await e.Channel.SendMessage(str).ConfigureAwait(false);
+ });
- cgb.CreateCommand(Prefix + "give")
- .Description(string.Format("Give someone a certain amount of {0}s", NadekoBot.Config.CurrencyName))
+ cgb.CreateCommand(Prefix + "give")
+ .Description(string.Format("Give someone a certain amount of {0}s", WizBot.Config.CurrencyName))
.Parameter("amount", ParameterType.Required)
.Parameter("receiver", ParameterType.Unparsed)
.Do(async e =>
@@ -51,7 +73,7 @@ public override void Install(ModuleManager manager)
return;
var mentionedUser = e.Message.MentionedUsers.FirstOrDefault(u =>
- u.Id != NadekoBot.Client.CurrentUser.Id &&
+ u.Id != WizBot.Client.CurrentUser.Id &&
u.Id != e.User.Id);
if (mentionedUser == null)
return;
@@ -60,14 +82,14 @@ public override void Install(ModuleManager manager)
if (userFlowers < amount)
{
- await e.Channel.SendMessage($"{e.User.Mention} You don't have enough {NadekoBot.Config.CurrencyName}s. You have only {userFlowers}{NadekoBot.Config.CurrencySign}.").ConfigureAwait(false);
+ await e.Channel.SendMessage($"{e.User.Mention} You don't have enough {WizBot.Config.CurrencyName}s. You have only {userFlowers}{WizBot.Config.CurrencySign}.").ConfigureAwait(false);
return;
}
FlowersHandler.RemoveFlowers(e.User, "Gift", (int)amount);
await FlowersHandler.AddFlowersAsync(mentionedUser, "Gift", (int)amount).ConfigureAwait(false);
- await e.Channel.SendMessage($"{e.User.Mention} successfully sent {amount} {NadekoBot.Config.CurrencyName}s to {mentionedUser.Mention}!").ConfigureAwait(false);
+ await e.Channel.SendMessage($"{e.User.Mention} successfully sent {amount} {WizBot.Config.CurrencyName}s to {mentionedUser.Mention}!").ConfigureAwait(false);
});
@@ -84,13 +106,13 @@ public override void Install(ModuleManager manager)
return;
var mentionedUser = e.Message.MentionedUsers.FirstOrDefault(u =>
- u.Id != NadekoBot.Client.CurrentUser.Id);
+ u.Id != WizBot.Client.CurrentUser.Id);
if (mentionedUser == null)
return;
await FlowersHandler.AddFlowersAsync(mentionedUser, $"Awarded by bot owner. ({e.User.Name}/{e.User.Id})", (int)amount).ConfigureAwait(false);
- await e.Channel.SendMessage($"{e.User.Mention} successfully awarded {amount} {NadekoBot.Config.CurrencyName}s to {mentionedUser.Mention}!").ConfigureAwait(false);
+ await e.Channel.SendMessage($"{e.User.Mention} successfully awarded {amount} {WizBot.Config.CurrencyName}s to {mentionedUser.Mention}!").ConfigureAwait(false);
});
cgb.CreateCommand(Prefix + "take")
@@ -106,50 +128,39 @@ public override void Install(ModuleManager manager)
return;
var mentionedUser = e.Message.MentionedUsers.FirstOrDefault(u =>
- u.Id != NadekoBot.Client.CurrentUser.Id);
+ u.Id != WizBot.Client.CurrentUser.Id);
if (mentionedUser == null)
return;
FlowersHandler.RemoveFlowers(mentionedUser, $"Taken by bot owner.({e.User.Name}/{e.User.Id})", (int)amount);
- await e.Channel.SendMessage($"{e.User.Mention} successfully took {amount} {NadekoBot.Config.CurrencyName}s from {mentionedUser.Mention}!").ConfigureAwait(false);
+ await e.Channel.SendMessage($"{e.User.Mention} successfully took {amount} {WizBot.Config.CurrencyName}s from {mentionedUser.Mention}!").ConfigureAwait(false);
});
- });
- }
- private static Func NadekoFlowerCheckFunc()
- {
- return async e =>
- {
- var pts = GetUserFlowers(e.User.Id);
- var str = $"`You have {pts} {NadekoBot.Config.CurrencyName}s".SnPl((int)pts) + "`\n";
- for (var i = 0; i < pts; i++)
- {
- str += NadekoBot.Config.CurrencySign;
- }
- await e.Channel.SendMessage(str).ConfigureAwait(false);
- };
+ cgb.CreateCommand(Prefix + "leaderboard")
+ .Alias(Prefix + "lb")
+ .Do(async e =>
+ {
+ var richestTemp = DbHandler.Instance.GetTopRichest();
+ var richest = richestTemp as CurrencyState[] ?? richestTemp.ToArray();
+ if (richest.Length == 0)
+ return;
+ await e.Channel.SendMessage(
+ richest.Aggregate(new StringBuilder(
+ $@"```xl
+┏━━━━━━━━━━━━━━━━━━━┳━━━━━━━┓
+┃ Id ┃ $$$ ┃
+"),
+ (cur, cs) => cur.AppendLine(
+ $@"┣━━━━━━━━━━━━━━━━━━━╋━━━━━━━┫
+┃{cs.UserId,-18} ┃ {cs.Value,5} ┃")
+ ).ToString() + "┗━━━━━━━━━━━━━━━━━━━┻━━━━━━━┛```");
+ });
+ });
}
private static long GetUserFlowers(ulong userId) =>
Classes.DbHandler.Instance.GetStateByUserId((long)userId)?.Value ?? 0;
- private static Func RaffleFunc()
- {
- return async e =>
- {
- var arg = string.IsNullOrWhiteSpace(e.GetArg("role")) ? "@everyone" : e.GetArg("role");
- var role = e.Server.FindRoles(arg).FirstOrDefault();
- if (role == null)
- {
- await e.Channel.SendMessage("💢 Role not found.").ConfigureAwait(false);
- return;
- }
- var members = role.Members.Where(u => u.Status == UserStatus.Online); // only online
- var membersArray = members as User[] ?? members.ToArray();
- var usr = membersArray[new Random().Next(0, membersArray.Length)];
- await e.Channel.SendMessage($"**Raffled user:** {usr.Name} (id: {usr.Id})").ConfigureAwait(false);
- };
- }
}
}
diff --git a/NadekoBot/Modules/Gambling/Helpers/Cards.cs b/WizBot/Modules/Gambling/Helpers/Cards.cs
similarity index 99%
rename from NadekoBot/Modules/Gambling/Helpers/Cards.cs
rename to WizBot/Modules/Gambling/Helpers/Cards.cs
index 76dc73a59..6b164f0da 100644
--- a/NadekoBot/Modules/Gambling/Helpers/Cards.cs
+++ b/WizBot/Modules/Gambling/Helpers/Cards.cs
@@ -2,7 +2,7 @@
using System.Collections.Generic;
using System.Linq;
-namespace NadekoBot.Modules.Gambling.Helpers
+namespace WizBot.Modules.Gambling.Helpers
{
public class Cards
{
diff --git a/NadekoBot/Modules/Games/Commands/BetrayGame.cs b/WizBot/Modules/Games/Commands/BetrayGame.cs
similarity index 69%
rename from NadekoBot/Modules/Games/Commands/BetrayGame.cs
rename to WizBot/Modules/Games/Commands/BetrayGame.cs
index 0bf410b5a..a7461f52b 100644
--- a/NadekoBot/Modules/Games/Commands/BetrayGame.cs
+++ b/WizBot/Modules/Games/Commands/BetrayGame.cs
@@ -1,10 +1,10 @@
using Discord.Commands;
-using NadekoBot.Classes;
+using WizBot.Classes;
using System;
using System.Collections.Generic;
using System.Threading.Tasks;
-namespace NadekoBot.Modules.Games.Commands
+namespace WizBot.Modules.Games.Commands
{
class BetrayGame : DiscordCommand
{
@@ -18,18 +18,18 @@ private enum Answers
internal override void Init(CommandGroupBuilder cgb)
{
cgb.CreateCommand(Module.Prefix + "betray")
- .Description("BETRAY GAME. Betray nadeko next turn." +
- "If Nadeko cooperates - you get extra points, nadeko loses a LOT." +
- "If Nadeko betrays - you both lose some points.")
+ .Description("BETRAY GAME. Betray Wiz Bot next turn." +
+ "If Wiz Bot cooperates - you get extra points, Wiz Bot loses a LOT." +
+ "If Wiz Bot betrays - you both lose some points.")
.Do(async e =>
{
await ReceiveAnswer(e, Answers.Betray).ConfigureAwait(false);
});
cgb.CreateCommand(Module.Prefix + "cooperate")
- .Description("BETRAY GAME. Cooperate with nadeko next turn." +
- "If Nadeko cooperates - you both get bonus points." +
- "If Nadeko betrays - you lose A LOT, nadeko gets extra.")
+ .Description("BETRAY GAME. Cooperate with Wiz Bot next turn." +
+ "If Wiz Bot cooperates - you both get bonus points." +
+ "If Wiz Bot betrays - you lose A LOT, Wiz Bot gets extra.")
.Do(async e =>
{
@@ -47,13 +47,13 @@ private int UserPoints {
userPoints = value;
}
}
- private int nadekoPoints = 0;
- private int NadekoPoints {
- get { return nadekoPoints; }
+ private int wizPoints = 0;
+ private int WizPoints {
+ get { return wizPoints; }
set {
if (value < 0)
- nadekoPoints = 0;
- nadekoPoints = value;
+ wizPoints = 0;
+ wizPoints = value;
}
}
@@ -62,50 +62,50 @@ private int NadekoPoints {
private async Task ReceiveAnswer(CommandEventArgs e, Answers userAnswer)
{
var response = userAnswer == Answers.Betray
- ? ":no_entry: `You betrayed nadeko` - you monster."
- : ":ok: `You cooperated with nadeko.` ";
+ ? ":no_entry: `You betrayed Wiz Bot` - you monster."
+ : ":ok: `You cooperated with Wiz Bot.` ";
var currentAnswer = NextAnswer;
- var nadekoResponse = currentAnswer == Answers.Betray
- ? ":no_entry: `aww Nadeko betrayed you` - she is so cute"
- : ":ok: `Nadeko cooperated.`";
+ var wizResponse = currentAnswer == Answers.Betray
+ ? ":no_entry: `aww Wiz Bot betrayed you` - she is so cute"
+ : ":ok: `Wiz Bot cooperated.`";
NextAnswer = userAnswer;
if (userAnswer == Answers.Betray && currentAnswer == Answers.Betray)
{
- NadekoPoints--;
+ WizPoints--;
UserPoints--;
}
else if (userAnswer == Answers.Cooperate && currentAnswer == Answers.Cooperate)
{
- NadekoPoints += 2;
+ WizPoints += 2;
UserPoints += 2;
}
else if (userAnswer == Answers.Betray && currentAnswer == Answers.Cooperate)
{
- NadekoPoints -= 3;
+ WizPoints -= 3;
UserPoints += 3;
}
else if (userAnswer == Answers.Cooperate && currentAnswer == Answers.Betray)
{
- NadekoPoints += 3;
+ WizPoints += 3;
UserPoints -= 3;
}
await e.Channel.SendMessage($"**ROUND {++round}**\n" +
$"{response}\n" +
- $"{nadekoResponse}\n" +
+ $"{wizResponse}\n" +
$"--------------------------------\n" +
- $"Nadeko has {NadekoPoints} points." +
+ $"Wiz Bot has {WizPoints} points." +
$"You have {UserPoints} points." +
$"--------------------------------\n")
.ConfigureAwait(false);
if (round < 10) return;
- if (nadekoPoints == userPoints)
+ if (wizPoints == userPoints)
await e.Channel.SendMessage("Its a draw").ConfigureAwait(false);
- else if (nadekoPoints > userPoints)
- await e.Channel.SendMessage("Nadeko won.").ConfigureAwait(false);
+ else if (wizPoints > userPoints)
+ await e.Channel.SendMessage("Wiz Bot won.").ConfigureAwait(false);
else
await e.Channel.SendMessage("You won.").ConfigureAwait(false);
- nadekoPoints = 0;
+ wizPoints = 0;
userPoints = 0;
round = 0;
}
diff --git a/NadekoBot/Modules/Games/Commands/Bomberman.cs b/WizBot/Modules/Games/Commands/Bomberman.cs
similarity index 93%
rename from NadekoBot/Modules/Games/Commands/Bomberman.cs
rename to WizBot/Modules/Games/Commands/Bomberman.cs
index 4987dd666..a7105c91e 100644
--- a/NadekoBot/Modules/Games/Commands/Bomberman.cs
+++ b/WizBot/Modules/Games/Commands/Bomberman.cs
@@ -1,11 +1,11 @@
using Discord;
using Discord.Commands;
-using NadekoBot.Classes;
+using WizBot.Classes;
using System.Text;
using System.Timers;
-using static NadekoBot.Modules.Games.Commands.Bomberman;
+using static WizBot.Modules.Games.Commands.Bomberman;
-namespace NadekoBot.Modules.Games.Commands
+namespace WizBot.Modules.Games.Commands
{
class Bomberman : DiscordCommand
{
@@ -30,10 +30,10 @@ public Bomberman(DiscordModule module) : base(module)
board[i, j] = new Field();
}
}
- NadekoBot.Client.MessageReceived += (s, e) =>
+ WizBot.Client.MessageReceived += (s, e) =>
{
if (e.Channel != gameChannel ||
- e.User.Id == NadekoBot.Client.CurrentUser.Id)
+ e.User.Id == WizBot.Client.CurrentUser.Id)
return;
if (e.Message.Text == "w")
diff --git a/NadekoBot/Modules/Games/Commands/Leet.cs b/WizBot/Modules/Games/Commands/Leet.cs
similarity index 99%
rename from NadekoBot/Modules/Games/Commands/Leet.cs
rename to WizBot/Modules/Games/Commands/Leet.cs
index 338452997..5c2773fab 100644
--- a/NadekoBot/Modules/Games/Commands/Leet.cs
+++ b/WizBot/Modules/Games/Commands/Leet.cs
@@ -1,11 +1,11 @@
using Discord.Commands;
-using NadekoBot.Classes;
+using WizBot.Classes;
using System.Text;
//taken from
//http://www.codeproject.com/Tips/207582/L-t-Tr-nsl-t-r-Leet-Translator (thanks)
// because i don't want to waste my time on this cancerous command
-namespace NadekoBot.Modules.Games.Commands
+namespace WizBot.Modules.Games.Commands
{
internal class Leet : DiscordCommand
{
diff --git a/NadekoBot/Modules/Games/Commands/PlantPick.cs b/WizBot/Modules/Games/Commands/PlantPick.cs
similarity index 87%
rename from NadekoBot/Modules/Games/Commands/PlantPick.cs
rename to WizBot/Modules/Games/Commands/PlantPick.cs
index 86db0d1f7..5a9b5d001 100644
--- a/NadekoBot/Modules/Games/Commands/PlantPick.cs
+++ b/WizBot/Modules/Games/Commands/PlantPick.cs
@@ -1,13 +1,13 @@
using Discord;
using Discord.Commands;
-using NadekoBot.Classes;
+using WizBot.Classes;
using System;
using System.Collections.Concurrent;
using System.IO;
using System.Linq;
using System.Threading.Tasks;
-namespace NadekoBot.Modules.Games.Commands
+namespace WizBot.Modules.Games.Commands
{
///
/// Flower picking/planting idea is given to me by its
@@ -42,7 +42,7 @@ internal override void Init(CommandGroupBuilder cgb)
await msg.Delete().ConfigureAwait(false);
await FlowersHandler.AddFlowersAsync(e.User, "Picked a flower.", 1, true).ConfigureAwait(false);
- msg = await e.Channel.SendMessage($"**{e.User.Name}** picked a {NadekoBot.Config.CurrencyName}!").ConfigureAwait(false);
+ msg = await e.Channel.SendMessage($"**{e.User.Name}** picked a {WizBot.Config.CurrencyName}!").ConfigureAwait(false);
await Task.Delay(10000).ConfigureAwait(false);
await msg.Delete().ConfigureAwait(false);
});
@@ -55,13 +55,13 @@ internal override void Init(CommandGroupBuilder cgb)
{
if (plantedFlowerChannels.ContainsKey(e.Channel.Id))
{
- e.Channel.SendMessage($"There is already a {NadekoBot.Config.CurrencyName} in this channel.");
+ e.Channel.SendMessage($"There is already a {WizBot.Config.CurrencyName} in this channel.");
return;
}
var removed = FlowersHandler.RemoveFlowers(e.User, "Planted a flower.", 1);
if (!removed)
{
- e.Channel.SendMessage($"You don't have any {NadekoBot.Config.CurrencyName}s.").Wait();
+ e.Channel.SendMessage($"You don't have any {WizBot.Config.CurrencyName}s.").Wait();
return;
}
@@ -70,13 +70,13 @@ internal override void Init(CommandGroupBuilder cgb)
Message msg;
//todo send message after, not in lock
if (file == null)
- msg = e.Channel.SendMessage(NadekoBot.Config.CurrencySign).GetAwaiter().GetResult();
+ msg = e.Channel.SendMessage(WizBot.Config.CurrencySign).GetAwaiter().GetResult();
else
msg = e.Channel.SendFile(file).GetAwaiter().GetResult();
plantedFlowerChannels.TryAdd(e.Channel.Id, msg);
}
- var vowelFirst = new[] { 'a', 'e', 'i', 'o', 'u' }.Contains(NadekoBot.Config.CurrencyName[0]);
- var msg2 = await e.Channel.SendMessage($"Oh how Nice! **{e.User.Name}** planted {(vowelFirst ? "an" : "a")} {NadekoBot.Config.CurrencyName}. Pick it using {Module.Prefix}pick");
+ var vowelFirst = new[] { 'a', 'e', 'i', 'o', 'u' }.Contains(WizBot.Config.CurrencyName[0]);
+ var msg2 = await e.Channel.SendMessage($"Oh how Nice! **{e.User.Name}** planted {(vowelFirst ? "an" : "a")} {WizBot.Config.CurrencyName}. Pick it using {Module.Prefix}pick");
await Task.Delay(20000).ConfigureAwait(false);
await msg2.Delete().ConfigureAwait(false);
});
diff --git a/NadekoBot/Modules/Games/Commands/PollCommand.cs b/WizBot/Modules/Games/Commands/PollCommand.cs
similarity index 97%
rename from NadekoBot/Modules/Games/Commands/PollCommand.cs
rename to WizBot/Modules/Games/Commands/PollCommand.cs
index 1e1c7b036..154006ce0 100644
--- a/NadekoBot/Modules/Games/Commands/PollCommand.cs
+++ b/WizBot/Modules/Games/Commands/PollCommand.cs
@@ -1,6 +1,6 @@
using Discord;
using Discord.Commands;
-using NadekoBot.Classes;
+using WizBot.Classes;
using System;
using System.Collections.Concurrent;
using System.Collections.Generic;
@@ -8,7 +8,7 @@
using System.Threading;
using System.Threading.Tasks;
-namespace NadekoBot.Modules.Games.Commands
+namespace WizBot.Modules.Games.Commands
{
internal class PollCommand : DiscordCommand
{
@@ -81,7 +81,7 @@ public Poll(CommandEventArgs e, string question, IEnumerable enumerable)
public async Task StartPoll()
{
started = DateTime.Now;
- NadekoBot.Client.MessageReceived += Vote;
+ WizBot.Client.MessageReceived += Vote;
var msgToSend =
$"📃**{e.User.Name}** from **{e.Server.Name}** server has created a poll which requires your attention:\n\n" +
$"**{question}**\n";
@@ -93,7 +93,7 @@ public async Task StartPoll()
public async Task StopPoll(Channel ch)
{
- NadekoBot.Client.MessageReceived -= Vote;
+ WizBot.Client.MessageReceived -= Vote;
Poll throwaway;
PollCommand.ActivePolls.TryRemove(e.Server, out throwaway);
try
diff --git a/NadekoBot/Modules/Games/Commands/SpeedTyping.cs b/WizBot/Modules/Games/Commands/SpeedTyping.cs
similarity index 94%
rename from NadekoBot/Modules/Games/Commands/SpeedTyping.cs
rename to WizBot/Modules/Games/Commands/SpeedTyping.cs
index 8a8072085..a50596e0e 100644
--- a/NadekoBot/Modules/Games/Commands/SpeedTyping.cs
+++ b/WizBot/Modules/Games/Commands/SpeedTyping.cs
@@ -1,8 +1,8 @@
using Discord;
using Discord.Commands;
-using NadekoBot.Classes;
-using NadekoBot.DataModels;
-using NadekoBot.Extensions;
+using WizBot.Classes;
+using WizBot.DataModels;
+using WizBot.Extensions;
using System;
using System.Collections.Concurrent;
using System.Collections.Generic;
@@ -10,7 +10,7 @@
using System.Linq;
using System.Threading.Tasks;
-namespace NadekoBot.Modules.Games.Commands
+namespace WizBot.Modules.Games.Commands
{
public static class SentencesProvider
@@ -51,7 +51,7 @@ public TypingGame(Channel channel)
internal async Task Stop()
{
if (!IsActive) return false;
- NadekoBot.Client.MessageReceived -= AnswerReceived;
+ WizBot.Client.MessageReceived -= AnswerReceived;
finishedUserIds.Clear();
IsActive = false;
sw.Stop();
@@ -95,14 +95,14 @@ internal async Task Start()
private void HandleAnswers()
{
- NadekoBot.Client.MessageReceived += AnswerReceived;
+ WizBot.Client.MessageReceived += AnswerReceived;
}
private async void AnswerReceived(object sender, MessageEventArgs e)
{
try
{
- if (e.Channel == null || e.Channel.Id != channel.Id || e.User.Id == NadekoBot.Client.CurrentUser.Id) return;
+ if (e.Channel == null || e.Channel.Id != channel.Id || e.User.Id == WizBot.Client.CurrentUser.Id) return;
var guess = e.Message.RawText;
@@ -180,7 +180,7 @@ internal override void Init(CommandGroupBuilder cgb)
.Parameter("text", ParameterType.Unparsed)
.Do(async e =>
{
- if (!NadekoBot.IsOwner(e.User.Id) || string.IsNullOrWhiteSpace(e.GetArg("text"))) return;
+ if (!WizBot.IsOwner(e.User.Id) || string.IsNullOrWhiteSpace(e.GetArg("text"))) return;
DbHandler.Instance.InsertData(new TypingArticle
{
diff --git a/NadekoBot/Modules/Games/Commands/Trivia/TriviaGame.cs b/WizBot/Modules/Games/Commands/Trivia/TriviaGame.cs
similarity index 92%
rename from NadekoBot/Modules/Games/Commands/Trivia/TriviaGame.cs
rename to WizBot/Modules/Games/Commands/Trivia/TriviaGame.cs
index 2865b1b20..21521f528 100644
--- a/NadekoBot/Modules/Games/Commands/Trivia/TriviaGame.cs
+++ b/WizBot/Modules/Games/Commands/Trivia/TriviaGame.cs
@@ -1,7 +1,7 @@
using Discord;
using Discord.Commands;
-using NadekoBot.Classes;
-using NadekoBot.Extensions;
+using WizBot.Classes;
+using WizBot.Extensions;
using System;
using System.Collections.Concurrent;
using System.Collections.Generic;
@@ -10,7 +10,7 @@
using System.Threading;
using System.Threading.Tasks;
-namespace NadekoBot.Modules.Games.Commands.Trivia
+namespace WizBot.Modules.Games.Commands.Trivia
{
internal class TriviaGame
{
@@ -34,11 +34,12 @@ internal class TriviaGame
public int WinRequirement { get; } = 10;
- public TriviaGame(CommandEventArgs e, bool showHints)
+ public TriviaGame(CommandEventArgs e, bool showHints, int winReq = 10)
{
ShowHints = showHints;
server = e.Server;
channel = e.Channel;
+ WinRequirement = winReq;
Task.Run(StartGame);
}
@@ -62,7 +63,7 @@ private async Task StartGame()
await channel.SendMessage($":question: **{CurrentQuestion.Question}**").ConfigureAwait(false);
//receive messages
- NadekoBot.Client.MessageReceived += PotentialGuess;
+ WizBot.Client.MessageReceived += PotentialGuess;
//allow people to guess
GameActive = true;
@@ -85,7 +86,7 @@ private async Task StartGame()
GameActive = false;
if (!triviaCancelSource.IsCancellationRequested)
await channel.Send($":clock2: :question: **Time's up!** The correct answer was **{CurrentQuestion.Answer}**").ConfigureAwait(false);
- NadekoBot.Client.MessageReceived -= PotentialGuess;
+ WizBot.Client.MessageReceived -= PotentialGuess;
// load next question if game is still running
await Task.Delay(2000).ConfigureAwait(false);
}
@@ -113,7 +114,7 @@ private async void PotentialGuess(object sender, MessageEventArgs e)
{
if (e.Channel.IsPrivate) return;
if (e.Server != server) return;
- if (e.User.Id == NadekoBot.Client.CurrentUser.Id) return;
+ if (e.User.Id == WizBot.Client.CurrentUser.Id) return;
var guess = false;
lock (_guessLock)
@@ -130,7 +131,7 @@ private async void PotentialGuess(object sender, MessageEventArgs e)
await channel.SendMessage($"☑️ {e.User.Mention} guessed it! The answer was: **{CurrentQuestion.Answer}**").ConfigureAwait(false);
if (Users[e.User] != WinRequirement) return;
ShouldStopGame = true;
- await channel.Send($":exclamation: We have a winner! Its {e.User.Mention}.").ConfigureAwait(false);
+ await channel.Send($":exclamation: We have a winner! It's {e.User.Mention}.").ConfigureAwait(false);
// add points to the winner
await FlowersHandler.AddFlowersAsync(e.User, "Won Trivia", 2).ConfigureAwait(false);
}
diff --git a/NadekoBot/Modules/Games/Commands/Trivia/TriviaQuestion.cs b/WizBot/Modules/Games/Commands/Trivia/TriviaQuestion.cs
similarity index 97%
rename from NadekoBot/Modules/Games/Commands/Trivia/TriviaQuestion.cs
rename to WizBot/Modules/Games/Commands/Trivia/TriviaQuestion.cs
index 9bfa2da49..b2cb4751b 100644
--- a/NadekoBot/Modules/Games/Commands/Trivia/TriviaQuestion.cs
+++ b/WizBot/Modules/Games/Commands/Trivia/TriviaQuestion.cs
@@ -1,10 +1,10 @@
-using NadekoBot.Extensions;
+using WizBot.Extensions;
using System;
using System.Collections.Generic;
using System.Text.RegularExpressions;
// THANKS @ShoMinamimoto for suggestions and coding help
-namespace NadekoBot.Modules.Games.Commands.Trivia
+namespace WizBot.Modules.Games.Commands.Trivia
{
public class TriviaQuestion
{
diff --git a/NadekoBot/Modules/Games/Commands/Trivia/TriviaQuestionPool.cs b/WizBot/Modules/Games/Commands/Trivia/TriviaQuestionPool.cs
similarity index 96%
rename from NadekoBot/Modules/Games/Commands/Trivia/TriviaQuestionPool.cs
rename to WizBot/Modules/Games/Commands/Trivia/TriviaQuestionPool.cs
index 3aa09a560..a927617a2 100644
--- a/NadekoBot/Modules/Games/Commands/Trivia/TriviaQuestionPool.cs
+++ b/WizBot/Modules/Games/Commands/Trivia/TriviaQuestionPool.cs
@@ -4,7 +4,7 @@
using System.IO;
using System.Linq;
-namespace NadekoBot.Modules.Games.Commands.Trivia
+namespace WizBot.Modules.Games.Commands.Trivia
{
public class TriviaQuestionPool
{
diff --git a/NadekoBot/Modules/Games/Commands/TriviaCommand.cs b/WizBot/Modules/Games/Commands/TriviaCommand.cs
similarity index 75%
rename from NadekoBot/Modules/Games/Commands/TriviaCommand.cs
rename to WizBot/Modules/Games/Commands/TriviaCommand.cs
index 15d29e07d..dc1d432fe 100644
--- a/NadekoBot/Modules/Games/Commands/TriviaCommand.cs
+++ b/WizBot/Modules/Games/Commands/TriviaCommand.cs
@@ -1,10 +1,11 @@
using Discord.Commands;
-using NadekoBot.Classes;
-using NadekoBot.Modules.Games.Commands.Trivia;
+using WizBot.Classes;
+using WizBot.Modules.Games.Commands.Trivia;
+using System;
using System.Collections.Concurrent;
using System.Linq;
-namespace NadekoBot.Modules.Games.Commands
+namespace WizBot.Modules.Games.Commands
{
internal class TriviaCommands : DiscordCommand
{
@@ -18,8 +19,8 @@ internal override void Init(CommandGroupBuilder cgb)
{
cgb.CreateCommand(Module.Prefix + "t")
.Description($"Starts a game of trivia. You can add nohint to prevent hints." +
- "First player to get to 10 points wins. 30 seconds per question." +
- $"\n**Usage**:`{Module.Prefix}t nohint`")
+ "First player to get to 10 points wins by default. You can specify a different number. 30 seconds per question." +
+ $"\n**Usage**:`{Module.Prefix}t nohint` or `{Module.Prefix}t 5 nohint`")
.Parameter("args", ParameterType.Multiple)
.Do(async e =>
{
@@ -27,9 +28,16 @@ internal override void Init(CommandGroupBuilder cgb)
if (!RunningTrivias.TryGetValue(e.Server.Id, out trivia))
{
var showHints = !e.Args.Contains("nohint");
- var triviaGame = new TriviaGame(e, showHints);
- if (RunningTrivias.TryAdd(e.Server.Id, triviaGame))
- await e.Channel.SendMessage("**Trivia game started!**").ConfigureAwait(false);
+ var number = e.Args.Select(s =>
+ {
+ int num;
+ return new Tuple(int.TryParse(s, out num), num);
+ }).Where(t => t.Item1).Select(t => t.Item2).FirstOrDefault();
+ if (number < 0)
+ return;
+ var triviaGame = new TriviaGame(e, showHints, number == 0 ? 10 : number);
+ if (RunningTrivias.TryAdd(e.Server.Id, triviaGame))
+ await e.Channel.SendMessage("**Trivia game started! {triviaGame.WinRequirement} points needed to win.**").ConfigureAwait(false);
else
await triviaGame.StopGame().ConfigureAwait(false);
}
diff --git a/NadekoBot/Modules/Games/GamesModule.cs b/WizBot/Modules/Games/GamesModule.cs
similarity index 85%
rename from NadekoBot/Modules/Games/GamesModule.cs
rename to WizBot/Modules/Games/GamesModule.cs
index 8eaa1244b..26339a674 100644
--- a/NadekoBot/Modules/Games/GamesModule.cs
+++ b/WizBot/Modules/Games/GamesModule.cs
@@ -1,12 +1,12 @@
using Discord.Commands;
using Discord.Modules;
-using NadekoBot.Extensions;
-using NadekoBot.Modules.Games.Commands;
-using NadekoBot.Modules.Permissions.Classes;
+using WizBot.Extensions;
+using WizBot.Modules.Games.Commands;
+using WizBot.Modules.Permissions.Classes;
using System;
using System.Linq;
-namespace NadekoBot.Modules.Games
+namespace WizBot.Modules.Games
{
internal class GamesModule : DiscordModule
{
@@ -24,7 +24,7 @@ public GamesModule()
}
- public override string Prefix { get; } = NadekoBot.Config.CommandPrefixes.Games;
+ public override string Prefix { get; } = WizBot.Config.CommandPrefixes.Games;
public override void Install(ModuleManager manager)
{
@@ -60,14 +60,14 @@ public override void Install(ModuleManager manager)
try
{
await e.Channel.SendMessage(
- $":question: **Question**: `{question}` \n🎱 **8Ball Answers**: `{NadekoBot.Config._8BallResponses[rng.Next(0, NadekoBot.Config._8BallResponses.Length)]}`")
+ $":question: **Question**: `{question}` \n🎱 **8Ball Answers**: `{WizBot.Config._8BallResponses[rng.Next(0, WizBot.Config._8BallResponses.Length)]}`")
.ConfigureAwait(false);
}
catch { }
});
cgb.CreateCommand(Prefix + "rps")
- .Description("Play a game of rocket paperclip scissors with Nadeko.\n**Usage**: >rps scissors")
+ .Description("Play a game of rocket paperclip scissors with Wiz Bot.\n**Usage**: >rps scissors")
.Parameter("input", ParameterType.Required)
.Do(async e =>
{
@@ -92,22 +92,22 @@ await e.Channel.SendMessage(
default:
return;
}
- var nadekoPick = new Random().Next(0, 3);
+ var wizPick = new Random().Next(0, 3);
var msg = "";
- if (pick == nadekoPick)
+ if (pick == wizPick)
msg = $"It's a draw! Both picked :{GetRPSPick(pick)}:";
- else if ((pick == 0 && nadekoPick == 1) ||
- (pick == 1 && nadekoPick == 2) ||
- (pick == 2 && nadekoPick == 0))
- msg = $"{NadekoBot.BotMention} won! :{GetRPSPick(nadekoPick)}: beats :{GetRPSPick(pick)}:";
+ else if ((pick == 0 && wizPick == 1) ||
+ (pick == 1 && wizPick == 2) ||
+ (pick == 2 && wizPick == 0))
+ msg = $"{WizBot.BotMention} won! :{GetRPSPick(wizPick)}: beats :{GetRPSPick(pick)}:";
else
- msg = $"{e.User.Mention} won! :{GetRPSPick(pick)}: beats :{GetRPSPick(nadekoPick)}:";
+ msg = $"{e.User.Mention} won! :{GetRPSPick(pick)}: beats :{GetRPSPick(wizPick)}:";
await e.Channel.SendMessage(msg).ConfigureAwait(false);
});
cgb.CreateCommand(Prefix + "linux")
- .Description("Prints a customizable Linux interjection")
+ .Description($"Prints a customizable Linux interjection\n**Usage**: `{Prefix}linux Spyware Windows`")
.Parameter("gnu", ParameterType.Required)
.Parameter("linux", ParameterType.Required)
.Do(async e =>
diff --git a/WizBot/Modules/Help/Commands/HelpCommand.cs b/WizBot/Modules/Help/Commands/HelpCommand.cs
new file mode 100644
index 000000000..e979faeb0
--- /dev/null
+++ b/WizBot/Modules/Help/Commands/HelpCommand.cs
@@ -0,0 +1,118 @@
+using Discord.Commands;
+using WizBot.Extensions;
+using WizBot.Modules;
+using WizBot.Modules.Permissions.Classes;
+using System;
+using System.IO;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace WizBot.Classes.Help.Commands
+{
+ internal class HelpCommand : DiscordCommand
+ {
+ public Func HelpFunc() => async e =>
+ {
+ var comToFind = e.GetArg("command")?.ToLowerInvariant();
+ if (string.IsNullOrWhiteSpace(comToFind))
+ {
+ await e.User.Send(HelpString).ConfigureAwait(false);
+ return;
+ }
+ await Task.Run(async () =>
+ {
+ var com = WizBot.Client.GetService().AllCommands
+ .FirstOrDefault(c => c.Text.ToLowerInvariant().Equals(comToFind) ||
+ c.Aliases.Select(a => a.ToLowerInvariant()).Contains(comToFind));
+ if (com != null)
+ await e.Channel.SendMessage($"`Help for '{com.Text}':` {com.Description}").ConfigureAwait(false);
+ }).ConfigureAwait(false);
+ };
+ public static string HelpString => (WizBot.IsBot
+ ? $"To add me to your server, use this link** -> \n"
+ : $"To invite me to your server, just send me an invite link here.") +
+ $"You can use `{WizBot.Config.CommandPrefixes.Help}modules` command to see a list of all modules.\n" +
+ $"You can use `{WizBot.Config.CommandPrefixes.Help}commands ModuleName`" +
+ $" (for example `{WizBot.Config.CommandPrefixes.Help}commands Administration`) to see a list of all of the commands in that module.\n" +
+ $"For a specific command help, use `{WizBot.Config.CommandPrefixes.Help}h \"Command name\"` (for example `-h \"!m q\"`)\n" +
+ "**LIST OF COMMANDS CAN BE FOUND ON THIS LINK**\n\n ";
+
+ public static string DMHelpString => WizBot.Config.DMHelpString;
+
+ public Action DoGitFunc() => e =>
+ {
+ string helpstr =
+$@"######For more information, go to: **http://wizkiller96network.com/**
+######You can donate on paypal: `inick01@live.com`
+#WizBot List Of Commands
+Version: `{WizStats.Instance.BotVersion}`";
+
+
+ string lastCategory = "";
+ foreach (var com in WizBot.Client.GetService().AllCommands)
+ {
+ if (com.Category != lastCategory)
+ {
+ helpstr += "\n### " + com.Category + " \n";
+ helpstr += "Command and aliases | Description | Usage\n";
+ helpstr += "----------------|--------------|-------\n";
+ lastCategory = com.Category;
+ }
+ helpstr += PrintCommandHelp(com);
+ }
+ helpstr = helpstr.Replace(WizBot.BotMention, "@BotName");
+ helpstr = helpstr.Replace("\n**Usage**:", " | ").Replace("**Usage**:", " | ").Replace("**Description:**", " | ").Replace("\n|", " | \n");
+#if DEBUG
+ File.WriteAllText("../../../commandlist.md", helpstr);
+#else
+ File.WriteAllText("commandlist.md", helpstr);
+#endif
+ };
+
+ internal override void Init(CommandGroupBuilder cgb)
+ {
+ cgb.CreateCommand(Module.Prefix + "h")
+ .Alias(Module.Prefix + "help", WizBot.BotMention + " help", WizBot.BotMention + " h", "~h")
+ .Description("Either shows a help for a single command, or PMs you help link if no arguments are specified.\n**Usage**: '-h !m q' or just '-h' ")
+ .Parameter("command", ParameterType.Unparsed)
+ .Do(HelpFunc());
+ cgb.CreateCommand(Module.Prefix + "hgit")
+ .Description("Generates the commandlist.md file. **Owner Only!**")
+ .AddCheck(SimpleCheckers.OwnerOnly())
+ .Do(DoGitFunc());
+ cgb.CreateCommand(Module.Prefix + "readme")
+ .Alias(Module.Prefix + "guide")
+ .Description("Sends a readme and a guide links to the channel.")
+ .Do(async e =>
+ await e.Channel.SendMessage(
+@"**FULL README**:
+**GUIDE ONLY**:
+**WINDOWS SETUP GUIDE**:
+**LINUX SETUP GUIDE**:
+**LIST OF COMMANDS**: ").ConfigureAwait(false));
+
+ cgb.CreateCommand(Module.Prefix + "donate")
+ .Alias("~donate")
+ .Description("Instructions for helping the project!")
+ .Do(async e =>
+ {
+ await e.Channel.SendMessage(
+$@"I've created a **paypal** email for WizBot, so if you wish to support the project, you can send your donations to `inick01@live.com`
+Don't forget to leave your discord name or id in the message, so that I can reward people who help out.
+You can join WizBot server by typing {Module.Prefix}h and you will get an invite in a private message.
+*If you want to support in some other way or on a different platform, please message me*"
+ ).ConfigureAwait(false);
+ });
+ }
+
+ private static string PrintCommandHelp(Command com)
+ {
+ var str = "`" + com.Text + "`";
+ str = com.Aliases.Aggregate(str, (current, a) => current + (", `" + a + "`"));
+ str += " **Description:** " + com.Description + "\n";
+ return str;
+ }
+
+ public HelpCommand(DiscordModule module) : base(module) { }
+ }
+}
\ No newline at end of file
diff --git a/NadekoBot/Modules/Help/HelpModule.cs b/WizBot/Modules/Help/HelpModule.cs
similarity index 80%
rename from NadekoBot/Modules/Help/HelpModule.cs
rename to WizBot/Modules/Help/HelpModule.cs
index 593fbd5fd..3267a9435 100644
--- a/NadekoBot/Modules/Help/HelpModule.cs
+++ b/WizBot/Modules/Help/HelpModule.cs
@@ -1,11 +1,11 @@
using Discord.Commands;
using Discord.Modules;
-using NadekoBot.Classes.Help.Commands;
-using NadekoBot.Extensions;
-using NadekoBot.Modules.Permissions.Classes;
+using WizBot.Classes.Help.Commands;
+using WizBot.Extensions;
+using WizBot.Modules.Permissions.Classes;
using System.Linq;
-namespace NadekoBot.Modules.Help
+namespace WizBot.Modules.Help
{
internal class HelpModule : DiscordModule
{
@@ -15,7 +15,7 @@ public HelpModule()
commands.Add(new HelpCommand(this));
}
- public override string Prefix { get; } = NadekoBot.Config.CommandPrefixes.Help;
+ public override string Prefix { get; } = WizBot.Config.CommandPrefixes.Help;
public override void Install(ModuleManager manager)
{
@@ -29,7 +29,7 @@ public override void Install(ModuleManager manager)
.Description("List all bot modules.")
.Do(async e =>
{
- await e.Channel.SendMessage("`List of modules:` \n• " + string.Join("\n• ", NadekoBot.Client.GetService().Modules.Select(m => m.Name)))
+ await e.Channel.SendMessage("`List of modules:` \n• " + string.Join("\n• ", WizBot.Client.GetService().Modules.Select(m => m.Name)))
.ConfigureAwait(false);
});
@@ -39,7 +39,7 @@ await e.Channel.SendMessage("`List of modules:` \n• " + string.Join("\n• ",
.Parameter("module", ParameterType.Unparsed)
.Do(async e =>
{
- var cmds = NadekoBot.Client.GetService().AllCommands
+ var cmds = WizBot.Client.GetService().AllCommands
.Where(c => c.Category.ToLower() == e.GetArg("module").Trim().ToLower());
var cmdsArray = cmds as Command[] ?? cmds.ToArray();
if (!cmdsArray.Any())
diff --git a/NadekoBot/Modules/Music/Classes/MusicControls.cs b/WizBot/Modules/Music/Classes/MusicControls.cs
similarity index 94%
rename from NadekoBot/Modules/Music/Classes/MusicControls.cs
rename to WizBot/Modules/Music/Classes/MusicControls.cs
index 4833dda83..ef546e09f 100644
--- a/NadekoBot/Modules/Music/Classes/MusicControls.cs
+++ b/WizBot/Modules/Music/Classes/MusicControls.cs
@@ -1,11 +1,11 @@
using Discord;
using Discord.Audio;
-using NadekoBot.Extensions;
+using WizBot.Extensions;
using System;
using System.Collections.Generic;
using System.Threading;
using System.Threading.Tasks;
-namespace NadekoBot.Modules.Music.Classes
+namespace WizBot.Modules.Music.Classes
{
public enum MusicType
@@ -95,10 +95,12 @@ public MusicPlayer(Channel startingVoiceChannel, float? defaultVolume)
Console.WriteLine($"Exception in PlaySong: {ex}");
}
OnCompleted(this, curSong);
- if (RepeatSong)
- playlist.Insert(0, curSong);
- else if (RepeatPlaylist)
- playlist.Insert(playlist.Count, curSong);
+ curSong = CurrentSong; //to check if its null now
+ if (curSong != null)
+ if (RepeatSong)
+ playlist.Insert(0, curSong);
+ else if (RepeatPlaylist)
+ playlist.Insert(playlist.Count, curSong);
SongCancelSource = new CancellationTokenSource();
cancelToken = SongCancelSource.Token;
}
diff --git a/NadekoBot/Modules/Music/Classes/PoopyBuffer.cs b/WizBot/Modules/Music/Classes/PoopyBuffer.cs
similarity index 99%
rename from NadekoBot/Modules/Music/Classes/PoopyBuffer.cs
rename to WizBot/Modules/Music/Classes/PoopyBuffer.cs
index 15dc49770..2d81600e7 100644
--- a/NadekoBot/Modules/Music/Classes/PoopyBuffer.cs
+++ b/WizBot/Modules/Music/Classes/PoopyBuffer.cs
@@ -2,7 +2,7 @@
using System.Threading;
using System.Threading.Tasks;
-namespace NadekoBot.Modules.Music.Classes
+namespace WizBot.Modules.Music.Classes
{
///
diff --git a/NadekoBot/Modules/Music/Classes/Song.cs b/WizBot/Modules/Music/Classes/Song.cs
similarity index 96%
rename from NadekoBot/Modules/Music/Classes/Song.cs
rename to WizBot/Modules/Music/Classes/Song.cs
index 6ebf97d2c..a5ff9efba 100644
--- a/NadekoBot/Modules/Music/Classes/Song.cs
+++ b/WizBot/Modules/Music/Classes/Song.cs
@@ -1,6 +1,6 @@
using Discord.Audio;
-using NadekoBot.Classes;
-using NadekoBot.Extensions;
+using WizBot.Classes;
+using WizBot.Extensions;
using System;
using System.Diagnostics;
using System.IO;
@@ -10,7 +10,7 @@
using System.Threading.Tasks;
using VideoLibrary;
-namespace NadekoBot.Modules.Music.Classes
+namespace WizBot.Modules.Music.Classes
{
public class SongInfo
{
@@ -249,7 +249,7 @@ public static async Task ResolveSong(string query, MusicType musicType = M
});
}
var link = await SearchHelper.FindYoutubeUrlByKeywords(query).ConfigureAwait(false);
- if (link == String.Empty)
+ if (string.IsNullOrWhiteSpace(link))
throw new OperationCanceledException("Not a valid youtube query.");
var allVideos = await Task.Factory.StartNew(async () => await YouTube.Default.GetAllVideosAsync(link).ConfigureAwait(false)).Unwrap().ConfigureAwait(false);
var videos = allVideos.Where(v => v.AdaptiveKind == AdaptiveKind.Audio);
@@ -260,7 +260,11 @@ public static async Task ResolveSong(string query, MusicType musicType = M
if (video == null) // do something with this error
throw new Exception("Could not load any video elements based on the query.");
- return new Song(new SongInfo
+ var m = Regex.Match(query, @"\?t=(?\d*)");
+ int gotoTime = 0;
+ if (m.Captures.Count > 0)
+ int.TryParse(m.Groups["t"].ToString(), out gotoTime);
+ var song = new Song(new SongInfo
{
Title = video.Title.Substring(0, video.Title.Length - 10), // removing trailing "- You Tube"
Provider = "YouTube",
@@ -268,6 +272,8 @@ public static async Task ResolveSong(string query, MusicType musicType = M
Query = link,
ProviderType = musicType,
});
+ song.SkipTo = gotoTime;
+ return song;
}
catch (Exception ex)
{
diff --git a/NadekoBot/Modules/Music/Classes/SoundCloud.cs b/WizBot/Modules/Music/Classes/SoundCloud.cs
similarity index 87%
rename from NadekoBot/Modules/Music/Classes/SoundCloud.cs
rename to WizBot/Modules/Music/Classes/SoundCloud.cs
index 00216fbbe..8c57725e7 100644
--- a/NadekoBot/Modules/Music/Classes/SoundCloud.cs
+++ b/WizBot/Modules/Music/Classes/SoundCloud.cs
@@ -1,8 +1,8 @@
-using NadekoBot.Classes;
+using WizBot.Classes;
using System;
using System.Threading.Tasks;
-namespace NadekoBot.Modules.Music.Classes
+namespace WizBot.Modules.Music.Classes
{
public class SoundCloud
{
@@ -16,10 +16,10 @@ public async Task GetVideoAsync(string url)
{
if (string.IsNullOrWhiteSpace(url))
throw new ArgumentNullException(nameof(url));
- if (string.IsNullOrWhiteSpace(NadekoBot.Creds.SoundCloudClientID))
- throw new ArgumentNullException(nameof(NadekoBot.Creds.SoundCloudClientID));
+ if (string.IsNullOrWhiteSpace(WizBot.Creds.SoundCloudClientID))
+ throw new ArgumentNullException(nameof(WizBot.Creds.SoundCloudClientID));
- var response = await SearchHelper.GetResponseStringAsync($"http://api.soundcloud.com/resolve?url={url}&client_id={NadekoBot.Creds.SoundCloudClientID}").ConfigureAwait(false);
+ var response = await SearchHelper.GetResponseStringAsync($"http://api.soundcloud.com/resolve?url={url}&client_id={WizBot.Creds.SoundCloudClientID}").ConfigureAwait(false);
var responseObj = Newtonsoft.Json.JsonConvert.DeserializeObject(response);
if (responseObj?.Kind != "track")
@@ -40,7 +40,7 @@ public class SoundCloudVideo
public string Title = "";
public string FullName => User.Name + " - " + Title;
public bool Streamable = false;
- public string StreamLink => $"https://api.soundcloud.com/tracks/{Id}/stream?client_id={NadekoBot.Creds.SoundCloudClientID}";
+ public string StreamLink => $"https://api.soundcloud.com/tracks/{Id}/stream?client_id={WizBot.Creds.SoundCloudClientID}";
}
public class SoundCloudUser
{
diff --git a/NadekoBot/Modules/Music/MusicModule.cs b/WizBot/Modules/Music/MusicModule.cs
similarity index 87%
rename from NadekoBot/Modules/Music/MusicModule.cs
rename to WizBot/Modules/Music/MusicModule.cs
index afba2f3ca..d6520c761 100644
--- a/NadekoBot/Modules/Music/MusicModule.cs
+++ b/WizBot/Modules/Music/MusicModule.cs
@@ -1,11 +1,11 @@
using Discord;
using Discord.Commands;
using Discord.Modules;
-using NadekoBot.Classes;
-using NadekoBot.DataModels;
-using NadekoBot.Extensions;
-using NadekoBot.Modules.Music.Classes;
-using NadekoBot.Modules.Permissions.Classes;
+using WizBot.Classes;
+using WizBot.DataModels;
+using WizBot.Extensions;
+using WizBot.Modules.Music.Classes;
+using WizBot.Modules.Permissions.Classes;
using System;
using System.Collections.Concurrent;
using System.Collections.Generic;
@@ -13,7 +13,7 @@
using System.Linq;
using System.Threading.Tasks;
-namespace NadekoBot.Modules.Music
+namespace WizBot.Modules.Music
{
internal class MusicModule : DiscordModule
{
@@ -24,7 +24,7 @@ internal class MusicModule : DiscordModule
public MusicModule()
{
// ready for 1.0
- //NadekoBot.Client.UserUpdated += (s, e) =>
+ //WizBot.Client.UserUpdated += (s, e) =>
//{
// try
// {
@@ -41,11 +41,11 @@ public MusicModule()
}
- public override string Prefix { get; } = NadekoBot.Config.CommandPrefixes.Music;
+ public override string Prefix { get; } = WizBot.Config.CommandPrefixes.Music;
public override void Install(ModuleManager manager)
{
- var client = NadekoBot.Client;
+ var client = WizBot.Client;
manager.CreateCommands(Prefix, cgb =>
{
@@ -57,12 +57,13 @@ public override void Install(ModuleManager manager)
cgb.CreateCommand("n")
.Alias("next")
.Alias("skip")
- .Description("Goes to the next song in the queue.**Usage**: `!m n`")
+ .Description("Goes to the next song in the queue. You have to be in the same voice channel as the bot.\n**Usage**: `!m n`")
.Do(e =>
{
MusicPlayer musicPlayer;
if (!MusicPlayers.TryGetValue(e.Server, out musicPlayer)) return;
- musicPlayer.Next();
+ if (musicPlayer.PlaybackVoiceChannel == e.User.VoiceChannel)
+ musicPlayer.Next();
});
cgb.CreateCommand("s")
@@ -74,7 +75,8 @@ await Task.Run(() =>
{
MusicPlayer musicPlayer;
if (!MusicPlayers.TryGetValue(e.Server, out musicPlayer)) return;
- musicPlayer.Stop();
+ if (e.User.VoiceChannel == musicPlayer.PlaybackVoiceChannel)
+ musicPlayer.Stop();
}).ConfigureAwait(false);
});
@@ -88,7 +90,8 @@ await Task.Run(() =>
{
MusicPlayer musicPlayer;
if (!MusicPlayers.TryRemove(e.Server, out musicPlayer)) return;
- musicPlayer.Destroy();
+ if (e.User.VoiceChannel == musicPlayer.PlaybackVoiceChannel)
+ musicPlayer.Destroy();
}).ConfigureAwait(false);
});
@@ -100,6 +103,8 @@ await Task.Run(() =>
MusicPlayer musicPlayer;
if (!MusicPlayers.TryGetValue(e.Server, out musicPlayer)) return;
musicPlayer.TogglePause();
+ if (e.User.VoiceChannel != musicPlayer.PlaybackVoiceChannel)
+ return;
if (musicPlayer.Paused)
await e.Channel.SendMessage("🎵`Music Player paused.`").ConfigureAwait(false);
else
@@ -172,6 +177,8 @@ await e.Channel.SendMessage($"🎵`Now Playing` {currentSong.PrettyName} " +
MusicPlayer musicPlayer;
if (!MusicPlayers.TryGetValue(e.Server, out musicPlayer))
return;
+ if (e.User.VoiceChannel != musicPlayer.PlaybackVoiceChannel)
+ return;
var arg = e.GetArg("val");
int volume;
if (!int.TryParse(arg, out volume))
@@ -208,6 +215,8 @@ await e.Channel.SendMessage($"🎵`Now Playing` {currentSong.PrettyName} " +
MusicPlayer musicPlayer;
if (!MusicPlayers.TryGetValue(e.Server, out musicPlayer))
return;
+ if (e.User.VoiceChannel != musicPlayer.PlaybackVoiceChannel)
+ return;
musicPlayer.SetVolume(0);
});
@@ -218,6 +227,8 @@ await e.Channel.SendMessage($"🎵`Now Playing` {currentSong.PrettyName} " +
MusicPlayer musicPlayer;
if (!MusicPlayers.TryGetValue(e.Server, out musicPlayer))
return;
+ if (e.User.VoiceChannel != musicPlayer.PlaybackVoiceChannel)
+ return;
musicPlayer.SetVolume(100);
});
@@ -228,6 +239,8 @@ await e.Channel.SendMessage($"🎵`Now Playing` {currentSong.PrettyName} " +
MusicPlayer musicPlayer;
if (!MusicPlayers.TryGetValue(e.Server, out musicPlayer))
return;
+ if (e.User.VoiceChannel != musicPlayer.PlaybackVoiceChannel)
+ return;
musicPlayer.SetVolume(50);
});
@@ -238,6 +251,8 @@ await e.Channel.SendMessage($"🎵`Now Playing` {currentSong.PrettyName} " +
MusicPlayer musicPlayer;
if (!MusicPlayers.TryGetValue(e.Server, out musicPlayer))
return;
+ if (e.User.VoiceChannel != musicPlayer.PlaybackVoiceChannel)
+ return;
if (musicPlayer.Playlist.Count < 2)
{
await e.Channel.SendMessage("💢 Not enough songs in order to perform the shuffle.").ConfigureAwait(false);
@@ -249,7 +264,7 @@ await e.Channel.SendMessage($"🎵`Now Playing` {currentSong.PrettyName} " +
});
cgb.CreateCommand("pl")
- .Description("Queues up to 25 songs from a youtube playlist specified by a link, or keywords.\n**Usage**: `!m pl playlist link or name`")
+ .Description("Queues up to 50 songs from a youtube playlist specified by a link, or keywords.\n**Usage**: `!m pl playlist link or name`")
.Parameter("playlist", ParameterType.Unparsed)
.Do(async e =>
{
@@ -261,10 +276,21 @@ await e.Channel.SendMessage($"🎵`Now Playing` {currentSong.PrettyName} " +
await e.Channel.SendMessage("💢 You need to be in a voice channel on this server.\n If you are already in a voice channel, try rejoining it.").ConfigureAwait(false);
return;
}
- var ids = await SearchHelper.GetVideoIDs(await SearchHelper.GetPlaylistIdByKeyword(arg).ConfigureAwait(false)).ConfigureAwait(false);
+ var plId = await SearchHelper.GetPlaylistIdByKeyword(arg).ConfigureAwait(false);
+ if (plId == null)
+ {
+ await e.Channel.SendMessage("No search results for that query.");
+ return;
+ }
+ var ids = await SearchHelper.GetVideoIDs(plId, 500).ConfigureAwait(false);
+ if (ids == null || ids.Count == 0)
+ {
+ await e.Channel.SendMessage($"🎵`Failed to find any songs.`");
+ return;
+ }
//todo TEMPORARY SOLUTION, USE RESOLVE QUEUE IN THE FUTURE
var idArray = ids as string[] ?? ids.ToArray();
- var count = idArray.Count();
+ var count = idArray.Length;
var msg =
await e.Channel.SendMessage($"🎵 `Attempting to queue {count} songs".SnPl(count) + "...`").ConfigureAwait(false);
foreach (var id in idArray)
@@ -279,7 +305,7 @@ await e.Channel.SendMessage($"🎵`Now Playing` {currentSong.PrettyName} " +
});
cgb.CreateCommand("lopl")
- .Description("Queues up to 50 songs from a directory. **Owner Only!**\n**Usage**: `!m lopl C:/music/classical`")
+ .Description("Queues all songs from a directory. **Owner Only!**\n**Usage**: `!m lopl C:/music/classical`")
.Parameter("directory", ParameterType.Unparsed)
.AddCheck(SimpleCheckers.OwnerOnly())
.Do(async e =>
@@ -319,7 +345,7 @@ await e.Channel.SendMessage($"🎵`Now Playing` {currentSong.PrettyName} " +
});
cgb.CreateCommand("lo")
- .Description("Queues a local file by specifying a full path. **Owner Only!**\n**Usage**: `!m ra C:/music/mysong.mp3`")
+ .Description("Queues a local file by specifying a full path. **Owner Only!**\n**Usage**: `!m lo C:/music/mysong.mp3`")
.Parameter("path", ParameterType.Unparsed)
.AddCheck(SimpleCheckers.OwnerOnly())
.Do(async e =>
@@ -352,6 +378,8 @@ await e.Channel.SendMessage($"🎵`Now Playing` {currentSong.PrettyName} " +
{
return;
}
+ if (e.User.VoiceChannel != musicPlayer.PlaybackVoiceChannel)
+ return;
if (arg?.ToLower() == "all")
{
musicPlayer.ClearQueue();
@@ -471,15 +499,7 @@ await e.Channel.SendMessage(currentValue ?
});
- //cgb.CreateCommand("info")
- // .Description("Prints music info (queued/finished/playing) only to this channel")
- // .Do(async e =>
- // {
- // MusicPlayer musicPlayer;
- // if (!MusicPlayers.TryGetValue(e.Server, out musicPlayer))
- // return;
- // musicPlayer
- // });
+
cgb.CreateCommand("load")
.Description("Loads a playlist under a certain name. \n**Usage**: `!m load classical-1`")
@@ -536,7 +556,24 @@ await e.Channel.SendMessage(currentValue ?
}
});
- cgb.CreateCommand("goto")
+ cgb.CreateCommand("playlists")
+ .Alias("pls")
+ .Description("Lists all playlists. Paginated. 20 per page. Default page is 0.\n**Usage**:`!m pls 1`")
+ .Parameter("num", ParameterType.Optional)
+ .Do(e =>
+ {
+ int num = 0;
+ int.TryParse(e.GetArg("num"), out num);
+ if (num < 0)
+ return;
+ var result = DbHandler.Instance.GetPlaylistData(num);
+ if (result.Count == 0)
+ e.Channel.SendMessage($"`No saved playlists found on page {num}`");
+ else
+ e.Channel.SendMessage($"```js\n--- List of saved playlists ---\n\n" + string.Join("\n", result.Select(r => $"'{r.Name}-{r.Id}' by {r.Creator} ({r.SongCnt} songs)")) + $"\n\n --- Page {num} ---```");
+ });
+
+ cgb.CreateCommand("goto")
.Description("Goes to a specific time in seconds in a song.")
.Parameter("time")
.Do(async e =>
@@ -546,6 +583,9 @@ await e.Channel.SendMessage(currentValue ?
if (!MusicPlayers.TryGetValue(e.Server, out musicPlayer))
return;
+ if (e.User.VoiceChannel != musicPlayer.PlaybackVoiceChannel)
+ return;
+
int skipTo;
if (!int.TryParse(skipToStr, out skipTo) || skipTo < 0)
return;
@@ -571,7 +611,20 @@ await e.Channel.SendMessage(currentValue ?
await e.Channel.SendMessage($"`Skipped to {minutes}:{seconds}`").ConfigureAwait(false);
});
- });
+ cgb.CreateCommand("getlink")
+ .Alias("gl")
+ .Description("Shows a link to the currently playing song.")
+ .Do(async e =>
+ {
+ MusicPlayer musicPlayer;
+ if (!MusicPlayers.TryGetValue(e.Server, out musicPlayer))
+ return;
+ var curSong = musicPlayer.CurrentSong;
+ if (curSong == null)
+ return;
+ await e.Channel.SendMessage($"🎶`Current song:` <{curSong.SongInfo.Query}>");
+ });
+ });
}
private async Task QueueSong(Channel textCh, Channel voiceCh, string query, bool silent = false, MusicType musicType = MusicType.Normal)
diff --git a/NadekoBot/Modules/NSFW/NSFWModule.cs b/WizBot/Modules/NSFW/NSFWModule.cs
similarity index 68%
rename from NadekoBot/Modules/NSFW/NSFWModule.cs
rename to WizBot/Modules/NSFW/NSFWModule.cs
index d75ad5316..5beb02caa 100644
--- a/NadekoBot/Modules/NSFW/NSFWModule.cs
+++ b/WizBot/Modules/NSFW/NSFWModule.cs
@@ -1,18 +1,18 @@
using Discord.Commands;
using Discord.Modules;
-using NadekoBot.Classes;
-using NadekoBot.Modules.Permissions.Classes;
+using WizBot.Classes;
+using WizBot.Modules.Permissions.Classes;
using Newtonsoft.Json.Linq;
using System;
-namespace NadekoBot.Modules.NSFW
+namespace WizBot.Modules.NSFW
{
internal class NSFWModule : DiscordModule
{
private readonly Random rng = new Random();
- public override string Prefix { get; } = NadekoBot.Config.CommandPrefixes.NSFW;
+ public override string Prefix { get; } = WizBot.Config.CommandPrefixes.NSFW;
public override void Install(ModuleManager manager)
{
@@ -27,10 +27,16 @@ public override void Install(ModuleManager manager)
.Do(async e =>
{
var tag = e.GetArg("tag")?.Trim() ?? "";
- await e.Channel.SendMessage(":heart: Gelbooru: " + await SearchHelper.GetGelbooruImageLink("rating%3Aexplicit+" + tag).ConfigureAwait(false))
- .ConfigureAwait(false);
- await e.Channel.SendMessage(":heart: Danbooru: " + await SearchHelper.GetDanbooruImageLink("rating%3Aexplicit+" + tag).ConfigureAwait(false))
- .ConfigureAwait(false);
+ var gel = await SearchHelper.GetGelbooruImageLink("rating%3Aexplicit+" + tag).ConfigureAwait(false);
+ if (gel != null)
+ await e.Channel.SendMessage(":heart: Gelbooru: " + gel)
+ .ConfigureAwait(false);
+ var dan = await SearchHelper.GetDanbooruImageLink("rating%3Aexplicit+" + tag).ConfigureAwait(false);
+ if (dan != null)
+ await e.Channel.SendMessage(":heart: Danbooru: " + dan)
+ .ConfigureAwait(false);
+ if (dan == null && gel == null)
+ await e.Channel.SendMessage("`No results.`");
});
cgb.CreateCommand(Prefix + "danbooru")
.Description("Shows a random hentai image from danbooru with a given tag. Tag is optional but preffered. (multiple tags are appended with +)\n**Usage**: ~danbooru yuri+kissing")
@@ -38,7 +44,11 @@ await e.Channel.SendMessage(":heart: Danbooru: " + await SearchHelper.GetDanboor
.Do(async e =>
{
var tag = e.GetArg("tag")?.Trim() ?? "";
- await e.Channel.SendMessage(await SearchHelper.GetDanbooruImageLink(tag).ConfigureAwait(false)).ConfigureAwait(false);
+ var link = await SearchHelper.GetDanbooruImageLink(tag).ConfigureAwait(false);
+ if (string.IsNullOrWhiteSpace(link))
+ await e.Channel.SendMessage("Search yielded no results ;(");
+ else
+ await e.Channel.SendMessage(link).ConfigureAwait(false);
});
cgb.CreateCommand(Prefix + "gelbooru")
.Description("Shows a random hentai image from gelbooru with a given tag. Tag is optional but preffered. (multiple tags are appended with +)\n**Usage**: ~gelbooru yuri+kissing")
@@ -46,26 +56,27 @@ await e.Channel.SendMessage(":heart: Danbooru: " + await SearchHelper.GetDanboor
.Do(async e =>
{
var tag = e.GetArg("tag")?.Trim() ?? "";
- await e.Channel.SendMessage(await SearchHelper.GetGelbooruImageLink(tag).ConfigureAwait(false)).ConfigureAwait(false);
- });
- cgb.CreateCommand(Prefix + "safebooru")
- .Description("Shows a random image from safebooru with a given tag. Tag is optional but preffered. (multiple tags are appended with +)\n**Usage**: ~safebooru yuri+kissing")
- .Parameter("tag", ParameterType.Unparsed)
- .Do(async e =>
- {
- var tag = e.GetArg("tag")?.Trim() ?? "";
- await e.Channel.SendMessage(await SearchHelper.GetSafebooruImageLink(tag).ConfigureAwait(false)).ConfigureAwait(false);
+ var link = await SearchHelper.GetGelbooruImageLink(tag).ConfigureAwait(false);
+ if (string.IsNullOrWhiteSpace(link))
+ await e.Channel.SendMessage("Search yielded no results ;(");
+ else
+ await e.Channel.SendMessage(link).ConfigureAwait(false);
});
+
cgb.CreateCommand(Prefix + "rule34")
- .Description("Shows a random image from rule34.xx with a given tag. Tag is optional but preffered. (multiple tags are appended with +)\n**Usage**: ~gelbooru yuri+kissing")
+ .Description("Shows a random image from rule34.xx with a given tag. Tag is optional but preffered. (multiple tags are appended with +)\n**Usage**: ~rule34 yuri+kissing")
.Parameter("tag", ParameterType.Unparsed)
.Do(async e =>
{
var tag = e.GetArg("tag")?.Trim() ?? "";
- await e.Channel.SendMessage(await SearchHelper.GetRule34ImageLink(tag).ConfigureAwait(false)).ConfigureAwait(false);
+ var link = await SearchHelper.GetRule34ImageLink(tag).ConfigureAwait(false);
+ if (string.IsNullOrWhiteSpace(link))
+ await e.Channel.SendMessage("Search yielded no results ;(");
+ else
+ await e.Channel.SendMessage(link).ConfigureAwait(false);
});
cgb.CreateCommand(Prefix + "e621")
- .Description("Shows a random hentai image from e621.net with a given tag. Tag is optional but preffered. Use spaces for multiple tags.\n**Usage**: ~e621 yuri+kissing")
+ .Description("Shows a random hentai image from e621.net with a given tag. Tag is optional but preffered. Use spaces for multiple tags.\n**Usage**: ~e621 yuri kissing")
.Parameter("tag", ParameterType.Unparsed)
.Do(async e =>
{
@@ -111,4 +122,4 @@ await e.Channel.SendMessage(":heart: Danbooru: " + await SearchHelper.GetDanboor
});
}
}
-}
+}
\ No newline at end of file
diff --git a/NadekoBot/Modules/Permissions/Classes/PermissionChecker.cs b/WizBot/Modules/Permissions/Classes/PermissionChecker.cs
similarity index 90%
rename from NadekoBot/Modules/Permissions/Classes/PermissionChecker.cs
rename to WizBot/Modules/Permissions/Classes/PermissionChecker.cs
index ae54c7c4b..6d94b26b3 100644
--- a/NadekoBot/Modules/Permissions/Classes/PermissionChecker.cs
+++ b/WizBot/Modules/Permissions/Classes/PermissionChecker.cs
@@ -1,12 +1,12 @@
using Discord;
using Discord.Commands;
using Discord.Commands.Permissions;
-using NadekoBot.Classes.JSONModels;
+using WizBot.Classes.JSONModels;
using System;
using System.Collections.Concurrent;
using System.Threading.Tasks;
-namespace NadekoBot.Modules.Permissions.Classes
+namespace WizBot.Modules.Permissions.Classes
{
internal class PermissionChecker : IPermissionChecker
@@ -33,7 +33,7 @@ public bool CanRun(Command command, User user, Channel channel, out string error
{
error = String.Empty;
- if (!NadekoBot.Ready)
+ if (!WizBot.Ready)
return false;
if (channel.IsPrivate || channel.Server == null)
@@ -51,6 +51,14 @@ public bool CanRun(Command command, User user, Channel channel, out string error
timeBlackList.TryAdd(user, DateTime.Now);
+ if (!channel.IsPrivate && !channel.Server.CurrentUser.GetPermissions(channel).SendMessages)
+ {
+ return false;
+ }
+ //{
+ // user.SendMessage($"I ignored your command in {channel.Server.Name}/#{channel.Name} because i don't have permissions to write to it. Please use `;acm channel_name 0` in that server instead of muting me.").GetAwaiter().GetResult();
+ //}
+
try
{
//is it a permission command?
@@ -69,7 +77,7 @@ public bool CanRun(Command command, User user, Channel channel, out string error
return true;
ServerPermissions perms;
PermissionsHandler.PermissionsDict.TryGetValue(user.Server.Id, out perms);
- throw new Exception($"You don't have the necessary role (**{(perms?.PermissionsControllerRole ?? "Nadeko")}**) to change permissions.");
+ throw new Exception($"You don't have the necessary role (**{(perms?.PermissionsControllerRole ?? "Wiz Bot")}**) to change permissions.");
}
var permissionType = PermissionsHandler.GetPermissionBanType(command, user, channel);
diff --git a/NadekoBot/Modules/Permissions/Classes/PermissionHelper.cs b/WizBot/Modules/Permissions/Classes/PermissionHelper.cs
similarity index 93%
rename from NadekoBot/Modules/Permissions/Classes/PermissionHelper.cs
rename to WizBot/Modules/Permissions/Classes/PermissionHelper.cs
index aef62ac84..885ee65f7 100644
--- a/NadekoBot/Modules/Permissions/Classes/PermissionHelper.cs
+++ b/WizBot/Modules/Permissions/Classes/PermissionHelper.cs
@@ -4,7 +4,7 @@
using System;
using System.Linq;
-namespace NadekoBot.Modules.Permissions.Classes
+namespace WizBot.Modules.Permissions.Classes
{
internal static class PermissionHelper
{
@@ -42,7 +42,7 @@ internal static string ValidateModule(string mod)
if (string.IsNullOrWhiteSpace(mod))
throw new ArgumentNullException(nameof(mod));
- foreach (var m in NadekoBot.Client.GetService().Modules)
+ foreach (var m in WizBot.Client.GetService().Modules)
{
if (m.Name.ToLower().Equals(mod.Trim().ToLower()))
return m.Name;
@@ -55,7 +55,7 @@ internal static string ValidateCommand(string commandText)
if (string.IsNullOrWhiteSpace(commandText))
throw new ArgumentNullException(nameof(commandText));
- foreach (var com in NadekoBot.Client.GetService().AllCommands)
+ foreach (var com in WizBot.Client.GetService().AllCommands)
{
if (com.Text.ToLower().Equals(commandText.Trim().ToLower()))
return com.Text;
diff --git a/NadekoBot/Modules/Permissions/Classes/PermissionsHandler.cs b/WizBot/Modules/Permissions/Classes/PermissionsHandler.cs
similarity index 87%
rename from NadekoBot/Modules/Permissions/Classes/PermissionsHandler.cs
rename to WizBot/Modules/Permissions/Classes/PermissionsHandler.cs
index a9bac105a..61bece147 100644
--- a/NadekoBot/Modules/Permissions/Classes/PermissionsHandler.cs
+++ b/WizBot/Modules/Permissions/Classes/PermissionsHandler.cs
@@ -7,7 +7,7 @@
using System.Linq;
using System.Threading.Tasks;
-namespace NadekoBot.Modules.Permissions.Classes
+namespace WizBot.Modules.Permissions.Classes
{
public static class PermissionsHandler
{
@@ -192,6 +192,60 @@ internal static void SetVerbosity(Server server, bool val)
Task.Run(() => WriteServerToJson(serverPerms));
}
+ internal static void CopyRolePermissions(Role fromRole, Role toRole)
+ {
+ var server = fromRole.Server;
+ var serverPerms = PermissionsDict.GetOrAdd(server.Id,
+ new ServerPermissions(server.Id, server.Name));
+
+ var from = GetRolePermissionsById(server, fromRole.Id);
+ if (from == null)
+ serverPerms.RolePermissions.Add(fromRole.Id, from = new Permissions(fromRole.Name));
+ var to = GetRolePermissionsById(server, toRole.Id);
+ if (to == null)
+ serverPerms.RolePermissions.Add(toRole.Id, to = new Permissions(toRole.Name));
+
+ to.CopyFrom(from);
+
+ Task.Run(() => WriteServerToJson(serverPerms));
+ }
+
+ internal static void CopyChannelPermissions(Channel fromChannel, Channel toChannel)
+ {
+ var server = fromChannel.Server;
+ var serverPerms = PermissionsDict.GetOrAdd(server.Id,
+ new ServerPermissions(server.Id, server.Name));
+
+ var from = GetChannelPermissionsById(server, fromChannel.Id);
+ if (from == null)
+ serverPerms.ChannelPermissions.Add(fromChannel.Id, from = new Permissions(fromChannel.Name));
+ var to = GetChannelPermissionsById(server, toChannel.Id);
+ if (to == null)
+ serverPerms.ChannelPermissions.Add(toChannel.Id, to = new Permissions(toChannel.Name));
+
+ to.CopyFrom(from);
+
+ Task.Run(() => WriteServerToJson(serverPerms));
+ }
+
+ internal static void CopyUserPermissions(User fromUser, User toUser)
+ {
+ var server = fromUser.Server;
+ var serverPerms = PermissionsDict.GetOrAdd(server.Id,
+ new ServerPermissions(server.Id, server.Name));
+
+ var from = GetUserPermissionsById(server, fromUser.Id);
+ if (from == null)
+ serverPerms.UserPermissions.Add(fromUser.Id, from = new Permissions(fromUser.Name));
+ var to = GetUserPermissionsById(server, toUser.Id);
+ if (to == null)
+ serverPerms.UserPermissions.Add(toUser.Id, to = new Permissions(toUser.Name));
+
+ to.CopyFrom(from);
+
+ Task.Run(() => WriteServerToJson(serverPerms));
+ }
+
public static void SetServerModulePermission(Server server, string moduleName, bool value)
{
var serverPerms = PermissionsDict.GetOrAdd(server.Id,
@@ -424,6 +478,18 @@ public Permissions(string name)
FilterWords = false;
}
+ public void CopyFrom(Permissions other)
+ {
+ Modules.Clear();
+ foreach (var mp in other.Modules)
+ Modules.AddOrUpdate(mp.Key, mp.Value, (s, b) => mp.Value);
+ Commands.Clear();
+ foreach (var cp in other.Commands)
+ Commands.AddOrUpdate(cp.Key, cp.Value, (s, b) => cp.Value);
+ FilterInvites = other.FilterInvites;
+ FilterWords = other.FilterWords;
+ }
+
public override string ToString()
{
var toReturn = "";
@@ -475,7 +541,7 @@ public class ServerPermissions
public ServerPermissions(ulong id, string name)
{
Id = id;
- PermissionsControllerRole = "Nadeko";
+ PermissionsControllerRole = "WizBot";
Verbose = true;
Permissions = new Permissions(name);
diff --git a/NadekoBot/Modules/Permissions/Classes/SimpleCheckers.cs b/WizBot/Modules/Permissions/Classes/SimpleCheckers.cs
similarity index 91%
rename from NadekoBot/Modules/Permissions/Classes/SimpleCheckers.cs
rename to WizBot/Modules/Permissions/Classes/SimpleCheckers.cs
index 3ab0650da..472532887 100644
--- a/NadekoBot/Modules/Permissions/Classes/SimpleCheckers.cs
+++ b/WizBot/Modules/Permissions/Classes/SimpleCheckers.cs
@@ -3,14 +3,14 @@
using Discord.Commands.Permissions;
using System;
-namespace NadekoBot.Modules.Permissions.Classes
+namespace WizBot.Modules.Permissions.Classes
{
public static class SimpleCheckers
{
public static ManageRoles CanManageRoles { get; } = new ManageRoles();
public static Func OwnerOnly() =>
- (com, user, ch) => NadekoBot.IsOwner(user.Id);
+ (com, user, ch) => WizBot.IsOwner(user.Id);
public static Func ManageMessages() =>
(com, user, ch) => user.ServerPermissions.ManageMessages;
diff --git a/NadekoBot/Modules/Permissions/Commands/FilterInvitesCommand.cs b/WizBot/Modules/Permissions/Commands/FilterInvitesCommand.cs
similarity index 94%
rename from NadekoBot/Modules/Permissions/Commands/FilterInvitesCommand.cs
rename to WizBot/Modules/Permissions/Commands/FilterInvitesCommand.cs
index 98e1a2f16..2dc516606 100644
--- a/NadekoBot/Modules/Permissions/Commands/FilterInvitesCommand.cs
+++ b/WizBot/Modules/Permissions/Commands/FilterInvitesCommand.cs
@@ -1,11 +1,11 @@
using Discord;
using Discord.Commands;
-using NadekoBot.Classes;
-using NadekoBot.Modules.Permissions.Classes;
+using WizBot.Classes;
+using WizBot.Modules.Permissions.Classes;
using System;
using System.Text.RegularExpressions;
-namespace NadekoBot.Modules.Permissions.Commands
+namespace WizBot.Modules.Permissions.Commands
{
internal class FilterInvitesCommand : DiscordCommand
{
@@ -14,9 +14,9 @@ internal class FilterInvitesCommand : DiscordCommand
public FilterInvitesCommand(DiscordModule module) : base(module)
{
- NadekoBot.Client.MessageReceived += async (sender, args) =>
+ WizBot.Client.MessageReceived += async (sender, args) =>
{
- if (args.Channel.IsPrivate || args.User.Id == NadekoBot.Client.CurrentUser.Id) return;
+ if (args.Channel.IsPrivate || args.User.Id == WizBot.Client.CurrentUser.Id) return;
try
{
Classes.ServerPermissions serverPerms;
diff --git a/NadekoBot/Modules/Permissions/Commands/FilterWordsCommand.cs b/WizBot/Modules/Permissions/Commands/FilterWordsCommand.cs
similarity index 94%
rename from NadekoBot/Modules/Permissions/Commands/FilterWordsCommand.cs
rename to WizBot/Modules/Permissions/Commands/FilterWordsCommand.cs
index 54819edab..4e6f7268e 100644
--- a/NadekoBot/Modules/Permissions/Commands/FilterWordsCommand.cs
+++ b/WizBot/Modules/Permissions/Commands/FilterWordsCommand.cs
@@ -1,19 +1,19 @@
using Discord;
using Discord.Commands;
-using NadekoBot.Classes;
-using NadekoBot.Modules.Permissions.Classes;
+using WizBot.Classes;
+using WizBot.Modules.Permissions.Classes;
using System;
using System.Linq;
-namespace NadekoBot.Modules.Permissions.Commands
+namespace WizBot.Modules.Permissions.Commands
{
internal class FilterWords : DiscordCommand
{
public FilterWords(DiscordModule module) : base(module)
{
- NadekoBot.Client.MessageReceived += async (sender, args) =>
+ WizBot.Client.MessageReceived += async (sender, args) =>
{
- if (args.Channel.IsPrivate || args.User.Id == NadekoBot.Client.CurrentUser.Id) return;
+ if (args.Channel.IsPrivate || args.User.Id == WizBot.Client.CurrentUser.Id) return;
try
{
Classes.ServerPermissions serverPerms;
@@ -53,7 +53,7 @@ internal override void Init(CommandGroupBuilder cgb)
.Alias(Module.Prefix + "channelfilterwords")
.Description("Enables or disables automatic deleting of messages containing banned words on the channel." +
"If no channel supplied, it will default to current one. Use ALL to apply to all existing channels at once." +
- "\n**Usage**: ;cfi enable #general-chat")
+ "\n**Usage**: ;cfw enable #general-chat")
.Parameter("bool")
.Parameter("channel", ParameterType.Optional)
.Do(async e =>
@@ -89,7 +89,7 @@ internal override void Init(CommandGroupBuilder cgb)
cgb.CreateCommand(Module.Prefix + "afw")
.Alias(Module.Prefix + "addfilteredword")
.Description("Adds a new word to the list of filtered words" +
- "\n**Usage**: ;aw poop")
+ "\n**Usage**: ;afw poop")
.Parameter("word", ParameterType.Unparsed)
.Do(async e =>
{
@@ -152,7 +152,7 @@ await e.Channel.SendMessage($"There are `{serverPerms.Words.Count}` filtered wor
cgb.CreateCommand(Module.Prefix + "sfw")
.Alias(Module.Prefix + "serverfilterwords")
- .Description("Enables or disables automatic deleting of messages containing forbidden words on the server.\n**Usage**: ;sfi disable")
+ .Description("Enables or disables automatic deleting of messages containing forbidden words on the server.\n**Usage**: ;sfw disable")
.Parameter("bool")
.Do(async e =>
{
diff --git a/NadekoBot/Modules/Permissions/PermissionsModule.cs b/WizBot/Modules/Permissions/PermissionsModule.cs
similarity index 82%
rename from NadekoBot/Modules/Permissions/PermissionsModule.cs
rename to WizBot/Modules/Permissions/PermissionsModule.cs
index 61a5fd521..eddfd22db 100644
--- a/NadekoBot/Modules/Permissions/PermissionsModule.cs
+++ b/WizBot/Modules/Permissions/PermissionsModule.cs
@@ -1,19 +1,19 @@
using Discord.Commands;
using Discord.Modules;
-using NadekoBot.Classes.JSONModels;
-using NadekoBot.Extensions;
-using NadekoBot.Modules.Games.Commands;
-using NadekoBot.Modules.Permissions.Classes;
-using NadekoBot.Modules.Permissions.Commands;
+using WizBot.Classes.JSONModels;
+using WizBot.Extensions;
+using WizBot.Modules.Games.Commands;
+using WizBot.Modules.Permissions.Classes;
+using WizBot.Modules.Permissions.Commands;
using System;
using System.Linq;
using System.Threading.Tasks;
-namespace NadekoBot.Modules.Permissions
+namespace WizBot.Modules.Permissions
{
internal class PermissionModule : DiscordModule
{
- public override string Prefix { get; } = NadekoBot.Config.CommandPrefixes.Permissions;
+ public override string Prefix { get; } = WizBot.Config.CommandPrefixes.Permissions;
public PermissionModule()
{
@@ -32,7 +32,7 @@ public override void Install(ModuleManager manager)
cgb.CreateCommand(Prefix + "permrole")
.Alias(Prefix + "pr")
- .Description("Sets a role which can change permissions. Or supply no parameters to find out the current one. Default one is 'Nadeko'.")
+ .Description("Sets a role which can change permissions. Or supply no parameters to find out the current one. Default one is 'Wiz Bot'.")
.Parameter("role", ParameterType.Unparsed)
.Do(async e =>
{
@@ -58,7 +58,94 @@ public override void Install(ModuleManager manager)
await e.Channel.SendMessage($"Role `{role.Name}` is now required in order to change permissions.").ConfigureAwait(false);
});
- cgb.CreateCommand(Prefix + "verbose")
+ cgb.CreateCommand(Prefix + "rpc")
+ .Alias(Prefix + "rolepermissionscopy")
+ .Description($"Copies BOT PERMISSIONS (not discord permissions) from one role to another.\n**Usage**:`{Prefix}rpc Some Role ~ Some other role`")
+ .Parameter("from_to", ParameterType.Unparsed)
+ .Do(async e =>
+ {
+ var arg = e.GetArg("from_to")?.Trim();
+ if (string.IsNullOrWhiteSpace(arg) || !arg.Contains('~'))
+ return;
+ var args = arg.Split('~').Select(a => a.Trim()).ToArray();
+ if (args.Length > 2)
+ {
+ await e.Channel.SendMessage("💢Invalid number of '~'s in the argument.");
+ return;
+ }
+ try
+ {
+ var fromRole = PermissionHelper.ValidateRole(e.Server, args[0]);
+ var toRole = PermissionHelper.ValidateRole(e.Server, args[1]);
+
+ PermissionsHandler.CopyRolePermissions(fromRole, toRole);
+ await e.Channel.SendMessage($"Copied permission settings from **{fromRole.Name}** to **{toRole.Name}**.");
+ }
+ catch (Exception ex)
+ {
+ await e.Channel.SendMessage($"💢{ex.Message}");
+ }
+ });
+
+ cgb.CreateCommand(Prefix + "cpc")
+ .Alias(Prefix + "channelpermissionscopy")
+ .Description($"Copies BOT PERMISSIONS (not discord permissions) from one channel to another.\n**Usage**:`{Prefix}cpc Some Channel ~ Some other channel`")
+ .Parameter("from_to", ParameterType.Unparsed)
+ .Do(async e =>
+ {
+ var arg = e.GetArg("from_to")?.Trim();
+ if (string.IsNullOrWhiteSpace(arg) || !arg.Contains('~'))
+ return;
+ var args = arg.Split('~').Select(a => a.Trim()).ToArray();
+ if (args.Length > 2)
+ {
+ await e.Channel.SendMessage("💢Invalid number of '~'s in the argument.");
+ return;
+ }
+ try
+ {
+ var fromChannel = PermissionHelper.ValidateChannel(e.Server, args[0]);
+ var toChannel = PermissionHelper.ValidateChannel(e.Server, args[1]);
+
+ PermissionsHandler.CopyChannelPermissions(fromChannel, toChannel);
+ await e.Channel.SendMessage($"Copied permission settings from **{fromChannel.Name}** to **{toChannel.Name}**.");
+ }
+ catch (Exception ex)
+ {
+ await e.Channel.SendMessage($"💢{ex.Message}");
+ }
+ });
+
+ cgb.CreateCommand(Prefix + "upc")
+ .Alias(Prefix + "userpermissionscopy")
+ .Description($"Copies BOT PERMISSIONS (not discord permissions) from one role to another.\n**Usage**:`{Prefix}upc @SomeUser ~ @SomeOtherUser`")
+ .Parameter("from_to", ParameterType.Unparsed)
+ .Do(async e =>
+ {
+ var arg = e.GetArg("from_to")?.Trim();
+ if (string.IsNullOrWhiteSpace(arg) || !arg.Contains('~'))
+ return;
+ var args = arg.Split('~').Select(a => a.Trim()).ToArray();
+ if (args.Length > 2)
+ {
+ await e.Channel.SendMessage("💢Invalid number of '~'s in the argument.");
+ return;
+ }
+ try
+ {
+ var fromUser = PermissionHelper.ValidateUser(e.Server, args[0]);
+ var toUser = PermissionHelper.ValidateUser(e.Server, args[1]);
+
+ PermissionsHandler.CopyUserPermissions(fromUser, toUser);
+ await e.Channel.SendMessage($"Copied permission settings from **{fromUser.ToString()}**to * *{toUser.ToString()}**.");
+ }
+ catch (Exception ex)
+ {
+ await e.Channel.SendMessage($"💢{ex.Message}");
+ }
+ });
+
+ cgb.CreateCommand(Prefix + "verbose")
.Alias(Prefix + "v")
.Description("Sets whether to show when a command/module is blocked.\n**Usage**: ;verbose true")
.Parameter("arg", ParameterType.Required)
@@ -134,7 +221,7 @@ public override void Install(ModuleManager manager)
cgb.CreateCommand(Prefix + "userperms")
.Alias(Prefix + "up")
- .Description("Shows banned permissions for a certain user. No argument means for yourself.\n**Usage**: ;up Kwoth")
+ .Description("Shows banned permissions for a certain user. No argument means for yourself.\n**Usage**: ;up Wizkiller96")
.Parameter("user", ParameterType.Unparsed)
.Do(async e =>
{
@@ -292,7 +379,8 @@ public override void Install(ModuleManager manager)
var module = PermissionHelper.ValidateModule(e.GetArg("module"));
var state = PermissionHelper.ValidateBool(e.GetArg("bool"));
- if (e.GetArg("channel")?.ToLower() == "all")
+ var channelArg = e.GetArg("channel");
+ if (channelArg?.ToLower() == "all")
{
foreach (var channel in e.Server.TextChannels)
{
@@ -300,9 +388,14 @@ public override void Install(ModuleManager manager)
}
await e.Channel.SendMessage($"Module **{module}** has been **{(state ? "enabled" : "disabled")}** on **ALL** channels.").ConfigureAwait(false);
}
- else
+ else if (string.IsNullOrWhiteSpace(channelArg))
{
- var channel = PermissionHelper.ValidateChannel(e.Server, e.GetArg("channel"));
+ PermissionsHandler.SetChannelModulePermission(e.Channel, module, state);
+ await e.Channel.SendMessage($"Module **{module}** has been **{(state ? "enabled" : "disabled")}** for **{e.Channel.Name}** channel.").ConfigureAwait(false);
+ }
+ else
+ {
+ var channel = PermissionHelper.ValidateChannel(e.Server, channelArg);
PermissionsHandler.SetChannelModulePermission(channel, module, state);
await e.Channel.SendMessage($"Module **{module}** has been **{(state ? "enabled" : "disabled")}** for **{channel.Name}** channel.").ConfigureAwait(false);
@@ -417,7 +510,7 @@ public override void Install(ModuleManager manager)
{
var state = PermissionHelper.ValidateBool(e.GetArg("bool"));
- foreach (var module in NadekoBot.Client.GetService().Modules)
+ foreach (var module in WizBot.Client.GetService().Modules)
{
PermissionsHandler.SetServerModulePermission(e.Server, module.Name, state);
}
@@ -444,7 +537,7 @@ public override void Install(ModuleManager manager)
var state = PermissionHelper.ValidateBool(e.GetArg("bool"));
var module = PermissionHelper.ValidateModule(e.GetArg("module"));
- foreach (var command in NadekoBot.Client.GetService().AllCommands.Where(c => c.Category == module))
+ foreach (var command in WizBot.Client.GetService().AllCommands.Where(c => c.Category == module))
{
PermissionsHandler.SetServerCommandPermission(e.Server, command.Text, state);
}
@@ -469,8 +562,9 @@ public override void Install(ModuleManager manager)
try
{
var state = PermissionHelper.ValidateBool(e.GetArg("bool"));
- var channel = PermissionHelper.ValidateChannel(e.Server, e.GetArg("channel"));
- foreach (var module in NadekoBot.Client.GetService().Modules)
+ var chArg = e.GetArg("channel");
+ var channel = string.IsNullOrWhiteSpace(chArg) ? e.Channel :PermissionHelper.ValidateChannel(e.Server, chArg);
+ foreach (var module in WizBot.Client.GetService().Modules)
{
PermissionsHandler.SetChannelModulePermission(channel, module.Name, state);
}
@@ -499,7 +593,7 @@ public override void Install(ModuleManager manager)
var state = PermissionHelper.ValidateBool(e.GetArg("bool"));
var module = PermissionHelper.ValidateModule(e.GetArg("module"));
var channel = PermissionHelper.ValidateChannel(e.Server, e.GetArg("channel"));
- foreach (var command in NadekoBot.Client.GetService().AllCommands.Where(c => c.Category == module))
+ foreach (var command in WizBot.Client.GetService().AllCommands.Where(c => c.Category == module))
{
PermissionsHandler.SetChannelCommandPermission(channel, command.Text, state);
}
@@ -525,7 +619,7 @@ public override void Install(ModuleManager manager)
{
var state = PermissionHelper.ValidateBool(e.GetArg("bool"));
var role = PermissionHelper.ValidateRole(e.Server, e.GetArg("role"));
- foreach (var module in NadekoBot.Client.GetService().Modules)
+ foreach (var module in WizBot.Client.GetService().Modules)
{
PermissionsHandler.SetRoleModulePermission(role, module.Name, state);
}
@@ -554,7 +648,7 @@ public override void Install(ModuleManager manager)
var state = PermissionHelper.ValidateBool(e.GetArg("bool"));
var module = PermissionHelper.ValidateModule(e.GetArg("module"));
var role = PermissionHelper.ValidateRole(e.Server, e.GetArg("channel"));
- foreach (var command in NadekoBot.Client.GetService().AllCommands.Where(c => c.Category == module))
+ foreach (var command in WizBot.Client.GetService().AllCommands.Where(c => c.Category == module))
{
PermissionsHandler.SetRoleCommandPermission(role, command.Text, state);
}
@@ -580,7 +674,7 @@ await Task.Run(async () =>
{
if (!e.Message.MentionedUsers.Any()) return;
var usr = e.Message.MentionedUsers.First();
- NadekoBot.Config.UserBlacklist.Add(usr.Id);
+ WizBot.Config.UserBlacklist.Add(usr.Id);
ConfigHandler.SaveConfig();
await e.Channel.SendMessage($"`Sucessfully blacklisted user {usr.Name}`").ConfigureAwait(false);
}).ConfigureAwait(false);
@@ -596,9 +690,9 @@ await Task.Run(async () =>
{
if (!e.Message.MentionedUsers.Any()) return;
var usr = e.Message.MentionedUsers.First();
- if (NadekoBot.Config.UserBlacklist.Contains(usr.Id))
+ if (WizBot.Config.UserBlacklist.Contains(usr.Id))
{
- NadekoBot.Config.UserBlacklist.Remove(usr.Id);
+ WizBot.Config.UserBlacklist.Remove(usr.Id);
ConfigHandler.SaveConfig();
await e.Channel.SendMessage($"`Sucessfully unblacklisted user {usr.Name}`").ConfigureAwait(false);
}
@@ -610,7 +704,7 @@ await Task.Run(async () =>
});
cgb.CreateCommand(Prefix + "cbl")
- .Description("Blacklists a mentioned channel (#general for example).\n**Usage**: ;ubl [channel_mention]")
+ .Description("Blacklists a mentioned channel (#general for example).\n**Usage**: ;cbl [channel_mention]")
.Parameter("channel", ParameterType.Unparsed)
.Do(async e =>
{
@@ -618,7 +712,7 @@ await Task.Run(async () =>
{
if (!e.Message.MentionedChannels.Any()) return;
var ch = e.Message.MentionedChannels.First();
- NadekoBot.Config.UserBlacklist.Add(ch.Id);
+ WizBot.Config.UserBlacklist.Add(ch.Id);
ConfigHandler.SaveConfig();
await e.Channel.SendMessage($"`Sucessfully blacklisted channel {ch.Name}`").ConfigureAwait(false);
}).ConfigureAwait(false);
@@ -633,14 +727,14 @@ await Task.Run(async () =>
{
if (!e.Message.MentionedChannels.Any()) return;
var ch = e.Message.MentionedChannels.First();
- NadekoBot.Config.UserBlacklist.Remove(ch.Id);
+ WizBot.Config.UserBlacklist.Remove(ch.Id);
ConfigHandler.SaveConfig();
await e.Channel.SendMessage($"`Sucessfully blacklisted channel {ch.Name}`").ConfigureAwait(false);
}).ConfigureAwait(false);
});
cgb.CreateCommand(Prefix + "sbl")
- .Description("Blacklists a server by a name or id (#general for example). **BOT OWNER ONLY**\n**Usage**: ;usl [servername/serverid]")
+ .Description("Blacklists a server by a name or id (#general for example). **BOT OWNER ONLY**\n**Usage**: ;sbl [servername/serverid]")
.Parameter("server", ParameterType.Unparsed)
.AddCheck(SimpleCheckers.OwnerOnly())
.Do(async e =>
@@ -650,15 +744,15 @@ await Task.Run(async () =>
var arg = e.GetArg("server")?.Trim();
if (string.IsNullOrWhiteSpace(arg))
return;
- var server = NadekoBot.Client.Servers.FirstOrDefault(s => s.Id.ToString() == arg) ??
- NadekoBot.Client.FindServers(arg.Trim()).FirstOrDefault();
+ var server = WizBot.Client.Servers.FirstOrDefault(s => s.Id.ToString() == arg) ??
+ WizBot.Client.FindServers(arg.Trim()).FirstOrDefault();
if (server == null)
{
await e.Channel.SendMessage("Cannot find that server").ConfigureAwait(false);
return;
}
var serverId = server.Id;
- NadekoBot.Config.ServerBlacklist.Add(serverId);
+ WizBot.Config.ServerBlacklist.Add(serverId);
ConfigHandler.SaveConfig();
//cleanup trivias and typeracing
Modules.Games.Commands.Trivia.TriviaGame trivia;
diff --git a/NadekoBot/Modules/Pokemon/PokeStats.cs b/WizBot/Modules/Pokemon/PokeStats.cs
similarity index 91%
rename from NadekoBot/Modules/Pokemon/PokeStats.cs
rename to WizBot/Modules/Pokemon/PokeStats.cs
index b97950437..8a2dfc0ae 100644
--- a/NadekoBot/Modules/Pokemon/PokeStats.cs
+++ b/WizBot/Modules/Pokemon/PokeStats.cs
@@ -1,6 +1,6 @@
using System.Collections.Generic;
-namespace NadekoBot.Modules.Pokemon
+namespace WizBot.Modules.Pokemon
{
class PokeStats
{
diff --git a/NadekoBot/Modules/Pokemon/PokemonModule.cs b/WizBot/Modules/Pokemon/PokemonModule.cs
similarity index 89%
rename from NadekoBot/Modules/Pokemon/PokemonModule.cs
rename to WizBot/Modules/Pokemon/PokemonModule.cs
index aa271d3b0..a1ce86901 100644
--- a/NadekoBot/Modules/Pokemon/PokemonModule.cs
+++ b/WizBot/Modules/Pokemon/PokemonModule.cs
@@ -1,20 +1,20 @@
using Discord.Commands;
using Discord.Modules;
-using NadekoBot.Classes;
-using NadekoBot.Classes.JSONModels;
-using NadekoBot.DataModels;
-using NadekoBot.Extensions;
-using NadekoBot.Modules.Permissions.Classes;
+using WizBot.Classes;
+using WizBot.Classes.JSONModels;
+using WizBot.DataModels;
+using WizBot.Extensions;
+using WizBot.Modules.Permissions.Classes;
using System;
using System.Collections.Concurrent;
using System.Collections.Generic;
using System.Linq;
-namespace NadekoBot.Modules.Pokemon
+namespace WizBot.Modules.Pokemon
{
class PokemonModule : DiscordModule
{
- public override string Prefix { get; } = NadekoBot.Config.CommandPrefixes.Pokemon;
+ public override string Prefix { get; } = WizBot.Config.CommandPrefixes.Pokemon;
private ConcurrentDictionary Stats = new ConcurrentDictionary();
@@ -48,11 +48,11 @@ private PokemonType GetPokeType(ulong id)
{
return stringToPokemonType(setTypes[(long)id]);
}
- int count = NadekoBot.Config.PokemonTypes.Count;
+ int count = WizBot.Config.PokemonTypes.Count;
int remainder = Math.Abs((int)(id % (ulong)count));
- return NadekoBot.Config.PokemonTypes[remainder];
+ return WizBot.Config.PokemonTypes[remainder];
}
@@ -60,7 +60,7 @@ private PokemonType GetPokeType(ulong id)
private PokemonType stringToPokemonType(string v)
{
var str = v.ToUpperInvariant();
- var list = NadekoBot.Config.PokemonTypes;
+ var list = WizBot.Config.PokemonTypes;
foreach (PokemonType p in list)
{
if (str == p.Name)
@@ -210,7 +210,7 @@ public override void Install(ModuleManager manager)
});
cgb.CreateCommand(Prefix + "heal")
- .Description($"Heals someone. Revives those that fainted. Costs a {NadekoBot.Config.CurrencyName} \n**Usage**:{Prefix}revive @someone")
+ .Description($"Heals someone. Revives those that fainted. Costs a {WizBot.Config.CurrencyName} \n**Usage**:{Prefix}revive @someone")
.Parameter("target", ParameterType.Unparsed)
.Do(async e =>
{
@@ -238,7 +238,7 @@ public override void Install(ModuleManager manager)
var pts = Classes.DbHandler.Instance.GetStateByUserId((long)e.User.Id)?.Value ?? 0;
if (pts < amount)
{
- await e.Channel.SendMessage($"{e.User.Mention} you don't have enough {NadekoBot.Config.CurrencyName}s! \nYou still need {amount - pts} {NadekoBot.Config.CurrencySign} to be able to do this!").ConfigureAwait(false);
+ await e.Channel.SendMessage($"{e.User.Mention} you don't have enough {WizBot.Config.CurrencyName}s! \nYou still need {amount - pts} {WizBot.Config.CurrencySign} to be able to do this!").ConfigureAwait(false);
return;
}
var target = (usr.Id == e.User.Id) ? "yourself" : usr.Name;
@@ -249,11 +249,11 @@ public override void Install(ModuleManager manager)
{
//Could heal only for half HP?
Stats[usr.Id].Hp = (targetStats.MaxHp / 2);
- await e.Channel.SendMessage($"{e.User.Name} revived {usr.Name} with one {NadekoBot.Config.CurrencySign}").ConfigureAwait(false);
+ await e.Channel.SendMessage($"{e.User.Name} revived {usr.Name} with one {WizBot.Config.CurrencySign}").ConfigureAwait(false);
return;
}
- var vowelFirst = new[] { 'a', 'e', 'i', 'o', 'u' }.Contains(NadekoBot.Config.CurrencyName[0]);
- await e.Channel.SendMessage($"{e.User.Name} healed {usr.Name} for {targetStats.MaxHp - HP} HP with {(vowelFirst ? "an" : "a")} {NadekoBot.Config.CurrencySign}").ConfigureAwait(false);
+ var vowelFirst = new[] { 'a', 'e', 'i', 'o', 'u' }.Contains(WizBot.Config.CurrencyName[0]);
+ await e.Channel.SendMessage($"{e.User.Name} healed {usr.Name} for {targetStats.MaxHp - HP} HP with {(vowelFirst ? "an" : "a")} {WizBot.Config.CurrencySign}").ConfigureAwait(false);
return;
}
else
@@ -282,7 +282,7 @@ public override void Install(ModuleManager manager)
});
cgb.CreateCommand(Prefix + "settype")
- .Description($"Set your poketype. Costs a {NadekoBot.Config.CurrencyName}.\n**Usage**: {Prefix}settype fire")
+ .Description($"Set your poketype. Costs a {WizBot.Config.CurrencyName}.\n**Usage**: {Prefix}settype fire")
.Parameter("targetType", ParameterType.Unparsed)
.Do(async e =>
{
@@ -292,7 +292,7 @@ public override void Install(ModuleManager manager)
var targetType = stringToPokemonType(targetTypeStr);
if (targetType == null)
{
- await e.Channel.SendMessage("Invalid type specified. Type must be one of:\nNORMAL, FIRE, WATER, ELECTRIC, GRASS, ICE, FIGHTING, POISON, GROUND, FLYING, PSYCHIC, BUG, ROCK, GHOST, DRAGON, DARK, STEEL").ConfigureAwait(false);
+ await e.Channel.SendMessage("Invalid type specified. Type must be one of:\n" + string.Join(", ", WizBot.Config.PokemonTypes.Select(t => t.Name.ToUpperInvariant()))).ConfigureAwait(false);
return;
}
if (targetType == GetPokeType(e.User.Id))
@@ -306,7 +306,7 @@ public override void Install(ModuleManager manager)
var pts = DbHandler.Instance.GetStateByUserId((long)e.User.Id)?.Value ?? 0;
if (pts < amount)
{
- await e.Channel.SendMessage($"{e.User.Mention} you don't have enough {NadekoBot.Config.CurrencyName}s! \nYou still need {amount - pts} {NadekoBot.Config.CurrencySign} to be able to do this!").ConfigureAwait(false);
+ await e.Channel.SendMessage($"{e.User.Mention} you don't have enough {WizBot.Config.CurrencyName}s! \nYou still need {amount - pts} {WizBot.Config.CurrencySign} to be able to do this!").ConfigureAwait(false);
return;
}
FlowersHandler.RemoveFlowers(e.User, $"set usertype to {targetTypeStr}", amount);
@@ -327,7 +327,7 @@ public override void Install(ModuleManager manager)
//Now for the response
- await e.Channel.SendMessage($"Set type of {e.User.Mention} to {targetTypeStr}{targetType.Icon} for a {NadekoBot.Config.CurrencySign}").ConfigureAwait(false);
+ await e.Channel.SendMessage($"Set type of {e.User.Mention} to {targetTypeStr}{targetType.Icon} for a {WizBot.Config.CurrencySign}").ConfigureAwait(false);
});
});
}
diff --git a/WizBot/Modules/Programming/Commands/HaskellRepl.cs b/WizBot/Modules/Programming/Commands/HaskellRepl.cs
new file mode 100644
index 000000000..a4cbf000c
--- /dev/null
+++ b/WizBot/Modules/Programming/Commands/HaskellRepl.cs
@@ -0,0 +1,92 @@
+using Discord;
+using Discord.Commands;
+using WizBot.Classes;
+using System.Collections.Concurrent;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+
+///
+/// I have no idea what am i doing
+///
+namespace WizBot.Modules.Programming.Commands
+{
+ class HaskellRepl : DiscordCommand
+ {
+ ConcurrentQueue> commandQueue = new ConcurrentQueue>();
+
+ Thread haskellThread;
+
+ public HaskellRepl(DiscordModule module) : base(module)
+ {
+ //start haskell interpreter
+
+ haskellThread = new Thread(new ThreadStart(() =>
+ {
+ var p = Process.Start(new ProcessStartInfo
+ {
+ FileName = "stack", //shouldn't use repl, but a Language.Haskell.Interpreter somehow
+ Arguments = "repl",
+ UseShellExecute = false,
+ RedirectStandardInput = true,
+ RedirectStandardOutput = true,
+ CreateNoWindow = true,
+ });
+
+ Task.Run(async () =>
+ {
+ while (true)
+ {
+ while (commandQueue.Count == 0)
+ await Task.Delay(100);
+
+ //read from queue
+ KeyValuePair com;
+ if (!commandQueue.TryDequeue(out com))
+ {
+ await Task.Delay(100);
+ continue;
+ }
+ //var bytes = Encoding.ASCII.GetBytes(com.Key);
+
+ //send the command to the process
+ p.StandardInput.WriteLine(com.Key);
+
+ //wait 50 ms for execution
+ await Task.Delay(50);
+
+ //read everything from the output
+ var outBuffer = new byte[1500];
+
+ p.StandardOutput.BaseStream.Read(outBuffer, 0, 1500);
+
+ var outStr = Encoding.ASCII.GetString(outBuffer);
+ //send to channel
+ await com.Value.SendMessage($"```hs\nPrelude> {com.Key}\n" + outStr + "\n```");
+ }
+ });
+
+ }));
+ haskellThread.Start();
+
+ }
+
+ internal override void Init(CommandGroupBuilder cgb)
+ {
+ cgb.CreateCommand(Module.Prefix + "hs")
+ .Description("Executes a haskell express with LAMBDABOT")
+ .Parameter("command", ParameterType.Unparsed)
+ .Do(e =>
+ {
+ var com = e.GetArg("command")?.Trim();
+ if (string.IsNullOrWhiteSpace(com))
+ return;
+
+ //send a command and a channel to the queue
+ commandQueue.Enqueue(new KeyValuePair(com, e.Channel));
+ });
+ }
+ }
+}
\ No newline at end of file
diff --git a/WizBot/Modules/Programming/ProgrammingModule.cs b/WizBot/Modules/Programming/ProgrammingModule.cs
new file mode 100644
index 000000000..402286b2e
--- /dev/null
+++ b/WizBot/Modules/Programming/ProgrammingModule.cs
@@ -0,0 +1,26 @@
+using Discord.Modules;
+using WizBot.Extensions;
+using WizBot.Modules.Permissions.Classes;
+using WizBot.Modules.Programming.Commands;
+
+namespace WizBot.Modules.Programming
+{
+ class ProgrammingModule : DiscordModule
+ {
+ public override string Prefix => WizBot.Config.CommandPrefixes.Programming;
+
+ public ProgrammingModule()
+ {
+ commands.Add(new HaskellRepl(this));
+ }
+
+ public override void Install(ModuleManager manager)
+ {
+ manager.CreateCommands("", cgb =>
+ {
+ cgb.AddCheck(PermissionChecker.Instance);
+ commands.ForEach(c => c.Init(cgb));
+ });
+ }
+ }
+}
\ No newline at end of file
diff --git a/NadekoBot/Modules/Searches/Commands/ConverterCommand.cs b/WizBot/Modules/Searches/Commands/ConverterCommand.cs
similarity index 90%
rename from NadekoBot/Modules/Searches/Commands/ConverterCommand.cs
rename to WizBot/Modules/Searches/Commands/ConverterCommand.cs
index 8d820df44..1cf8c4f60 100644
--- a/NadekoBot/Modules/Searches/Commands/ConverterCommand.cs
+++ b/WizBot/Modules/Searches/Commands/ConverterCommand.cs
@@ -1,5 +1,5 @@
using Discord.Commands;
-using NadekoBot.Classes;
+using WizBot.Classes;
using ScaredFingers.UnitsConversion;
using System;
using System.Collections.Generic;
@@ -7,7 +7,7 @@
using System.Threading;
using System.Threading.Tasks;
-namespace NadekoBot.Modules.Searches.Commands
+namespace WizBot.Modules.Searches.Commands
{
class ConverterCommand : DiscordCommand
{
@@ -92,6 +92,8 @@ private Func ConvertFunc() =>
}
else
{
+ CultureInfo ci = new CultureInfo("en-US");
+ Thread.CurrentThread.CurrentCulture = ci;
reInitCurrencyConverterTable();
Unit inUnit = currTable.CreateUnit(quantity, from.ToUpperInvariant());
Unit outUnit = inUnit.Convert(currTable.CurrencyCode(to.ToUpperInvariant()));
@@ -109,10 +111,17 @@ private void reInitCurrencyConverterTable()
{
if (lastChanged == null || lastChanged.DayOfYear != DateTime.Now.DayOfYear)
{
- exchangeRateProvider = new WebExchangeRatesProvider();
- currTable = new CurrencyExchangeTable(exchangeRateProvider);
- lastChanged = DateTime.Now;
- }
+ try
+ {
+ exchangeRateProvider = new WebExchangeRatesProvider();
+ currTable = new CurrencyExchangeTable(exchangeRateProvider);
+ lastChanged = DateTime.Now;
+ }
+ catch
+ {
+ Console.WriteLine("Error with the currency download.");
+ }
+ }
}
private void ResolveUnitCodes(string from, string to, out UnitTable table, out int fromCode, out int toCode)
diff --git a/NadekoBot/Modules/Searches/Commands/IMDB/ImdbMovie.cs b/WizBot/Modules/Searches/Commands/IMDB/ImdbMovie.cs
similarity index 96%
rename from NadekoBot/Modules/Searches/Commands/IMDB/ImdbMovie.cs
rename to WizBot/Modules/Searches/Commands/IMDB/ImdbMovie.cs
index 87397dbf9..a0e220116 100644
--- a/NadekoBot/Modules/Searches/Commands/IMDB/ImdbMovie.cs
+++ b/WizBot/Modules/Searches/Commands/IMDB/ImdbMovie.cs
@@ -1,8 +1,8 @@
-using NadekoBot.Extensions;
+using WizBot.Extensions;
using System.Collections.Generic;
using System.Web;
-namespace NadekoBot.Modules.Searches.Commands.IMDB
+namespace WizBot.Modules.Searches.Commands.IMDB
{
public class ImdbMovie
{
diff --git a/NadekoBot/Modules/Searches/Commands/IMDB/ImdbScraper.cs b/WizBot/Modules/Searches/Commands/IMDB/ImdbScraper.cs
similarity index 99%
rename from NadekoBot/Modules/Searches/Commands/IMDB/ImdbScraper.cs
rename to WizBot/Modules/Searches/Commands/IMDB/ImdbScraper.cs
index 1735eda63..7e8c9be0c 100644
--- a/NadekoBot/Modules/Searches/Commands/IMDB/ImdbScraper.cs
+++ b/WizBot/Modules/Searches/Commands/IMDB/ImdbScraper.cs
@@ -18,7 +18,7 @@
* Last Updated: Feb, 2016
*******************************************************************************/
-namespace NadekoBot.Modules.Searches.Commands.IMDB
+namespace WizBot.Modules.Searches.Commands.IMDB
{
public static class ImdbScraper
{
diff --git a/NadekoBot/Modules/Searches/Commands/LoLCommands.cs b/WizBot/Modules/Searches/Commands/LoLCommands.cs
similarity index 95%
rename from NadekoBot/Modules/Searches/Commands/LoLCommands.cs
rename to WizBot/Modules/Searches/Commands/LoLCommands.cs
index 075a5b2e5..22d9060cd 100644
--- a/NadekoBot/Modules/Searches/Commands/LoLCommands.cs
+++ b/WizBot/Modules/Searches/Commands/LoLCommands.cs
@@ -1,6 +1,6 @@
using Discord.Commands;
-using NadekoBot.Classes;
-using NadekoBot.Extensions;
+using WizBot.Classes;
+using WizBot.Extensions;
using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
@@ -9,7 +9,7 @@
using System.Text;
using System.Threading.Tasks;
-namespace NadekoBot.Modules.Searches.Commands
+namespace WizBot.Modules.Searches.Commands
{
internal class LoLCommands : DiscordCommand
{
@@ -21,6 +21,14 @@ private class CachedChampion
public string Name { get; set; }
}
+ private class ChampionNameComparer : IEqualityComparer
+ {
+ public bool Equals(JToken a, JToken b) => a["name"].ToString() == b["name"].ToString();
+
+ public int GetHashCode(JToken obj) =>
+ obj["name"].GetHashCode();
+ }
+
private static Dictionary CachedChampionImages = new Dictionary();
private readonly object cacheLock = new object();
@@ -89,7 +97,7 @@ internal override void Init(CommandGroupBuilder cgb)
await e.Channel.SendFile("champ.png", champ.ImageStream).ConfigureAwait(false);
return;
}
- var allData = JArray.Parse(await Classes.SearchHelper.GetResponseStringAsync($"http://api.champion.gg/champion/{name}?api_key={NadekoBot.Creds.LOLAPIKey}").ConfigureAwait(false));
+ var allData = JArray.Parse(await Classes.SearchHelper.GetResponseStringAsync($"http://api.champion.gg/champion/{name}?api_key={WizBot.Creds.LOLAPIKey}").ConfigureAwait(false));
JToken data = null;
if (role != null)
{
@@ -134,7 +142,7 @@ internal override void Init(CommandGroupBuilder cgb)
roles[i] = ">" + roles[i] + "<";
}
var general = JArray.Parse(await SearchHelper.GetResponseStringAsync($"http://api.champion.gg/stats/" +
- $"champs/{name}?api_key={NadekoBot.Creds.LOLAPIKey}")
+ $"champs/{name}?api_key={WizBot.Creds.LOLAPIKey}")
.ConfigureAwait(false))
.FirstOrDefault(jt => jt["role"].ToString() == role)?["general"];
if (general == null)
@@ -224,7 +232,6 @@ internal override void Init(CommandGroupBuilder cgb)
//draw average stats
g.DrawString(
$@" Average Stats
-
Kills: {general["kills"]} CS: {general["minionsKilled"]}
Deaths: {general["deaths"]} Win: {general["winPercent"]}%
Assists: {general["assists"]} Ban: {general["banRate"]}%
@@ -285,7 +292,7 @@ internal override void Init(CommandGroupBuilder cgb)
.Do(async e =>
{
- var showCount = 6;
+ var showCount = 8;
//http://api.champion.gg/stats/champs/mostBanned?api_key=YOUR_API_TOKEN&page=1&limit=2
try
{
@@ -293,19 +300,19 @@ internal override void Init(CommandGroupBuilder cgb)
await Classes
.SearchHelper
.GetResponseStringAsync($"http://api.champion.gg/stats/champs/mostBanned?" +
- $"api_key={NadekoBot.Creds.LOLAPIKey}&page=1&" +
+ $"api_key={WizBot.Creds.LOLAPIKey}&page=1&" +
$"limit={showCount}")
.ConfigureAwait(false))["data"] as JArray;
-
+ var dataList = data.Distinct(new ChampionNameComparer()).Take(showCount).ToList();
var sb = new StringBuilder();
sb.AppendLine($"**Showing {showCount} top banned champions.**");
sb.AppendLine($"`{trashTalk[new Random().Next(0, trashTalk.Length)]}`");
- for (var i = 0; i < data.Count; i++)
+ for (var i = 0; i < dataList.Count; i++)
{
if (i % 2 == 0 && i != 0)
sb.AppendLine();
- sb.Append($"`{i + 1}.` **{data[i]["name"]}** ");
- //sb.AppendLine($" ({data[i]["general"]["banRate"]}%)");
+ sb.Append($"`{i + 1}.` **{dataList[i]["name"]}** ");
+ //sb.AppendLine($" ({dataList[i]["general"]["banRate"]}%)");
}
await e.Channel.SendMessage(sb.ToString()).ConfigureAwait(false);
@@ -381,4 +388,4 @@ private static string ResolvePos(string pos)
}
}
}
-}
+}
\ No newline at end of file
diff --git a/NadekoBot/Modules/Searches/Commands/RedditCommand.cs b/WizBot/Modules/Searches/Commands/RedditCommand.cs
similarity index 81%
rename from NadekoBot/Modules/Searches/Commands/RedditCommand.cs
rename to WizBot/Modules/Searches/Commands/RedditCommand.cs
index 7a17d3472..2764a6a26 100644
--- a/NadekoBot/Modules/Searches/Commands/RedditCommand.cs
+++ b/WizBot/Modules/Searches/Commands/RedditCommand.cs
@@ -1,7 +1,7 @@
using Discord.Commands;
-using NadekoBot.Classes;
+using WizBot.Classes;
-namespace NadekoBot.Modules.Searches.Commands
+namespace WizBot.Modules.Searches.Commands
{
class RedditCommand : DiscordCommand
{
diff --git a/NadekoBot/Modules/Searches/Commands/StreamNotifications.cs b/WizBot/Modules/Searches/Commands/StreamNotifications.cs
similarity index 98%
rename from NadekoBot/Modules/Searches/Commands/StreamNotifications.cs
rename to WizBot/Modules/Searches/Commands/StreamNotifications.cs
index ffa38e5c2..563e63399 100644
--- a/NadekoBot/Modules/Searches/Commands/StreamNotifications.cs
+++ b/WizBot/Modules/Searches/Commands/StreamNotifications.cs
@@ -1,7 +1,7 @@
using Discord.Commands;
-using NadekoBot.Classes;
-using NadekoBot.Classes.JSONModels;
-using NadekoBot.Modules.Permissions.Classes;
+using WizBot.Classes;
+using WizBot.Classes.JSONModels;
+using WizBot.Modules.Permissions.Classes;
using Newtonsoft.Json.Linq;
using System;
using System.Collections.Concurrent;
@@ -9,7 +9,7 @@
using System.Threading.Tasks;
using System.Timers;
-namespace NadekoBot.Modules.Searches.Commands
+namespace WizBot.Modules.Searches.Commands
{
internal class StreamNotifications : DiscordCommand
{
@@ -47,7 +47,7 @@ public StreamNotifications(DiscordModule module) : base(module)
if (data.Item1 != stream.LastStatus)
{
stream.LastStatus = data.Item1;
- var server = NadekoBot.Client.GetServer(stream.ServerId);
+ var server = WizBot.Client.GetServer(stream.ServerId);
var channel = server?.GetChannel(stream.ChannelId);
if (channel == null)
continue;
diff --git a/WizBot/Modules/Searches/Commands/WowJokes.cs b/WizBot/Modules/Searches/Commands/WowJokes.cs
new file mode 100644
index 000000000..39025f561
--- /dev/null
+++ b/WizBot/Modules/Searches/Commands/WowJokes.cs
@@ -0,0 +1,36 @@
+using Discord.Commands;
+using WizBot.Classes;
+using WizBot.Classes.JSONModels;
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+
+namespace WizBot.Modules.Searches.Commands
+{
+ class WowJokeCommand : DiscordCommand
+ {
+
+ List jokes = new List();
+
+ public WowJokeCommand(DiscordModule module) : base(module)
+ {
+ }
+
+ internal override void Init(CommandGroupBuilder cgb)
+ {
+
+ cgb.CreateCommand(Module.Prefix + "wowjoke")
+ .Description("Get one of Kwoth's penultimate WoW jokes.")
+ .Do(async e =>
+ {
+ if (!jokes.Any())
+ {
+ jokes = JsonConvert.DeserializeObject>(File.ReadAllText("data/wowjokes.json"));
+ }
+ await e.Channel.SendMessage(jokes[new Random().Next(0, jokes.Count)].ToString());
+ });
+ }
+ }
+}
\ No newline at end of file
diff --git a/NadekoBot/Modules/Searches/SearchesModule.cs b/WizBot/Modules/Searches/SearchesModule.cs
similarity index 77%
rename from NadekoBot/Modules/Searches/SearchesModule.cs
rename to WizBot/Modules/Searches/SearchesModule.cs
index 94c3dcb79..fed2d7fc8 100644
--- a/NadekoBot/Modules/Searches/SearchesModule.cs
+++ b/WizBot/Modules/Searches/SearchesModule.cs
@@ -1,11 +1,11 @@
using Discord.Commands;
using Discord.Modules;
-using NadekoBot.Classes;
-using NadekoBot.Classes.JSONModels;
-using NadekoBot.Extensions;
-using NadekoBot.Modules.Permissions.Classes;
-using NadekoBot.Modules.Searches.Commands;
-using NadekoBot.Modules.Searches.Commands.IMDB;
+using WizBot.Classes;
+using WizBot.Classes.JSONModels;
+using WizBot.Extensions;
+using WizBot.Modules.Permissions.Classes;
+using WizBot.Modules.Searches.Commands;
+using WizBot.Modules.Searches.Commands.IMDB;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using System;
@@ -16,7 +16,7 @@
using System.Net;
using System.Net.Http;
-namespace NadekoBot.Modules.Searches
+namespace WizBot.Modules.Searches
{
internal class SearchesModule : DiscordModule
{
@@ -27,10 +27,11 @@ public SearchesModule()
commands.Add(new StreamNotifications(this));
commands.Add(new ConverterCommand(this));
commands.Add(new RedditCommand(this));
+ commands.Add(new WowJokeCommand(this));
rng = new Random();
}
- public override string Prefix { get; } = NadekoBot.Config.CommandPrefixes.Searches;
+ public override string Prefix { get; } = WizBot.Config.CommandPrefixes.Searches;
public override void Install(ModuleManager manager)
{
@@ -42,7 +43,7 @@ public override void Install(ModuleManager manager)
commands.ForEach(cmd => cmd.Init(cgb));
cgb.CreateCommand(Prefix + "we")
- .Description("Shows weather data for a specified city and a country BOTH ARE REQUIRED. Weather api is very random if you make a mistake.")
+ .Description($"Shows weather data for a specified city and a country. BOTH ARE REQUIRED. Use country abbrevations.\n**Usage**: {Prefix}we Moscow RF")
.Parameter("city", ParameterType.Required)
.Parameter("country", ParameterType.Required)
.Do(async e =>
@@ -68,7 +69,13 @@ await e.Channel.SendMessage(
{
if (!(await SearchHelper.ValidateQuery(e.Channel, e.GetArg("query")).ConfigureAwait(false))) return;
- var shortUrl = await SearchHelper.ShortenUrl(await SearchHelper.FindYoutubeUrlByKeywords(e.GetArg("query")).ConfigureAwait(false)).ConfigureAwait(false);
+ var link = await SearchHelper.FindYoutubeUrlByKeywords(e.GetArg("query")).ConfigureAwait(false);
+ if (string.IsNullOrWhiteSpace(link))
+ {
+ await e.Channel.SendMessage("No results found for that query.");
+ return;
+ }
+ var shortUrl = await SearchHelper.ShortenUrl(link).ConfigureAwait(false);
await e.Channel.SendMessage(shortUrl).ConfigureAwait(false);
});
@@ -137,6 +144,7 @@ await e.Channel.SendMessage(
});
cgb.CreateCommand(Prefix + "randomcat")
+ .Alias(Prefix + "meow")
.Description("Shows a random cat image.")
.Do(async e =>
{
@@ -154,21 +162,21 @@ await SearchHelper.GetResponseStringAsync("http://www.random.cat/meow").Configur
return;
try
{
- var reqString = $"https://www.googleapis.com/customsearch/v1?q={Uri.EscapeDataString(e.GetArg("query"))}&cx=018084019232060951019%3Ahs5piey28-e&num=1&searchType=image&fields=items%2Flink&key={NadekoBot.Creds.GoogleAPIKey}";
+ var reqString = $"https://www.googleapis.com/customsearch/v1?q={Uri.EscapeDataString(e.GetArg("query"))}&cx=018084019232060951019%3Ahs5piey28-e&num=1&searchType=image&fields=items%2Flink&key={WizBot.Creds.GoogleAPIKey}";
var obj = JObject.Parse(await SearchHelper.GetResponseStringAsync(reqString).ConfigureAwait(false));
await e.Channel.SendMessage(obj["items"][0]["link"].ToString()).ConfigureAwait(false);
}
catch (HttpRequestException exception)
- {
- if (exception.Message.Contains ("403 (Forbidden)"))
- {
- await e.Channel.SendMessage ("Daily limit reached!");
- }
- else
- {
- await e.Channel.SendMessage ("Something went wrong.");
- }
- }
+ {
+ if (exception.Message.Contains("403 (Forbidden)"))
+ {
+ await e.Channel.SendMessage("Daily limit reached!");
+ }
+ else
+ {
+ await e.Channel.SendMessage("Something went wrong.");
+ }
+ }
});
cgb.CreateCommand(Prefix + "ir")
@@ -180,21 +188,22 @@ await SearchHelper.GetResponseStringAsync("http://www.random.cat/meow").Configur
return;
try
{
- var reqString = $"https://www.googleapis.com/customsearch/v1?q={Uri.EscapeDataString(e.GetArg("query"))}&cx=018084019232060951019%3Ahs5piey28-e&num=1&searchType=image&start={ rng.Next(1, 150) }&fields=items%2Flink&key={NadekoBot.Creds.GoogleAPIKey}";
+ var reqString = $"https://www.googleapis.com/customsearch/v1?q={Uri.EscapeDataString(e.GetArg("query"))}&cx=018084019232060951019%3Ahs5piey28-e&num=50&searchType=image&start={ rng.Next(1, 50) }&fields=items%2Flink&key={WizBot.Creds.GoogleAPIKey}";
var obj = JObject.Parse(await SearchHelper.GetResponseStringAsync(reqString).ConfigureAwait(false));
- await e.Channel.SendMessage(obj["items"][0]["link"].ToString()).ConfigureAwait(false);
+ var items = obj["items"] as JArray;
+ await e.Channel.SendMessage(items[rng.Next(0, items.Count)]["link"].ToString()).ConfigureAwait(false);
}
catch (HttpRequestException exception)
- {
- if (exception.Message.Contains ("403 (Forbidden)"))
- {
- await e.Channel.SendMessage ("Daily limit reached!");
- }
- else
- {
- await e.Channel.SendMessage ("Something went wrong.");
- }
- }
+ {
+ if (exception.Message.Contains("403 (Forbidden)"))
+ {
+ await e.Channel.SendMessage("Daily limit reached!");
+ }
+ else
+ {
+ await e.Channel.SendMessage("Something went wrong.");
+ }
+ }
});
cgb.CreateCommand(Prefix + "lmgtfy")
.Description("Google something for an idiot.")
@@ -218,7 +227,7 @@ await e.Channel.SendMessage(await $"http://lmgtfy.com/?q={ Uri.EscapeUriString(e
return;
}
await e.Channel.SendIsTyping().ConfigureAwait(false);
- var headers = new Dictionary { { "X-Mashape-Key", NadekoBot.Creds.MashapeKey } };
+ var headers = new Dictionary { { "X-Mashape-Key", WizBot.Creds.MashapeKey } };
var res = await SearchHelper.GetResponseStringAsync($"https://omgvamp-hearthstone-v1.p.mashape.com/cards/search/{Uri.EscapeUriString(arg)}", headers)
.ConfigureAwait(false);
try
@@ -291,7 +300,7 @@ await e.Channel.SendFile(arg + ".png", (await images.MergeAsync()).ToStream(Syst
return;
}
await e.Channel.SendIsTyping().ConfigureAwait(false);
- var headers = new Dictionary { { "X-Mashape-Key", NadekoBot.Creds.MashapeKey } };
+ var headers = new Dictionary { { "X-Mashape-Key", WizBot.Creds.MashapeKey } };
var res = await SearchHelper.GetResponseStringAsync($"https://mashape-community-urban-dictionary.p.mashape.com/define?term={Uri.EscapeUriString(arg)}", headers).ConfigureAwait(false);
try
{
@@ -320,7 +329,7 @@ await e.Channel.SendFile(arg + ".png", (await images.MergeAsync()).ToStream(Syst
return;
}
await e.Channel.SendIsTyping().ConfigureAwait(false);
- var headers = new Dictionary { { "X-Mashape-Key", NadekoBot.Creds.MashapeKey } };
+ var headers = new Dictionary { { "X-Mashape-Key", WizBot.Creds.MashapeKey } };
var res = await SearchHelper.GetResponseStringAsync($"https://tagdef.p.mashape.com/one.{Uri.EscapeUriString(arg)}.json", headers).ConfigureAwait(false);
try
{
@@ -341,7 +350,7 @@ await e.Channel.SendFile(arg + ".png", (await images.MergeAsync()).ToStream(Syst
.Description("Shows a random quote.")
.Do(async e =>
{
- var quote = NadekoBot.Config.Quotes[rng.Next(0, NadekoBot.Config.Quotes.Count)].ToString();
+ var quote = WizBot.Config.Quotes[rng.Next(0, WizBot.Config.Quotes.Count)].ToString();
await e.Channel.SendMessage(quote).ConfigureAwait(false);
});
@@ -409,8 +418,68 @@ await e.Channel.SendFile(arg + ".png", (await images.MergeAsync()).ToStream(Syst
return;
await e.Channel.SendMessage($"https://images.google.com/searchbyimage?image_url={usr.AvatarUrl}").ConfigureAwait(false);
});
- });
+ cgb.CreateCommand(Prefix + "revimg")
+ .Description("Returns a google reverse image search for an image from a link.")
+ .Parameter("image", ParameterType.Unparsed)
+ .Do(async e =>
+ {
+ var imgLink = e.GetArg("image")?.Trim();
+
+ if (string.IsNullOrWhiteSpace(imgLink))
+ return;
+ await e.Channel.SendMessage($"https://images.google.com/searchbyimage?image_url={imgLink}").ConfigureAwait(false);
+ });
+ cgb.CreateCommand(Prefix + "safebooru")
+ .Description("Shows a random image from safebooru with a given tag. Tag is optional but preffered. (multiple tags are appended with +)\n**Usage**: ~safebooru yuri+kissing")
+ .Parameter("tag", ParameterType.Unparsed)
+ .Do(async e =>
+ {
+ var tag = e.GetArg("tag")?.Trim() ?? "";
+ var link = await SearchHelper.GetSafebooruImageLink(tag).ConfigureAwait(false);
+ if (link == null)
+ await e.Channel.SendMessage("`No results.`");
+ else
+ await e.Channel.SendMessage(link).ConfigureAwait(false);
+ });
+
+ cgb.CreateCommand(Prefix + "wiki")
+ .Description("Gives you back a wikipedia link")
+ .Parameter("query", ParameterType.Unparsed)
+ .Do(async e =>
+ {
+ var query = e.GetArg("query");
+ var result = await SearchHelper.GetResponseStringAsync("https://en.wikipedia.org//w/api.php?action=query&format=json&prop=info&redirects=1&formatversion=2&inprop=url&titles=" + Uri.EscapeDataString(query));
+ var data = JsonConvert.DeserializeObject(result);
+ if (data.Query.Pages[0].Missing)
+ await e.Channel.SendMessage("`That page could not be found.`");
+ else
+ await e.Channel.SendMessage(data.Query.Pages[0].FullUrl);
+ });
+
+ cgb.CreateCommand(Prefix + "clr")
+ .Description("Shows you what color corresponds to that hex.\n**Usage**: `~clr 00ff00`")
+ .Parameter("color", ParameterType.Unparsed)
+ .Do(async e =>
+ {
+ var arg1 = e.GetArg("color")?.Trim()?.Replace("#", "");
+ if (string.IsNullOrWhiteSpace(arg1))
+ return;
+ var img = new Bitmap(50, 50);
+
+ var red = Convert.ToInt32(arg1.Substring(0, 2), 16);
+ var green = Convert.ToInt32(arg1.Substring(2, 2), 16);
+ var blue = Convert.ToInt32(arg1.Substring(4, 2), 16);
+ var brush = new SolidBrush(Color.FromArgb(red, green, blue));
+
+ using (Graphics g = Graphics.FromImage(img))
+ {
+ g.FillRectangle(brush, 0, 0, 50, 50);
+ g.Flush();
+ }
+
+ await e.Channel.SendFile("arg1.png", img.ToStream());
+ });
+ });
}
}
}
-
diff --git a/NadekoBot/Modules/Translator/Helpers/GoogleTranslator.cs b/WizBot/Modules/Translator/Helpers/GoogleTranslator.cs
similarity index 99%
rename from NadekoBot/Modules/Translator/Helpers/GoogleTranslator.cs
rename to WizBot/Modules/Translator/Helpers/GoogleTranslator.cs
index eb0e466ce..c84e3d9d1 100644
--- a/NadekoBot/Modules/Translator/Helpers/GoogleTranslator.cs
+++ b/WizBot/Modules/Translator/Helpers/GoogleTranslator.cs
@@ -9,7 +9,7 @@
using System.Net;
using System.Web;
-namespace NadekoBot.Modules.Translator.Helpers
+namespace WizBot.Modules.Translator.Helpers
{
///
/// Translates text using Google's online language tools.
diff --git a/NadekoBot/Modules/Translator/TranslateCommand.cs b/WizBot/Modules/Translator/TranslateCommand.cs
similarity index 80%
rename from NadekoBot/Modules/Translator/TranslateCommand.cs
rename to WizBot/Modules/Translator/TranslateCommand.cs
index 0c4ae5027..95f599d29 100644
--- a/NadekoBot/Modules/Translator/TranslateCommand.cs
+++ b/WizBot/Modules/Translator/TranslateCommand.cs
@@ -1,10 +1,10 @@
using Discord.Commands;
-using NadekoBot.Classes;
-using NadekoBot.Modules.Translator.Helpers;
+using WizBot.Classes;
+using WizBot.Modules.Translator.Helpers;
using System;
using System.Threading.Tasks;
-namespace NadekoBot.Modules.Translator
+namespace WizBot.Modules.Translator
{
class TranslateCommand : DiscordCommand
{
@@ -13,7 +13,8 @@ public TranslateCommand(DiscordModule module) : base(module) { }
internal override void Init(CommandGroupBuilder cgb)
{
cgb.CreateCommand(Module.Prefix + "trans")
- .Description("Translates from>to text. From the given language to the destiation language.")
+ .Alias(Module.Prefix + "translate")
+ .Description($"Translates from>to text. From the given language to the destiation language.\n**Usage**: {Module.Prefix}trans en>fr Hello")
.Parameter("langs", ParameterType.Required)
.Parameter("text", ParameterType.Unparsed)
.Do(TranslateFunc());
diff --git a/NadekoBot/Modules/Translator/TranslatorModule.cs b/WizBot/Modules/Translator/TranslatorModule.cs
similarity index 72%
rename from NadekoBot/Modules/Translator/TranslatorModule.cs
rename to WizBot/Modules/Translator/TranslatorModule.cs
index 1b333a6b7..de272e039 100644
--- a/NadekoBot/Modules/Translator/TranslatorModule.cs
+++ b/WizBot/Modules/Translator/TranslatorModule.cs
@@ -1,8 +1,8 @@
using Discord.Modules;
-using NadekoBot.Extensions;
-using NadekoBot.Modules.Permissions.Classes;
+using WizBot.Extensions;
+using WizBot.Modules.Permissions.Classes;
-namespace NadekoBot.Modules.Translator
+namespace WizBot.Modules.Translator
{
internal class TranslatorModule : DiscordModule
{
@@ -12,7 +12,7 @@ public TranslatorModule()
commands.Add(new ValidLanguagesCommand(this));
}
- public override string Prefix { get; } = NadekoBot.Config.CommandPrefixes.Searches;
+ public override string Prefix { get; } = WizBot.Config.CommandPrefixes.Searches;
public override void Install(ModuleManager manager)
{
diff --git a/NadekoBot/Modules/Translator/ValidLanguagesCommand.cs b/WizBot/Modules/Translator/ValidLanguagesCommand.cs
similarity index 93%
rename from NadekoBot/Modules/Translator/ValidLanguagesCommand.cs
rename to WizBot/Modules/Translator/ValidLanguagesCommand.cs
index ede25f138..d1a35a312 100644
--- a/NadekoBot/Modules/Translator/ValidLanguagesCommand.cs
+++ b/WizBot/Modules/Translator/ValidLanguagesCommand.cs
@@ -1,10 +1,10 @@
using Discord.Commands;
-using NadekoBot.Classes;
-using NadekoBot.Modules.Translator.Helpers;
+using WizBot.Classes;
+using WizBot.Modules.Translator.Helpers;
using System;
using System.Threading.Tasks;
-namespace NadekoBot.Modules.Translator
+namespace WizBot.Modules.Translator
{
class ValidLanguagesCommand : DiscordCommand
{
diff --git a/NadekoBot/Modules/Trello/TrelloModule.cs b/WizBot/Modules/Trello/TrelloModule.cs
similarity index 91%
rename from NadekoBot/Modules/Trello/TrelloModule.cs
rename to WizBot/Modules/Trello/TrelloModule.cs
index 01d69ad09..3c0fc6139 100644
--- a/NadekoBot/Modules/Trello/TrelloModule.cs
+++ b/WizBot/Modules/Trello/TrelloModule.cs
@@ -1,20 +1,20 @@
using Discord.Modules;
using Manatee.Trello;
using Manatee.Trello.ManateeJson;
-using NadekoBot.Extensions;
-using NadekoBot.Modules.Permissions.Classes;
+using WizBot.Extensions;
+using WizBot.Modules.Permissions.Classes;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Timers;
using Action = Manatee.Trello.Action;
-namespace NadekoBot.Modules.Trello
+namespace WizBot.Modules.Trello
{
internal class TrelloModule : DiscordModule
{
private readonly Timer t = new Timer { Interval = 2000 };
- public override string Prefix { get; } = NadekoBot.Config.CommandPrefixes.Trello;
+ public override string Prefix { get; } = WizBot.Config.CommandPrefixes.Trello;
public override void Install(ModuleManager manager)
{
@@ -26,7 +26,7 @@ public override void Install(ModuleManager manager)
TrelloConfiguration.Deserializer = serializer;
TrelloConfiguration.JsonFactory = new ManateeFactory();
TrelloConfiguration.RestClientProvider = new Manatee.Trello.WebApi.WebApiClientProvider();
- TrelloAuthorization.Default.AppKey = NadekoBot.Creds.TrelloAppKey;
+ TrelloAuthorization.Default.AppKey = WizBot.Creds.TrelloAppKey;
//TrelloAuthorization.Default.UserToken = "[your user token]";
Discord.Channel bound = null;
@@ -74,7 +74,7 @@ public override void Install(ModuleManager manager)
.Parameter("code", Discord.Commands.ParameterType.Required)
.Do(async e =>
{
- if (!NadekoBot.IsOwner(e.User.Id) || NadekoBot.IsBot) return;
+ if (!WizBot.IsOwner(e.User.Id) || WizBot.IsBot) return;
try
{
await (await client.GetInvite(e.GetArg("code")).ConfigureAwait(false)).Accept()
@@ -93,7 +93,7 @@ public override void Install(ModuleManager manager)
.Parameter("board_id", Discord.Commands.ParameterType.Required)
.Do(async e =>
{
- if (!NadekoBot.IsOwner(e.User.Id)) return;
+ if (!WizBot.IsOwner(e.User.Id)) return;
if (bound != null) return;
try
{
@@ -113,7 +113,7 @@ public override void Install(ModuleManager manager)
.Description("Unbinds a bot from the channel and board.")
.Do(async e =>
{
- if (!NadekoBot.IsOwner(e.User.Id)) return;
+ if (!WizBot.IsOwner(e.User.Id)) return;
if (bound == null || bound != e.Channel) return;
t.Stop();
bound = null;
@@ -127,7 +127,7 @@ public override void Install(ModuleManager manager)
.Description("Lists all lists yo ;)")
.Do(async e =>
{
- if (!NadekoBot.IsOwner(e.User.Id)) return;
+ if (!WizBot.IsOwner(e.User.Id)) return;
if (bound == null || board == null || bound != e.Channel) return;
await e.Channel.SendMessage("Lists for a board '" + board.Name + "'\n" + string.Join("\n", board.Lists.Select(l => "**• " + l.ToString() + "**")))
.ConfigureAwait(false);
@@ -138,7 +138,7 @@ public override void Install(ModuleManager manager)
.Parameter("list_name", Discord.Commands.ParameterType.Unparsed)
.Do(async e =>
{
- if (!NadekoBot.IsOwner(e.User.Id)) return;
+ if (!WizBot.IsOwner(e.User.Id)) return;
if (bound == null || board == null || bound != e.Channel || e.GetArg("list_name") == null) return;
int num;
diff --git a/NadekoBot/Properties/AssemblyInfo.cs b/WizBot/Properties/AssemblyInfo.cs
similarity index 83%
rename from NadekoBot/Properties/AssemblyInfo.cs
rename to WizBot/Properties/AssemblyInfo.cs
index 2f38b1851..4b1bc3de6 100644
--- a/NadekoBot/Properties/AssemblyInfo.cs
+++ b/WizBot/Properties/AssemblyInfo.cs
@@ -5,13 +5,13 @@
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
[assembly: AssemblyDescription("Discord bot written in C#.")]
-[assembly: AssemblyCompany("Kwoth")]
-[assembly: AssemblyCopyright("Copyright © Kwoth 2015-2016")]
-[assembly: AssemblyProduct("NadekoBot")]
+[assembly: AssemblyCompany("Kwoth & Wizkiller96")]
+[assembly: AssemblyCopyright("Copyright © WizNet 2016")]
+[assembly: AssemblyProduct("WizBot")]
[assembly: AssemblyVersion("0.9.*")]
-[assembly: AssemblyTitle("NadekoBot")]
+[assembly: AssemblyTitle("WizBot")]
[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyTrademark("")]
+[assembly: AssemblyTrademark("WizNet")]
[assembly: AssemblyCulture("")]
// Setting ComVisible to false makes the types in this assembly not visible
diff --git a/NadekoBot/Properties/Resources.Designer.cs b/WizBot/Properties/Resources.Designer.cs
similarity index 96%
rename from NadekoBot/Properties/Resources.Designer.cs
rename to WizBot/Properties/Resources.Designer.cs
index b393bbf6e..b56586e81 100644
--- a/NadekoBot/Properties/Resources.Designer.cs
+++ b/WizBot/Properties/Resources.Designer.cs
@@ -1,743 +1,743 @@
-//------------------------------------------------------------------------------
-//
-// This code was generated by a tool.
-// Runtime Version:4.0.30319.42000
-//
-// Changes to this file may cause incorrect behavior and will be lost if
-// the code is regenerated.
-//
-//------------------------------------------------------------------------------
-
-namespace NadekoBot.Properties {
- using System;
-
-
- ///
- /// A strongly-typed resource class, for looking up localized strings, etc.
- ///
- // This class was auto-generated by the StronglyTypedResourceBuilder
- // class via a tool like ResGen or Visual Studio.
- // To add or remove a member, edit your .ResX file then rerun ResGen
- // with the /str option, or rebuild your VS project.
- [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
- [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
- [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
- public class Resources {
-
- private static global::System.Resources.ResourceManager resourceMan;
-
- private static global::System.Globalization.CultureInfo resourceCulture;
-
- [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
- internal Resources() {
- }
-
- ///
- /// Returns the cached ResourceManager instance used by this class.
- ///
- [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
- public static global::System.Resources.ResourceManager ResourceManager {
- get {
- if (object.ReferenceEquals(resourceMan, null)) {
- global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("NadekoBot.Properties.Resources", typeof(Resources).Assembly);
- resourceMan = temp;
- }
- return resourceMan;
- }
- }
-
- ///
- /// Overrides the current thread's CurrentUICulture property for all
- /// resource lookups using this strongly typed resource class.
- ///
- [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
- public static global::System.Globalization.CultureInfo Culture {
- get {
- return resourceCulture;
- }
- set {
- resourceCulture = value;
- }
- }
-
- ///
- /// Looks up a localized resource of type System.Drawing.Bitmap.
- ///
- public static System.Drawing.Bitmap _0 {
- get {
- object obj = ResourceManager.GetObject("_0", resourceCulture);
- return ((System.Drawing.Bitmap)(obj));
- }
- }
-
- ///
- /// Looks up a localized resource of type System.Drawing.Bitmap.
- ///
- public static System.Drawing.Bitmap _1 {
- get {
- object obj = ResourceManager.GetObject("_1", resourceCulture);
- return ((System.Drawing.Bitmap)(obj));
- }
- }
-
- ///
- /// Looks up a localized resource of type System.Drawing.Bitmap.
- ///
- public static System.Drawing.Bitmap _10_of_clubs {
- get {
- object obj = ResourceManager.GetObject("_10_of_clubs", resourceCulture);
- return ((System.Drawing.Bitmap)(obj));
- }
- }
-
- ///
- /// Looks up a localized resource of type System.Drawing.Bitmap.
- ///
- public static System.Drawing.Bitmap _10_of_diamonds {
- get {
- object obj = ResourceManager.GetObject("_10_of_diamonds", resourceCulture);
- return ((System.Drawing.Bitmap)(obj));
- }
- }
-
- ///
- /// Looks up a localized resource of type System.Drawing.Bitmap.
- ///
- public static System.Drawing.Bitmap _10_of_hearts {
- get {
- object obj = ResourceManager.GetObject("_10_of_hearts", resourceCulture);
- return ((System.Drawing.Bitmap)(obj));
- }
- }
-
- ///
- /// Looks up a localized resource of type System.Drawing.Bitmap.
- ///
- public static System.Drawing.Bitmap _10_of_spades {
- get {
- object obj = ResourceManager.GetObject("_10_of_spades", resourceCulture);
- return ((System.Drawing.Bitmap)(obj));
- }
- }
-
- ///
- /// Looks up a localized resource of type System.Drawing.Bitmap.
- ///
- public static System.Drawing.Bitmap _2 {
- get {
- object obj = ResourceManager.GetObject("_2", resourceCulture);
- return ((System.Drawing.Bitmap)(obj));
- }
- }
-
- ///
- /// Looks up a localized resource of type System.Drawing.Bitmap.
- ///
- public static System.Drawing.Bitmap _2_of_clubs {
- get {
- object obj = ResourceManager.GetObject("_2_of_clubs", resourceCulture);
- return ((System.Drawing.Bitmap)(obj));
- }
- }
-
- ///
- /// Looks up a localized resource of type System.Drawing.Bitmap.
- ///
- public static System.Drawing.Bitmap _2_of_diamonds {
- get {
- object obj = ResourceManager.GetObject("_2_of_diamonds", resourceCulture);
- return ((System.Drawing.Bitmap)(obj));
- }
- }
-
- ///
- /// Looks up a localized resource of type System.Drawing.Bitmap.
- ///
- public static System.Drawing.Bitmap _2_of_hearts {
- get {
- object obj = ResourceManager.GetObject("_2_of_hearts", resourceCulture);
- return ((System.Drawing.Bitmap)(obj));
- }
- }
-
- ///
- /// Looks up a localized resource of type System.Drawing.Bitmap.
- ///
- public static System.Drawing.Bitmap _2_of_spades {
- get {
- object obj = ResourceManager.GetObject("_2_of_spades", resourceCulture);
- return ((System.Drawing.Bitmap)(obj));
- }
- }
-
- ///
- /// Looks up a localized resource of type System.Drawing.Bitmap.
- ///
- public static System.Drawing.Bitmap _3 {
- get {
- object obj = ResourceManager.GetObject("_3", resourceCulture);
- return ((System.Drawing.Bitmap)(obj));
- }
- }
-
- ///
- /// Looks up a localized resource of type System.Drawing.Bitmap.
- ///
- public static System.Drawing.Bitmap _3_of_clubs {
- get {
- object obj = ResourceManager.GetObject("_3_of_clubs", resourceCulture);
- return ((System.Drawing.Bitmap)(obj));
- }
- }
-
- ///
- /// Looks up a localized resource of type System.Drawing.Bitmap.
- ///
- public static System.Drawing.Bitmap _3_of_diamonds {
- get {
- object obj = ResourceManager.GetObject("_3_of_diamonds", resourceCulture);
- return ((System.Drawing.Bitmap)(obj));
- }
- }
-
- ///
- /// Looks up a localized resource of type System.Drawing.Bitmap.
- ///
- public static System.Drawing.Bitmap _3_of_hearts {
- get {
- object obj = ResourceManager.GetObject("_3_of_hearts", resourceCulture);
- return ((System.Drawing.Bitmap)(obj));
- }
- }
-
- ///
- /// Looks up a localized resource of type System.Drawing.Bitmap.
- ///
- public static System.Drawing.Bitmap _3_of_spades {
- get {
- object obj = ResourceManager.GetObject("_3_of_spades", resourceCulture);
- return ((System.Drawing.Bitmap)(obj));
- }
- }
-
- ///
- /// Looks up a localized resource of type System.Drawing.Bitmap.
- ///
- public static System.Drawing.Bitmap _4 {
- get {
- object obj = ResourceManager.GetObject("_4", resourceCulture);
- return ((System.Drawing.Bitmap)(obj));
- }
- }
-
- ///
- /// Looks up a localized resource of type System.Drawing.Bitmap.
- ///
- public static System.Drawing.Bitmap _4_of_clubs {
- get {
- object obj = ResourceManager.GetObject("_4_of_clubs", resourceCulture);
- return ((System.Drawing.Bitmap)(obj));
- }
- }
-
- ///
- /// Looks up a localized resource of type System.Drawing.Bitmap.
- ///
- public static System.Drawing.Bitmap _4_of_diamonds {
- get {
- object obj = ResourceManager.GetObject("_4_of_diamonds", resourceCulture);
- return ((System.Drawing.Bitmap)(obj));
- }
- }
-
- ///
- /// Looks up a localized resource of type System.Drawing.Bitmap.
- ///
- public static System.Drawing.Bitmap _4_of_hearts {
- get {
- object obj = ResourceManager.GetObject("_4_of_hearts", resourceCulture);
- return ((System.Drawing.Bitmap)(obj));
- }
- }
-
- ///
- /// Looks up a localized resource of type System.Drawing.Bitmap.
- ///
- public static System.Drawing.Bitmap _4_of_spades {
- get {
- object obj = ResourceManager.GetObject("_4_of_spades", resourceCulture);
- return ((System.Drawing.Bitmap)(obj));
- }
- }
-
- ///
- /// Looks up a localized resource of type System.Drawing.Bitmap.
- ///
- public static System.Drawing.Bitmap _5 {
- get {
- object obj = ResourceManager.GetObject("_5", resourceCulture);
- return ((System.Drawing.Bitmap)(obj));
- }
- }
-
- ///
- /// Looks up a localized resource of type System.Drawing.Bitmap.
- ///
- public static System.Drawing.Bitmap _5_of_clubs {
- get {
- object obj = ResourceManager.GetObject("_5_of_clubs", resourceCulture);
- return ((System.Drawing.Bitmap)(obj));
- }
- }
-
- ///
- /// Looks up a localized resource of type System.Drawing.Bitmap.
- ///
- public static System.Drawing.Bitmap _5_of_diamonds {
- get {
- object obj = ResourceManager.GetObject("_5_of_diamonds", resourceCulture);
- return ((System.Drawing.Bitmap)(obj));
- }
- }
-
- ///
- /// Looks up a localized resource of type System.Drawing.Bitmap.
- ///
- public static System.Drawing.Bitmap _5_of_hearts {
- get {
- object obj = ResourceManager.GetObject("_5_of_hearts", resourceCulture);
- return ((System.Drawing.Bitmap)(obj));
- }
- }
-
- ///
- /// Looks up a localized resource of type System.Drawing.Bitmap.
- ///
- public static System.Drawing.Bitmap _5_of_spades {
- get {
- object obj = ResourceManager.GetObject("_5_of_spades", resourceCulture);
- return ((System.Drawing.Bitmap)(obj));
- }
- }
-
- ///
- /// Looks up a localized resource of type System.Drawing.Bitmap.
- ///
- public static System.Drawing.Bitmap _6 {
- get {
- object obj = ResourceManager.GetObject("_6", resourceCulture);
- return ((System.Drawing.Bitmap)(obj));
- }
- }
-
- ///
- /// Looks up a localized resource of type System.Drawing.Bitmap.
- ///
- public static System.Drawing.Bitmap _6_of_clubs {
- get {
- object obj = ResourceManager.GetObject("_6_of_clubs", resourceCulture);
- return ((System.Drawing.Bitmap)(obj));
- }
- }
-
- ///
- /// Looks up a localized resource of type System.Drawing.Bitmap.
- ///
- public static System.Drawing.Bitmap _6_of_diamonds {
- get {
- object obj = ResourceManager.GetObject("_6_of_diamonds", resourceCulture);
- return ((System.Drawing.Bitmap)(obj));
- }
- }
-
- ///
- /// Looks up a localized resource of type System.Drawing.Bitmap.
- ///
- public static System.Drawing.Bitmap _6_of_hearts {
- get {
- object obj = ResourceManager.GetObject("_6_of_hearts", resourceCulture);
- return ((System.Drawing.Bitmap)(obj));
- }
- }
-
- ///
- /// Looks up a localized resource of type System.Drawing.Bitmap.
- ///
- public static System.Drawing.Bitmap _6_of_spades {
- get {
- object obj = ResourceManager.GetObject("_6_of_spades", resourceCulture);
- return ((System.Drawing.Bitmap)(obj));
- }
- }
-
- ///
- /// Looks up a localized resource of type System.Drawing.Bitmap.
- ///
- public static System.Drawing.Bitmap _7 {
- get {
- object obj = ResourceManager.GetObject("_7", resourceCulture);
- return ((System.Drawing.Bitmap)(obj));
- }
- }
-
- ///
- /// Looks up a localized resource of type System.Drawing.Bitmap.
- ///
- public static System.Drawing.Bitmap _7_of_clubs {
- get {
- object obj = ResourceManager.GetObject("_7_of_clubs", resourceCulture);
- return ((System.Drawing.Bitmap)(obj));
- }
- }
-
- ///
- /// Looks up a localized resource of type System.Drawing.Bitmap.
- ///
- public static System.Drawing.Bitmap _7_of_diamonds {
- get {
- object obj = ResourceManager.GetObject("_7_of_diamonds", resourceCulture);
- return ((System.Drawing.Bitmap)(obj));
- }
- }
-
- ///
- /// Looks up a localized resource of type System.Drawing.Bitmap.
- ///
- public static System.Drawing.Bitmap _7_of_hearts {
- get {
- object obj = ResourceManager.GetObject("_7_of_hearts", resourceCulture);
- return ((System.Drawing.Bitmap)(obj));
- }
- }
-
- ///
- /// Looks up a localized resource of type System.Drawing.Bitmap.
- ///
- public static System.Drawing.Bitmap _7_of_spades {
- get {
- object obj = ResourceManager.GetObject("_7_of_spades", resourceCulture);
- return ((System.Drawing.Bitmap)(obj));
- }
- }
-
- ///
- /// Looks up a localized resource of type System.Drawing.Bitmap.
- ///
- public static System.Drawing.Bitmap _8 {
- get {
- object obj = ResourceManager.GetObject("_8", resourceCulture);
- return ((System.Drawing.Bitmap)(obj));
- }
- }
-
- ///
- /// Looks up a localized resource of type System.Drawing.Bitmap.
- ///
- public static System.Drawing.Bitmap _8_of_clubs {
- get {
- object obj = ResourceManager.GetObject("_8_of_clubs", resourceCulture);
- return ((System.Drawing.Bitmap)(obj));
- }
- }
-
- ///
- /// Looks up a localized resource of type System.Drawing.Bitmap.
- ///
- public static System.Drawing.Bitmap _8_of_diamonds {
- get {
- object obj = ResourceManager.GetObject("_8_of_diamonds", resourceCulture);
- return ((System.Drawing.Bitmap)(obj));
- }
- }
-
- ///
- /// Looks up a localized resource of type System.Drawing.Bitmap.
- ///
- public static System.Drawing.Bitmap _8_of_hearts {
- get {
- object obj = ResourceManager.GetObject("_8_of_hearts", resourceCulture);
- return ((System.Drawing.Bitmap)(obj));
- }
- }
-
- ///
- /// Looks up a localized resource of type System.Drawing.Bitmap.
- ///
- public static System.Drawing.Bitmap _8_of_spades {
- get {
- object obj = ResourceManager.GetObject("_8_of_spades", resourceCulture);
- return ((System.Drawing.Bitmap)(obj));
- }
- }
-
- ///
- /// Looks up a localized resource of type System.Drawing.Bitmap.
- ///
- public static System.Drawing.Bitmap _9 {
- get {
- object obj = ResourceManager.GetObject("_9", resourceCulture);
- return ((System.Drawing.Bitmap)(obj));
- }
- }
-
- ///
- /// Looks up a localized resource of type System.Drawing.Bitmap.
- ///
- public static System.Drawing.Bitmap _9_of_clubs {
- get {
- object obj = ResourceManager.GetObject("_9_of_clubs", resourceCulture);
- return ((System.Drawing.Bitmap)(obj));
- }
- }
-
- ///
- /// Looks up a localized resource of type System.Drawing.Bitmap.
- ///
- public static System.Drawing.Bitmap _9_of_diamonds {
- get {
- object obj = ResourceManager.GetObject("_9_of_diamonds", resourceCulture);
- return ((System.Drawing.Bitmap)(obj));
- }
- }
-
- ///
- /// Looks up a localized resource of type System.Drawing.Bitmap.
- ///
- public static System.Drawing.Bitmap _9_of_hearts {
- get {
- object obj = ResourceManager.GetObject("_9_of_hearts", resourceCulture);
- return ((System.Drawing.Bitmap)(obj));
- }
- }
-
- ///
- /// Looks up a localized resource of type System.Drawing.Bitmap.
- ///
- public static System.Drawing.Bitmap _9_of_spades {
- get {
- object obj = ResourceManager.GetObject("_9_of_spades", resourceCulture);
- return ((System.Drawing.Bitmap)(obj));
- }
- }
-
- ///
- /// Looks up a localized resource of type System.Drawing.Bitmap.
- ///
- public static System.Drawing.Bitmap ace_of_clubs {
- get {
- object obj = ResourceManager.GetObject("ace_of_clubs", resourceCulture);
- return ((System.Drawing.Bitmap)(obj));
- }
- }
-
- ///
- /// Looks up a localized resource of type System.Drawing.Bitmap.
- ///
- public static System.Drawing.Bitmap ace_of_diamonds {
- get {
- object obj = ResourceManager.GetObject("ace_of_diamonds", resourceCulture);
- return ((System.Drawing.Bitmap)(obj));
- }
- }
-
- ///
- /// Looks up a localized resource of type System.Drawing.Bitmap.
- ///
- public static System.Drawing.Bitmap ace_of_hearts {
- get {
- object obj = ResourceManager.GetObject("ace_of_hearts", resourceCulture);
- return ((System.Drawing.Bitmap)(obj));
- }
- }
-
- ///
- /// Looks up a localized resource of type System.Drawing.Bitmap.
- ///
- public static System.Drawing.Bitmap ace_of_spades {
- get {
- object obj = ResourceManager.GetObject("ace_of_spades", resourceCulture);
- return ((System.Drawing.Bitmap)(obj));
- }
- }
-
- ///
- /// Looks up a localized resource of type System.Drawing.Bitmap.
- ///
- public static System.Drawing.Bitmap black_joker {
- get {
- object obj = ResourceManager.GetObject("black_joker", resourceCulture);
- return ((System.Drawing.Bitmap)(obj));
- }
- }
-
- ///
- /// Looks up a localized resource of type System.Drawing.Bitmap.
- ///
- public static System.Drawing.Bitmap heads {
- get {
- object obj = ResourceManager.GetObject("heads", resourceCulture);
- return ((System.Drawing.Bitmap)(obj));
- }
- }
-
- ///
- /// Looks up a localized resource of type System.Drawing.Bitmap.
- ///
- public static System.Drawing.Bitmap hidden {
- get {
- object obj = ResourceManager.GetObject("hidden", resourceCulture);
- return ((System.Drawing.Bitmap)(obj));
- }
- }
-
- ///
- /// Looks up a localized resource of type System.Drawing.Bitmap.
- ///
- public static System.Drawing.Bitmap jack_of_clubs {
- get {
- object obj = ResourceManager.GetObject("jack_of_clubs", resourceCulture);
- return ((System.Drawing.Bitmap)(obj));
- }
- }
-
- ///
- /// Looks up a localized resource of type System.Drawing.Bitmap.
- ///
- public static System.Drawing.Bitmap jack_of_diamonds {
- get {
- object obj = ResourceManager.GetObject("jack_of_diamonds", resourceCulture);
- return ((System.Drawing.Bitmap)(obj));
- }
- }
-
- ///
- /// Looks up a localized resource of type System.Drawing.Bitmap.
- ///
- public static System.Drawing.Bitmap jack_of_hearts {
- get {
- object obj = ResourceManager.GetObject("jack_of_hearts", resourceCulture);
- return ((System.Drawing.Bitmap)(obj));
- }
- }
-
- ///
- /// Looks up a localized resource of type System.Drawing.Bitmap.
- ///
- public static System.Drawing.Bitmap jack_of_spades {
- get {
- object obj = ResourceManager.GetObject("jack_of_spades", resourceCulture);
- return ((System.Drawing.Bitmap)(obj));
- }
- }
-
- ///
- /// Looks up a localized resource of type System.Drawing.Bitmap.
- ///
- public static System.Drawing.Bitmap king_of_clubs {
- get {
- object obj = ResourceManager.GetObject("king_of_clubs", resourceCulture);
- return ((System.Drawing.Bitmap)(obj));
- }
- }
-
- ///
- /// Looks up a localized resource of type System.Drawing.Bitmap.
- ///
- public static System.Drawing.Bitmap king_of_diamonds {
- get {
- object obj = ResourceManager.GetObject("king_of_diamonds", resourceCulture);
- return ((System.Drawing.Bitmap)(obj));
- }
- }
-
- ///
- /// Looks up a localized resource of type System.Drawing.Bitmap.
- ///
- public static System.Drawing.Bitmap king_of_hearts {
- get {
- object obj = ResourceManager.GetObject("king_of_hearts", resourceCulture);
- return ((System.Drawing.Bitmap)(obj));
- }
- }
-
- ///
- /// Looks up a localized resource of type System.Drawing.Bitmap.
- ///
- public static System.Drawing.Bitmap king_of_spades {
- get {
- object obj = ResourceManager.GetObject("king_of_spades", resourceCulture);
- return ((System.Drawing.Bitmap)(obj));
- }
- }
-
- ///
- /// Looks up a localized resource of type System.Drawing.Bitmap.
- ///
- public static System.Drawing.Bitmap queen_of_clubs {
- get {
- object obj = ResourceManager.GetObject("queen_of_clubs", resourceCulture);
- return ((System.Drawing.Bitmap)(obj));
- }
- }
-
- ///
- /// Looks up a localized resource of type System.Drawing.Bitmap.
- ///
- public static System.Drawing.Bitmap queen_of_diamonds {
- get {
- object obj = ResourceManager.GetObject("queen_of_diamonds", resourceCulture);
- return ((System.Drawing.Bitmap)(obj));
- }
- }
-
- ///
- /// Looks up a localized resource of type System.Drawing.Bitmap.
- ///
- public static System.Drawing.Bitmap queen_of_hearts {
- get {
- object obj = ResourceManager.GetObject("queen_of_hearts", resourceCulture);
- return ((System.Drawing.Bitmap)(obj));
- }
- }
-
- ///
- /// Looks up a localized resource of type System.Drawing.Bitmap.
- ///
- public static System.Drawing.Bitmap queen_of_spades {
- get {
- object obj = ResourceManager.GetObject("queen_of_spades", resourceCulture);
- return ((System.Drawing.Bitmap)(obj));
- }
- }
-
- ///
- /// Looks up a localized resource of type System.Drawing.Bitmap.
- ///
- public static System.Drawing.Bitmap red_joker {
- get {
- object obj = ResourceManager.GetObject("red_joker", resourceCulture);
- return ((System.Drawing.Bitmap)(obj));
- }
- }
-
- ///
- /// Looks up a localized resource of type System.Drawing.Bitmap.
- ///
- public static System.Drawing.Bitmap rip {
- get {
- object obj = ResourceManager.GetObject("rip", resourceCulture);
- return ((System.Drawing.Bitmap)(obj));
- }
- }
-
- ///
- /// Looks up a localized resource of type System.Drawing.Bitmap.
- ///
- public static System.Drawing.Bitmap tails {
- get {
- object obj = ResourceManager.GetObject("tails", resourceCulture);
- return ((System.Drawing.Bitmap)(obj));
- }
- }
- }
-}
+//------------------------------------------------------------------------------
+//
+// This code was generated by a tool.
+// Runtime Version:4.0.30319.42000
+//
+// Changes to this file may cause incorrect behavior and will be lost if
+// the code is regenerated.
+//
+//------------------------------------------------------------------------------
+
+namespace WizBot.Properties {
+ using System;
+
+
+ ///
+ /// A strongly-typed resource class, for looking up localized strings, etc.
+ ///
+ // This class was auto-generated by the StronglyTypedResourceBuilder
+ // class via a tool like ResGen or Visual Studio.
+ // To add or remove a member, edit your .ResX file then rerun ResGen
+ // with the /str option, or rebuild your VS project.
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+ public class Resources {
+
+ private static global::System.Resources.ResourceManager resourceMan;
+
+ private static global::System.Globalization.CultureInfo resourceCulture;
+
+ [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+ internal Resources() {
+ }
+
+ ///
+ /// Returns the cached ResourceManager instance used by this class.
+ ///
+ [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+ public static global::System.Resources.ResourceManager ResourceManager {
+ get {
+ if (object.ReferenceEquals(resourceMan, null)) {
+ global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("WizBot.Properties.Resources", typeof(Resources).Assembly);
+ resourceMan = temp;
+ }
+ return resourceMan;
+ }
+ }
+
+ ///
+ /// Overrides the current thread's CurrentUICulture property for all
+ /// resource lookups using this strongly typed resource class.
+ ///
+ [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+ public static global::System.Globalization.CultureInfo Culture {
+ get {
+ return resourceCulture;
+ }
+ set {
+ resourceCulture = value;
+ }
+ }
+
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
+ public static System.Drawing.Bitmap _0 {
+ get {
+ object obj = ResourceManager.GetObject("_0", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
+ public static System.Drawing.Bitmap _1 {
+ get {
+ object obj = ResourceManager.GetObject("_1", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
+ public static System.Drawing.Bitmap _10_of_clubs {
+ get {
+ object obj = ResourceManager.GetObject("_10_of_clubs", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
+ public static System.Drawing.Bitmap _10_of_diamonds {
+ get {
+ object obj = ResourceManager.GetObject("_10_of_diamonds", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
+ public static System.Drawing.Bitmap _10_of_hearts {
+ get {
+ object obj = ResourceManager.GetObject("_10_of_hearts", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
+ public static System.Drawing.Bitmap _10_of_spades {
+ get {
+ object obj = ResourceManager.GetObject("_10_of_spades", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
+ public static System.Drawing.Bitmap _2 {
+ get {
+ object obj = ResourceManager.GetObject("_2", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
+ public static System.Drawing.Bitmap _2_of_clubs {
+ get {
+ object obj = ResourceManager.GetObject("_2_of_clubs", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
+ public static System.Drawing.Bitmap _2_of_diamonds {
+ get {
+ object obj = ResourceManager.GetObject("_2_of_diamonds", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
+ public static System.Drawing.Bitmap _2_of_hearts {
+ get {
+ object obj = ResourceManager.GetObject("_2_of_hearts", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
+ public static System.Drawing.Bitmap _2_of_spades {
+ get {
+ object obj = ResourceManager.GetObject("_2_of_spades", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
+ public static System.Drawing.Bitmap _3 {
+ get {
+ object obj = ResourceManager.GetObject("_3", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
+ public static System.Drawing.Bitmap _3_of_clubs {
+ get {
+ object obj = ResourceManager.GetObject("_3_of_clubs", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
+ public static System.Drawing.Bitmap _3_of_diamonds {
+ get {
+ object obj = ResourceManager.GetObject("_3_of_diamonds", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
+ public static System.Drawing.Bitmap _3_of_hearts {
+ get {
+ object obj = ResourceManager.GetObject("_3_of_hearts", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
+ public static System.Drawing.Bitmap _3_of_spades {
+ get {
+ object obj = ResourceManager.GetObject("_3_of_spades", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
+ public static System.Drawing.Bitmap _4 {
+ get {
+ object obj = ResourceManager.GetObject("_4", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
+ public static System.Drawing.Bitmap _4_of_clubs {
+ get {
+ object obj = ResourceManager.GetObject("_4_of_clubs", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
+ public static System.Drawing.Bitmap _4_of_diamonds {
+ get {
+ object obj = ResourceManager.GetObject("_4_of_diamonds", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
+ public static System.Drawing.Bitmap _4_of_hearts {
+ get {
+ object obj = ResourceManager.GetObject("_4_of_hearts", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
+ public static System.Drawing.Bitmap _4_of_spades {
+ get {
+ object obj = ResourceManager.GetObject("_4_of_spades", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
+ public static System.Drawing.Bitmap _5 {
+ get {
+ object obj = ResourceManager.GetObject("_5", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
+ public static System.Drawing.Bitmap _5_of_clubs {
+ get {
+ object obj = ResourceManager.GetObject("_5_of_clubs", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
+ public static System.Drawing.Bitmap _5_of_diamonds {
+ get {
+ object obj = ResourceManager.GetObject("_5_of_diamonds", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
+ public static System.Drawing.Bitmap _5_of_hearts {
+ get {
+ object obj = ResourceManager.GetObject("_5_of_hearts", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
+ public static System.Drawing.Bitmap _5_of_spades {
+ get {
+ object obj = ResourceManager.GetObject("_5_of_spades", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
+ public static System.Drawing.Bitmap _6 {
+ get {
+ object obj = ResourceManager.GetObject("_6", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
+ public static System.Drawing.Bitmap _6_of_clubs {
+ get {
+ object obj = ResourceManager.GetObject("_6_of_clubs", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
+ public static System.Drawing.Bitmap _6_of_diamonds {
+ get {
+ object obj = ResourceManager.GetObject("_6_of_diamonds", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
+ public static System.Drawing.Bitmap _6_of_hearts {
+ get {
+ object obj = ResourceManager.GetObject("_6_of_hearts", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
+ public static System.Drawing.Bitmap _6_of_spades {
+ get {
+ object obj = ResourceManager.GetObject("_6_of_spades", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
+ public static System.Drawing.Bitmap _7 {
+ get {
+ object obj = ResourceManager.GetObject("_7", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
+ public static System.Drawing.Bitmap _7_of_clubs {
+ get {
+ object obj = ResourceManager.GetObject("_7_of_clubs", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
+ public static System.Drawing.Bitmap _7_of_diamonds {
+ get {
+ object obj = ResourceManager.GetObject("_7_of_diamonds", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
+ public static System.Drawing.Bitmap _7_of_hearts {
+ get {
+ object obj = ResourceManager.GetObject("_7_of_hearts", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
+ public static System.Drawing.Bitmap _7_of_spades {
+ get {
+ object obj = ResourceManager.GetObject("_7_of_spades", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
+ public static System.Drawing.Bitmap _8 {
+ get {
+ object obj = ResourceManager.GetObject("_8", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
+ public static System.Drawing.Bitmap _8_of_clubs {
+ get {
+ object obj = ResourceManager.GetObject("_8_of_clubs", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
+ public static System.Drawing.Bitmap _8_of_diamonds {
+ get {
+ object obj = ResourceManager.GetObject("_8_of_diamonds", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
+ public static System.Drawing.Bitmap _8_of_hearts {
+ get {
+ object obj = ResourceManager.GetObject("_8_of_hearts", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
+ public static System.Drawing.Bitmap _8_of_spades {
+ get {
+ object obj = ResourceManager.GetObject("_8_of_spades", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
+ public static System.Drawing.Bitmap _9 {
+ get {
+ object obj = ResourceManager.GetObject("_9", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
+ public static System.Drawing.Bitmap _9_of_clubs {
+ get {
+ object obj = ResourceManager.GetObject("_9_of_clubs", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
+ public static System.Drawing.Bitmap _9_of_diamonds {
+ get {
+ object obj = ResourceManager.GetObject("_9_of_diamonds", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
+ public static System.Drawing.Bitmap _9_of_hearts {
+ get {
+ object obj = ResourceManager.GetObject("_9_of_hearts", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
+ public static System.Drawing.Bitmap _9_of_spades {
+ get {
+ object obj = ResourceManager.GetObject("_9_of_spades", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
+ public static System.Drawing.Bitmap ace_of_clubs {
+ get {
+ object obj = ResourceManager.GetObject("ace_of_clubs", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
+ public static System.Drawing.Bitmap ace_of_diamonds {
+ get {
+ object obj = ResourceManager.GetObject("ace_of_diamonds", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
+ public static System.Drawing.Bitmap ace_of_hearts {
+ get {
+ object obj = ResourceManager.GetObject("ace_of_hearts", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
+ public static System.Drawing.Bitmap ace_of_spades {
+ get {
+ object obj = ResourceManager.GetObject("ace_of_spades", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
+ public static System.Drawing.Bitmap black_joker {
+ get {
+ object obj = ResourceManager.GetObject("black_joker", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
+ public static System.Drawing.Bitmap heads {
+ get {
+ object obj = ResourceManager.GetObject("heads", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
+ public static System.Drawing.Bitmap hidden {
+ get {
+ object obj = ResourceManager.GetObject("hidden", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
+ public static System.Drawing.Bitmap jack_of_clubs {
+ get {
+ object obj = ResourceManager.GetObject("jack_of_clubs", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
+ public static System.Drawing.Bitmap jack_of_diamonds {
+ get {
+ object obj = ResourceManager.GetObject("jack_of_diamonds", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
+ public static System.Drawing.Bitmap jack_of_hearts {
+ get {
+ object obj = ResourceManager.GetObject("jack_of_hearts", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
+ public static System.Drawing.Bitmap jack_of_spades {
+ get {
+ object obj = ResourceManager.GetObject("jack_of_spades", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
+ public static System.Drawing.Bitmap king_of_clubs {
+ get {
+ object obj = ResourceManager.GetObject("king_of_clubs", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
+ public static System.Drawing.Bitmap king_of_diamonds {
+ get {
+ object obj = ResourceManager.GetObject("king_of_diamonds", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
+ public static System.Drawing.Bitmap king_of_hearts {
+ get {
+ object obj = ResourceManager.GetObject("king_of_hearts", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
+ public static System.Drawing.Bitmap king_of_spades {
+ get {
+ object obj = ResourceManager.GetObject("king_of_spades", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
+ public static System.Drawing.Bitmap queen_of_clubs {
+ get {
+ object obj = ResourceManager.GetObject("queen_of_clubs", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
+ public static System.Drawing.Bitmap queen_of_diamonds {
+ get {
+ object obj = ResourceManager.GetObject("queen_of_diamonds", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
+ public static System.Drawing.Bitmap queen_of_hearts {
+ get {
+ object obj = ResourceManager.GetObject("queen_of_hearts", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
+ public static System.Drawing.Bitmap queen_of_spades {
+ get {
+ object obj = ResourceManager.GetObject("queen_of_spades", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
+ public static System.Drawing.Bitmap red_joker {
+ get {
+ object obj = ResourceManager.GetObject("red_joker", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
+ public static System.Drawing.Bitmap rip {
+ get {
+ object obj = ResourceManager.GetObject("rip", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
+ public static System.Drawing.Bitmap tails {
+ get {
+ object obj = ResourceManager.GetObject("tails", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+ }
+}
diff --git a/NadekoBot/Properties/Resources.resx b/WizBot/Properties/Resources.resx
similarity index 100%
rename from NadekoBot/Properties/Resources.resx
rename to WizBot/Properties/Resources.resx
diff --git a/WizBot/SQLite.cs b/WizBot/SQLite.cs
new file mode 100644
index 000000000..e74447f63
--- /dev/null
+++ b/WizBot/SQLite.cs
@@ -0,0 +1,3278 @@
+//
+// Copyright (c) 2009-2012 Krueger Systems, Inc.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+// THE SOFTWARE.
+//
+#if WINDOWS_PHONE && !USE_WP8_NATIVE_SQLITE
+#define USE_CSHARP_SQLITE
+#endif
+
+using System;
+using System.Diagnostics;
+using System.Runtime.InteropServices;
+using System.Collections.Generic;
+using System.Reflection;
+using System.Linq;
+using System.Linq.Expressions;
+using System.Threading;
+
+#if USE_CSHARP_SQLITE
+using Sqlite3 = Community.CsharpSqlite.Sqlite3;
+using Sqlite3DatabaseHandle = Community.CsharpSqlite.Sqlite3.sqlite3;
+using Sqlite3Statement = Community.CsharpSqlite.Sqlite3.Vdbe;
+#elif USE_WP8_NATIVE_SQLITE
+using Sqlite3 = Sqlite.Sqlite3;
+using Sqlite3DatabaseHandle = Sqlite.Database;
+using Sqlite3Statement = Sqlite.Statement;
+#else
+using Sqlite3DatabaseHandle = System.IntPtr;
+using Sqlite3Statement = System.IntPtr;
+#endif
+
+namespace SQLite
+{
+ public class SQLiteException : Exception
+ {
+ public SQLite3.Result Result { get; private set; }
+
+ protected SQLiteException (SQLite3.Result r,string message) : base(message)
+ {
+ Result = r;
+ }
+
+ public static SQLiteException New (SQLite3.Result r, string message)
+ {
+ return new SQLiteException (r, message);
+ }
+ }
+
+ public class NotNullConstraintViolationException : SQLiteException
+ {
+ public IEnumerable Columns { get; protected set; }
+
+ protected NotNullConstraintViolationException (SQLite3.Result r, string message)
+ : this (r, message, null, null)
+ {
+
+ }
+
+ protected NotNullConstraintViolationException (SQLite3.Result r, string message, TableMapping mapping, object obj)
+ : base (r, message)
+ {
+ if (mapping != null && obj != null) {
+ this.Columns = from c in mapping.Columns
+ where c.IsNullable == false && c.GetValue (obj) == null
+ select c;
+ }
+ }
+
+ public static new NotNullConstraintViolationException New (SQLite3.Result r, string message)
+ {
+ return new NotNullConstraintViolationException (r, message);
+ }
+
+ public static NotNullConstraintViolationException New (SQLite3.Result r, string message, TableMapping mapping, object obj)
+ {
+ return new NotNullConstraintViolationException (r, message, mapping, obj);
+ }
+
+ public static NotNullConstraintViolationException New (SQLiteException exception, TableMapping mapping, object obj)
+ {
+ return new NotNullConstraintViolationException (exception.Result, exception.Message, mapping, obj);
+ }
+ }
+
+ [Flags]
+ public enum SQLiteOpenFlags {
+ ReadOnly = 1, ReadWrite = 2, Create = 4,
+ NoMutex = 0x8000, FullMutex = 0x10000,
+ SharedCache = 0x20000, PrivateCache = 0x40000,
+ ProtectionComplete = 0x00100000,
+ ProtectionCompleteUnlessOpen = 0x00200000,
+ ProtectionCompleteUntilFirstUserAuthentication = 0x00300000,
+ ProtectionNone = 0x00400000
+ }
+
+ [Flags]
+ public enum CreateFlags
+ {
+ None = 0,
+ ImplicitPK = 1, // create a primary key for field called 'Id' (Orm.ImplicitPkName)
+ ImplicitIndex = 2, // create an index for fields ending in 'Id' (Orm.ImplicitIndexSuffix)
+ AllImplicit = 3, // do both above
+
+ AutoIncPK = 4 // force PK field to be auto inc
+ }
+
+ ///
+ /// Represents an open connection to a SQLite database.
+ ///
+ public partial class SQLiteConnection : IDisposable
+ {
+ private bool _open;
+ private TimeSpan _busyTimeout;
+ private Dictionary _mappings = null;
+ private Dictionary _tables = null;
+ private System.Diagnostics.Stopwatch _sw;
+ private long _elapsedMilliseconds = 0;
+
+ private int _transactionDepth = 0;
+ private Random _rand = new Random ();
+
+ public Sqlite3DatabaseHandle Handle { get; private set; }
+ internal static readonly Sqlite3DatabaseHandle NullHandle = default(Sqlite3DatabaseHandle);
+
+ public string DatabasePath { get; private set; }
+
+ public bool TimeExecution { get; set; }
+
+ public bool Trace { get; set; }
+
+ public bool StoreDateTimeAsTicks { get; private set; }
+
+ ///
+ /// Constructs a new SQLiteConnection and opens a SQLite database specified by databasePath.
+ ///
+ ///
+ /// Constructs a new SQLiteConnection and opens a SQLite database specified by databasePath.
+ ///
+ ///
+ /// Used to list some code that we want the MonoTouch linker
+ /// to see, but that we never want to actually execute.
+ ///
+ static bool _preserveDuringLinkMagic;
+
+ ///
+ /// Sets a busy handler to sleep the specified amount of time when a table is locked.
+ /// The handler will sleep multiple times until a total time of
+ public TimeSpan BusyTimeout {
+ get { return _busyTimeout; }
+ set {
+ _busyTimeout = value;
+ if (Handle != NullHandle) {
+ SQLite3.BusyTimeout (Handle, (int)_busyTimeout.TotalMilliseconds);
+ }
+ }
+ }
+
+ ///
+ /// Returns the mappings from types to tables that the connection
+ /// currently understands.
+ ///
+ public IEnumerable TableMappings {
+ get {
+ return _tables != null ? _tables.Values : Enumerable.Empty ();
+ }
+ }
+
+ ///
+ /// Retrieves the mapping that is automatically generated for the given type.
+ ///
+ ///
+ /// The mapping represents the schema of the columns of the database and contains
+ /// methods to set and get properties of objects.
+ ///
+ public TableMapping GetMapping(Type type, CreateFlags createFlags = CreateFlags.None)
+ {
+ if (_mappings == null) {
+ _mappings = new Dictionary ();
+ }
+ TableMapping map;
+ if (!_mappings.TryGetValue (type.FullName, out map)) {
+ map = new TableMapping (type, createFlags);
+ _mappings [type.FullName] = map;
+ }
+ return map;
+ }
+
+ ///
+ /// Retrieves the mapping that is automatically generated for the given type.
+ ///
+ ///
+ /// The mapping represents the schema of the columns of the database and contains
+ /// methods to set and get properties of objects.
+ ///
+ public TableMapping GetMapping ()
+ {
+ return GetMapping (typeof (T));
+ }
+
+ private struct IndexedColumn
+ {
+ public int Order;
+ public string ColumnName;
+ }
+
+ private struct IndexInfo
+ {
+ public string IndexName;
+ public string TableName;
+ public bool Unique;
+ public List Columns;
+ }
+
+ ///
+ /// Executes a "drop table" on the database. This is non-recoverable.
+ ///
+ public int DropTable()
+ {
+ var map = GetMapping (typeof (T));
+
+ var query = string.Format("drop table if exists \"{0}\"", map.TableName);
+
+ return Execute (query);
+ }
+
+ ///
+ /// Executes a "create table if not exists" on the database. It also
+ /// creates any specified indexes on the columns of the table. It uses
+ /// a schema automatically generated from the specified type. You can
+ /// later access this schema by calling GetMapping.
+ ///
+ ///
+ /// The number of entries added to the database schema.
+ ///
+ public int CreateTable(CreateFlags createFlags = CreateFlags.None)
+ {
+ return CreateTable(typeof (T), createFlags);
+ }
+
+ ///
+ /// Executes a "create table if not exists" on the database. It also
+ /// creates any specified indexes on the columns of the table. It uses
+ /// a schema automatically generated from the specified type. You can
+ /// later access this schema by calling GetMapping.
+ ///
+ ///
+ /// The number of entries added to the database schema.
+ ///
+ public int CreateTable(Type ty, CreateFlags createFlags = CreateFlags.None)
+ {
+ if (_tables == null) {
+ _tables = new Dictionary ();
+ }
+ TableMapping map;
+ if (!_tables.TryGetValue (ty.FullName, out map)) {
+ map = GetMapping (ty, createFlags);
+ _tables.Add (ty.FullName, map);
+ }
+ var query = "create table if not exists \"" + map.TableName + "\"(\n";
+
+ var decls = map.Columns.Select (p => Orm.SqlDecl (p, StoreDateTimeAsTicks));
+ var decl = string.Join (",\n", decls.ToArray ());
+ query += decl;
+ query += ")";
+
+ var count = Execute (query);
+
+ if (count == 0) { //Possible bug: This always seems to return 0?
+ // Table already exists, migrate it
+ MigrateTable (map);
+ }
+
+ var indexes = new Dictionary ();
+ foreach (var c in map.Columns) {
+ foreach (var i in c.Indices) {
+ var iname = i.Name ?? map.TableName + "_" + c.Name;
+ IndexInfo iinfo;
+ if (!indexes.TryGetValue (iname, out iinfo)) {
+ iinfo = new IndexInfo {
+ IndexName = iname,
+ TableName = map.TableName,
+ Unique = i.Unique,
+ Columns = new List ()
+ };
+ indexes.Add (iname, iinfo);
+ }
+
+ if (i.Unique != iinfo.Unique)
+ throw new Exception ("All the columns in an index must have the same value for their Unique property");
+
+ iinfo.Columns.Add (new IndexedColumn {
+ Order = i.Order,
+ ColumnName = c.Name
+ });
+ }
+ }
+
+ foreach (var indexName in indexes.Keys) {
+ var index = indexes[indexName];
+ var columns = index.Columns.OrderBy(i => i.Order).Select(i => i.ColumnName).ToArray();
+ count += CreateIndex(indexName, index.TableName, columns, index.Unique);
+ }
+
+ return count;
+ }
+
+ ///
+ /// Creates an index for the specified table and columns.
+ ///
+ ///
+ /// Creates an index for the specified table and column.
+ ///
+ ///
+ /// Creates an index for the specified table and column.
+ ///
+ ///
+ /// Creates an index for the specified table and columns.
+ ///
+ ///
+ /// Creates an index for the specified object property.
+ /// e.g. CreateIndex(c => c.Name);
+ ///
+ /// Type to reflect to a database table.
+ /// (Expression> property, bool unique = false)
+ {
+ MemberExpression mx;
+ if (property.Body.NodeType == ExpressionType.Convert)
+ {
+ mx = ((UnaryExpression)property.Body).Operand as MemberExpression;
+ }
+ else
+ {
+ mx= (property.Body as MemberExpression);
+ }
+ var propertyInfo = mx.Member as PropertyInfo;
+ if (propertyInfo == null)
+ {
+ throw new ArgumentException("The lambda expression 'property' should point to a valid Property");
+ }
+
+ var propName = propertyInfo.Name;
+
+ var map = GetMapping();
+ var colName = map.FindColumnWithPropertyName(propName).Name;
+
+ CreateIndex(map.TableName, colName, unique);
+ }
+
+ public class ColumnInfo
+ {
+// public int cid { get; set; }
+
+ [Column ("name")]
+ public string Name { get; set; }
+
+// [Column ("type")]
+// public string ColumnType { get; set; }
+
+ public int notnull { get; set; }
+
+// public string dflt_value { get; set; }
+
+// public int pk { get; set; }
+
+ public override string ToString ()
+ {
+ return Name;
+ }
+ }
+
+ public List GetTableInfo (string tableName)
+ {
+ var query = "pragma table_info(\"" + tableName + "\")";
+ return Query (query);
+ }
+
+ void MigrateTable (TableMapping map)
+ {
+ var existingCols = GetTableInfo (map.TableName);
+
+ var toBeAdded = new List ();
+
+ foreach (var p in map.Columns) {
+ var found = false;
+ foreach (var c in existingCols) {
+ found = (string.Compare (p.Name, c.Name, StringComparison.OrdinalIgnoreCase) == 0);
+ if (found)
+ break;
+ }
+ if (!found) {
+ toBeAdded.Add (p);
+ }
+ }
+
+ foreach (var p in toBeAdded) {
+ var addCol = "alter table \"" + map.TableName + "\" add column " + Orm.SqlDecl (p, StoreDateTimeAsTicks);
+ Execute (addCol);
+ }
+ }
+
+ ///
+ /// Creates a new SQLiteCommand. Can be overridden to provide a sub-class.
+ ///
+ ///
+ /// Creates a new SQLiteCommand given the command text with arguments. Place a '?'
+ /// in the command text for each of the arguments.
+ ///
+ ///
+ /// A
+ public SQLiteCommand CreateCommand (string cmdText, params object[] ps)
+ {
+ if (!_open)
+ throw SQLiteException.New (SQLite3.Result.Error, "Cannot create commands from unopened database");
+
+ var cmd = NewCommand ();
+ cmd.CommandText = cmdText;
+ foreach (var o in ps) {
+ cmd.Bind (o);
+ }
+ return cmd;
+ }
+
+ ///
+ /// Creates a SQLiteCommand given the command text (SQL) with arguments. Place a '?'
+ /// in the command text for each of the arguments and then executes that command.
+ /// Use this method instead of Query when you don't expect rows back. Such cases include
+ /// INSERTs, UPDATEs, and DELETEs.
+ /// You can set the Trace or TimeExecution properties of the connection
+ /// to profile execution.
+ ///
+ ///
+ /// The number of rows modified in the database as a result of this execution.
+ ///
+ public int Execute (string query, params object[] args)
+ {
+ var cmd = CreateCommand (query, args);
+
+ if (TimeExecution) {
+ if (_sw == null) {
+ _sw = new Stopwatch ();
+ }
+ _sw.Reset ();
+ _sw.Start ();
+ }
+
+ var r = cmd.ExecuteNonQuery ();
+
+ if (TimeExecution) {
+ _sw.Stop ();
+ _elapsedMilliseconds += _sw.ElapsedMilliseconds;
+ Debug.WriteLine (string.Format ("Finished in {0} ms ({1:0.0} s total)", _sw.ElapsedMilliseconds, _elapsedMilliseconds / 1000.0));
+ }
+
+ return r;
+ }
+
+ public T ExecuteScalar (string query, params object[] args)
+ {
+ var cmd = CreateCommand (query, args);
+
+ if (TimeExecution) {
+ if (_sw == null) {
+ _sw = new Stopwatch ();
+ }
+ _sw.Reset ();
+ _sw.Start ();
+ }
+
+ var r = cmd.ExecuteScalar ();
+
+ if (TimeExecution) {
+ _sw.Stop ();
+ _elapsedMilliseconds += _sw.ElapsedMilliseconds;
+ Debug.WriteLine (string.Format ("Finished in {0} ms ({1:0.0} s total)", _sw.ElapsedMilliseconds, _elapsedMilliseconds / 1000.0));
+ }
+
+ return r;
+ }
+
+ ///
+ /// Creates a SQLiteCommand given the command text (SQL) with arguments. Place a '?'
+ /// in the command text for each of the arguments and then executes that command.
+ /// It returns each row of the result using the mapping automatically generated for
+ /// the given type.
+ ///
+ ///
+ /// An enumerable with one result for each row returned by the query.
+ ///
+ public List Query (string query, params object[] args) where T : new()
+ {
+ var cmd = CreateCommand (query, args);
+ return cmd.ExecuteQuery ();
+ }
+
+ ///
+ /// Creates a SQLiteCommand given the command text (SQL) with arguments. Place a '?'
+ /// in the command text for each of the arguments and then executes that command.
+ /// It returns each row of the result using the mapping automatically generated for
+ /// the given type.
+ ///
+ ///
+ /// An enumerable with one result for each row returned by the query.
+ /// The enumerator will call sqlite3_step on each call to MoveNext, so the database
+ /// connection must remain open for the lifetime of the enumerator.
+ ///
+ public IEnumerable DeferredQuery(string query, params object[] args) where T : new()
+ {
+ var cmd = CreateCommand(query, args);
+ return cmd.ExecuteDeferredQuery();
+ }
+
+ ///
+ /// Creates a SQLiteCommand given the command text (SQL) with arguments. Place a '?'
+ /// in the command text for each of the arguments and then executes that command.
+ /// It returns each row of the result using the specified mapping. This function is
+ /// only used by libraries in order to query the database via introspection. It is
+ /// normally not used.
+ ///
+ ///
+ /// An enumerable with one result for each row returned by the query.
+ ///
+ public List Query (TableMapping map, string query, params object[] args)
+ {
+ var cmd = CreateCommand (query, args);
+ return cmd.ExecuteQuery (map);
+ }
+
+ ///
+ /// Creates a SQLiteCommand given the command text (SQL) with arguments. Place a '?'
+ /// in the command text for each of the arguments and then executes that command.
+ /// It returns each row of the result using the specified mapping. This function is
+ /// only used by libraries in order to query the database via introspection. It is
+ /// normally not used.
+ ///
+ ///
+ /// An enumerable with one result for each row returned by the query.
+ /// The enumerator will call sqlite3_step on each call to MoveNext, so the database
+ /// connection must remain open for the lifetime of the enumerator.
+ ///
+ public IEnumerable DeferredQuery(TableMapping map, string query, params object[] args)
+ {
+ var cmd = CreateCommand(query, args);
+ return cmd.ExecuteDeferredQuery(map);
+ }
+
+ ///
+ /// Returns a queryable interface to the table represented by the given type.
+ ///
+ ///
+ /// A queryable object that is able to translate Where, OrderBy, and Take
+ /// queries into native SQL.
+ ///
+ public TableQuery Table () where T : new()
+ {
+ return new TableQuery (this);
+ }
+
+ ///
+ /// Attempts to retrieve an object with the given primary key from the table
+ /// associated with the specified type. Use of this method requires that
+ /// the given type have a designated PrimaryKey (using the PrimaryKeyAttribute).
+ ///
+ ///
+ /// The object with the given primary key. Throws a not found exception
+ /// if the object is not found.
+ ///
+ public T Get (object pk) where T : new()
+ {
+ var map = GetMapping (typeof(T));
+ return Query (map.GetByPrimaryKeySql, pk).First ();
+ }
+
+ ///
+ /// Attempts to retrieve the first object that matches the predicate from the table
+ /// associated with the specified type.
+ ///
+ ///
+ /// The object that matches the given predicate. Throws a not found exception
+ /// if the object is not found.
+ ///
+ public T Get (Expression> predicate) where T : new()
+ {
+ return Table ().Where (predicate).First ();
+ }
+
+ ///
+ /// Attempts to retrieve an object with the given primary key from the table
+ /// associated with the specified type. Use of this method requires that
+ /// the given type have a designated PrimaryKey (using the PrimaryKeyAttribute).
+ ///
+ ///
+ /// The object with the given primary key or null
+ /// if the object is not found.
+ ///
+ public T Find (object pk) where T : new ()
+ {
+ var map = GetMapping (typeof (T));
+ return Query (map.GetByPrimaryKeySql, pk).FirstOrDefault ();
+ }
+
+ ///
+ /// Attempts to retrieve an object with the given primary key from the table
+ /// associated with the specified type. Use of this method requires that
+ /// the given type have a designated PrimaryKey (using the PrimaryKeyAttribute).
+ ///
+ ///
+ /// The object with the given primary key or null
+ /// if the object is not found.
+ ///
+ public object Find (object pk, TableMapping map)
+ {
+ return Query (map, map.GetByPrimaryKeySql, pk).FirstOrDefault ();
+ }
+
+ ///
+ /// Attempts to retrieve the first object that matches the predicate from the table
+ /// associated with the specified type.
+ ///
+ ///
+ /// The object that matches the given predicate or null
+ /// if the object is not found.
+ ///
+ public T Find (Expression> predicate) where T : new()
+ {
+ return Table ().Where (predicate).FirstOrDefault ();
+ }
+
+ ///
+ /// Whether
+ public bool IsInTransaction {
+ get { return _transactionDepth > 0; }
+ }
+
+ ///
+ /// Begins a new transaction. Call
+ /// Throws if a transaction has already begun.
+ public void BeginTransaction ()
+ {
+ // The BEGIN command only works if the transaction stack is empty,
+ // or in other words if there are no pending transactions.
+ // If the transaction stack is not empty when the BEGIN command is invoked,
+ // then the command fails with an error.
+ // Rather than crash with an error, we will just ignore calls to BeginTransaction
+ // that would result in an error.
+ if (Interlocked.CompareExchange (ref _transactionDepth, 1, 0) == 0) {
+ try {
+ Execute ("begin transaction");
+ } catch (Exception ex) {
+ var sqlExp = ex as SQLiteException;
+ if (sqlExp != null) {
+ // It is recommended that applications respond to the errors listed below
+ // by explicitly issuing a ROLLBACK command.
+ // TODO: This rollback failsafe should be localized to all throw sites.
+ switch (sqlExp.Result) {
+ case SQLite3.Result.IOError:
+ case SQLite3.Result.Full:
+ case SQLite3.Result.Busy:
+ case SQLite3.Result.NoMem:
+ case SQLite3.Result.Interrupt:
+ RollbackTo (null, true);
+ break;
+ }
+ } else {
+ // Call decrement and not VolatileWrite in case we've already
+ // created a transaction point in SaveTransactionPoint since the catch.
+ Interlocked.Decrement (ref _transactionDepth);
+ }
+
+ throw;
+ }
+ } else {
+ // Calling BeginTransaction on an already open transaction is invalid
+ throw new InvalidOperationException ("Cannot begin a transaction while already in a transaction.");
+ }
+ }
+
+ ///
+ /// Creates a savepoint in the database at the current point in the transaction timeline.
+ /// Begins a new transaction if one is not in progress.
+ ///
+ /// Call
+ /// A string naming the savepoint.
+ public string SaveTransactionPoint ()
+ {
+ int depth = Interlocked.Increment (ref _transactionDepth) - 1;
+ string retVal = "S" + _rand.Next (short.MaxValue) + "D" + depth;
+
+ try {
+ Execute ("savepoint " + retVal);
+ } catch (Exception ex) {
+ var sqlExp = ex as SQLiteException;
+ if (sqlExp != null) {
+ // It is recommended that applications respond to the errors listed below
+ // by explicitly issuing a ROLLBACK command.
+ // TODO: This rollback failsafe should be localized to all throw sites.
+ switch (sqlExp.Result) {
+ case SQLite3.Result.IOError:
+ case SQLite3.Result.Full:
+ case SQLite3.Result.Busy:
+ case SQLite3.Result.NoMem:
+ case SQLite3.Result.Interrupt:
+ RollbackTo (null, true);
+ break;
+ }
+ } else {
+ Interlocked.Decrement (ref _transactionDepth);
+ }
+
+ throw;
+ }
+
+ return retVal;
+ }
+
+ ///
+ /// Rolls back the transaction that was begun by
+ public void Rollback ()
+ {
+ RollbackTo (null, false);
+ }
+
+ ///
+ /// Rolls back the savepoint created by
+ ///
+ /// Rolls back the transaction that was begun by
+ ///
+ /// Releases a savepoint returned from
+ ///
+ /// Commits the transaction that was begun by
+ public void Commit ()
+ {
+ if (Interlocked.Exchange (ref _transactionDepth, 0) != 0) {
+ Execute ("commit");
+ }
+ // Do nothing on a commit with no open transaction
+ }
+
+ ///
+ /// Executes
+ ///
+ /// Inserts all specified objects.
+ ///
+ ///
+ /// The number of rows added to the table.
+ ///
+ public int InsertAll (System.Collections.IEnumerable objects)
+ {
+ var c = 0;
+ RunInTransaction(() => {
+ foreach (var r in objects) {
+ c += Insert (r);
+ }
+ });
+ return c;
+ }
+
+ ///
+ /// Inserts all specified objects.
+ ///
+ ///
+ /// The number of rows added to the table.
+ ///
+ public int InsertAll (System.Collections.IEnumerable objects, string extra)
+ {
+ var c = 0;
+ RunInTransaction (() => {
+ foreach (var r in objects) {
+ c += Insert (r, extra);
+ }
+ });
+ return c;
+ }
+
+ ///
+ /// Inserts all specified objects.
+ ///
+ ///
+ /// The number of rows added to the table.
+ ///
+ public int InsertAll (System.Collections.IEnumerable objects, Type objType)
+ {
+ var c = 0;
+ RunInTransaction (() => {
+ foreach (var r in objects) {
+ c += Insert (r, objType);
+ }
+ });
+ return c;
+ }
+
+ ///
+ /// Inserts the given object and retrieves its
+ /// auto incremented primary key if it has one.
+ ///
+ ///
+ /// The number of rows added to the table.
+ ///
+ public int Insert (object obj)
+ {
+ if (obj == null) {
+ return 0;
+ }
+ return Insert (obj, "", obj.GetType ());
+ }
+
+ ///
+ /// Inserts the given object and retrieves its
+ /// auto incremented primary key if it has one.
+ /// If a UNIQUE constraint violation occurs with
+ /// some pre-existing object, this function deletes
+ /// the old object.
+ ///
+ ///
+ /// The number of rows modified.
+ ///
+ public int InsertOrReplace (object obj)
+ {
+ if (obj == null) {
+ return 0;
+ }
+ return Insert (obj, "OR REPLACE", obj.GetType ());
+ }
+
+ ///
+ /// Inserts the given object and retrieves its
+ /// auto incremented primary key if it has one.
+ ///
+ ///
+ /// The number of rows added to the table.
+ ///
+ public int Insert (object obj, Type objType)
+ {
+ return Insert (obj, "", objType);
+ }
+
+ ///
+ /// Inserts the given object and retrieves its
+ /// auto incremented primary key if it has one.
+ /// If a UNIQUE constraint violation occurs with
+ /// some pre-existing object, this function deletes
+ /// the old object.
+ ///
+ ///
+ /// The number of rows modified.
+ ///
+ public int InsertOrReplace (object obj, Type objType)
+ {
+ return Insert (obj, "OR REPLACE", objType);
+ }
+
+ ///
+ /// Inserts the given object and retrieves its
+ /// auto incremented primary key if it has one.
+ ///
+ ///
+ /// The number of rows added to the table.
+ ///
+ public int Insert (object obj, string extra)
+ {
+ if (obj == null) {
+ return 0;
+ }
+ return Insert (obj, extra, obj.GetType ());
+ }
+
+ ///
+ /// Inserts the given object and retrieves its
+ /// auto incremented primary key if it has one.
+ ///
+ ///
+ /// The number of rows added to the table.
+ ///
+ public int Insert (object obj, string extra, Type objType)
+ {
+ if (obj == null || objType == null) {
+ return 0;
+ }
+
+
+ var map = GetMapping (objType);
+
+#if NETFX_CORE
+ if (map.PK != null && map.PK.IsAutoGuid)
+ {
+ // no GetProperty so search our way up the inheritance chain till we find it
+ PropertyInfo prop;
+ while (objType != null)
+ {
+ var info = objType.GetTypeInfo();
+ prop = info.GetDeclaredProperty(map.PK.PropertyName);
+ if (prop != null)
+ {
+ if (prop.GetValue(obj, null).Equals(Guid.Empty))
+ {
+ prop.SetValue(obj, Guid.NewGuid(), null);
+ }
+ break;
+ }
+
+ objType = info.BaseType;
+ }
+ }
+#else
+ if (map.PK != null && map.PK.IsAutoGuid) {
+ var prop = objType.GetProperty(map.PK.PropertyName);
+ if (prop != null) {
+ if (prop.GetValue(obj, null).Equals(Guid.Empty)) {
+ prop.SetValue(obj, Guid.NewGuid(), null);
+ }
+ }
+ }
+#endif
+
+
+ var replacing = string.Compare (extra, "OR REPLACE", StringComparison.OrdinalIgnoreCase) == 0;
+
+ var cols = replacing ? map.InsertOrReplaceColumns : map.InsertColumns;
+ var vals = new object[cols.Length];
+ for (var i = 0; i < vals.Length; i++) {
+ vals [i] = cols [i].GetValue (obj);
+ }
+
+ var insertCmd = map.GetInsertCommand (this, extra);
+ int count;
+
+ try {
+ count = insertCmd.ExecuteNonQuery (vals);
+ }
+ catch (SQLiteException ex) {
+
+ if (SQLite3.ExtendedErrCode (this.Handle) == SQLite3.ExtendedResult.ConstraintNotNull) {
+ throw NotNullConstraintViolationException.New (ex.Result, ex.Message, map, obj);
+ }
+ throw;
+ }
+
+ if (map.HasAutoIncPK)
+ {
+ var id = SQLite3.LastInsertRowid (Handle);
+ map.SetAutoIncPK (obj, id);
+ }
+
+ return count;
+ }
+
+ ///
+ /// Updates all of the columns of a table using the specified object
+ /// except for its primary key.
+ /// The object is required to have a primary key.
+ ///
+ ///
+ /// The number of rows updated.
+ ///
+ public int Update (object obj)
+ {
+ if (obj == null) {
+ return 0;
+ }
+ return Update (obj, obj.GetType ());
+ }
+
+ ///
+ /// Updates all of the columns of a table using the specified object
+ /// except for its primary key.
+ /// The object is required to have a primary key.
+ ///
+ ///
+ /// The number of rows updated.
+ ///
+ public int Update (object obj, Type objType)
+ {
+ int rowsAffected = 0;
+ if (obj == null || objType == null) {
+ return 0;
+ }
+
+ var map = GetMapping (objType);
+
+ var pk = map.PK;
+
+ if (pk == null) {
+ throw new NotSupportedException ("Cannot update " + map.TableName + ": it has no PK");
+ }
+
+ var cols = from p in map.Columns
+ where p != pk
+ select p;
+ var vals = from c in cols
+ select c.GetValue (obj);
+ var ps = new List (vals);
+ ps.Add (pk.GetValue (obj));
+ var q = string.Format ("update \"{0}\" set {1} where {2} = ? ", map.TableName, string.Join (",", (from c in cols
+ select "\"" + c.Name + "\" = ? ").ToArray ()), pk.Name);
+
+ try {
+ rowsAffected = Execute (q, ps.ToArray ());
+ }
+ catch (SQLiteException ex) {
+
+ if (ex.Result == SQLite3.Result.Constraint && SQLite3.ExtendedErrCode (this.Handle) == SQLite3.ExtendedResult.ConstraintNotNull) {
+ throw NotNullConstraintViolationException.New (ex, map, obj);
+ }
+
+ throw ex;
+ }
+
+ return rowsAffected;
+ }
+
+ ///
+ /// Updates all specified objects.
+ ///
+ ///
+ /// The number of rows modified.
+ ///
+ public int UpdateAll (System.Collections.IEnumerable objects)
+ {
+ var c = 0;
+ RunInTransaction (() => {
+ foreach (var r in objects) {
+ c += Update (r);
+ }
+ });
+ return c;
+ }
+
+ ///
+ /// Deletes the given object from the database using its primary key.
+ ///
+ ///
+ /// The number of rows deleted.
+ ///
+ public int Delete (object objectToDelete)
+ {
+ var map = GetMapping (objectToDelete.GetType ());
+ var pk = map.PK;
+ if (pk == null) {
+ throw new NotSupportedException ("Cannot delete " + map.TableName + ": it has no PK");
+ }
+ var q = string.Format ("delete from \"{0}\" where \"{1}\" = ?", map.TableName, pk.Name);
+ return Execute (q, pk.GetValue (objectToDelete));
+ }
+
+ ///
+ /// Deletes the object with the specified primary key.
+ ///
+ ///
+ /// The number of objects deleted.
+ ///
+ ///
+ /// The type of object.
+ ///
+ public int Delete (object primaryKey)
+ {
+ var map = GetMapping (typeof (T));
+ var pk = map.PK;
+ if (pk == null) {
+ throw new NotSupportedException ("Cannot delete " + map.TableName + ": it has no PK");
+ }
+ var q = string.Format ("delete from \"{0}\" where \"{1}\" = ?", map.TableName, pk.Name);
+ return Execute (q, primaryKey);
+ }
+
+ ///
+ /// Deletes all the objects from the specified table.
+ /// WARNING WARNING: Let me repeat. It deletes ALL the objects from the
+ /// specified table. Do you really want to do that?
+ ///
+ ///
+ /// The number of objects deleted.
+ ///
+ ///
+ /// The type of objects to delete.
+ ///
+ public int DeleteAll ()
+ {
+ var map = GetMapping (typeof (T));
+ var query = string.Format("delete from \"{0}\"", map.TableName);
+ return Execute (query);
+ }
+
+ ~SQLiteConnection ()
+ {
+ Dispose (false);
+ }
+
+ public void Dispose ()
+ {
+ Dispose (true);
+ GC.SuppressFinalize (this);
+ }
+
+ protected virtual void Dispose (bool disposing)
+ {
+ Close ();
+ }
+
+ public void Close ()
+ {
+ if (_open && Handle != NullHandle) {
+ try {
+ if (_mappings != null) {
+ foreach (var sqlInsertCommand in _mappings.Values) {
+ sqlInsertCommand.Dispose();
+ }
+ }
+ var r = SQLite3.Close (Handle);
+ if (r != SQLite3.Result.OK) {
+ string msg = SQLite3.GetErrmsg (Handle);
+ throw SQLiteException.New (r, msg);
+ }
+ }
+ finally {
+ Handle = NullHandle;
+ _open = false;
+ }
+ }
+ }
+ }
+
+ ///
+ /// Represents a parsed connection string.
+ ///
+ class SQLiteConnectionString
+ {
+ public string ConnectionString { get; private set; }
+ public string DatabasePath { get; private set; }
+ public bool StoreDateTimeAsTicks { get; private set; }
+
+#if NETFX_CORE
+ static readonly string MetroStyleDataPath = Windows.Storage.ApplicationData.Current.LocalFolder.Path;
+#endif
+
+ public SQLiteConnectionString (string databasePath, bool storeDateTimeAsTicks)
+ {
+ ConnectionString = databasePath;
+ StoreDateTimeAsTicks = storeDateTimeAsTicks;
+
+#if NETFX_CORE
+ DatabasePath = System.IO.Path.Combine (MetroStyleDataPath, databasePath);
+#else
+ DatabasePath = databasePath;
+#endif
+ }
+ }
+
+ [AttributeUsage (AttributeTargets.Class)]
+ public class TableAttribute : Attribute
+ {
+ public string Name { get; set; }
+
+ public TableAttribute (string name)
+ {
+ Name = name;
+ }
+ }
+
+ [AttributeUsage (AttributeTargets.Property)]
+ public class ColumnAttribute : Attribute
+ {
+ public string Name { get; set; }
+
+ public ColumnAttribute (string name)
+ {
+ Name = name;
+ }
+ }
+
+ [AttributeUsage (AttributeTargets.Property)]
+ public class PrimaryKeyAttribute : Attribute
+ {
+ }
+
+ [AttributeUsage (AttributeTargets.Property)]
+ public class AutoIncrementAttribute : Attribute
+ {
+ }
+
+ [AttributeUsage (AttributeTargets.Property)]
+ public class IndexedAttribute : Attribute
+ {
+ public string Name { get; set; }
+ public int Order { get; set; }
+ public virtual bool Unique { get; set; }
+
+ public IndexedAttribute()
+ {
+ }
+
+ public IndexedAttribute(string name, int order)
+ {
+ Name = name;
+ Order = order;
+ }
+ }
+
+ [AttributeUsage (AttributeTargets.Property)]
+ public class IgnoreAttribute : Attribute
+ {
+ }
+
+ [AttributeUsage (AttributeTargets.Property)]
+ public class UniqueAttribute : IndexedAttribute
+ {
+ public override bool Unique {
+ get { return true; }
+ set { /* throw? */ }
+ }
+ }
+
+ [AttributeUsage (AttributeTargets.Property)]
+ public class MaxLengthAttribute : Attribute
+ {
+ public int Value { get; private set; }
+
+ public MaxLengthAttribute (int length)
+ {
+ Value = length;
+ }
+ }
+
+ [AttributeUsage (AttributeTargets.Property)]
+ public class CollationAttribute: Attribute
+ {
+ public string Value { get; private set; }
+
+ public CollationAttribute (string collation)
+ {
+ Value = collation;
+ }
+ }
+
+ [AttributeUsage (AttributeTargets.Property)]
+ public class NotNullAttribute : Attribute
+ {
+ }
+
+ public class TableMapping
+ {
+ public Type MappedType { get; private set; }
+
+ public string TableName { get; private set; }
+
+ public Column[] Columns { get; private set; }
+
+ public Column PK { get; private set; }
+
+ public string GetByPrimaryKeySql { get; private set; }
+
+ Column _autoPk;
+ Column[] _insertColumns;
+ Column[] _insertOrReplaceColumns;
+
+ public TableMapping(Type type, CreateFlags createFlags = CreateFlags.None)
+ {
+ MappedType = type;
+
+#if NETFX_CORE
+ var tableAttr = (TableAttribute)System.Reflection.CustomAttributeExtensions
+ .GetCustomAttribute(type.GetTypeInfo(), typeof(TableAttribute), true);
+#else
+ var tableAttr = (TableAttribute)type.GetCustomAttributes (typeof (TableAttribute), true).FirstOrDefault ();
+#endif
+
+ TableName = tableAttr != null ? tableAttr.Name : MappedType.Name;
+
+#if !NETFX_CORE
+ var props = MappedType.GetProperties (BindingFlags.Public | BindingFlags.Instance | BindingFlags.SetProperty);
+#else
+ var props = from p in MappedType.GetRuntimeProperties()
+ where ((p.GetMethod != null && p.GetMethod.IsPublic) || (p.SetMethod != null && p.SetMethod.IsPublic) || (p.GetMethod != null && p.GetMethod.IsStatic) || (p.SetMethod != null && p.SetMethod.IsStatic))
+ select p;
+#endif
+ var cols = new List ();
+ foreach (var p in props) {
+#if !NETFX_CORE
+ var ignore = p.GetCustomAttributes (typeof(IgnoreAttribute), true).Length > 0;
+#else
+ var ignore = p.GetCustomAttributes (typeof(IgnoreAttribute), true).Count() > 0;
+#endif
+ if (p.CanWrite && !ignore) {
+ cols.Add (new Column (p, createFlags));
+ }
+ }
+ Columns = cols.ToArray ();
+ foreach (var c in Columns) {
+ if (c.IsAutoInc && c.IsPK) {
+ _autoPk = c;
+ }
+ if (c.IsPK) {
+ PK = c;
+ }
+ }
+
+ HasAutoIncPK = _autoPk != null;
+
+ if (PK != null) {
+ GetByPrimaryKeySql = string.Format ("select * from \"{0}\" where \"{1}\" = ?", TableName, PK.Name);
+ }
+ else {
+ // People should not be calling Get/Find without a PK
+ GetByPrimaryKeySql = string.Format ("select * from \"{0}\" limit 1", TableName);
+ }
+ }
+
+ public bool HasAutoIncPK { get; private set; }
+
+ public void SetAutoIncPK (object obj, long id)
+ {
+ if (_autoPk != null) {
+ _autoPk.SetValue (obj, Convert.ChangeType (id, _autoPk.ColumnType, null));
+ }
+ }
+
+ public Column[] InsertColumns {
+ get {
+ if (_insertColumns == null) {
+ _insertColumns = Columns.Where (c => !c.IsAutoInc).ToArray ();
+ }
+ return _insertColumns;
+ }
+ }
+
+ public Column[] InsertOrReplaceColumns {
+ get {
+ if (_insertOrReplaceColumns == null) {
+ _insertOrReplaceColumns = Columns.ToArray ();
+ }
+ return _insertOrReplaceColumns;
+ }
+ }
+
+ public Column FindColumnWithPropertyName (string propertyName)
+ {
+ var exact = Columns.FirstOrDefault (c => c.PropertyName == propertyName);
+ return exact;
+ }
+
+ public Column FindColumn (string columnName)
+ {
+ var exact = Columns.FirstOrDefault (c => c.Name == columnName);
+ return exact;
+ }
+
+ PreparedSqlLiteInsertCommand _insertCommand;
+ string _insertCommandExtra;
+
+ public PreparedSqlLiteInsertCommand GetInsertCommand(SQLiteConnection conn, string extra)
+ {
+ if (_insertCommand == null) {
+ _insertCommand = CreateInsertCommand(conn, extra);
+ _insertCommandExtra = extra;
+ }
+ else if (_insertCommandExtra != extra) {
+ _insertCommand.Dispose();
+ _insertCommand = CreateInsertCommand(conn, extra);
+ _insertCommandExtra = extra;
+ }
+ return _insertCommand;
+ }
+
+ PreparedSqlLiteInsertCommand CreateInsertCommand(SQLiteConnection conn, string extra)
+ {
+ var cols = InsertColumns;
+ string insertSql;
+ if (!cols.Any() && Columns.Count() == 1 && Columns[0].IsAutoInc)
+ {
+ insertSql = string.Format("insert {1} into \"{0}\" default values", TableName, extra);
+ }
+ else
+ {
+ var replacing = string.Compare (extra, "OR REPLACE", StringComparison.OrdinalIgnoreCase) == 0;
+
+ if (replacing) {
+ cols = InsertOrReplaceColumns;
+ }
+
+ insertSql = string.Format("insert {3} into \"{0}\"({1}) values ({2})", TableName,
+ string.Join(",", (from c in cols
+ select "\"" + c.Name + "\"").ToArray()),
+ string.Join(",", (from c in cols
+ select "?").ToArray()), extra);
+
+ }
+
+ var insertCommand = new PreparedSqlLiteInsertCommand(conn);
+ insertCommand.CommandText = insertSql;
+ return insertCommand;
+ }
+
+ protected internal void Dispose()
+ {
+ if (_insertCommand != null) {
+ _insertCommand.Dispose();
+ _insertCommand = null;
+ }
+ }
+
+ public class Column
+ {
+ PropertyInfo _prop;
+
+ public string Name { get; private set; }
+
+ public string PropertyName { get { return _prop.Name; } }
+
+ public Type ColumnType { get; private set; }
+
+ public string Collation { get; private set; }
+
+ public bool IsAutoInc { get; private set; }
+ public bool IsAutoGuid { get; private set; }
+
+ public bool IsPK { get; private set; }
+
+ public IEnumerable Indices { get; set; }
+
+ public bool IsNullable { get; private set; }
+
+ public int? MaxStringLength { get; private set; }
+
+ public Column(PropertyInfo prop, CreateFlags createFlags = CreateFlags.None)
+ {
+ var colAttr = (ColumnAttribute)prop.GetCustomAttributes(typeof(ColumnAttribute), true).FirstOrDefault();
+
+ _prop = prop;
+ Name = colAttr == null ? prop.Name : colAttr.Name;
+ //If this type is Nullable then Nullable.GetUnderlyingType returns the T, otherwise it returns null, so get the actual type instead
+ ColumnType = Nullable.GetUnderlyingType(prop.PropertyType) ?? prop.PropertyType;
+ Collation = Orm.Collation(prop);
+
+ IsPK = Orm.IsPK(prop) ||
+ (((createFlags & CreateFlags.ImplicitPK) == CreateFlags.ImplicitPK) &&
+ string.Compare (prop.Name, Orm.ImplicitPkName, StringComparison.OrdinalIgnoreCase) == 0);
+
+ var isAuto = Orm.IsAutoInc(prop) || (IsPK && ((createFlags & CreateFlags.AutoIncPK) == CreateFlags.AutoIncPK));
+ IsAutoGuid = isAuto && ColumnType == typeof(Guid);
+ IsAutoInc = isAuto && !IsAutoGuid;
+
+ Indices = Orm.GetIndices(prop);
+ if (!Indices.Any()
+ && !IsPK
+ && ((createFlags & CreateFlags.ImplicitIndex) == CreateFlags.ImplicitIndex)
+ && Name.EndsWith (Orm.ImplicitIndexSuffix, StringComparison.OrdinalIgnoreCase)
+ )
+ {
+ Indices = new IndexedAttribute[] { new IndexedAttribute() };
+ }
+ IsNullable = !(IsPK || Orm.IsMarkedNotNull(prop));
+ MaxStringLength = Orm.MaxStringLength(prop);
+ }
+
+ public void SetValue (object obj, object val)
+ {
+ _prop.SetValue (obj, val, null);
+ }
+
+ public object GetValue (object obj)
+ {
+ return _prop.GetValue (obj, null);
+ }
+ }
+ }
+
+ public static class Orm
+ {
+ public const int DefaultMaxStringLength = 140;
+ public const string ImplicitPkName = "Id";
+ public const string ImplicitIndexSuffix = "Id";
+
+ public static string SqlDecl (TableMapping.Column p, bool storeDateTimeAsTicks)
+ {
+ string decl = "\"" + p.Name + "\" " + SqlType (p, storeDateTimeAsTicks) + " ";
+
+ if (p.IsPK) {
+ decl += "primary key ";
+ }
+ if (p.IsAutoInc) {
+ decl += "autoincrement ";
+ }
+ if (!p.IsNullable) {
+ decl += "not null ";
+ }
+ if (!string.IsNullOrEmpty (p.Collation)) {
+ decl += "collate " + p.Collation + " ";
+ }
+
+ return decl;
+ }
+
+ public static string SqlType (TableMapping.Column p, bool storeDateTimeAsTicks)
+ {
+ var clrType = p.ColumnType;
+ if (clrType == typeof(Boolean) || clrType == typeof(Byte) || clrType == typeof(UInt16) || clrType == typeof(SByte) || clrType == typeof(Int16) || clrType == typeof(Int32)) {
+ return "integer";
+ } else if (clrType == typeof(UInt32) || clrType == typeof(Int64)) {
+ return "bigint";
+ } else if (clrType == typeof(Single) || clrType == typeof(Double) || clrType == typeof(Decimal)) {
+ return "float";
+ } else if (clrType == typeof(String)) {
+ int? len = p.MaxStringLength;
+
+ if (len.HasValue)
+ return "varchar(" + len.Value + ")";
+
+ return "varchar";
+ } else if (clrType == typeof(TimeSpan)) {
+ return "bigint";
+ } else if (clrType == typeof(DateTime)) {
+ return storeDateTimeAsTicks ? "bigint" : "datetime";
+ } else if (clrType == typeof(DateTimeOffset)) {
+ return "bigint";
+#if !NETFX_CORE
+ } else if (clrType.IsEnum) {
+#else
+ } else if (clrType.GetTypeInfo().IsEnum) {
+#endif
+ return "integer";
+ } else if (clrType == typeof(byte[])) {
+ return "blob";
+ } else if (clrType == typeof(Guid)) {
+ return "varchar(36)";
+ } else {
+ throw new NotSupportedException ("Don't know about " + clrType);
+ }
+ }
+
+ public static bool IsPK (MemberInfo p)
+ {
+ var attrs = p.GetCustomAttributes (typeof(PrimaryKeyAttribute), true);
+#if !NETFX_CORE
+ return attrs.Length > 0;
+#else
+ return attrs.Count() > 0;
+#endif
+ }
+
+ public static string Collation (MemberInfo p)
+ {
+ var attrs = p.GetCustomAttributes (typeof(CollationAttribute), true);
+#if !NETFX_CORE
+ if (attrs.Length > 0) {
+ return ((CollationAttribute)attrs [0]).Value;
+#else
+ if (attrs.Count() > 0) {
+ return ((CollationAttribute)attrs.First()).Value;
+#endif
+ } else {
+ return string.Empty;
+ }
+ }
+
+ public static bool IsAutoInc (MemberInfo p)
+ {
+ var attrs = p.GetCustomAttributes (typeof(AutoIncrementAttribute), true);
+#if !NETFX_CORE
+ return attrs.Length > 0;
+#else
+ return attrs.Count() > 0;
+#endif
+ }
+
+ public static IEnumerable GetIndices(MemberInfo p)
+ {
+ var attrs = p.GetCustomAttributes(typeof(IndexedAttribute), true);
+ return attrs.Cast();
+ }
+
+ public static int? MaxStringLength(PropertyInfo p)
+ {
+ var attrs = p.GetCustomAttributes (typeof(MaxLengthAttribute), true);
+#if !NETFX_CORE
+ if (attrs.Length > 0)
+ return ((MaxLengthAttribute)attrs [0]).Value;
+#else
+ if (attrs.Count() > 0)
+ return ((MaxLengthAttribute)attrs.First()).Value;
+#endif
+
+ return null;
+ }
+
+ public static bool IsMarkedNotNull(MemberInfo p)
+ {
+ var attrs = p.GetCustomAttributes (typeof (NotNullAttribute), true);
+#if !NETFX_CORE
+ return attrs.Length > 0;
+#else
+ return attrs.Count() > 0;
+#endif
+ }
+ }
+
+ public partial class SQLiteCommand
+ {
+ SQLiteConnection _conn;
+ private List _bindings;
+
+ public string CommandText { get; set; }
+
+ internal SQLiteCommand (SQLiteConnection conn)
+ {
+ _conn = conn;
+ _bindings = new List ();
+ CommandText = "";
+ }
+
+ public int ExecuteNonQuery ()
+ {
+ if (_conn.Trace) {
+ Debug.WriteLine ("Executing: " + this);
+ }
+
+ var r = SQLite3.Result.OK;
+ var stmt = Prepare ();
+ r = SQLite3.Step (stmt);
+ Finalize (stmt);
+ if (r == SQLite3.Result.Done) {
+ int rowsAffected = SQLite3.Changes (_conn.Handle);
+ return rowsAffected;
+ } else if (r == SQLite3.Result.Error) {
+ string msg = SQLite3.GetErrmsg (_conn.Handle);
+ throw SQLiteException.New (r, msg);
+ }
+ else if (r == SQLite3.Result.Constraint) {
+ if (SQLite3.ExtendedErrCode (_conn.Handle) == SQLite3.ExtendedResult.ConstraintNotNull) {
+ throw NotNullConstraintViolationException.New (r, SQLite3.GetErrmsg (_conn.Handle));
+ }
+ }
+
+ throw SQLiteException.New(r, r.ToString());
+ }
+
+ public IEnumerable ExecuteDeferredQuery ()
+ {
+ return ExecuteDeferredQuery(_conn.GetMapping(typeof(T)));
+ }
+
+ public List ExecuteQuery ()
+ {
+ return ExecuteDeferredQuery(_conn.GetMapping(typeof(T))).ToList();
+ }
+
+ public List ExecuteQuery (TableMapping map)
+ {
+ return ExecuteDeferredQuery(map).ToList();
+ }
+
+ ///
+ /// Invoked every time an instance is loaded from the database.
+ ///
+ ///
+ /// This can be overridden in combination with the
+ protected virtual void OnInstanceCreated (object obj)
+ {
+ // Can be overridden.
+ }
+
+ public IEnumerable ExecuteDeferredQuery (TableMapping map)
+ {
+ if (_conn.Trace) {
+ Debug.WriteLine ("Executing Query: " + this);
+ }
+
+ var stmt = Prepare ();
+ try
+ {
+ var cols = new TableMapping.Column[SQLite3.ColumnCount (stmt)];
+
+ for (int i = 0; i < cols.Length; i++) {
+ var name = SQLite3.ColumnName16 (stmt, i);
+ cols [i] = map.FindColumn (name);
+ }
+
+ while (SQLite3.Step (stmt) == SQLite3.Result.Row) {
+ var obj = Activator.CreateInstance(map.MappedType);
+ for (int i = 0; i < cols.Length; i++) {
+ if (cols [i] == null)
+ continue;
+ var colType = SQLite3.ColumnType (stmt, i);
+ var val = ReadCol (stmt, i, colType, cols [i].ColumnType);
+ cols [i].SetValue (obj, val);
+ }
+ OnInstanceCreated (obj);
+ yield return (T)obj;
+ }
+ }
+ finally
+ {
+ SQLite3.Finalize(stmt);
+ }
+ }
+
+ public T ExecuteScalar