Discord/chaosbot
3
0
Fork 0
Code Issues 12 Pull Requests Packages Projects Releases Wiki Activity

General cleanup

Browse Source
This commit is contained in:
Daniel_I_Am 2020-06-04 02:36:12 +02:00
parent bbbb847110
commit 8617dbae2f
No known key found for this signature in database
GPG Key ID: 80C428FCC9743E84
2 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ChaosBot/Database/Repository/RaffleRepository.cs
View File

@ -11,7 +11,7 @@ namespace ChaosBot.Database.Repository
{ {
private static readonly string Table = "RaffleTable"; private static readonly string Table = "RaffleTable";
public static Raffle[] all() public static Raffle[] All()
{ {
DataTable dataTable = Controller.SelectQuery(Table); DataTable dataTable = Controller.SelectQuery(Table);
@ -27,14 +27,14 @@ namespace ChaosBot.Database.Repository
return raffles.ToArray(); return raffles.ToArray();
} }
public static int count() public static int Count()
{ {
DataTable dataTable = Controller.SelectQuery(Table, "COUNT(*)"); DataTable dataTable = Controller.SelectQuery(Table, "COUNT(*)");
return Convert.ToInt32(dataTable.Rows[0]["COUNT(*)"]); return Convert.ToInt32(dataTable.Rows[0]["COUNT(*)"]);
} }
public static int count(string userId) public static int Count(string userId)
{ {
Dictionary<string, object> filterDict = new Dictionary<string, object>(); Dictionary<string, object> filterDict = new Dictionary<string, object>();
filterDict.Add("userId", userId); filterDict.Add("userId", userId);
@ -63,7 +63,7 @@ namespace ChaosBot.Database.Repository
return raffles.ToArray(); return raffles.ToArray();
} }
public static void insert(Raffle raffle) public static void Insert(Raffle raffle)
{ {
Dictionary<string, object> dict = new Dictionary<string, object>(); Dictionary<string, object> dict = new Dictionary<string, object>();
@ -72,7 +72,7 @@ namespace ChaosBot.Database.Repository
Controller.InsertQuery(Table, dict); Controller.InsertQuery(Table, dict);
} }
public static void massInsert(List<Raffle> raffles) public static void MassInsert(List<Raffle> raffles)
{ {
foreach (var raf in raffles) foreach (var raf in raffles)
{ {
@ -94,7 +94,7 @@ namespace ChaosBot.Database.Repository
return new Raffle(idFetch, userIdFetch); return new Raffle(idFetch, userIdFetch);
} }
public static int clearRaffle() public static int ClearRaffle()
{ {
List<SqliteCommand> cmds = new List<SqliteCommand>(); List<SqliteCommand> cmds = new List<SqliteCommand>();
@ -103,7 +103,7 @@ namespace ChaosBot.Database.Repository
return Controller.TransactionQuery(cmds); return Controller.TransactionQuery(cmds);
} }
// public static void delete() // public static void Delete()
// { // {
// //
// } // }

14
ChaosBot/Discord/Modules/RaffleSystem.cs
View File

@ -17,8 +17,6 @@ namespace ChaosBot.Discord.Modules
{ {
private static Logger _logger = Program._logger; private static Logger _logger = Program._logger;
private static Dictionary<ulong, int> _currentPot = new Dictionary<ulong, int>();
[Command("raffle")] [Command("raffle")]
[Alias("raffle info")] [Alias("raffle info")]
[RequireUserPermission(GuildPermission.ManageGuild)] [RequireUserPermission(GuildPermission.ManageGuild)]
@ -145,18 +143,18 @@ namespace ChaosBot.Discord.Modules
for (int i = 0; i < amount; i++) for (int i = 0; i < amount; i++)
raffles.Add(new Raffle(userId.ToString())); raffles.Add(new Raffle(userId.ToString()));
RaffleRepository.massInsert(raffles); RaffleRepository.MassInsert(raffles);
} }
else else
{ {
RaffleRepository.insert(new Raffle(userId.ToString())); RaffleRepository.Insert(new Raffle(userId.ToString()));
} }
sb.AppendLine($"{Context.User.Mention} has added {amount} rafflepoints to <@{userId}>."); sb.AppendLine($"{Context.User.Mention} has added {amount} rafflepoints to <@{userId}>.");
sb.AppendLine(); sb.AppendLine();
sb.AppendLine($"<@{userId}> now has {RaffleRepository.count(userId.ToString())} rafflepoints!"); sb.AppendLine($"<@{userId}> now has {RaffleRepository.Count(userId.ToString())} rafflepoints!");
} }
private void PickRaffle(StringBuilder sb) private void PickRaffle(StringBuilder sb)
@ -167,7 +165,7 @@ namespace ChaosBot.Discord.Modules
private void ClearRaffle(StringBuilder sb, bool noOutput = false) private void ClearRaffle(StringBuilder sb, bool noOutput = false)
{ {
int Removed = RaffleRepository.clearRaffle(); int Removed = RaffleRepository.ClearRaffle();
sb.AppendLine($"{Context.User.Mention} has cleared all {Removed} rafflepoints"); sb.AppendLine($"{Context.User.Mention} has cleared all {Removed} rafflepoints");
} }
@ -176,8 +174,8 @@ namespace ChaosBot.Discord.Modules
{ {
ulong userId = Convert.ToUInt64(user.Substring(3, user.Length-4)); ulong userId = Convert.ToUInt64(user.Substring(3, user.Length-4));
sb.AppendLine($"<@{userId}>, you have {RaffleRepository.count(userId.ToString())} rafflepoints."); sb.AppendLine($"<@{userId}>, you have {RaffleRepository.Count(userId.ToString())} rafflepoints.");
sb.AppendLine($"There is a total of {RaffleRepository.count()} rafflepoints."); sb.AppendLine($"There is a total of {RaffleRepository.Count()} rafflepoints.");
} }
} }
} }