daan/geekbot
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases Packages Wiki Activity

True Async and Ping Pong

Browse source
This commit is contained in:
Runebaas 2017-04-25 20:59:38 +02:00
parent 341de410f1
commit 2af916e4d1
14 changed files with 87 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.gitignore vendored
View file

@ -2,4 +2,5 @@ Geekbot.net/bin
Geekbot.net/obj
Backup/
.vs/
UpgradeLog.htm
UpgradeLog.htm
.idea

2
Geekbot.net/Modules/AdminCmd.cs
View file

@ -14,7 +14,7 @@ namespace Geekbot.net.Modules
}
[RequireUserPermission(Discord.GuildPermission.Administrator)]
[Command("welcome"), Summary("Set a Welcome Message (use '$user' to mention the new joined user).")]
[Command("welcome", RunMode = RunMode.Async), Summary("Set a Welcome Message (use '$user' to mention the new joined user).")]
public async Task SetWelcomeMessage([Remainder, Summary("The message")] string welcomeMessage)
{
var key = Context.Guild.Id + "-welcomeMsg";

2
Geekbot.net/Modules/Cat.cs
View file

@ -13,7 +13,7 @@ namespace Geekbot.net.Modules
this.catClient = catClient;
}
[Command("cat"), Summary("Return a random image of a cat.")]
[Command("cat", RunMode = RunMode.Async), Summary("Return a random image of a cat.")]
public async Task Say()
{
var request = new RestRequest("meow.php", Method.GET);

4
Geekbot.net/Modules/Counters.cs
View file

@ -14,7 +14,7 @@ namespace Geekbot.net.Modules
redis = redisClient;
}
[Command("good"), Summary("Increase Someones Karma")]
[Command("good", RunMode = RunMode.Async), Summary("Increase Someones Karma")]
public async Task Good([Summary("The someone")] IUser user)
{
var lastKarma = GetLastKarma();
@ -37,7 +37,7 @@ namespace Geekbot.net.Modules
}
}
[Command("bad"), Summary("Decrease Someones Karma")]
[Command("bad", RunMode = RunMode.Async), Summary("Decrease Someones Karma")]
public async Task Bad([Summary("The someone")] IUser user)
{
var lastKarma = GetLastKarma();

3
Geekbot.net/Modules/EightBall.cs
View file

@ -13,8 +13,7 @@ namespace Geekbot.net.Modules
{
rnd = randomClient;
}
[Command("8ball"), Summary("Ask 8Ball a Question.")]
[Command("8ball", RunMode = RunMode.Async), Summary("Ask 8Ball a Question.")]
public async Task Ball([Remainder, Summary("The Question")] string echo)
{
var replies = new List<string> {

47
Geekbot.net/Modules/GuildInfo.cs Normal file
View file

@ -0,0 +1,47 @@
using System;
using System.Threading.Tasks;
using Discord.Commands;
using Discord;
using Geekbot.net.Lib;
using System.Linq;
namespace Geekbot.net.Modules
{
public class GuildInfo : ModuleBase
{
private readonly IRedisClient redis;
public GuildInfo(IRedisClient redisClient)
{
redis = redisClient;
}
[Command("serverstats", RunMode = RunMode.Async), Summary("Show some info about the bot.")]
public async Task getInfo()
{
var eb = new EmbedBuilder();
eb.WithAuthor(new EmbedAuthorBuilder()
.WithIconUrl(Context.Guild.IconUrl)
.WithName(Context.Guild.Name));
eb.WithColor(new Color(110, 204, 147));
var created = Context.Guild.CreatedAt;
var age = Math.Floor((DateTime.Now - created).TotalDays);
var messages = redis.Client.StringGet($"{Context.Guild.Id}-messages");
var level = LevelCalc.GetLevelAtExperience((int)messages);
eb.AddField("Server Age", $"{created.Day}/{created.Month}/{created.Year} ({age} days)");
eb.AddInlineField("Level", level)
.AddInlineField("Messages", messages);
await ReplyAsync("", false, eb.Build());
}
public static string FirstCharToUpper(string input)
{
if (String.IsNullOrEmpty(input))
throw new ArgumentException("ARGH!");
return input.First().ToString().ToUpper() + input.Substring(1);
}
}
}

2
Geekbot.net/Modules/Help.cs
View file

@ -6,7 +6,7 @@ namespace Geekbot.net.Modules
{
public class Help : ModuleBase
{
[Command("help"), Summary("List all Commands")]
[Command("help", RunMode = RunMode.Async), Summary("List all Commands")]
public async Task GetHelp()
{
var commands = new CommandService();

41
Geekbot.net/Modules/Info.cs
View file

@ -1,10 +1,10 @@
using System;
using System.Threading.Tasks;
using Discord.Commands;
using Discord;
using Geekbot.net.Lib;
using System.Collections.Generic;
using System.Linq;
using System.Runtime.CompilerServices;
using System.Threading.Tasks;
using Discord;
using Discord.Commands;
using Geekbot.net.Lib;
namespace Geekbot.net.Modules
{
@ -16,33 +16,22 @@ namespace Geekbot.net.Modules
redis = redisClient;
}
[Command("serverstats"), Summary("Show some info about the bot.")]
public async Task getInfo()
[Command("info", RunMode = RunMode.Async), Summary("Get Information about the bot")]
public async Task BotInfo()
{
var eb = new EmbedBuilder();
eb.WithAuthor(new EmbedAuthorBuilder()
.WithIconUrl(Context.Guild.IconUrl)
.WithName(Context.Guild.Name));
eb.WithColor(new Color(110, 204, 147));
var created = Context.Guild.CreatedAt;
var age = Math.Floor((DateTime.Now - created).TotalDays);
var messages = redis.Client.StringGet($"{Context.Guild.Id}-messages");
var level = LevelCalc.GetLevelAtExperience((int)messages);
eb.WithTitle("Geekbot V3");
eb.AddField("Server Age", $"{created.Day}/{created.Month}/{created.Year} ({age} days)");
eb.AddInlineField("Level", level)
.AddInlineField("Messages", messages);
var botOwner = Context.Guild.GetUserAsync(ulong.Parse(redis.Client.StringGet("botOwner"))).Result;
eb.AddInlineField("Status", Context.Client.ConnectionState.ToString())
.AddInlineField("Bot Name", Context.Client.CurrentUser.Username)
.AddInlineField("Bot Owner", $"{botOwner.Username}#{botOwner.Discriminator}");
eb.AddInlineField("Servers", Context.Client.GetGuildsAsync().Result.Count);
await ReplyAsync("", false, eb.Build());
}
public static string FirstCharToUpper(string input)
{
if (String.IsNullOrEmpty(input))
throw new ArgumentException("ARGH!");
return input.First().ToString().ToUpper() + input.Substring(1);
}
}
}

2
Geekbot.net/Modules/Ping.cs
View file

@ -6,7 +6,7 @@ namespace Geekbot.net.Modules
{
public class Ping : ModuleBase
{
[Command("👀"), Summary("Look at the bot.")]
[Command("👀", RunMode = RunMode.Async), Summary("Look at the bot.")]
public async Task Eyes()
{
await ReplyAsync("S... Stop looking at me... baka!");

4
Geekbot.net/Modules/Roll.cs
View file

@ -15,7 +15,7 @@ namespace Geekbot.net.Modules
rnd = randomClient;
}
[Command("roll"), Summary("Roll a number between 1 and 100.")]
[Command("roll", RunMode = RunMode.Async), Summary("Roll a number between 1 and 100.")]
public async Task RollCommand([Remainder, Summary("stuff...")] string stuff = "nothing")
{
var number = rnd.Client.Next(1, 100);
@ -38,7 +38,7 @@ namespace Geekbot.net.Modules
}
}
[Command("dice"), Summary("Roll a dice")]
[Command("dice", RunMode = RunMode.Async), Summary("Roll a dice")]
public async Task DiceCommand([Summary("The highest number on the dice")] int max = 6)
{
var number = rnd.Client.Next(1, max);

2
Geekbot.net/Modules/Say.cs
View file

@ -6,7 +6,7 @@ namespace Geekbot.net.Modules
public class Say : ModuleBase
{
[RequireUserPermission(Discord.GuildPermission.Administrator)]
[Command("say"), Summary("Say Something.")]
[Command("say", RunMode = RunMode.Async), Summary("Say Something.")]
public async Task Echo([Remainder, Summary("What?")] string echo)
{
await Context.Message.DeleteAsync();

3
Geekbot.net/Modules/UserInfo.cs
View file

@ -15,7 +15,7 @@ namespace Geekbot.net.Modules
}
[Alias("stats")]
[Command("user"), Summary("Get information about this user")]
[Command("user", RunMode = RunMode.Async), Summary("Get information about this user")]
public async Task User([Summary("The (optional) user to get info for")] IUser user = null)
{
var userInfo = user ?? Context.Message.Author;
@ -30,6 +30,7 @@ namespace Geekbot.net.Modules
eb.WithAuthor(new EmbedAuthorBuilder()
.WithIconUrl(userInfo.GetAvatarUrl())
.WithName(userInfo.Username));
eb.WithColor(new Color(221, 255, 119));
eb.AddField("Discordian Since", $"{userInfo.CreatedAt.Day}/{userInfo.CreatedAt.Month}/{userInfo.CreatedAt.Year} ({age} days)");

2
Geekbot.net/Modules/Youtube.cs
View file

@ -17,7 +17,7 @@ namespace Geekbot.net.Modules
{
public class Youtube : ModuleBase
{
[Command("yt"), Summary("Search for something on youtube.")]
[Command("yt", RunMode = RunMode.Async), Summary("Search for something on youtube.")]
public async Task Yt([Remainder, Summary("A Song Title")] string searchQuery)
{
var youtubeService = new YouTubeService(new BaseClientService.Initializer()

16
Geekbot.net/Program.cs
View file

@ -54,32 +54,37 @@ namespace Geekbot.net
map.Add(redis);
map.Add<IRandomClient>(new RandomClient());
await InstallCommands();
Console.WriteLine("Connecting to Discord...");
try
{
await client.LoginAsync(TokenType.Bot, token);
await client.StartAsync();
client.Connected += FinishStartup;
}
catch (AggregateException)
{
Console.WriteLine("Could not connect to discord...");
Environment.Exit(1);
}
Console.WriteLine("Done and ready for use...\n");
await Task.Delay(-1);
}
public async Task InstallCommands()
public async Task FinishStartup()
{
await client.SetGameAsync("Ping Pong");
Console.WriteLine($"Now Connected to {client.Guilds.Count} Servers");
Console.WriteLine("Registering Stuff");
client.MessageReceived += HandleCommand;
client.MessageReceived += HandleMessageReceived;
client.UserJoined += HandleUserJoined;
await commands.AddModulesAsync(Assembly.GetEntryAssembly());
Console.WriteLine("Done and ready for use...\n");
}
public async Task HandleCommand(SocketMessage messageParam)
{
var message = messageParam as SocketUserMessage;
@ -110,7 +115,6 @@ namespace Geekbot.net
{
var message = messsageParam;
if (message == null) return;
// if (message.Author.Username.Equals(client.CurrentUser.Username)) return;
var channel = (SocketGuildChannel)message.Channel;