liz/PluralKit
liz/PluralKit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

lint/fixes, add group patch validation

Browse Source
This commit is contained in:
spiral 2021-09-22 13:48:34 -04:00
parent bc2c198a82
commit c472a7f6df
No known key found for this signature in database
GPG Key ID: A6059F0CA0E1BD31
6 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
PluralKit.Bot/Commands/Message.cs
View File

@ -137,7 +137,7 @@ namespace PluralKit.Bot
{ {
if (message.System.Id != ctx.System.Id) if (message.System.Id != ctx.System.Id)
throw new PKError("You can only delete your own messages."); throw new PKError("You can only delete your own messages.");
await ctx.Rest.DeleteMessage(message.Message.Channel, message.Message.Mid); await ctx.Rest.DeleteMessage(message.Message.Channel, message.Message.Mid);
if (ctx.Guild != null) if (ctx.Guild != null)

4
PluralKit.Bot/Proxy/ProxyService.cs
View File

@ -55,13 +55,13 @@ namespace PluralKit.Bot
{ {
if (!ShouldProxy(channel, message, ctx)) if (!ShouldProxy(channel, message, ctx))
return false; return false;
var rootChannel = _cache.GetRootChannel(message.ChannelId); var rootChannel = _cache.GetRootChannel(message.ChannelId);
List<ProxyMember> members; List<ProxyMember> members;
// Fetch members and try to match to a specific member // Fetch members and try to match to a specific member
using (_metrics.Measure.Timer.Time(BotMetrics.ProxyMembersQueryTime)) using (_metrics.Measure.Timer.Time(BotMetrics.ProxyMembersQueryTime))
{ {
await using var conn = await _db.Obtain(); await using var conn = await _db.Obtain();
members = (await _repo.GetProxyMembers(conn, message.Author.Id, message.GuildId!.Value)).ToList(); members = (await _repo.GetProxyMembers(conn, message.Author.Id, message.GuildId!.Value)).ToList();
} }

2
PluralKit.Bot/Tracing/DiscordRequestObserver.cs
View File

@ -1,4 +1,4 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Diagnostics; using System.Diagnostics;
using System.Linq; using System.Linq;

20
PluralKit.Core/Models/Patch/GroupPatch.cs
View File

@ -35,12 +35,20 @@ namespace PluralKit.Core
public new void AssertIsValid() public new void AssertIsValid()
{ {
if (Icon.Value != null && !MiscUtils.TryMatchUri(Icon.Value, out var avatarUri)) if (Name.IsPresent)
throw new ValidationError("icon"); AssertValid(Name.Value, "name", Limits.MaxGroupNameLength);
if (BannerImage.Value != null && !MiscUtils.TryMatchUri(BannerImage.Value, out var bannerImage)) if (DisplayName.Value != null)
throw new ValidationError("banner"); AssertValid(DisplayName.Value, "display_name", Limits.MaxGroupNameLength);
if (Color.Value != null && (!Regex.IsMatch(Color.Value, "^[0-9a-fA-F]{6}$"))) if (Description.Value != null)
throw new ValidationError("color"); AssertValid(Description.Value, "description", Limits.MaxDescriptionLength);
if (Icon.Value != null)
AssertValid(Icon.Value, "icon", Limits.MaxUriLength,
s => MiscUtils.TryMatchUri(s, out var avatarUri));
if (BannerImage.Value != null)
AssertValid(BannerImage.Value, "banner", Limits.MaxUriLength,
s => MiscUtils.TryMatchUri(s, out var bannerUri));
if (Color.Value != null)
AssertValid(Color.Value, "color", "^[0-9a-fA-F]{6}$");
} }
#nullable disable #nullable disable

2
PluralKit.Core/Models/Patch/MemberPatch.cs
View File

@ -56,7 +56,7 @@ namespace PluralKit.Core
public new void AssertIsValid() public new void AssertIsValid()
{ {
if (Name.IsPresent) if (Name.IsPresent)
AssertValid(Name.Value, "display_name", Limits.MaxMemberNameLength); AssertValid(Name.Value, "name", Limits.MaxMemberNameLength);
if (DisplayName.Value != null) if (DisplayName.Value != null)
AssertValid(DisplayName.Value, "display_name", Limits.MaxMemberNameLength); AssertValid(DisplayName.Value, "display_name", Limits.MaxMemberNameLength);
if (AvatarUrl.Value != null) if (AvatarUrl.Value != null)

2
PluralKit.Core/Services/DataFileService.cs
View File

@ -84,7 +84,7 @@ namespace PluralKit.Core
} }
} }
public class GroupMember public class GroupMember
{ {
public string Group { get; set; } public string Group { get; set; }