EllieBotDevs/elliebot
1
1
Fork 1
Code Issues Pull requests Projects Releases 32 Packages 1 Wiki Activity

Leaderboards will show 10 users per page

Browse source
This commit is contained in:
Toastie 2024-10-08 13:55:47 +13:00
parent af4be2aa8c
commit db8885739f
Signed by: toastie_t0ast
GPG key ID: 27F3B6855AFD40A4
7 changed files with 31 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/EllieBot.Generators/GrpcApiPermGenerator.cs
View file

@ -87,7 +87,7 @@ namespace EllieBot.Generators
sw.WriteLine("namespace EllieBot.GrpcApi;");
sw.WriteLine();
sw.WriteLine("public partial class PermsInterceptor");
sw.WriteLine("public partial class GrpcApiPermsInterceptor");
sw.WriteLine("{");
sw.Indent++;

12
src/EllieBot.GrpcApiBase/protos/greet.proto
View file

@ -5,18 +5,11 @@ option csharp_namespace = "EllieBot.GrpcApi";
package greet;
service GrpcGreet {
rpc GetGreetSettings (GetGreetRequest) returns (GetGreetReply);
rpc GetGreetSettings (GetGreetRequest) returns (GrpcGreetSettings);
rpc UpdateGreet (UpdateGreetRequest) returns (UpdateGreetReply);
rpc TestGreet (TestGreetRequest) returns (TestGreetReply);
}
message GetGreetReply {
GrpcGreetSettings greet = 1;
GrpcGreetSettings greetDm = 2;
GrpcGreetSettings bye = 3;
GrpcGreetSettings boost = 4;
}
message GrpcGreetSettings {
optional uint64 channelId = 1;
string message = 2;
@ -26,6 +19,7 @@ message GrpcGreetSettings {
message GetGreetRequest {
uint64 guildId = 1;
GrpcGreetType type = 2;
}
message UpdateGreetRequest {
@ -41,7 +35,7 @@ enum GrpcGreetType {
}
message UpdateGreetReply {
bool success = 1;
GrpcGreetSettings settings = 1;
}
message TestGreetRequest {

6
src/EllieBot/Modules/Xp/Xp.cs
View file

@ -107,7 +107,7 @@ public partial class Xp : EllieModule<XpService>
[Cmd]
[UserPerm(GuildPerm.ManageChannels)]
[RequireContext(ContextType.Guild)]
public async Task XpExclude(Channel _, [Leftover] IChannel channel = null)
public async Task XpExclude(Channel _, [Leftover] IChannel? channel = null)
{
if (channel is null)
channel = ctx.Channel;
@ -203,7 +203,7 @@ public partial class Xp : EllieModule<XpService>
await Response()
.Paginated()
.PageItems(GetPageItems)
.PageSize(9)
.PageSize(10)
.CurrentPage(page)
.Page((users, curPage) =>
{
@ -262,7 +262,7 @@ public partial class Xp : EllieModule<XpService>
await Response()
.Paginated()
.PageItems(GetPageItems)
.PageSize(9)
.PageSize(10)
.Page((users, curPage) =>
{
var embed = _sender.CreateEmbed()

16
src/EllieBot/Modules/Xp/XpService.cs
View file

@ -571,8 +571,8 @@ public class XpService : IEService, IReadyExecutor, IExecNoCommand
.UserXpStats
.Where(x => x.GuildId == guildId)
.OrderByDescending(x => x.Xp + x.AwardedXp)
.Skip(page * 9)
.Take(9)
.Skip(page * 10)
.Take(10)
.ToArrayAsyncLinqToDB();
}
@ -582,8 +582,8 @@ public class XpService : IEService, IReadyExecutor, IExecNoCommand
return await uow.Set<UserXpStats>()
.Where(x => x.GuildId == guildId && x.UserId.In(users))
.OrderByDescending(x => x.Xp + x.AwardedXp)
.Skip(page * 9)
.Take(9)
.Skip(page * 10)
.Take(10)
.ToArrayAsyncLinqToDB();
}
@ -593,8 +593,8 @@ public class XpService : IEService, IReadyExecutor, IExecNoCommand
return await uow.GetTable<DiscordUser>()
.OrderByDescending(x => x.TotalXp)
.Skip(page * 9)
.Take(9)
.Skip(page * 10)
.Take(10)
.ToArrayAsyncLinqToDB();
}
@ -605,8 +605,8 @@ public class XpService : IEService, IReadyExecutor, IExecNoCommand
return await uow.GetTable<DiscordUser>()
.Where(x => x.UserId.In(users))
.OrderByDescending(x => x.TotalXp)
.Skip(page * 9)
.Take(9)
.Skip(page * 10)
.Take(10)
.ToArrayAsyncLinqToDB();
}

32
src/EllieBot/Services/GrpcApi/GreetByeSvc.cs
View file

@ -14,12 +14,6 @@ public sealed class GreetByeSvc : GrpcGreet.GrpcGreetBase, IEService
_client = client;
}
public GreetSettings GetDefaultGreet(GreetType type)
=> new GreetSettings()
{
GreetType = type
};
private static GrpcGreetSettings ToConf(GreetSettings? conf)
{
if (conf is null)
@ -35,23 +29,13 @@ public sealed class GreetByeSvc : GrpcGreet.GrpcGreetBase, IEService
}
[GrpcApiPerm(GuildPerm.Administrator)]
public override async Task<GetGreetReply> GetGreetSettings(GetGreetRequest request, ServerCallContext context)
public override async Task<GrpcGreetSettings> GetGreetSettings(GetGreetRequest request, ServerCallContext context)
{
var guildId = request.GuildId;
var greetConf = await _gs.GetGreetSettingsAsync(guildId, GreetType.Greet);
var byeConf = await _gs.GetGreetSettingsAsync(guildId, GreetType.Bye);
var boostConf = await _gs.GetGreetSettingsAsync(guildId, GreetType.Boost);
var greetDmConf = await _gs.GetGreetSettingsAsync(guildId, GreetType.GreetDm);
// todo timer
var conf = await _gs.GetGreetSettingsAsync(guildId, (GreetType)request.Type);
return new GetGreetReply()
{
Greet = ToConf(greetConf),
Bye = ToConf(byeConf),
Boost = ToConf(boostConf),
GreetDm = ToConf(greetDmConf)
};
return ToConf(conf);
}
[GrpcApiPerm(GuildPerm.Administrator)]
@ -61,12 +45,18 @@ public sealed class GreetByeSvc : GrpcGreet.GrpcGreetBase, IEService
var s = request.Settings;
var msg = s.Message;
var type = GetGreetType(s.Type);
await _gs.SetMessage(gid, GetGreetType(s.Type), msg);
await _gs.SetGreet(gid, s.ChannelId, GetGreetType(s.Type), s.IsEnabled);
await _gs.SetGreet(gid, s.ChannelId, type, s.IsEnabled);
var settings = await _gs.GetGreetSettingsAsync(gid, type);
if (settings is null)
return new();
return new()
{
Success = true
Settings = ToConf(settings)
};
}

8
src/EllieBot/Services/PermsInterceptor.cs → src/EllieBot/Services/GrpcApiPermsInterceptor.cs
View file

@ -3,11 +3,11 @@ using Grpc.Core.Interceptors;
namespace EllieBot.GrpcApi;
public sealed partial class PermsInterceptor : Interceptor
public sealed partial class GrpcApiPermsInterceptor : Interceptor
{
private readonly DiscordSocketClient _client;
public PermsInterceptor(DiscordSocketClient client)
public GrpcApiPermsInterceptor(DiscordSocketClient client)
{
_client = client;
Log.Information("interceptor created");
@ -29,8 +29,8 @@ public sealed partial class PermsInterceptor : Interceptor
.RequestHeaders
.ToDictionary(x => x.Key, x => x.Value);
var method = context.Method[(context.Method.LastIndexOf('/') + 1)..];
if (!metadata.ContainsKey("userid"))
throw new RpcException(new Status(StatusCode.Unauthenticated, "userid has to be specified"));
if (perms.TryGetValue(method, out var perm))
{

2
src/EllieBot/Services/GrpcApiService.cs
View file

@ -39,7 +39,7 @@ public class GrpcApiService : IEService, IReadyExecutor
var host = creds.GrpcApi.Host;
var port = creds.GrpcApi.Port + _client.ShardId;
var interceptor = new PermsInterceptor(_client);
var interceptor = new GrpcApiPermsInterceptor(_client);
_app = new Server()
{