LogalDeveloper/owncast
LogalDeveloper/owncast
0
Fork 0
Code

Fixing chat message formatting in #1315

Browse Source
This commit is contained in:
Gabe Kangas 2021-08-18 16:11:00 -07:00
parent 0f00a700e7
commit 8907566ed1
4 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/chat/events/events.go
View File

@ -95,7 +95,7 @@ func RenderAndSanitize(raw string) string {
func RenderMarkdown(raw string) string { func RenderMarkdown(raw string) string {
markdown := goldmark.New( markdown := goldmark.New(
goldmark.WithRendererOptions( goldmark.WithRendererOptions(
html.WithUnsafe(), html.WithHardWraps(),
), ),
goldmark.WithExtensions( goldmark.WithExtensions(
extension.NewLinkify( extension.NewLinkify(

1
utils/utils.go
View File

@ -90,6 +90,7 @@ func RenderSimpleMarkdown(raw string) string {
markdown := goldmark.New( markdown := goldmark.New(
goldmark.WithRendererOptions( goldmark.WithRendererOptions(
html.WithUnsafe(), html.WithUnsafe(),
html.WithHardWraps(),
), ),
goldmark.WithExtensions( goldmark.WithExtensions(
extension.NewLinkify( extension.NewLinkify(

2
webroot/js/components/chat/chat-message-view.js
View File

@ -183,7 +183,7 @@ function formatTimestamp(sentAt) {
text into the `contenteditable` area on a page. text into the `contenteditable` area on a page.
*/ */
function convertToMarkup(str = '') { function convertToMarkup(str = '') {
return convertToText(str).replace(/\n/g, '<br>'); return str;// convertToText(str).replace(/\n/g, '<br>');
} }
function stripTags(str) { function stripTags(str) {

13
webroot/styles/chat.css
View File

@ -179,6 +179,19 @@
/* height: 15rem; */ /* height: 15rem; */
} }
.message-text ul li:before {
content: '» ';
}
.message-text p {
margin-bottom: 1.0em;
}
.message-text li {
margin: 0.3em;
margin-bottom: 1.0em;
}
/* MESSAGE TEXT CONTENT */ /* MESSAGE TEXT CONTENT */
/* MESSAGE TEXT CONTENT */ /* MESSAGE TEXT CONTENT */
/* MESSAGE TEXT CONTENT */ /* MESSAGE TEXT CONTENT */