anas/divan
1
0
Fork 0
Code Issues 12 Pull Requests Actions Packages Projects Releases Wiki Activity

#79 moving comment html conversions to import process

Browse Source
This commit is contained in:
Hamid Reza Mohammadi 2021-02-24 19:51:42 +03:30
parent da8d7006db
commit 41a262b03f
2 changed files with 39 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
RMuseum/Services/Implementation/GanjoorService-Imports/GanjoorService-MySqlImports.cs
View File

@ -1,4 +1,5 @@
using Microsoft.EntityFrameworkCore;
using DNTPersianUtils.Core;
using Microsoft.EntityFrameworkCore;
using MySql.Data.MySqlClient;
using RMuseum.DbContext;
using RMuseum.Models.Artifact;
@ -11,6 +12,7 @@ using System;
using System.Collections.Generic;
using System.Data;
using System.Linq;
using System.Text.RegularExpressions;
using System.Threading.Tasks;
namespace RMuseum.Services.Implementation
@ -518,7 +520,7 @@ namespace RMuseum.Services.Implementation
AuthorUrl = row["comment_author_url"].ToString(),
AuthorIpAddress = row["comment_author_IP"].ToString(),
CommentDate = (DateTime)row["comment_date"],
HtmlComment = row["comment_content"].ToString(),
HtmlComment = _PrepareCommentHtml(row["comment_content"].ToString()),
Status = row["comment_approved"].ToString() == "1" ? PublishStatus.Published : PublishStatus.Awaiting
};
@ -696,5 +698,36 @@ namespace RMuseum.Services.Implementation
return verses;
}
private string _Linkify(string SearchText)
{
// this will find links like:
// http://www.mysite.com
// as well as any links with other characters directly in front of it like:
// href="http://www.mysite.com"
// you can then use your own logic to determine which links to linkify
Regex regx = new Regex(@"\b(((\S+)?)(@|mailto\:|(news|(ht|f)tp(s?))\://)\S+)\b", RegexOptions.IgnoreCase);
SearchText = SearchText.Replace(" ", " ");
MatchCollection matches = regx.Matches(SearchText);
foreach (Match match in matches)
{
if (match.Value.StartsWith("http"))
{ // if it starts with anything else then dont linkify -- may already be linked!
SearchText = SearchText.Replace(match.Value, "<a href='" + match.Value + "'>" + match.Value + "</a>");
}
}
return SearchText;
}
private string _PrepareCommentHtml(string comment)
{
comment = comment.ToPersianNumbers().ApplyCorrectYeKe();
comment = _Linkify(comment);
comment = $"<p>{comment.Replace("\r\n", "\n").Replace("\n\n", "\n").Replace("\n", "<br />")}</p>";
return comment;
}
}
}

39
RMuseum/Services/Implementation/GanjoorService.cs
View File

@ -15,7 +15,6 @@ using System.Globalization;
using System.Linq;
using System.Threading.Tasks;
using RMuseum.Models.Artifact;
using System.Text.RegularExpressions;
using RSecurityBackend.Services.Implementation;
using DNTPersianUtils.Core;
@ -439,27 +438,7 @@ namespace RMuseum.Services.Implementation
}
}
private string _Linkify(string SearchText)
{
// this will find links like:
// http://www.mysite.com
// as well as any links with other characters directly in front of it like:
// href="http://www.mysite.com"
// you can then use your own logic to determine which links to linkify
Regex regx = new Regex(@"\b(((\S+)?)(@|mailto\:|(news|(ht|f)tp(s?))\://)\S+)\b", RegexOptions.IgnoreCase);
SearchText = SearchText.Replace("&nbsp;", " ");
MatchCollection matches = regx.Matches(SearchText);
foreach (Match match in matches)
{
if (match.Value.StartsWith("http"))
{ // if it starts with anything else then dont linkify -- may already be linked!
SearchText = SearchText.Replace(match.Value, "<a href='" + match.Value + "'>" + match.Value + "</a>");
}
}
return SearchText;
}
/// <summary>
/// get poem comments
@ -495,7 +474,6 @@ namespace RMuseum.Services.Implementation
foreach(GanjoorCommentSummaryViewModel comment in allComments)
{
comment.AuthorName = comment.AuthorName.ToPersianNumbers().ApplyCorrectYeKe();
comment.HtmlComment = _PrepareCommentHtml(comment.HtmlComment);
}
GanjoorCommentSummaryViewModel[] rootComments = allComments.Where(c => c.InReplyToId == null).ToArray();
@ -556,9 +534,8 @@ namespace RMuseum.Services.Implementation
var userRes = await _appUserService.GetUserInformation(userId);
comment.HtmlComment = comment.HtmlComment.ToPersianNumbers().ApplyCorrectYeKe();
comment.HtmlComment = _Linkify(comment.HtmlComment);
comment.HtmlComment = $"<p>{comment.HtmlComment.Replace("\r\n", "\n").Replace("\n\n", "\n").Replace("\n", "<br />")}</p>";
return new RServiceResult<GanjoorCommentSummaryViewModel>
(
@ -637,7 +614,7 @@ namespace RMuseum.Services.Implementation
"حذف پاسخ شما به حاشیه",
$"پاسخ شما به یکی از حاشیه‌های گنجور به دلیل حذف زنجیرهٔ حاشیه توسط یکی از حاشیه‌گذاران حذف شده است.{Environment.NewLine}" +
$"این متن حاشیهٔ حذف شدهٔ شماست: {Environment.NewLine}" +
$"{_PrepareCommentHtml(replies[i].HtmlComment)}"
$"{replies[i].HtmlComment}"
);
}
_context.GanjoorComments.Remove(replies[i]);
@ -712,7 +689,6 @@ namespace RMuseum.Services.Implementation
foreach (GanjoorCommentFullViewModel comment in paginatedResult.Items)
{
comment.AuthorName = comment.AuthorName.ToPersianNumbers().ApplyCorrectYeKe();
comment.HtmlComment = _PrepareCommentHtml(comment.HtmlComment);
}
return new RServiceResult<(PaginationMetadata PagingMeta, GanjoorCommentFullViewModel[] Items)>(paginatedResult);
@ -723,14 +699,7 @@ namespace RMuseum.Services.Implementation
}
}
private string _PrepareCommentHtml(string comment)
{
comment = comment.ToPersianNumbers().ApplyCorrectYeKe();
comment = _Linkify(comment);
comment = $"<p>{comment.Replace("\r\n", "\n").Replace("\n\n", "\n").Replace("\n", "<br />")}</p>";
return comment;
}
/// <summary>