Merge remote-tracking branch 'origin/wip/mobile'

2 files changed, 5 insertions, 13 deletions

diff --git a/ui/lib/components/Message.svelte b/ui/lib/components/Message.svelte
index baa16ca..dd06eca 100644
--- a/ui/lib/components/Message.svelte
+++ b/ui/lib/components/Message.svelte
@@ -1,9 +1,12 @@
 <script>
-    import SvelteMarkdown from 'svelte-markdown';
+    import { marked } from 'marked';
+    import DOMPurify from 'dompurify';
 
     export let at;
     export let body;
 
+    let renderedBody = DOMPurify.sanitize(marked.parse(body));
+
     let scroll = (message) => {
         message.scrollIntoView();
     }
@@ -12,7 +15,7 @@
 <div class="message relative">
     <span class="timestamp chip variant-soft absolute top-0 right-0">{at}</span>
     <section use:scroll class="py-1 message-body">
-        <SvelteMarkdown source={body} />
+        {@html renderedBody}
     </section>
 </div>
 
diff --git a/ui/lib/components/MessageRun.svelte b/ui/lib/components/MessageRun.svelte
index cbf4f04..af699ab 100644
--- a/ui/lib/components/MessageRun.svelte
+++ b/ui/lib/components/MessageRun.svelte
@@ -21,14 +21,3 @@
         <Message {at} {body} />
     {/each}
 </div>
-
-<style>
-    .own-message {
-        width: 80%;
-        margin-right: auto;
-    }
-    .other-message {
-        width: 80%;
-        margin-left: auto;
-    }
-</style>