Open platform to collect and prioritize feedback
enhancement: crop long post on initial page
goenningf7993929848c
diff --git a/app/pkg/markdown/markdown.go b/app/pkg/markdown/markdown.goindex a091281e6..6164d8ec0 100644--- a/app/pkg/markdown/markdown.go+++ b/app/pkg/markdown/markdown.go@@ -18,24 +18,6 @@ var mdExtns = 0 |blackfriday.EXTENSION_NO_INTRA_EMPHASIS |blackfriday.EXTENSION_HARD_LINE_BREAK-var simpleHTMLExtensions = 0 |- blackfriday.HTML_USE_XHTML |- blackfriday.HTML_USE_SMARTYPANTS |- blackfriday.HTML_SMARTYPANTS_FRACTIONS |- blackfriday.HTML_SMARTYPANTS_DASHES |- blackfriday.HTML_SKIP_IMAGES |- blackfriday.HTML_SMARTYPANTS_LATEX_DASHES--var simpleRenderer = SimpleRenderer(simpleHTMLExtensions)--// Simple turns a markdown into HTML using few rules-func Simple(input string) template.HTML {- sanitizedInput := html.EscapeString(input)- output := blackfriday.Markdown([]byte(sanitizedInput), simpleRenderer, mdExtns)-- return template.HTML(strings.TrimSpace(string(output)))-}-var fullHTMLExtensions = 0 |blackfriday.HTML_USE_XHTML |blackfriday.HTML_USE_SMARTYPANTS |diff --git a/app/pkg/markdown/markdown_test.go b/app/pkg/markdown/markdown_test.goindex f3807ff25..115c13ce6 100644--- a/app/pkg/markdown/markdown_test.go+++ b/app/pkg/markdown/markdown_test.go@@ -78,36 +78,3 @@ How are you?`,Expect(output).Equals(expected)}}--func TestSimpleMarkdown(t *testing.T) {- RegisterT(t)-- for input, expected := range map[string]string{- "**Hello World**": `<p><strong>Hello World</strong></p>`,- "[My Link](http://example.com/)": `<p><a href="http://example.com/">My Link</a></p>`,- "": `<p></p>`,- "Go to http://example.com/hello.jpg": `<p>Go to <a href="http://example.com/hello.jpg">http://example.com/hello.jpg</a></p>`,- "~~Option 3~~": `<p><del>Option 3</del></p>`,- "# Hello World": `<p>Hello World</p>`,- "### Hello World": `<p>Hello World</p>`,- "Check this out: `HEEEY`": "<p>Check this out: <code>HEEEY</code></p>",- `-123--456--789`: `<p>-123<br />--456<br />--789</p>`,- `# Hello World-How are you?`: `<p>Hello World</p>--<p>How are you?</p>`,- `Hello World--How are you?`: `<p>Hello World</p>--<p>How are you?</p>`,- `Hello <b>Beautiful</b> World`: `<p>Hello <b>Beautiful</b> World</p>`,- } {- output := markdown.Simple(input)- Expect(output).Equals(template.HTML(expected))- }-}diff --git a/app/tasks/tasks.go b/app/tasks/tasks.goindex d4ae046c2..4d30f5f5f 100644--- a/app/tasks/tasks.go+++ b/app/tasks/tasks.go@@ -142,7 +142,7 @@ func NotifyAboutNewPost(post *models.Post) worker.Task {"title": post.Title,"tenantName": c.Tenant().Name,"userName": c.User().Name,- "content": markdown.Simple(post.Description),+ "content": markdown.Full(post.Description),"postLink": linkWithText(fmt.Sprintf("#%d", post.Number), web.BaseURL(c), "/posts/%d/%s", post.Number, post.Slug),"view": linkWithText("View it on your browser", web.BaseURL(c), "/posts/%d/%s", post.Number, post.Slug),"change": linkWithText("change your notification settings", web.BaseURL(c), "/settings"),@@ -202,7 +202,7 @@ func NotifyAboutNewComment(post *models.Post, comment *models.NewComment) worker"title": post.Title,"tenantName": c.Tenant().Name,"userName": c.User().Name,- "content": markdown.Simple(comment.Content),+ "content": markdown.Full(comment.Content),"postLink": linkWithText(fmt.Sprintf("#%d", post.Number), web.BaseURL(c), "/posts/%d/%s", post.Number, post.Slug),"view": linkWithText("View it on your browser", web.BaseURL(c), "/posts/%d/%s", post.Number, post.Slug),"unsubscribe": linkWithText("unsubscribe from it", web.BaseURL(c), "/posts/%d/%s", post.Number, post.Slug),@@ -273,7 +273,7 @@ func NotifyAboutStatusChange(post *models.Post, prevStatus enum.PostStatus) work"title": post.Title,"postLink": linkWithText(fmt.Sprintf("#%d", post.Number), web.BaseURL(c), "/posts/%d/%s", post.Number, post.Slug),"tenantName": c.Tenant().Name,- "content": markdown.Simple(post.Response.Text),+ "content": markdown.Full(post.Response.Text),"status": post.Status.Name(),"duplicate": duplicate,"view": linkWithText("View it on your browser", web.BaseURL(c), "/posts/%d/%s", post.Number, post.Slug),@@ -333,7 +333,7 @@ func NotifyAboutDeletedPost(post *models.Post) worker.Task {props := dto.Props{"title": post.Title,"tenantName": c.Tenant().Name,- "content": markdown.Simple(post.Response.Text),+ "content": markdown.Full(post.Response.Text),"change": linkWithText("change your notification settings", web.BaseURL(c), "/settings"),"logo": web.LogoURL(c),}diff --git a/public/components/SignInModal.tsx b/public/components/SignInModal.tsxindex f91fbb2ed..28e32bb01 100644--- a/public/components/SignInModal.tsx+++ b/public/components/SignInModal.tsx@@ -41,7 +41,7 @@ export const SignInModal: React.StatelessComponent<SignInModalProps> = (props) =return (<Modal.Window isOpen={props.isOpen} onClose={closeModal}>- <Modal.Header>Sign in to raise your voice</Modal.Header>+ <Modal.Header>Sign in to post and vote</Modal.Header><Modal.Content>{content}</Modal.Content><LegalFooter /></Modal.Window>diff --git a/public/components/common/MultiLineText.tsx b/public/components/common/MultiLineText.tsxindex de0d23825..280fc8a6f 100644--- a/public/components/common/MultiLineText.tsx+++ b/public/components/common/MultiLineText.tsx@@ -1,10 +1,11 @@import React from "react"-import { markdown } from "@fider/services"+import { markdown, truncate } from "@fider/services"interface MultiLineTextProps {className?: stringtext?: string- style: "full" | "simple"+ maxLength?: number+ style: "full" | "plainText"}export const MultiLineText = (props: MultiLineTextProps) => {@@ -12,6 +13,7 @@ export const MultiLineText = (props: MultiLineTextProps) => {return <p />}- const func = props.style === "full" ? markdown.full : markdown.simple- return <div className={`markdown-body ${props.className || ""}`} dangerouslySetInnerHTML={{ __html: func(props.text) }} />+ const html = markdown[props.style](props.text)+ const className = `markdown-body ${props.className || ""}`+ return <div className={className} dangerouslySetInnerHTML={{ __html: props.maxLength ? truncate(html, props.maxLength) : html }} />}diff --git a/public/pages/Home/components/ListPosts.tsx b/public/pages/Home/components/ListPosts.tsxindex 1129ae638..38e2e35ba 100644--- a/public/pages/Home/components/ListPosts.tsx+++ b/public/pages/Home/components/ListPosts.tsx@@ -24,7 +24,7 @@ const ListPostItem = (props: { post: Post; user?: CurrentUser; tags: Tag[] }) =><a className="c-list-item-title" href={`/posts/${props.post.number}/${props.post.slug}`}>{props.post.title}</a>- <MultiLineText className="c-list-item-description" text={props.post.description} style="simple" />+ <MultiLineText className="c-list-item-description" maxLength={300} text={props.post.description} style="plainText" /><ShowPostResponse showUser={false} status={props.post.status} response={props.post.response} />{props.tags.map((tag) => (<ShowTag key={tag.id} size="tiny" tag={tag} />diff --git a/public/pages/MyNotifications/MyNotifications.page.tsx b/public/pages/MyNotifications/MyNotifications.page.tsxindex e5965ddeb..47a5dc7b1 100644--- a/public/pages/MyNotifications/MyNotifications.page.tsx+++ b/public/pages/MyNotifications/MyNotifications.page.tsx@@ -39,7 +39,7 @@ export default class MyNotificationsPage extends React.Component<MyNotificationsreturn (<ListItem key={n.id}><a href={`/notifications/${n.id}`}>- <MultiLineText text={n.title} style="simple" />+ <MultiLineText text={n.title} style="full" /><span className="info"><Moment date={n.createdAt} /></span>diff --git a/public/pages/ShowPost/ShowPost.page.tsx b/public/pages/ShowPost/ShowPost.page.tsxindex 5800216e0..893f94bac 100644--- a/public/pages/ShowPost/ShowPost.page.tsx+++ b/public/pages/ShowPost/ShowPost.page.tsx@@ -121,7 +121,7 @@ export default class ShowPostPage extends React.Component<ShowPostPageProps, Sho</Form>) : (<>- <MultiLineText className="description" text={this.props.post.description} style="simple" />+ <MultiLineText className="description" text={this.props.post.description} style="full" />{this.props.attachments.map((x) => (<ImageViewer key={x} bkey={x} />))}diff --git a/public/pages/ShowPost/components/ShowComment.tsx b/public/pages/ShowPost/components/ShowComment.tsxindex 74a1a0696..808fe5024 100644--- a/public/pages/ShowPost/components/ShowComment.tsx+++ b/public/pages/ShowPost/components/ShowComment.tsx@@ -149,7 +149,7 @@ export const ShowComment = (props: ShowCommentProps) => {</Form>) : (<>- <MultiLineText text={comment.content} style="simple" />+ <MultiLineText text={comment.content} style="full" />{comment.attachments && comment.attachments.map((x) => <ImageViewer key={x} bkey={x} />)}</>)}diff --git a/public/services/markdown.spec.ts b/public/services/markdown.spec.tsindex cb4cccb89..dda15b9c0 100644--- a/public/services/markdown.spec.ts+++ b/public/services/markdown.spec.ts@@ -4,51 +4,52 @@ const testCases = [{input: "Visit [GitHub](https://github.com) to learn more.",expectedFull: '<p>Visit <a target="_blank" rel="noopener" href="https://github.com">GitHub</a> to learn more.</p>',- expectedSimple: '<p>Visit <a target="_blank" rel="noopener" href="https://github.com">GitHub</a> to learn more.</p>',+ expectedPlainText: "Visit GitHub to learn more.",},{input: "My Picture ",- expectedFull: '<p>My Picture <img alt="" src="http://demo.dev.fider.io:3000/images/100/28"></p>',- expectedSimple: "<p>My Picture </p>",+ expectedFull: "<p>My Picture </p>",+ expectedPlainText: "My Picture",},{input: "# Hello World",expectedFull: "<h1>Hello World</h1>",expectedSimple: "<p>Hello World</p>",+ expectedPlainText: "Hello World",},{input: "Hello <b>Beautiful</b> World",expectedFull: "<p>Hello <b>Beautiful</b> World</p>",- expectedSimple: "<p>Hello <b>Beautiful</b> World</p>",+ expectedPlainText: "Hello <b>Beautiful</b> World",},{input: `[Uh oh...]("onerror="alert('XSS'))`,expectedFull: '<p><a target="_blank" rel="noopener" href="">Uh oh...</a></p>',- expectedSimple: '<p><a target="_blank" rel="noopener" href="">Uh oh...</a></p>',+ expectedPlainText: "Uh oh...",},{input: "~~Option 3~~",expectedFull: "<p><del>Option 3</del></p>",- expectedSimple: "<p><del>Option 3</del></p>",+ expectedPlainText: "Option 3",},{input: "Check this out: `HEEEY`",expectedFull: "<p>Check this out: <code>HEEEY</code></p>",- expectedSimple: "<p>Check this out: <code>HEEEY</code></p>",+ expectedPlainText: "Check this out: HEEEY",},{input: `# Hello WorldHow are you?`,expectedFull: `<h1>Hello World</h1><p>How are you?</p>`,- expectedSimple: `<p>Hello World</p><p>How are you?</p>`,+ expectedPlainText: "Hello World How are you?",},{input: `-123-456-789`,expectedFull: "<p>-123<br>-456<br>-789</p>",- expectedSimple: "<p>-123<br>-456<br>-789</p>",+ expectedPlainText: "-123 -456 -789",},]@@ -60,8 +61,8 @@ testCases.forEach((x) => {})testCases.forEach((x) => {- test(`Can parse markdown ${x.input} to ${x.expectedSimple} (simple mode)`, () => {- const result = markdown.simple(x.input)- expect(result).toEqual(x.expectedSimple)+ test(`Can parse markdown ${x.input} to ${x.expectedPlainText} (plain text)`, () => {+ const result = markdown.plainText(x.input)+ expect(result).toEqual(x.expectedPlainText)})})diff --git a/public/services/markdown.ts b/public/services/markdown.tsindex df45fbe4d..fa50513de 100644--- a/public/services/markdown.ts+++ b/public/services/markdown.ts@@ -23,14 +23,24 @@ const link = (href: string, title: string, text: string) => {return `<a href="${href}"${titleAttr} rel="noopener" target="_blank">${text}</a>`}-const simpleRenderer = new marked.Renderer()-simpleRenderer.heading = (_text, _level, raw) => `<p>${raw}</p>`-simpleRenderer.image = () => ""-simpleRenderer.link = link-const fullRenderer = new marked.Renderer()+fullRenderer.image = () => ""fullRenderer.link = link+const plainTextRenderer = new marked.Renderer()+plainTextRenderer.link = (_href, _title, text) => text+plainTextRenderer.image = (_href, _title, _text) => ""+plainTextRenderer.br = () => " "+plainTextRenderer.strong = (text) => text+plainTextRenderer.list = (body) => body+plainTextRenderer.listitem = (text) => `${text} `+plainTextRenderer.heading = (text) => text+plainTextRenderer.paragraph = (text) => ` ${text} `+plainTextRenderer.code = (code) => code+plainTextRenderer.codespan = (code) => code+plainTextRenderer.html = (html) => html+plainTextRenderer.del = (text) => text+const entities: { [key: string]: string } = {"<": "<",">": ">",@@ -43,6 +53,6 @@ export const full = (input: string): string => {return sanitize(marked(encodeHTML(input), { renderer: fullRenderer }).trim())}-export const simple = (input: string): string => {- return sanitize(marked(encodeHTML(input), { renderer: simpleRenderer }).trim())+export const plainText = (input: string): string => {+ return sanitize(marked(encodeHTML(input), { renderer: plainTextRenderer }).trim())}diff --git a/public/services/utils.ts b/public/services/utils.tsindex b38b064fb..d1c9a9d34 100644--- a/public/services/utils.ts+++ b/public/services/utils.ts@@ -138,7 +138,7 @@ export const uploadedImageURL = (bkey: string | undefined, size?: number): strin}export const truncate = (input: string, maxLength: number): string => {- if (input && input.length > 1000) {+ if (input && input.length > maxLength) {return `${input.substr(0, maxLength)}...`}return input