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

Decently sized C#6 refactor

Browse Source 
Also removed unused using statements
This commit is contained in:
Kwoth 2015-12-12 23:39:58 +01:00
parent 1847ddbbe2
commit d9657436a4
10 changed files with 161 additions and 221 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
NadekoBot/Classes/Cards.cs
View File

@ -58,14 +58,10 @@ public class Cards
this.suit = s;
this.number = card_num;
}
public string GetName() {
return cardNames[number];
}
public override string ToString()
{
return cardNames[number] + " Of " + suit;
}
public string GetName() => cardNames[number];
public override string ToString() => cardNames[number] + " Of " + suit;
public int CompareTo(object obj)
{
@ -95,11 +91,7 @@ public class Cards
/// Restart the game of blackjack. It will only refill the pool for now. Probably wont be used, unless you want to have only 1 bjg running at one time,
/// then you will restart the same game every time.
/// </summary>
public void Restart()
{
// you dont have to uncover what is actually happening anda da hood
RefillPool();
}
public void Restart() => RefillPool();
/// <summary>
/// Removes all cards from the pool and refills the pool with all of the possible cards. NOTE: I think this is too expensive.

5
NadekoBot/Classes/Extensions.cs
View File

@ -1,7 +1,6 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Security.Cryptography;
using Discord.Commands;
@ -34,9 +33,7 @@ namespace NadekoBot
/// <param name="message">Message to be sent</param>
/// <returns></returns>
public static async Task<Message> Send(this CommandEventArgs e, string message)
{
return await NadekoBot.client.SendMessage(e.Channel, message);
}
=> await NadekoBot.client.SendMessage(e.Channel, message);
/// <summary>
/// Sends a message to the channel from which MessageEventArg came.
/// </summary>

76
NadekoBot/Classes/Trivia.cs
View File

@ -6,8 +6,6 @@ using System.Collections.Generic;
using System.Diagnostics;
using System.IO;
using System.Linq;
using System.Net.Http;
using System.Text;
using System.Threading.Tasks;
using System.Timers;
@ -31,51 +29,40 @@ namespace NadekoBot
return tg;
}
public TriviaQuestion GetCurrentQuestion(long serverId) {
return runningTrivias[serverId].currentQuestion;
}
public TriviaQuestion GetCurrentQuestion(long serverId) => runningTrivias[serverId].currentQuestion;
public override Func<CommandEventArgs, Task> DoFunc()
{
return async e =>
public override Func<CommandEventArgs, Task> DoFunc() => async e =>
{
TriviaGame tg;
if ((tg = StartNewGame(e))!=null)
if ((tg = StartNewGame(e)) != null)
{
await e.Send( "**Trivia game started!**\nFirst player to get to 10 points wins! You have 30 seconds per question.\nUse command [tq] if game was started by accident.\nTyping [idfk] 15 seconds after the question has started will give you a hint.");
await e.Send("**Trivia game started!**\nFirst player to get to 10 points wins! You have 30 seconds per question.\nUse command [tq] if game was started by accident.\nTyping [idfk] 15 seconds after the question has started will give you a hint.");
}
else
await e.Send( "Trivia game is already running on this server. The question is:\n**"+GetCurrentQuestion(e.Server.Id).Question+"**");
await e.Send("Trivia game is already running on this server. The question is:\n**" + GetCurrentQuestion(e.Server.Id).Question + "**");
};
}
private Func<CommandEventArgs, Task> LbFunc()
{
return async e =>
private Func<CommandEventArgs, Task> LbFunc() => async e =>
{
if (runningTrivias.ContainsKey(e.Server.Id))
{
var lb = runningTrivias[e.User.Server.Id].GetLeaderboard();
await e.Send( lb);
await e.Send(lb);
}
else
await e.Send( "Trivia game is not running on this server.");
await e.Send("Trivia game is not running on this server.");
};
}
private Func<CommandEventArgs, Task> RepeatFunc()
{
return async e =>
private Func<CommandEventArgs, Task> RepeatFunc() => async e =>
{
if (runningTrivias.ContainsKey(e.Server.Id))
{
var lb = runningTrivias[e.User.Server.Id].GetLeaderboard();
await e.Send( lb);
await e.Send(lb);
}
else
await e.Send( "Trivia game is not running on this server.");
await e.Send("Trivia game is not running on this server.");
};
}
public override void Init(CommandGroupBuilder cgb)
{
@ -97,18 +84,15 @@ namespace NadekoBot
.Do(QuitFunc());
}
private Func<CommandEventArgs, Task> QuitFunc()
private Func<CommandEventArgs, Task> QuitFunc() => async e =>
{
return async e =>
if (runningTrivias.ContainsKey(e.Server.Id) && runningTrivias[e.Server.Id].ChannelId == e.Channel.Id)
{
if (runningTrivias.ContainsKey(e.Server.Id) && runningTrivias[e.Server.Id].ChannelId ==e.Channel.Id)
{
await e.Send( "Trivia will stop after this question. Run [**@NadekoBot clr**] to remove this bot's messages from the channel.");
await e.Send("Trivia will stop after this question. Run [**@NadekoBot clr**] to remove this bot's messages from the channel.");
runningTrivias[e.Server.Id].StopGame();
}
else await e.Send( "No trivias are running on this channel.");
else await e.Send("No trivias are running on this channel.");
};
}
internal static void FinishGame(TriviaGame triviaGame)
{
@ -122,13 +106,7 @@ namespace NadekoBot
private long _serverId;
private long _channellId;
public long ChannelId
{
get
{
return _channellId;
}
}
public long ChannelId => _channellId;
private Dictionary<long, int> users;
@ -271,19 +249,21 @@ namespace NadekoBot
}
}
public class TriviaQuestion {
public class TriviaQuestion
{
public string Category;
public string Question;
public string Answer;
public TriviaQuestion(string q, string a) {
public TriviaQuestion(string q, string a)
{
this.Question = q;
this.Answer = a;
}
public override string ToString()
{
return this.Category == null ? "--------**Q**--------\nQuestion: **" + this.Question + "?**" : "--------Q--------\nCategory: " + this.Category + "\nQuestion: **"+ this.Question+ "?**";
}
public override string ToString() =>
this.Category == null ?
"--------**Q**--------\nQuestion: **" + this.Question + "?**" :
"--------Q--------\nCategory: " + this.Category + "\nQuestion: **" + this.Question + "?**";
}
public class TriviaQuestionsPool {
@ -303,7 +283,8 @@ namespace NadekoBot
private Random _r;
public TriviaQuestionsPool() {
public TriviaQuestionsPool()
{
_r = new Random();
pool = new List<TriviaQuestion>();
JArray arr = JArray.Parse(File.ReadAllText("questions.txt"));
@ -311,9 +292,10 @@ namespace NadekoBot
foreach (var item in arr)
{
TriviaQuestion tq;
tq = new TriviaQuestion((string)item["Question"],(string)item["Answer"]);
tq = new TriviaQuestion((string)item["Question"], (string)item["Answer"]);
if (item?["Category"] != null) {
if (item?["Category"] != null)
{
tq.Category = item["Category"].ToString();
}

12
NadekoBot/Classes/_JSONModels.cs
View File

@ -21,16 +21,14 @@
public string description;
public string image_url_lge;
public override string ToString()
{
return "`Title:` **" + title_english +
public override string ToString() =>
"`Title:` **" + title_english +
"**\n`Status:` " + airing_status +
"\n`Episodes:` " + total_episodes +
"\n`Link:` http://anilist.co/anime/" + id +
"\n`Synopsis:` " + description.Substring(0, description.Length > 500 ? 500 : description.Length) + "..." +
"\n`img:` " + image_url_lge;
}
}
class MangaResult
{
@ -42,9 +40,8 @@
public int total_volumes;
public string description;
public override string ToString()
{
return "`Title:` **" + title_english +
public override string ToString() =>
"`Title:` **" + title_english +
"**\n`Status:` " + publishing_status +
"\n`Chapters:` " + total_chapters +
"\n`Volumes:` " + total_volumes +
@ -52,5 +49,4 @@
"\n`Synopsis:` " + description.Substring(0, description.Length > 500 ? 500 : description.Length) + "..." +
"\n`img:` " + image_url_lge;
}
}
}

16
NadekoBot/Commands/CopyCommand.cs
View File

@ -1,7 +1,5 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Discord.Commands;
@ -24,17 +22,14 @@ namespace NadekoBot
}
}
public override Func<CommandEventArgs, Task> DoFunc()
{
return async e =>
public override Func<CommandEventArgs, Task> DoFunc() => async e =>
{
if (CopiedUsers.Contains(e.User.Id)) return;
CopiedUsers.Add(e.User.Id);
await e.Send( " I'll start copying you now.");
await e.Send(" I'll start copying you now.");
return;
};
}
public override void Init(CommandGroupBuilder cgb)
{
@ -49,16 +44,13 @@ namespace NadekoBot
.Do(StopCopy());
}
private Func<CommandEventArgs, Task> StopCopy()
{
return async e =>
private Func<CommandEventArgs, Task> StopCopy() => async e =>
{
if (!CopiedUsers.Contains(e.User.Id)) return;
CopiedUsers.Remove(e.User.Id);
await e.Send( " I wont copy anymore.");
await e.Send(" I wont copy anymore.");
return;
};
}
}
}

7
NadekoBot/Commands/DiceRollCommand.cs
View File

@ -1,11 +1,8 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Discord.Commands;
using Discord.Modules;
using Discord;
using System.Drawing;
using System.Drawing.Imaging;
@ -85,9 +82,7 @@ namespace NadekoBot
};
}
private Image GetDice(int num) {
return Image.FromFile("images/dice/"+num+".png");
}
private Image GetDice(int num) => Image.FromFile("images/dice/" + num + ".png");
public override void Init(CommandGroupBuilder cgb)
{

20
NadekoBot/Commands/DrawCommand.cs
View File

@ -13,8 +13,7 @@ namespace NadekoBot
public DrawCommand() : base() { }
public override Func<CommandEventArgs,Task> DoFunc() {
return async (e) =>
public override Func<CommandEventArgs, Task> DoFunc() => async (e) =>
{
if (cards == null)
{
@ -26,7 +25,7 @@ namespace NadekoBot
{
int num = 1;
var isParsed = int.TryParse(e.GetArg("count"), out num);
if (!isParsed || num <2)
if (!isParsed || num < 2)
{
await client.SendFile(e.Channel, cards.DrawACard().Path);
return;
@ -38,9 +37,9 @@ namespace NadekoBot
List<Cards.Card> cardObjects = new List<Cards.Card>();
for (int i = 0; i < num; i++)
{
if (cards.CardPool.Count == 0 && i!= 0)
if (cards.CardPool.Count == 0 && i != 0)
{
await e.Send( "No more cards in a deck.");
await e.Send("No more cards in a deck.");
break;
}
var currentCard = cards.DrawACard();
@ -48,16 +47,17 @@ namespace NadekoBot
images.Add(Image.FromFile(currentCard.Path));
}
Bitmap bitmap = ImageHandler.MergeImages(images);
await client.SendFile(e.Channel, images.Count+" cards.jpg",ImageHandler.ImageToStream(bitmap, ImageFormat.Jpeg));
if (cardObjects.Count == 5) {
await client.SendFile(e.Channel, images.Count + " cards.jpg", ImageHandler.ImageToStream(bitmap, ImageFormat.Jpeg));
if (cardObjects.Count == 5)
{
await e.Send(Cards.GetHandValue(cardObjects));
}
}
catch (Exception ex) {
Console.WriteLine("Error drawing (a) card(s) "+ex.ToString());
catch (Exception ex)
{
Console.WriteLine("Error drawing (a) card(s) " + ex.ToString());
}
};
}
public override void Init(CommandGroupBuilder cgb)
{

4
NadekoBot/Commands/FlipCoinCommand.cs
View File

@ -13,9 +13,8 @@ namespace NadekoBot
_r = new Random();
}
public override Func<CommandEventArgs, Task> DoFunc()
public override Func<CommandEventArgs, Task> DoFunc() => async e =>
{
return async e => {
int num = _r.Next(0, 2);
if (num == 1)
{
@ -26,7 +25,6 @@ namespace NadekoBot
await client.SendFile(e.Channel, @"images/coins/tails.png");
}
};
}
public override void Init(CommandGroupBuilder cgb)
{

9
NadekoBot/Commands/HelpCommand.cs
View File

@ -6,9 +6,7 @@ namespace NadekoBot
{
class HelpCommand : DiscordCommand
{
public override Func<CommandEventArgs, Task> DoFunc()
{
return async e =>
public override Func<CommandEventArgs, Task> DoFunc() => async e =>
{
string helpstr = "Official repo: **github.com/Kwoth/NadekoBot/** \n";
@ -26,12 +24,11 @@ namespace NadekoBot
while (helpstr.Length > 2000)
{
var curstr = helpstr.Substring(0, 2000);
await client.SendMessage(e.User, curstr.Substring(0, curstr.LastIndexOf("\n")+1));
helpstr = curstr.Substring(curstr.LastIndexOf("\n")+1) + helpstr.Substring(2000);
await client.SendMessage(e.User, curstr.Substring(0, curstr.LastIndexOf("\n") + 1));
helpstr = curstr.Substring(curstr.LastIndexOf("\n") + 1) + helpstr.Substring(2000);
}
await client.SendMessage(e.User, helpstr);
};
}
public override void Init(CommandGroupBuilder cgb)
{

15
NadekoBot/Modules/Conversations.cs
View File

@ -8,7 +8,6 @@ using System.Timers;
using System.Threading.Tasks;
using System.Diagnostics;
using System.Drawing;
using Newtonsoft.Json.Linq;
using System.IO;
using System.Text;
using System.Drawing.Imaging;
@ -29,10 +28,7 @@ namespace NadekoBot.Modules
return cb;
}
private CommandBuilder AliasCommand(CommandBuilder cb, string txt)
{
return cb.Alias(new string[] { "," + txt, "-" + txt });
}
private CommandBuilder AliasCommand(CommandBuilder cb, string txt) => cb.Alias(new string[] { "," + txt, "-" + txt });
public override void Install(ModuleManager manager)
{
@ -546,7 +542,7 @@ namespace NadekoBot.Modules
invites+=invite.Url+"\n";
i++;
}
catch (Exception ex) {
catch (Exception) {
j++;
continue;
}
@ -641,11 +637,6 @@ namespace NadekoBot.Modules
}
private Func<CommandEventArgs, Task> SayYes()
{
return async e =>
{
await NadekoBot.client.SendMessage(e.Channel, "Yes. :)");
};
}
=> async e => await NadekoBot.client.SendMessage(e.Channel, "Yes. :)");
}
}