From 9f574ea4b24c8fd3e43d5c1e6796f15177130dda Mon Sep 17 00:00:00 2001
From: Nicolas Constant
");
- messageContent = Regex.Replace(messageContent, @"\r\n?|\n", "
");
+ messageContent = Regex.Replace(messageContent, @"\r\n\r\n?|\n\n", "
");
+ messageContent = Regex.Replace(messageContent, @"\r\n?|\n", "
");
// Extract Urls
var urlMatch = _urlRegex.Matches(messageContent);
- foreach (var m in urlMatch)
+ foreach (Match m in urlMatch)
{
var url = m.ToString().Replace("\n", string.Empty).Trim();
@@ -69,8 +74,8 @@ namespace BirdsiteLive.Domain.Tools
}
// Extract Hashtags
- var hashtagMatch = _hastagRegex.Matches(messageContent);
- foreach (var m in hashtagMatch)
+ var hashtagMatch = OrderByLength(_hastagRegex.Matches(messageContent));
+ foreach (Match m in hashtagMatch)
{
var tag = m.ToString().Replace("#", string.Empty).Replace("\n", string.Empty).Trim();
var url = $"https://{_instanceSettings.Domain}/tags/{tag}";
@@ -87,8 +92,8 @@ namespace BirdsiteLive.Domain.Tools
}
// Extract Mentions
- var mentionMatch = _mentionRegex.Matches(messageContent);
- foreach (var m in mentionMatch)
+ var mentionMatch = OrderByLength(_mentionRegex.Matches(messageContent));
+ foreach (Match m in mentionMatch)
{
var mention = m.ToString().Replace("@", string.Empty).Replace("\n", string.Empty).Trim();
var url = $"https://{_instanceSettings.Domain}/users/{mention}";
@@ -105,7 +110,21 @@ namespace BirdsiteLive.Domain.Tools
$@" @{mention}");
}
+ // Clean up return lines
+ messageContent = Regex.Replace(messageContent, @"
", "
");
+ messageContent = Regex.Replace(messageContent, @"
", "
");
+
return (messageContent.Trim(), tags.ToArray());
}
+
+ private IEnumerable
"));
+ #endregion
+ }
+
+ [TestMethod]
+ public void Extract_ReturnSingleLines_Test()
+ {
+ #region Stubs
+ var message = "Bla.\n@Mention blo. https://t.co/pgtrJi9600";
+ #endregion
+
+ var service = new StatusExtractor(_settings);
+ var result = service.ExtractTags(message);
+
+ #region Validations
+ Assert.IsTrue(result.content.Contains("Bla."));
+ Assert.IsTrue(result.content.Contains("
"));
+ #endregion
+ }
+
[TestMethod]
public void Extract_FormatUrl_Test()
{