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

Reworked Database, using hashtables now (mostly), ability to change game, several small improvents

Browse source
This commit is contained in:
Runebaas 2017-09-27 22:48:09 +02:00
parent 7308e5257a
commit 29c181ddda
No known key found for this signature in database
GPG key ID: 2677AF508D0300D6
13 changed files with 264 additions and 178 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,6 +1,8 @@
using System.Threading.Tasks;
using Discord;
using Discord.Commands;
using Discord.WebSocket;
using Serilog;
using StackExchange.Redis;
namespace Geekbot.net.Modules
@ -9,10 +11,14 @@ namespace Geekbot.net.Modules
public class AdminCmd : ModuleBase
{
private readonly IDatabase redis;
public AdminCmd(IDatabase redis)
private readonly DiscordSocketClient client;
private readonly ILogger logger;
public AdminCmd(IDatabase redis, DiscordSocketClient client, ILogger logger)
{
this.redis = redis;
this.client = client;
this.logger = logger;
}
[RequireUserPermission(GuildPermission.Administrator)]
@ -20,8 +26,7 @@ namespace Geekbot.net.Modules
[Summary("Set a Welcome Message (use '$user' to mention the new joined user).")]
public async Task SetWelcomeMessage([Remainder] [Summary("message")] string welcomeMessage)
{
var key = Context.Guild.Id + "-welcomeMsg";
redis.StringSet(key, welcomeMessage);
redis.HashSet($"{Context.Guild.Id}:Settings", new HashEntry[] { new HashEntry("WelcomeMsg", welcomeMessage) });
var formatedMessage = welcomeMessage.Replace("$user", Context.User.Mention);
await ReplyAsync("Welcome message has been changed\r\nHere is an example of how it would look:\r\n" +
formatedMessage);
@ -41,5 +46,22 @@ namespace Geekbot.net.Modules
redis.StringSet("youtubeKey", key);
await ReplyAsync("Apikey has been set");
}
[Command("game", RunMode = RunMode.Async)]
[Summary("Set the game that the bot is playing")]
public async Task SetGame([Remainder] [Summary("Game")] string key)
{
var botOwner = redis.StringGet("botOwner");
if (!Context.User.Id.ToString().Equals(botOwner.ToString()))
{
await ReplyAsync($"Sorry, only the botowner can do this ({botOwner}");
return;
}
redis.StringSet("Game", key);
await client.SetGameAsync(key);
logger.Information($"[Geekbot] Changed game to {key}");
await ReplyAsync($"Now Playing {key}");
}
}
}

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

@ -2,53 +2,64 @@
using System.Threading.Tasks;
using Discord;
using Discord.Commands;
using Geekbot.net.Lib;
using StackExchange.Redis;
using Serilog;
namespace Geekbot.net.Modules
{
public class Counters : ModuleBase
{
private readonly IDatabase redis;
private readonly ILogger logger;
private readonly IErrorHandler errorHandler;
public Counters(IDatabase redis)
public Counters(IDatabase redis, ILogger logger, IErrorHandler errorHandler)
{
this.redis = redis;
this.logger = logger;
this.errorHandler = errorHandler;
}
[Command("good", RunMode = RunMode.Async)]
[Summary("Increase Someones Karma")]
public async Task Good([Summary("@someone")] IUser user)
{
var lastKarma = GetLastKarma();
if (user.Id == Context.User.Id)
try
{
await ReplyAsync($"Sorry {Context.User.Username}, but you can't give yourself karma");
}
else if (lastKarma > GetUnixTimestamp())
{
await ReplyAsync(
$"Sorry {Context.User.Username}, but you have to wait {GetTimeLeft(lastKarma)} before you can give karma again...");
}
else
{
var key = Context.Guild.Id + "-" + user.Id + "-karma";
var badJokes = (int) redis.StringGet(key);
var newBadJokes = badJokes + 1;
redis.StringSet(key, newBadJokes.ToString());
var lastKey = Context.Guild.Id + "-" + Context.User.Id + "-karma-timeout";
redis.StringSet(lastKey, GetNewLastKarma());
var lastKarmaFromRedis = redis.HashGet($"{Context.Guild.Id}:KarmaTimeout", Context.User.Id.ToString());
var lastKarma = ConvertToDateTimeOffset(lastKarmaFromRedis.ToString());
if (user.Id == Context.User.Id)
{
await ReplyAsync($"Sorry {Context.User.Username}, but you can't lower your own karma");
}
else if (TimeoutFinished(lastKarma))
{
await ReplyAsync(
$"Sorry {Context.User.Username}, but you have to wait {GetTimeLeft(lastKarma)} before you can give karma again...");
}
else
{
var newKarma = redis.HashIncrement($"{Context.Guild.Id}:Karma", user.Id.ToString());
redis.HashSet($"{Context.Guild.Id}:KarmaTimeout",
new HashEntry[] {new HashEntry(Context.User.Id.ToString(), DateTimeOffset.Now.ToString("u"))});
var eb = new EmbedBuilder();
eb.WithAuthor(new EmbedAuthorBuilder()
.WithIconUrl(user.GetAvatarUrl())
.WithName(user.Username));
var eb = new EmbedBuilder();
eb.WithAuthor(new EmbedAuthorBuilder()
.WithIconUrl(user.GetAvatarUrl())
.WithName(user.Username));
eb.WithColor(new Color(138, 219, 146));
eb.Title = "Karma Increased";
eb.AddInlineField("By", Context.User.Username);
eb.AddInlineField("amount", "+1");
eb.AddInlineField("Current Karma", newBadJokes);
await ReplyAsync("", false, eb.Build());
eb.WithColor(new Color(138, 219, 146));
eb.Title = "Karma Increased";
eb.AddInlineField("By", Context.User.Username);
eb.AddInlineField("amount", "+1");
eb.AddInlineField("Current Karma", newKarma);
await ReplyAsync("", false, eb.Build());
}
}
catch (Exception e)
{
errorHandler.HandleCommandException(e, Context);
}
}
@ -56,64 +67,58 @@ namespace Geekbot.net.Modules
[Summary("Decrease Someones Karma")]
public async Task Bad([Summary("@someone")] IUser user)
{
var lastKarma = GetLastKarma();
if (user.Id == Context.User.Id)
try
{
await ReplyAsync($"Sorry {Context.User.Username}, but you can't lower your own karma");
}
else if (lastKarma > GetUnixTimestamp())
{
await ReplyAsync(
$"Sorry {Context.User.Username}, but you have to wait {GetTimeLeft(lastKarma)} before you can take karma again...");
}
else
{
var key = Context.Guild.Id + "-" + user.Id + "-karma";
var badJokes = (int) redis.StringGet(key);
var newBadJokes = badJokes - 1;
redis.StringSet(key, newBadJokes.ToString());
var lastKey = Context.Guild.Id + "-" + Context.User.Id + "-karma-timeout";
redis.StringSet(lastKey, GetNewLastKarma());
var lastKarmaFromRedis = redis.HashGet($"{Context.Guild.Id}:KarmaTimeout", Context.User.Id.ToString());
var lastKarma = ConvertToDateTimeOffset(lastKarmaFromRedis.ToString());
if (user.Id == Context.User.Id)
{
await ReplyAsync($"Sorry {Context.User.Username}, but you can't lower your own karma");
}
else if (TimeoutFinished(lastKarma))
{
await ReplyAsync(
$"Sorry {Context.User.Username}, but you have to wait {GetTimeLeft(lastKarma)} before you can take karma again...");
}
else
{
var newKarma = redis.HashDecrement($"{Context.Guild.Id}:Karma", user.Id.ToString());
redis.HashSet($"{Context.Guild.Id}:KarmaTimeout",
new HashEntry[] {new HashEntry(Context.User.Id.ToString(), DateTimeOffset.Now.ToString())});
var eb = new EmbedBuilder();
eb.WithAuthor(new EmbedAuthorBuilder()
.WithIconUrl(user.GetAvatarUrl())
.WithName(user.Username));
var eb = new EmbedBuilder();
eb.WithAuthor(new EmbedAuthorBuilder()
.WithIconUrl(user.GetAvatarUrl())
.WithName(user.Username));
eb.WithColor(new Color(138, 219, 146));
eb.Title = "Karma Decreased";
eb.AddInlineField("By", Context.User.Username);
eb.AddInlineField("amount", "-1");
eb.AddInlineField("Current Karma", newBadJokes);
await ReplyAsync("", false, eb.Build());
eb.WithColor(new Color(138, 219, 146));
eb.Title = "Karma Decreased";
eb.AddInlineField("By", Context.User.Username);
eb.AddInlineField("amount", "-1");
eb.AddInlineField("Current Karma", newKarma);
await ReplyAsync("", false, eb.Build());
}
}
catch (Exception e)
{
errorHandler.HandleCommandException(e, Context);
}
}
private int GetLastKarma()
private DateTimeOffset ConvertToDateTimeOffset(string dateTimeOffsetString)
{
var lastKey = Context.Guild.Id + "-" + Context.User.Id + "-karma-timeout";
var redisReturn = redis.StringGet(lastKey);
if (!int.TryParse(redisReturn.ToString(), out var i))
i = GetUnixTimestamp();
return i;
if(string.IsNullOrEmpty(dateTimeOffsetString)) return DateTimeOffset.Now.Subtract(new TimeSpan(7, 18, 0, 0));
return DateTimeOffset.Parse(dateTimeOffsetString);
}
private int GetNewLastKarma()
private bool TimeoutFinished(DateTimeOffset lastKarma)
{
var timeout = TimeSpan.FromMinutes(3);
return (int) DateTime.UtcNow.Subtract(new DateTime(1970, 1, 1)).Add(timeout).TotalSeconds;
return lastKarma.AddMinutes(3) > DateTimeOffset.Now;
}
private int GetUnixTimestamp()
private string GetTimeLeft(DateTimeOffset lastKarma)
{
return (int) DateTime.UtcNow.Subtract(new DateTime(1970, 1, 1)).TotalSeconds;
}
private string GetTimeLeft(int time)
{
var dtDateTime = new DateTime(1970, 1, 1, 0, 0, 0, 0, DateTimeKind.Utc);
dtDateTime = dtDateTime.AddSeconds(time).ToLocalTime();
var dt = dtDateTime.Subtract(DateTime.Now);
var dt = lastKarma.AddMinutes(3).Subtract(DateTimeOffset.Now);
return $"{dt.Minutes} Minutes and {dt.Seconds} Seconds";
}
}

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

@ -30,7 +30,7 @@ namespace Geekbot.net.Modules
var created = Context.Guild.CreatedAt;
var age = Math.Floor((DateTime.Now - created).TotalDays);
var messages = redis.StringGet($"{Context.Guild.Id}-messages");
var messages = redis.HashGet($"{Context.Guild.Id}:Messages", 0.ToString());
var level = LevelCalc.GetLevelAtExperience((int) messages);
eb.AddField("Server Age", $"{created.Day}/{created.Month}/{created.Year} ({age} days)");

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

@ -20,7 +20,7 @@ namespace Geekbot.net.Modules
{
var eb = new EmbedBuilder();
eb.WithTitle("Geekbot V3.1");
eb.WithTitle("Geekbot V3.2");
var botOwner = Context.Guild.GetUserAsync(ulong.Parse(redis.StringGet("botOwner"))).Result;

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

@ -29,9 +29,7 @@ namespace Geekbot.net.Modules
if (guess == number)
{
await ReplyAsync($"Congratulations {Context.User.Username}, your guess was correct!");
var key = $"{Context.Guild.Id}-{Context.User.Id}-correctRolls";
var messages = (int) redis.StringGet(key);
redis.StringSet(key, (messages + 1).ToString());
redis.HashIncrement($"{Context.Guild.Id}:Rolls", Context.User.Id.ToString());
}
}
else

6
Geekbot.net/Modules/Ship.cs
View file

@ -27,15 +27,13 @@ namespace Geekbot.net.Modules
dbstring = $"{user1.Id}-{user2.Id}";
else
dbstring = $"{user2.Id}-{user1.Id}";
dbstring = $"{Context.Guild.Id}-{dbstring}";
Console.WriteLine(dbstring);
var dbval = redis.StringGet(dbstring);
var dbval = redis.HashGet($"{Context.Guild.Id}:Ships", dbstring);
var shippingRate = 0;
if (dbval.IsNullOrEmpty)
{
shippingRate = rnd.Next(1, 100);
redis.StringSet(dbstring, shippingRate);
redis.HashSet($"{Context.Guild.Id}:Ships", dbstring, shippingRate);
}
else
{

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

@ -1,11 +1,11 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Discord;
using Discord.Commands;
using Geekbot.net.Lib;
using Serilog;
using StackExchange.Redis;
namespace Geekbot.net.Modules
@ -13,10 +13,14 @@ namespace Geekbot.net.Modules
public class UserInfo : ModuleBase
{
private readonly IDatabase redis;
public UserInfo(IDatabase redis)
private readonly IErrorHandler errorHandler;
private readonly ILogger logger;
public UserInfo(IDatabase redis, IErrorHandler errorHandler, ILogger logger)
{
this.redis = redis;
this.errorHandler = errorHandler;
this.logger = logger;
}
[Command("stats", RunMode = RunMode.Async)]
@ -27,12 +31,11 @@ namespace Geekbot.net.Modules
var age = Math.Floor((DateTime.Now - userInfo.CreatedAt).TotalDays);
var key = Context.Guild.Id + "-" + userInfo.Id;
var messages = (int) redis.StringGet(key + "-messages");
var messages = (int) redis.HashGet($"{Context.Guild.Id}:Messages", userInfo.Id.ToString());
var level = LevelCalc.GetLevelAtExperience(messages);
var guildKey = Context.Guild.Id.ToString();
var guildMessages = (int) redis.StringGet(guildKey + "-messages");
var guildMessages = (int) redis.HashGet($"{Context.Guild.Id}:Messages", 0.ToString());
var percent = Math.Round((double) (100 * messages) / guildMessages, 2);
@ -49,11 +52,11 @@ namespace Geekbot.net.Modules
.AddInlineField("Messages Sent", messages)
.AddInlineField("Server Total", $"{percent}%");
var karma = redis.StringGet(key + "-karma");
var karma = redis.HashGet($"{Context.Guild.Id}:Karma", userInfo.Id.ToString());
if (!karma.IsNullOrEmpty)
eb.AddInlineField("Karma", karma);
var correctRolls = redis.StringGet($"{Context.Guild.Id}-{userInfo.Id}-correctRolls");
var correctRolls = redis.HashGet($"{Context.Guild.Id}:Rolls", userInfo.Id.ToString());
if (!correctRolls.IsNullOrEmpty)
eb.AddInlineField("Guessed Rolls", correctRolls);
@ -64,34 +67,43 @@ namespace Geekbot.net.Modules
[Summary("get user top 10")]
public async Task Rank()
{
await ReplyAsync("this will take a moment...");
var guildKey = Context.Guild.Id.ToString();
var guildMessages = (int) redis.StringGet(guildKey + "-messages");
var allGuildUsers = await Context.Guild.GetUsersAsync();
var unsortedDict = new Dictionary<string, int>();
foreach (var user in allGuildUsers)
try
{
var key = Context.Guild.Id + "-" + user.Id;
var messages = (int) redis.StringGet(key + "-messages");
if (messages > 0)
unsortedDict.Add($"{user.Username}#{user.Discriminator}", messages);
var messageList = redis.HashGetAll($"{Context.Guild.Id}:Messages");
var sortedList = messageList.OrderByDescending(e => e.Value).ToList().Take(11).ToList();
var guildMessages = (int) sortedList.First().Value;
sortedList.RemoveAt(0);
var highScore = new StringBuilder();
highScore.AppendLine($":bar_chart: **Highscore for {Context.Guild.Name}**");
var counter = 1;
foreach (var user in sortedList)
{
var guildUser = Context.Guild.GetUserAsync((ulong) user.Name).Result;
var percent = Math.Round((double) (100 * (int) user.Value) / guildMessages, 2);
highScore.AppendLine(
$"{NumerToEmoji(counter)} **{guildUser.Username}#{guildUser.Discriminator}** - {percent}% of total - {user.Value} messages");
counter++;
}
await ReplyAsync(highScore.ToString());
}
catch (Exception e)
{
errorHandler.HandleCommandException(e, Context);
}
}
private string NumerToEmoji(int number)
{
var emojis = new string[] {":one:", ":two:", ":three:", ":four:", ":five:", ":six", ":seven:", ":eight:", ":nine:", ":keycap_ten:"};
try
{
return emojis[number - 1];
}
catch (Exception e)
{
logger.Warning(e, $"Can't provide emoji number {number}");
return ":zero:";
}
var sortedDict = unsortedDict.OrderByDescending(x => x.Value);
var reply = new StringBuilder();
reply.AppendLine($"Total Messages on {Context.Guild.Name}: {guildMessages}");
var count = 1;
foreach (var entry in sortedDict)
if (count < 11)
{
var percent = Math.Round((double) (100 * entry.Value) / guildMessages, 2);
reply.AppendLine($"#{count} - **{entry.Key}** - {percent}% of total - {entry.Value} messages");
count++;
}
else
{
break;
}
await ReplyAsync(reply.ToString());
}
}
}