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

DRY-ify checking URL length for avatars

Browse Source
This commit is contained in:
spiral 2020-11-22 15:43:38 -05:00
parent 7f82a3e63a
commit 05f1ee92ea
No known key found for this signature in database
GPG Key ID: 00C26F208D3FCCAB
4 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -177,8 +177,6 @@ namespace PluralKit.Bot
{ {
ctx.CheckOwnGroup(target); ctx.CheckOwnGroup(target);
if (img.Url.Length > Limits.MaxUriLength)
throw Errors.InvalidUrl(img.Url);
await AvatarUtils.VerifyAvatarOrThrow(img.Url); await AvatarUtils.VerifyAvatarOrThrow(img.Url);
await _db.Execute(c => _repo.UpdateGroup(c, target.Id, new GroupPatch {Icon = img.Url})); await _db.Execute(c => _repo.UpdateGroup(c, target.Id, new GroupPatch {Icon = img.Url}));

9
PluralKit.Bot/Commands/MemberAvatar.cs
View File

@ -102,18 +102,11 @@ namespace PluralKit.Bot
} }
ctx.CheckSystem().CheckOwnMember(target); ctx.CheckSystem().CheckOwnMember(target);
await ValidateUrl(avatarArg.Value.Url); await AvatarUtils.VerifyAvatarOrThrow(avatarArg.Value.Url);
await UpdateAvatar(location, ctx, target, avatarArg.Value.Url); await UpdateAvatar(location, ctx, target, avatarArg.Value.Url);
await PrintResponse(location, ctx, target, avatarArg.Value, guildData); await PrintResponse(location, ctx, target, avatarArg.Value, guildData);
} }
private static Task ValidateUrl(string url)
{
if (url.Length > Limits.MaxUriLength)
throw Errors.InvalidUrl(url);
return AvatarUtils.VerifyAvatarOrThrow(url);
}
private Task PrintResponse(AvatarLocation location, Context ctx, PKMember target, ParsedImage avatar, private Task PrintResponse(AvatarLocation location, Context ctx, PKMember target, ParsedImage avatar,
MemberGuildSettings? targetGuildData) MemberGuildSettings? targetGuildData)
{ {

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

@ -140,8 +140,6 @@ namespace PluralKit.Bot
async Task SetIcon(ParsedImage img) async Task SetIcon(ParsedImage img)
{ {
if (img.Url.Length > Limits.MaxUriLength)
throw Errors.InvalidUrl(img.Url);
await AvatarUtils.VerifyAvatarOrThrow(img.Url); await AvatarUtils.VerifyAvatarOrThrow(img.Url);
await _db.Execute(c => _repo.UpdateSystem(c, ctx.System.Id, new SystemPatch {AvatarUrl = img.Url})); await _db.Execute(c => _repo.UpdateSystem(c, ctx.System.Id, new SystemPatch {AvatarUrl = img.Url}));

3
PluralKit.Bot/Utils/AvatarUtils.cs
View File

@ -11,6 +11,9 @@ namespace PluralKit.Bot {
public static class AvatarUtils { public static class AvatarUtils {
public static async Task VerifyAvatarOrThrow(string url) public static async Task VerifyAvatarOrThrow(string url)
{ {
if (url.Length > Limits.MaxUriLength)
throw Errors.UrlTooLong(url);
// List of MIME types we consider acceptable // List of MIME types we consider acceptable
var acceptableMimeTypes = new[] var acceptableMimeTypes = new[]
{ {