octo/BirdsiteLive
1
0
Fork 0
mirror of https://github.com/NicolasConstant/BirdsiteLive synced 2025-06-05 21:49:16 +02:00
Code Issues Projects Releases Wiki Activity

fix start tag detection

Browse Source
This commit is contained in:
Nicolas Constant
2020-08-01 00:00:27 -04:00
parent d9a1dc84be
commit ce996c20b2
2 changed files with 48 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/BirdsiteLive.Domain/Tools/StatusExtractor.cs
View File

@ -13,7 +13,11 @@ namespace BirdsiteLive.Domain.Tools
public class StatusExtractor : IStatusExtractor
{
private readonly Regex _hastagRegex = new Regex(@"\W(\#[a-zA-Z0-9_ー]+\b)(?!;)");
//private readonly Regex _hastagRegex = new Regex(@"(?<=[\s>]|^)#(\w*[a-zA-Z0-9_ー]+\w*)\b(?!;)");
//private readonly Regex _hastagRegex = new Regex(@"(?<=[\s>]|^)#(\w*[a-zA-Z0-9_ー]+)\b(?!;)");
private readonly Regex _mentionRegex = new Regex(@"\W(\@[a-zA-Z0-9_ー]+\b)(?!;)");
//private readonly Regex _mentionRegex = new Regex(@"(?<=[\s>]|^)@(\w*[a-zA-Z0-9_ー]+\w*)\b(?!;)");
//private readonly Regex _mentionRegex = new Regex(@"(?<=[\s>]|^)@(\w*[a-zA-Z0-9_ー]+)\b(?!;)");
private readonly InstanceSettings _instanceSettings;
#region Ctor
@ -26,6 +30,7 @@ namespace BirdsiteLive.Domain.Tools
public (string content, Tag[] tags) ExtractTags(string messageContent)
{
var tags = new List<Tag>();
messageContent = $" {messageContent} ";
var hashtagMatch = _hastagRegex.Matches(messageContent);
foreach (var m in hashtagMatch)
@ -62,7 +67,7 @@ namespace BirdsiteLive.Domain.Tools
$@" <span class=""h-card""><a href=""https://{_instanceSettings.Domain}/@{mention}"" class=""u-url mention"">@<span>{mention}</span></a></span>");
}
return (messageContent, tags.ToArray());
return (messageContent.Trim(), tags.ToArray());
}
}
}