From 624171c35f62f0bc9bb31ed3c402f75c8e09e541 Mon Sep 17 00:00:00 2001 From: Toastie Date: Mon, 15 Jul 2024 15:45:33 +1200 Subject: [PATCH] Updated Xp module --- src/EllieBot/Modules/Xp/Club/Club.cs | 19 +++--- src/EllieBot/Modules/Xp/Club/ClubService.cs | 68 ++++++++++++-------- src/EllieBot/Modules/Xp/Club/IClubService.cs | 3 +- 3 files changed, 53 insertions(+), 37 deletions(-) diff --git a/src/EllieBot/Modules/Xp/Club/Club.cs b/src/EllieBot/Modules/Xp/Club/Club.cs index d584eba..9a84dc9 100644 --- a/src/EllieBot/Modules/Xp/Club/Club.cs +++ b/src/EllieBot/Modules/Xp/Club/Club.cs @@ -113,16 +113,18 @@ public partial class Xp { var lvl = new LevelStats(club.Xp); var allUsers = club.Members.OrderByDescending(x => - { - var l = new LevelStats(x.TotalXp).Level; - if (club.OwnerId == x.Id) - return int.MaxValue; - if (x.IsClubAdmin) - return (int.MaxValue / 2) + l; - return l; - }) + { + var l = new LevelStats(x.TotalXp).Level; + if (club.OwnerId == x.Id) + return int.MaxValue; + if (x.IsClubAdmin) + return (int.MaxValue / 2) + l; + return l; + }) .ToList(); + var rank = await _service.GetClubRankAsync(club.Id); + await Response() .Paginated() .Items(allUsers) @@ -135,6 +137,7 @@ public partial class Xp .WithDescription(GetText(strs.level_x(lvl.Level + $" ({club.Xp} xp)"))) .AddField(GetText(strs.desc), string.IsNullOrWhiteSpace(club.Description) ? "-" : club.Description) + .AddField(GetText(strs.rank), $"#{rank}", true) .AddField(GetText(strs.owner), club.Owner.ToString(), true) // .AddField(GetText(strs.level_req), club.MinimumLevelReq.ToString(), true) .AddField(GetText(strs.members), diff --git a/src/EllieBot/Modules/Xp/Club/ClubService.cs b/src/EllieBot/Modules/Xp/Club/ClubService.cs index be89659..d35a05d 100644 --- a/src/EllieBot/Modules/Xp/Club/ClubService.cs +++ b/src/EllieBot/Modules/Xp/Club/ClubService.cs @@ -23,22 +23,22 @@ public class ClubService : IEService, IClubService { if (!CheckClubName(clubName)) return ClubCreateResult.NameTooLong; - + //must be lvl 5 and must not be in a club already await using var uow = _db.GetDbContext(); var du = uow.GetOrCreateUser(user); var xp = new LevelStats(du.TotalXp); - - if (xp.Level < 5) + + if (xp.Level < 5) return ClubCreateResult.InsufficientLevel; - + if (du.ClubId is not null) return ClubCreateResult.AlreadyInAClub; if (await uow.Set().AnyAsyncEF(x => x.Name == clubName)) return ClubCreateResult.NameTaken; - + du.IsClubAdmin = true; du.Club = new() { @@ -53,7 +53,7 @@ public class ClubService : IEService, IClubService return ClubCreateResult.Success; } - + public OneOf TransferClub(IUser from, IUser newOwner) { using var uow = _db.GetDbContext(); @@ -62,7 +62,7 @@ public class ClubService : IEService, IClubService if (club is null || club.Owner.UserId != from.Id) return ClubTransferError.NotOwner; - + if (!club.Members.Contains(newOwnerUser)) return ClubTransferError.TargetNotMember; @@ -72,22 +72,22 @@ public class ClubService : IEService, IClubService uow.SaveChanges(); return club; } - + public async Task ToggleAdminAsync(IUser owner, IUser toAdmin) { if (owner.Id == toAdmin.Id) return ToggleAdminResult.CantTargetThyself; - + await using var uow = _db.GetDbContext(); var club = uow.Set().GetByOwner(owner.Id); var adminUser = uow.GetOrCreateUser(toAdmin); if (club is null) return ToggleAdminResult.NotOwner; - - if(!club.Members.Contains(adminUser)) + + if (!club.Members.Contains(adminUser)) return ToggleAdminResult.TargetNotMember; - + var newState = adminUser.IsClubAdmin = !adminUser.IsClubAdmin; await uow.SaveChangesAsync(); return newState ? ToggleAdminResult.AddedAdmin : ToggleAdminResult.RemovedAdmin; @@ -99,17 +99,17 @@ public class ClubService : IEService, IClubService var member = uow.Set().GetByMember(user.Id); return member; } - + public async Task SetClubIconAsync(ulong ownerUserId, string url) { if (url is not null) { using var http = _httpFactory.CreateClient(); using var temp = await http.GetAsync(url, HttpCompletionOption.ResponseHeadersRead); - - if (!temp.IsImage()) + + if (!temp.IsImage()) return SetClubIconResult.InvalidFileType; - + if (temp.GetContentLength() > 5.Megabytes()) return SetClubIconResult.TooLarge; } @@ -134,6 +134,18 @@ public class ClubService : IEService, IClubService return club is not null; } + public async Task GetClubRankAsync(int clubId) + { + await using var uow = _db.GetDbContext(); + + var rank = await uow.Clubs + .ToLinqToDBTable() + .Where(x => x.Xp > (uow.Clubs.First(c => c.Id == clubId).Xp)) + .CountAsyncLinqToDB(); + + return rank + 1; + } + public ClubApplyResult ApplyToClub(IUser user, ClubInfo club) { using var uow = _db.GetDbContext(); @@ -144,10 +156,10 @@ public class ClubService : IEService, IClubService // or doesn't min minumum level requirement, can't apply if (du.ClubId is not null) return ClubApplyResult.AlreadyInAClub; - + if (club.Bans.Any(x => x.UserId == du.Id)) return ClubApplyResult.Banned; - + if (club.Applicants.Any(x => x.UserId == du.Id)) return ClubApplyResult.AlreadyApplied; @@ -162,7 +174,7 @@ public class ClubService : IEService, IClubService return ClubApplyResult.Success; } - + public ClubAcceptResult AcceptApplication(ulong clubOwnerUserId, string userName, out DiscordUser discordUser) { discordUser = null; @@ -188,7 +200,7 @@ public class ClubService : IEService, IClubService uow.SaveChanges(); return ClubAcceptResult.Accepted; } - + public ClubDenyResult RejectApplication(ulong clubOwnerUserId, string userName, out DiscordUser discordUser) { discordUser = null; @@ -201,9 +213,9 @@ public class ClubService : IEService, IClubService club.Applicants.FirstOrDefault(x => x.User.ToString().ToUpperInvariant() == userName.ToUpperInvariant()); if (applicant is null) return ClubDenyResult.NoSuchApplicant; - + club.Applicants.Remove(applicant); - + discordUser = applicant.User; uow.SaveChanges(); return ClubDenyResult.Rejected; @@ -220,7 +232,7 @@ public class ClubService : IEService, IClubService using var uow = _db.GetDbContext(); var du = uow.GetOrCreateUser(user, x => x.Include(u => u.Club)); if (du.Club is null) - return ClubLeaveResult.NotInAClub; + return ClubLeaveResult.NotInAClub; if (du.Club.OwnerId == du.Id) return ClubLeaveResult.OwnerCantLeave; @@ -306,7 +318,7 @@ public class ClubService : IEService, IClubService return ClubUnbanResult.Success; } - + public ClubKickResult Kick(ulong kickerId, string userName, out ClubInfo club) { using var uow = _db.GetDbContext(); @@ -342,14 +354,14 @@ public class ClubService : IEService, IClubService { if (!CheckClubName(clubName)) return ClubRenameResult.NameTooLong; - + await using var uow = _db.GetDbContext(); - + var club = uow.Set().GetByOwnerOrAdmin(userId); - + if (club is null) return ClubRenameResult.NotOwnerOrAdmin; - + if (await uow.Set().AnyAsyncEF(x => x.Name == clubName)) return ClubRenameResult.NameTaken; diff --git a/src/EllieBot/Modules/Xp/Club/IClubService.cs b/src/EllieBot/Modules/Xp/Club/IClubService.cs index 7e9bbf0..8a45e8d 100644 --- a/src/EllieBot/Modules/Xp/Club/IClubService.cs +++ b/src/EllieBot/Modules/Xp/Club/IClubService.cs @@ -6,7 +6,7 @@ namespace EllieBot.Modules.Xp.Services; public interface IClubService { Task CreateClubAsync(IUser user, string clubName); - OneOf TransferClub(IUser from, IUser newOwner); + OneOf TransferClub(IUser from, IUser newOwner); Task ToggleAdminAsync(IUser owner, IUser toAdmin); ClubInfo? GetClubByMember(IUser user); Task SetClubIconAsync(ulong ownerUserId, string? url); @@ -23,6 +23,7 @@ public interface IClubService ClubKickResult Kick(ulong kickerId, string userName, out ClubInfo club); List GetClubLeaderboardPage(int page); Task RenameClubAsync(ulong userId, string clubName); + Task GetClubRankAsync(int clubId); } public enum ClubApplyResult