From 5c259810433be8cdbe6fcac8776cdbf4a0c244b0 Mon Sep 17 00:00:00 2001
From: eug-vs <eug-vs@keemail.me>
Date: Tue, 7 Apr 2020 15:31:00 +0300
Subject: fix: account for \r line endings, remove consoles

---
 src/lib/Markdown/Markdown.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/lib/Markdown/Markdown.tsx')

diff --git a/src/lib/Markdown/Markdown.tsx b/src/lib/Markdown/Markdown.tsx
index 09ad54a..0a71fd3 100644
--- a/src/lib/Markdown/Markdown.tsx
+++ b/src/lib/Markdown/Markdown.tsx
@@ -16,7 +16,7 @@ const Markdown: React.FC<PropTypes> = ({ data, url }) => {
   }, [data, url]);
 
   if (url) axios.get(url).then(response => setMarkdown(response.data));
-  return <Section rawLines={markdown.split('\n')} />
+  return <Section rawLines={markdown.split(/\r?\n/)} />
 };
 
 
-- 
cgit v1.2.3


From ae3228b9b3e95ace25292d0231e98e6087781c0a Mon Sep 17 00:00:00 2001
From: eug-vs <eug-vs@keemail.me>
Date: Thu, 9 Apr 2020 11:55:46 +0300
Subject: feat: resolve local urls

---
 src/lib/Markdown/Markdown.tsx | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

(limited to 'src/lib/Markdown/Markdown.tsx')

diff --git a/src/lib/Markdown/Markdown.tsx b/src/lib/Markdown/Markdown.tsx
index 0a71fd3..c929c71 100644
--- a/src/lib/Markdown/Markdown.tsx
+++ b/src/lib/Markdown/Markdown.tsx
@@ -8,15 +8,23 @@ interface PropTypes {
   url?: string;
 }
 
+const resolveUrls = (line: string, baseUrl: string = ''): string => {
+  return line.replace(/src="(?!http)(.*)"[\s>]/, (match, url, offset, string) => `src="${baseUrl}/${url}?sanitize=true"`)
+             .replace(/\[(.*\]?.*)\]\((?!http)(.+?)\)/, (match, text, url, offset, string) => `[${text}](${baseUrl}/${url})`);
+}
+
 const Markdown: React.FC<PropTypes> = ({ data, url }) => {
   const [markdown, setMarkdown] = useState<string>(data || '');
 
+  if (url) axios.get(url).then(response => setMarkdown(response.data));
+
   useEffect(() => {
     if (!url) setMarkdown(data || '');
   }, [data, url]);
 
-  if (url) axios.get(url).then(response => setMarkdown(response.data));
-  return <Section rawLines={markdown.split(/\r?\n/)} />
+  const baseUrl = url?.slice(0, url.lastIndexOf('/'));
+  const lines = markdown.split(/\r?\n/).map(line => resolveUrls(line, baseUrl));
+  return <Section rawLines={lines} />
 };
 
 
-- 
cgit v1.2.3


From 6d36ca60373f4d89d79209d0c6324d6eda5a001d Mon Sep 17 00:00:00 2001
From: eug-vs <eug-vs@keemail.me>
Date: Thu, 9 Apr 2020 12:11:11 +0300
Subject: fix: correct linting errors

---
 src/lib/Markdown/Markdown.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/lib/Markdown/Markdown.tsx')

diff --git a/src/lib/Markdown/Markdown.tsx b/src/lib/Markdown/Markdown.tsx
index c929c71..82e889c 100644
--- a/src/lib/Markdown/Markdown.tsx
+++ b/src/lib/Markdown/Markdown.tsx
@@ -8,7 +8,7 @@ interface PropTypes {
   url?: string;
 }
 
-const resolveUrls = (line: string, baseUrl: string = ''): string => {
+const resolveUrls = (line: string, baseUrl: string): string => {
   return line.replace(/src="(?!http)(.*)"[\s>]/, (match, url, offset, string) => `src="${baseUrl}/${url}?sanitize=true"`)
              .replace(/\[(.*\]?.*)\]\((?!http)(.+?)\)/, (match, text, url, offset, string) => `[${text}](${baseUrl}/${url})`);
 }
@@ -22,7 +22,7 @@ const Markdown: React.FC<PropTypes> = ({ data, url }) => {
     if (!url) setMarkdown(data || '');
   }, [data, url]);
 
-  const baseUrl = url?.slice(0, url.lastIndexOf('/'));
+  const baseUrl = url?.slice(0, url.lastIndexOf('/')) || '';
   const lines = markdown.split(/\r?\n/).map(line => resolveUrls(line, baseUrl));
   return <Section rawLines={lines} />
 };
-- 
cgit v1.2.3