notfire/Iceshrimp.NET
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[backend/core] Convert GeneratedRegex partial methods to partial properties

Browse source
This commit is contained in:
Laura Hausmann 2024-07-15 22:53:06 +02:00
parent c6adb0bee1
commit 8d288e9f44
No known key found for this signature in database
GPG key ID: D044E84C5BE01605
2 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Iceshrimp.Backend/Core/Helpers/EmojiHelpers.cs
View file

File diff suppressed because one or more lines are too long

12
Iceshrimp.Backend/Core/Services/EmojiService.cs
View file

@ -158,8 +158,8 @@ public partial class EmojiService(
return name;
host = host?.ToPunycodeLower();
var match = CustomEmojiRegex().Match(name);
var remoteMatch = RemoteCustomEmojiRegex().Match(name);
var match = CustomEmojiRegex.Match(name);
var remoteMatch = RemoteCustomEmojiRegex.Match(name);
var localMatchSuccess = !match.Success || match.Groups.Count != 2;
if (localMatchSuccess && !remoteMatch.Success)
throw GracefulException.BadRequest("Invalid emoji name");
@ -218,7 +218,7 @@ public partial class EmojiService(
var existing = await db.Emojis.FirstOrDefaultAsync(p => p.Host == null && p.Name == name);
if (name != null && existing == null && CustomEmojiRegex().IsMatch(name))
if (name != null && existing == null && CustomEmojiRegex.IsMatch(name))
{
emoji.Name = name;
emoji.Uri = emoji.GetPublicUri(config.Value);
@ -238,11 +238,11 @@ public partial class EmojiService(
return emoji;
}
public static bool IsCustomEmoji(string s) => CustomEmojiRegex().IsMatch(s) || RemoteCustomEmojiRegex().IsMatch(s);
public static bool IsCustomEmoji(string s) => CustomEmojiRegex.IsMatch(s) || RemoteCustomEmojiRegex.IsMatch(s);
[GeneratedRegex(@"^:?([\w+-]+)(?:@\.)?:?$", RegexOptions.Compiled)]
private static partial Regex CustomEmojiRegex();
private static partial Regex CustomEmojiRegex { get; }
[GeneratedRegex(@"^:?([\w+-]+)@([a-zA-Z0-9._\-]+\.[a-zA-Z0-9._\-]+):?$", RegexOptions.Compiled)]
private static partial Regex RemoteCustomEmojiRegex();
private static partial Regex RemoteCustomEmojiRegex { get; }
}