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

[backend/mfm] Only use div as root element for public preview in MfmConverter.ToHtmlAsync

Browse source
This commit is contained in:
Laura Hausmann 2024-09-07 01:56:53 +02:00
parent 63eabbd8d0
commit 37707a0712
No known key found for this signature in database
GPG key ID: D044E84C5BE01605
2 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Iceshrimp.Backend/Core/Helpers/LibMfm/Conversion/MfmConverter.cs
View file

@ -59,13 +59,13 @@ public class MfmConverter(IOptions<Config.InstanceSection> config)
} }
public async Task<string> ToHtmlAsync( public async Task<string> ToHtmlAsync(
IEnumerable<MfmNode> nodes, List<Note.MentionedUser> mentions, string? host, IEnumerable<MfmNode> nodes, List<Note.MentionedUser> mentions, string? host, string? quoteUri = null,
string? quoteUri = null, bool quoteInaccessible = false, bool replyInaccessible = false bool quoteInaccessible = false, bool replyInaccessible = false, bool divAsRoot = false
) )
{ {
var context = BrowsingContext.New(); var context = BrowsingContext.New();
var document = await context.OpenNewAsync(); var document = await context.OpenNewAsync();
var element = document.CreateElement("div"); var element = document.CreateElement(divAsRoot ? "div" : "p");
var nodeList = nodes.ToList(); var nodeList = nodes.ToList();
var hasContent = nodeList.Count > 0; var hasContent = nodeList.Count > 0;
@ -130,11 +130,11 @@ public class MfmConverter(IOptions<Config.InstanceSection> config)
public async Task<string> ToHtmlAsync( public async Task<string> ToHtmlAsync(
string mfm, List<Note.MentionedUser> mentions, string? host, string? quoteUri = null, string mfm, List<Note.MentionedUser> mentions, string? host, string? quoteUri = null,
bool quoteInaccessible = false, bool replyInaccessible = false bool quoteInaccessible = false, bool replyInaccessible = false, bool divAsRoot = false
) )
{ {
var nodes = MfmParser.Parse(mfm); var nodes = MfmParser.Parse(mfm);
return await ToHtmlAsync(nodes, mentions, host, quoteUri, quoteInaccessible, replyInaccessible); return await ToHtmlAsync(nodes, mentions, host, quoteUri, quoteInaccessible, replyInaccessible, divAsRoot);
} }
private INode FromMfmNode( private INode FromMfmNode(

6
Iceshrimp.Backend/Pages/Note.cshtml.cs
View file

@ -67,12 +67,14 @@ public class NoteModel(
if (Note is { Text: not null }) if (Note is { Text: not null })
{ {
TextContent[Note.Id] = await mfmConverter.ToHtmlAsync(Note.Text, await GetMentions(Note), Note.UserHost); TextContent[Note.Id] = await mfmConverter.ToHtmlAsync(Note.Text, await GetMentions(Note), Note.UserHost,
divAsRoot: true);
if (Note.Renote is { Text: not null }) if (Note.Renote is { Text: not null })
{ {
TextContent[Note.Renote.Id] = await mfmConverter.ToHtmlAsync(Note.Renote.Text, TextContent[Note.Renote.Id] = await mfmConverter.ToHtmlAsync(Note.Renote.Text,
await GetMentions(Note.Renote), await GetMentions(Note.Renote),
Note.Renote.UserHost); Note.Renote.UserHost,
divAsRoot: true);
MediaAttachments[Note.Renote.Id] = await GetAttachments(Note.Renote); MediaAttachments[Note.Renote.Id] = await GetAttachments(Note.Renote);
} }
} }