From 0c6ee3dd4decc80103508b976eaeea0961250e06 Mon Sep 17 00:00:00 2001 From: Nicolas Constant Date: Tue, 2 Feb 2021 00:26:26 -0500 Subject: [PATCH] clean up --- src/BirdsiteLive.Domain/Tools/StatusExtractor.cs | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/src/BirdsiteLive.Domain/Tools/StatusExtractor.cs b/src/BirdsiteLive.Domain/Tools/StatusExtractor.cs index b6b571c..a43ccb0 100644 --- a/src/BirdsiteLive.Domain/Tools/StatusExtractor.cs +++ b/src/BirdsiteLive.Domain/Tools/StatusExtractor.cs @@ -16,18 +16,6 @@ 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(@"#\w+"); - //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(@"@\w+"); - //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 Regex _urlRegex = new Regex(@"((http|ftp|https):\/\/[\w\-_]+(\.[\w\-_]+)+([\w\-\.,@?^=%&:/~\+#]*[\w\-\@?^=%&/~\+#])?)"); - private readonly InstanceSettings _instanceSettings; private readonly ILogger _logger; @@ -53,7 +41,7 @@ namespace BirdsiteLive.Domain.Tools // messageContent = Regex.Replace(messageContent, m.ToString(), $" {m} "); // Extract Urls - var urlMatch = _urlRegex.Matches(messageContent); + var urlMatch = UrlRegexes.Url.Matches(messageContent); foreach (Match m in urlMatch) { var url = m.ToString().Replace("\n", string.Empty).Trim();