diff --git a/FAKit/Sources/FAKit/FASubmission.swift b/FAKit/Sources/FAKit/FASubmission.swift index c09ff0d..2b59fd1 100644 --- a/FAKit/Sources/FAKit/FASubmission.swift +++ b/FAKit/Sources/FAKit/FASubmission.swift @@ -67,7 +67,7 @@ extension FASubmission.Comment { displayAuthor: comment.displayAuthor, authorAvatarUrl: comment.authorAvatarUrl, datetime: comment.datetime, - htmlMessage: comment.htmlMessage.selfContainedFAHtml, + htmlMessage: comment.htmlMessage.selfContainedFAHtmlComment, answers: []) } diff --git a/FAKit/Sources/FAKit/String+FA.swift b/FAKit/Sources/FAKit/String+FA.swift index 4ff69fc..dadab67 100644 --- a/FAKit/Sources/FAKit/String+FA.swift +++ b/FAKit/Sources/FAKit/String+FA.swift @@ -28,6 +28,19 @@ extension String { .replacingOccurrences(of: "src=\"//", with: "src=\"https://") .replacingOccurrences(of: "src=\"/", with: "src=\"https://www.furaffinity.net/") } + + public var selfContainedFAHtmlComment: String { + """ + + + + + + + \(self) + +""" + } enum FATheme { case light diff --git a/FurAffinity/Helpers/FASession+CanvasPreview.swift b/FurAffinity/Helpers/FASession+CanvasPreview.swift index 012c0cd..eb9a4e5 100644 --- a/FurAffinity/Helpers/FASession+CanvasPreview.swift +++ b/FurAffinity/Helpers/FASession+CanvasPreview.swift @@ -90,12 +90,12 @@ extension FASubmission { let htmlDescription = "YCH for \n\"MikazukiHellfire\" MikazukiHellfire\n
\n
Medea © \n\"MikazukiHellfire\" MikazukiHellfire\n
\n
\n
\n
\n
*******************************\n
* \nFeed me with coffee?\n
* \nMy Gallery\n
* \nTwitter" let terrinissAvatarUrl = URL(string: "https://a.furaffinity.net/1616615925/terriniss.gif")! let comments: [FASubmission.Comment] = [ - .init(cid: 166652793, displayAuthor: "Terriniss", authorAvatarUrl: terrinissAvatarUrl, datetime: "2 months ago", htmlMessage: "BID HERE \n
Moon", answers: [ - .init(cid: 166653891, displayAuthor: "Terriniss", authorAvatarUrl: terrinissAvatarUrl, datetime: "2 months ago", htmlMessage: "SakuraSlowly (DA) - SB", answers: [ - .init(cid: 166658565, displayAuthor: "Terriniss", authorAvatarUrl: terrinissAvatarUrl, datetime: "2 months ago", htmlMessage: "DeathPanda21 (da) - 55$", answers: []) + .init(cid: 166652793, displayAuthor: "Terriniss", authorAvatarUrl: terrinissAvatarUrl, datetime: "2 months ago", htmlMessage: "BID HERE \n
Moon".selfContainedFAHtmlComment, answers: [ + .init(cid: 166653891, displayAuthor: "Terriniss", authorAvatarUrl: terrinissAvatarUrl, datetime: "2 months ago", htmlMessage: "SakuraSlowly (DA) - SB".selfContainedFAHtmlComment, answers: [ + .init(cid: 166658565, displayAuthor: "Terriniss", authorAvatarUrl: terrinissAvatarUrl, datetime: "2 months ago", htmlMessage: "DeathPanda21 (da) - 55$".selfContainedFAHtmlComment, answers: []) ]) ]), - .init(cid: 166653340, displayAuthor: "RuruDasPippen", authorAvatarUrl: URL(string: "https://a.furaffinity.net/1643948243/rurudaspippen.gif")!, datetime: "2 months ago", htmlMessage: "Look at the babies!", answers: []) + .init(cid: 166653340, displayAuthor: "RuruDasPippen", authorAvatarUrl: URL(string: "https://a.furaffinity.net/1643948243/rurudaspippen.gif")!, datetime: "2 months ago", htmlMessage: "Look at the babies!".selfContainedFAHtmlComment, answers: []) ] return FASubmission( diff --git a/FurAffinity/Submissions/SubmissionCommentView.swift b/FurAffinity/Submissions/SubmissionCommentView.swift index c5201d3..ebab325 100644 --- a/FurAffinity/Submissions/SubmissionCommentView.swift +++ b/FurAffinity/Submissions/SubmissionCommentView.swift @@ -16,6 +16,7 @@ struct SubmissionCommentView: View { HStack(alignment: .top) { AvatarView(avatarUrl: comment.authorAvatarUrl) .frame(width: 32, height: 32) + .padding(.top, 5) VStack(alignment: .leading, spacing: 0) { HStack(alignment: .firstTextBaseline) { diff --git a/FurAffinity/Submissions/SubmissionCommentsView.swift b/FurAffinity/Submissions/SubmissionCommentsView.swift index f2edc35..b4a5235 100644 --- a/FurAffinity/Submissions/SubmissionCommentsView.swift +++ b/FurAffinity/Submissions/SubmissionCommentsView.swift @@ -16,7 +16,7 @@ struct SubmissionCommentsView: View { var comments: [FASubmission.Comment] func commentViews(for comments: [FASubmission.Comment], indent: Bool) -> some View { - VStack(alignment: .leading) { + VStack(alignment: .leading, spacing: 5) { ForEach(comments) { comment in SubmissionCommentView(comment: comment) AnyView(commentViews(for: comment.answers, indent: true))