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

Remove all string identifiers, changed to long

Browse Source
This commit is contained in:
Daniel_I_Am 2020-06-08 20:51:33 +02:00
parent 17170962b1
commit 81c32f1137
No known key found for this signature in database
GPG Key ID: 80C428FCC9743E84
6 changed files with 37 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ChaosBot/Database/Entity/Points.cs
View File

@ -12,12 +12,12 @@ namespace ChaosBot.Database.Entity
[DBUnique] [DBUnique]
public int id { get; private set; } public int id { get; private set; }
public int points { get; private set; } public int points { get; private set; }
public string userId { get; private set; } public long userId { get; private set; }
public string guildId { get; private set; } public long guildId { get; private set; }
public Points() {} public Points() {}
public Points(int id, string userId, string guildId, int points) public Points(int id, long userId, long guildId, int points)
{ {
this.id = id; this.id = id;
this.userId = userId; this.userId = userId;
@ -25,7 +25,7 @@ namespace ChaosBot.Database.Entity
this.points = points; this.points = points;
} }
public Points(string userId, string guildId, int points) public Points(long userId, long guildId, int points)
{ {
this.points = points; this.points = points;
this.userId = userId; this.userId = userId;
@ -40,8 +40,8 @@ namespace ChaosBot.Database.Entity
public override void SetFromRow(DataRow row) public override void SetFromRow(DataRow row)
{ {
id = (int)row["id"]; id = (int)row["id"];
userId = (string)row["userId"]; userId = (long)row["userId"];
guildId = (string)row["guildId"]; guildId = (long)row["guildId"];
points = (int)row["points"]; points = (int)row["points"];
} }
} }

12
ChaosBot/Database/Entity/Raffle.cs
View File

@ -11,19 +11,19 @@ namespace ChaosBot.Database.Entity
[DBNotNull] [DBNotNull]
[DBUnique] [DBUnique]
public int id { get; private set; } public int id { get; private set; }
public string userId { get; private set; } public long userId { get; private set; }
public string guildId { get; private set; } public long guildId { get; private set; }
public Raffle() {} public Raffle() {}
public Raffle(int id, string userId, string guildId) public Raffle(int id, long userId, long guildId)
{ {
this.id = id; this.id = id;
this.userId = userId; this.userId = userId;
this.guildId = guildId; this.guildId = guildId;
} }
public Raffle(string userId, string guildId) public Raffle(long userId, long guildId)
{ {
this.userId = userId; this.userId = userId;
this.guildId = guildId; this.guildId = guildId;
@ -37,8 +37,8 @@ namespace ChaosBot.Database.Entity
public override void SetFromRow(DataRow row) public override void SetFromRow(DataRow row)
{ {
id = (int)row["id"]; id = (int)row["id"];
userId = (string)row["userid"]; userId = (long)row["userid"];
guildId = (string) row["guildid"]; guildId = (long) row["guildid"];
} }
} }
} }

10
ChaosBot/Database/Repository/PointsRepository.cs
View File

@ -16,7 +16,7 @@ namespace ChaosBot.Database.Repository
return pointsList.ToArray(); return pointsList.ToArray();
} }
public static Points[] All(string guildId) public static Points[] All(long guildId)
{ {
List<Points> pointsList = Points.Query().Where("guildId", guildId).All(); List<Points> pointsList = Points.Query().Where("guildId", guildId).All();
@ -24,7 +24,7 @@ namespace ChaosBot.Database.Repository
} }
public static int Total(string userId, string guildId) public static int Total(long userId, long guildId)
{ {
Points userPoints = Points.Query().Where("userId", userId).Where("guildId", guildId).First(); Points userPoints = Points.Query().Where("userId", userId).Where("guildId", guildId).First();
@ -37,13 +37,13 @@ namespace ChaosBot.Database.Repository
} }
public static int Count(string userId, string guildId) public static int Count(long userId, long guildId)
{ {
return Points.Query().Where("userId", userId).Where("guildId", guildId).Count(); return Points.Query().Where("userId", userId).Where("guildId", guildId).Count();
} }
public static int Add(string userId, int points, string guildId) public static int Add(long userId, int points, long guildId)
{ {
Points userPoints = Points.Query().Where("userId", userId).Where("guildId", guildId).First(); Points userPoints = Points.Query().Where("userId", userId).Where("guildId", guildId).First();
if (userPoints != null) if (userPoints != null)
@ -59,7 +59,7 @@ namespace ChaosBot.Database.Repository
return points; return points;
} }
public static int Remove(string userId, int points, string guildId) public static int Remove(long userId, int points, long guildId)
{ {
Points userPoints = Points.Query().Where("userId", userId).Where("guildId", guildId).First(); Points userPoints = Points.Query().Where("userId", userId).Where("guildId", guildId).First();

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

@ -27,7 +27,7 @@ namespace ChaosBot.Database.Repository
/// </summary> /// </summary>
/// <param name="guildId"></param> /// <param name="guildId"></param>
/// <returns>List of raffles</returns> /// <returns>List of raffles</returns>
public static Raffle[] All(string guildId) public static Raffle[] All(long guildId)
{ {
var raffles = Raffle.Query().Where("guildId", guildId).All(); var raffles = Raffle.Query().Where("guildId", guildId).All();
@ -48,7 +48,7 @@ namespace ChaosBot.Database.Repository
/// </summary> /// </summary>
/// <param name="guildId"></param> /// <param name="guildId"></param>
/// <returns>Amount of raffles</returns> /// <returns>Amount of raffles</returns>
public static int Count(string guildId) public static int Count(long guildId)
{ {
return Raffle.Query().Where("guildId", guildId).Count(); return Raffle.Query().Where("guildId", guildId).Count();
} }
@ -59,7 +59,7 @@ namespace ChaosBot.Database.Repository
/// <param name="userId"></param> /// <param name="userId"></param>
/// <param name="guildId"></param> /// <param name="guildId"></param>
/// <returns>Amount of raffles</returns> /// <returns>Amount of raffles</returns>
public static int Count(string userId, string guildId) public static int Count(long userId, long guildId)
{ {
return Raffle.Query().Where("userId", userId).Where("guildId", guildId).Count(); return Raffle.Query().Where("userId", userId).Where("guildId", guildId).Count();
} }
@ -69,7 +69,7 @@ namespace ChaosBot.Database.Repository
/// </summary> /// </summary>
/// <param name="userId"></param> /// <param name="userId"></param>
/// <returns>List of raffles</returns> /// <returns>List of raffles</returns>
public static Raffle[] SelectUser(string userId) public static Raffle[] SelectUser(long userId)
{ {
List<Raffle> raffles = Raffle.Query().Where("userId", userId).Get(); List<Raffle> raffles = Raffle.Query().Where("userId", userId).Get();
@ -82,7 +82,7 @@ namespace ChaosBot.Database.Repository
/// <param name="userId"></param> /// <param name="userId"></param>
/// <param name="guildId"></param> /// <param name="guildId"></param>
/// <returns>List of raffles</returns> /// <returns>List of raffles</returns>
public static Raffle[] SelectUser(string userId, string guildId) public static Raffle[] SelectUser(long userId, long guildId)
{ {
List<Raffle> raffles = Raffle.Query().Where("userId", userId).Where("guildId", guildId).Get(); List<Raffle> raffles = Raffle.Query().Where("userId", userId).Where("guildId", guildId).Get();
@ -115,7 +115,7 @@ namespace ChaosBot.Database.Repository
/// </summary> /// </summary>
/// <param name="guildId"></param> /// <param name="guildId"></param>
/// <returns>Random raffle</returns> /// <returns>Random raffle</returns>
public static Raffle PickRandom(string guildId) public static Raffle PickRandom(long guildId)
{ {
return Raffle.Query().Where("guildId", guildId).OrderBy("RANDOM()").First(); return Raffle.Query().Where("guildId", guildId).OrderBy("RANDOM()").First();
} }
@ -124,7 +124,7 @@ namespace ChaosBot.Database.Repository
/// Clear all <c>Raffle</c>s for a given guild /// Clear all <c>Raffle</c>s for a given guild
/// </summary> /// </summary>
/// <param name="guildId"></param> /// <param name="guildId"></param>
public static void ClearRaffle(string guildId) public static void ClearRaffle(long guildId)
{ {
Raffle.Query().Where("guildId", guildId).Delete(); Raffle.Query().Where("guildId", guildId).Delete();
} }

10
ChaosBot/Discord/Modules/PointsCommands.cs
View File

@ -58,7 +58,7 @@ namespace ChaosBot.Discord.Modules
[Alias("points info")] [Alias("points info")]
public async Task PointsCommandTotal() public async Task PointsCommandTotal()
{ {
int cur = PointsRepository.Total(Context.User.Id.ToString(), Context.Guild.Id.ToString()); int cur = PointsRepository.Total(Convert.ToInt64(Context.User.Id), Convert.ToInt64(Context.Guild.Id));
await ReplyAsync($"You have {cur} points.", false); await ReplyAsync($"You have {cur} points.", false);
} }
@ -72,7 +72,7 @@ namespace ChaosBot.Discord.Modules
{ {
ulong userId = Convert.ToUInt64(user.Substring(3, user.Length - 4)); ulong userId = Convert.ToUInt64(user.Substring(3, user.Length - 4));
await ReplyAsync($"{Context.User.Mention} has given <@{userId}> {amount} points for a total of {PointsRepository.Add(userId.ToString(), amount, Context.Guild.Id.ToString())} points.", false); await ReplyAsync($"{Context.User.Mention} has given <@{userId}> {amount} points for a total of {PointsRepository.Add(Convert.ToInt64(userId), amount, Convert.ToInt64(Context.Guild.Id))} points.", false);
} }
else else
await ReplyAsync($"NO ACCESS"); await ReplyAsync($"NO ACCESS");
@ -85,9 +85,9 @@ namespace ChaosBot.Discord.Modules
public async Task RaffleCommandRemove(string user, int amount = 1) public async Task RaffleCommandRemove(string user, int amount = 1)
{ {
ulong userId = Convert.ToUInt64(user.Substring(3, user.Length - 4)); ulong userId = Convert.ToUInt64(user.Substring(3, user.Length - 4));
int cur = PointsRepository.Total(Context.User.Id.ToString(), Context.Guild.Id.ToString()); int cur = PointsRepository.Total(Convert.ToInt64(Context.User.Id), Convert.ToInt64(Context.Guild.Id));
if (cur > amount) if (cur > amount)
await ReplyAsync($"{Context.User.Mention} has removed {amount} points from <@{userId}> for a total of {PointsRepository.Remove(userId.ToString(), amount, Context.Guild.Id.ToString())} points.", false); await ReplyAsync($"{Context.User.Mention} has removed {amount} points from <@{userId}> for a total of {PointsRepository.Remove(Convert.ToInt64(userId), amount, Convert.ToInt64(Context.Guild.Id))} points.", false);
else else
await ReplyAsync($"{Context.User.Mention} has tried to remove {amount} points from <@{userId}> they only had {cur} points. None were taken...", false); await ReplyAsync($"{Context.User.Mention} has tried to remove {amount} points from <@{userId}> they only had {cur} points. None were taken...", false);
} }
@ -98,7 +98,7 @@ namespace ChaosBot.Discord.Modules
{ {
ulong userId = Convert.ToUInt64(userMention.Substring(3, userMention.Length - 4)); ulong userId = Convert.ToUInt64(userMention.Substring(3, userMention.Length - 4));
int matches = PointsRepository.Count(userId.ToString(), Context.Guild.Id.ToString()); int matches = PointsRepository.Count(Convert.ToInt64(userId), Convert.ToInt64(Context.Guild.Id));
if (matches > 0) if (matches > 0)
{ {
Points.Query().Where("userId", userId).Where("guildId", Context.Guild.Id).Delete(); Points.Query().Where("userId", userId).Where("guildId", Context.Guild.Id).Delete();

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

@ -140,32 +140,32 @@ namespace ChaosBot.Discord.Modules
List<Raffle> raffles = new List<Raffle>(); List<Raffle> raffles = new List<Raffle>();
for (int i = 0; i < amount; i++) for (int i = 0; i < amount; i++)
raffles.Add(new Raffle(userId.ToString(), Context.Guild.Id.ToString())); raffles.Add(new Raffle(Convert.ToInt64(userId), Convert.ToInt64(Context.Guild.Id)));
RaffleRepository.MassInsert(raffles); RaffleRepository.MassInsert(raffles);
} }
else else
{ {
RaffleRepository.Insert(new Raffle(userId.ToString(), Context.Guild.Id.ToString())); RaffleRepository.Insert(new Raffle(Convert.ToInt64(userId), Convert.ToInt64(Context.Guild.Id)));
} }
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(), Context.Guild.Id.ToString())} rafflepoints!"); sb.AppendLine($"<@{userId}> now has {RaffleRepository.Count(Convert.ToInt64(userId), Convert.ToInt64(Context.Guild.Id))} rafflepoints!");
} }
private void PickRaffle(StringBuilder sb) private void PickRaffle(StringBuilder sb)
{ {
Raffle winner = RaffleRepository.PickRandom(Context.Guild.Id.ToString()); Raffle winner = RaffleRepository.PickRandom(Convert.ToInt64(Context.Guild.Id));
RaffleRepository.Delete(winner.id); RaffleRepository.Delete(winner.id);
sb.Append($"<@{winner.userId}> has won the raffle!"); sb.Append($"<@{winner.userId}> has won the raffle!");
} }
private void ClearRaffle(StringBuilder sb, bool noOutput = false) private void ClearRaffle(StringBuilder sb, bool noOutput = false)
{ {
int removed = RaffleRepository.Count(Context.Guild.Id.ToString()); int removed = RaffleRepository.Count(Convert.ToInt64(Context.Guild.Id));
RaffleRepository.ClearRaffle(Context.Guild.Id.ToString()); RaffleRepository.ClearRaffle(Convert.ToInt64(Context.Guild.Id));
sb.AppendLine($"{Context.User.Mention} has cleared all {removed} rafflepoints"); sb.AppendLine($"{Context.User.Mention} has cleared all {removed} rafflepoints");
} }
@ -174,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(), Context.Guild.Id.ToString())} rafflepoints."); sb.AppendLine($"<@{userId}>, you have {RaffleRepository.Count(Convert.ToInt64(userId), Convert.ToInt64(Context.Guild.Id))} rafflepoints.");
sb.AppendLine($"There is a total of {RaffleRepository.Count(Context.Guild.Id.ToString())} rafflepoints."); sb.AppendLine($"There is a total of {RaffleRepository.Count(Convert.ToInt64(Context.Guild.Id))} rafflepoints.");
} }
} }
} }