From 19fa06b5bdd0f216c1b5dbb272a7928f637714a1 Mon Sep 17 00:00:00 2001
From: Xylight <james@xylight.dev>
Date: Thu, 1 Aug 2024 10:13:28 -0700
Subject: [PATCH] fix: make translate feature mostly work

---
 bun.lockb                                     | Bin 300459 -> 300459 bytes
 .../components/lemmy/post/PostActions.svelte  |  19 +++++-----------
 .../components/markdown/MarkdownEditor.svelte |   2 +-
 .../components/translate/Translation.svelte   |  21 ++++++++----------
 src/lib/components/ui/navbar/Profile.svelte   |  15 ++++++++++---
 5 files changed, 27 insertions(+), 30 deletions(-)

diff --git a/bun.lockb b/bun.lockb
index ea95e702d7661210b1f07eacbb78604e11e605f1..fca7552191144a0da06ee34e1b46cf0f799d2089 100755
GIT binary patch
delta 149
zcmV;G0BZlMs}ifL5|Az+NNKMhZ_bf=Iac{goC;+~A)u1X0-14G<6y_^5F{T|u}=EB
zlLS;KlkhGGgLu2Qc)I~@8$dy_PkjsS`vQVe5f+6F@bejnB@G1b43nZsf<Y`{Cl_o^
zI6=2n12Z2ix+@R#I2MS#S%EoY3yXLP_Sr+vip7T|*8ztm*8;aC*8{SP0XDbTVg%DN
DVH`co

delta 151
zcmV;I0BHZKs}ifL5|Az+sSysCdtjK-Y$%X1&O>48;yMzK03WN^jlDFEaN?b{u}=EB
z0S=R~E+>=lE(n8oySI3|0c{&V?!aiTJ!l+AtB5eA$b%dC;k=q@=D&_#`OZv|arwC(
ze;<)ftj}rjHnm<tIJD3M-?B0g+o{0(Z|TH1yhY<vhb7kmhb7knw<XsDvWo#Ux7cC?
F(=xEQN<sht

diff --git a/src/lib/components/lemmy/post/PostActions.svelte b/src/lib/components/lemmy/post/PostActions.svelte
index c281c934..ad7f441c 100644
--- a/src/lib/components/lemmy/post/PostActions.svelte
+++ b/src/lib/components/lemmy/post/PostActions.svelte
@@ -8,19 +8,15 @@
     BookmarkSlash,
     BugAnt,
     ChatBubbleOvalLeft,
-    ChatBubbleOvalLeftEllipsis,
     CheckBadge,
     EllipsisHorizontal,
     Eye,
     EyeSlash,
     Flag,
-    GlobeAlt,
-    Home,
     Icon,
     Language,
     Newspaper,
     PencilSquare,
-    Scale,
     ServerStack,
     Share,
     Trash,
@@ -36,12 +32,7 @@
   } from '$lib/components/lemmy/moderation/moderation.js'
   import ModerationMenu from '$lib/components/lemmy/moderation/ModerationMenu.svelte'
   import { profile } from '$lib/auth.js'
-  import {
-    contentView,
-    deleteItem,
-    markAsRead,
-    save,
-  } from '$lib/lemmy/contentview.js'
+  import { deleteItem, markAsRead, save } from '$lib/lemmy/contentview.js'
   import { setSessionStorage } from '$lib/session.js'
   import { goto } from '$app/navigation'
   import { userSettings, type View } from '$lib/settings.js'
@@ -55,11 +46,9 @@
     toast,
   } from 'mono-svelte'
   import { fediseer, type Data } from '$lib/fediseer/fediseer'
-  import Fediseer from '$lib/fediseer/Fediseer.svelte'
   import { t } from '$lib/translations'
   import { text } from '$lib/components/translate/translation'
-  import Translation from '$lib/components/translate/Translation.svelte'
-  import { hidePost, postLink, type MediaType } from './helpers'
+  import { hidePost, type MediaType } from './helpers'
   import { feature } from '$lib/version'
   import Switch from '$lib/components/input/Switch.svelte'
   import { instanceToURL } from '$lib/util'
@@ -92,7 +81,9 @@
 </script>
 
 {#if fediseerData}
-  <Fediseer bind:open={fediseerOpen} data={fediseerData} />
+  {#await import('$lib/fediseer/Fediseer.svelte') then { default: Fediseer }}
+    <Fediseer bind:open={fediseerOpen} data={fediseerData} />
+  {/await}
 {/if}
 
 {#if editing}
diff --git a/src/lib/components/markdown/MarkdownEditor.svelte b/src/lib/components/markdown/MarkdownEditor.svelte
index 7846f094..02476f80 100644
--- a/src/lib/components/markdown/MarkdownEditor.svelte
+++ b/src/lib/components/markdown/MarkdownEditor.svelte
@@ -173,7 +173,7 @@
     class="flex flex-col border border-slate-200 border-b-slate-300 dark:border-t-zinc-700 dark:border-zinc-800
     focus-within:border-primary-900 focus-within:dark:border-primary-100 focus-within:ring ring-slate-300
     dark:ring-zinc-700 rounded-xl
-overflow-hidden transition-colors"
+overflow-hidden transition-colors {$$props.class}"
     class:mt-1={label}
   >
     {#if previewing}
diff --git a/src/lib/components/translate/Translation.svelte b/src/lib/components/translate/Translation.svelte
index cad6ae7b..37981e34 100644
--- a/src/lib/components/translate/Translation.svelte
+++ b/src/lib/components/translate/Translation.svelte
@@ -34,7 +34,6 @@
     requestURL.searchParams.set('q', text)
     requestURL.searchParams.set('source', from)
     requestURL.searchParams.set('target', to)
-    requestURL.searchParams.set('alternatives', '')
 
     result = fetch(requestURL.toString(), {
       method: 'POST',
@@ -89,16 +88,14 @@
         <Spinner width={32} />
       </div>
     {:then result}
-      {#if !error}
-        <MarkdownEditor
-          previewButton={false}
-          previewing
-          tools={false}
-          rows={8}
-          value={result.translatedText || 'Failed to translate'}
-          disabled
-        ></MarkdownEditor>
-      {/if}
+      <MarkdownEditor
+        previewButton={false}
+        previewing
+        tools={false}
+        rows={8}
+        value={result.translatedText || 'Failed to translate'}
+        disabled
+      ></MarkdownEditor>
     {:catch err}
       <MarkdownEditor
         previewButton={false}
@@ -106,7 +103,7 @@
         tools={false}
         disabled
         rows={8}
-        value={err || 'Failed to translate'}
+        value="Failed to translate: {err}"
         class="!border-red-500 !ring-red-500 !text-red-500"
       ></MarkdownEditor>
     {/await}
diff --git a/src/lib/components/ui/navbar/Profile.svelte b/src/lib/components/ui/navbar/Profile.svelte
index c4c8bb02..372e91e9 100644
--- a/src/lib/components/ui/navbar/Profile.svelte
+++ b/src/lib/components/ui/navbar/Profile.svelte
@@ -143,9 +143,18 @@
     <!-- svelte-ignore a11y-no-static-element-interactions -->
     <div class="contents" on:click|stopPropagation={() => {}}>
       <Select bind:value={$colorScheme} class="ml-auto my-auto w-24" size="sm">
-        <option value="system">{$t('nav.menu.colorscheme.system')}</option>
-        <option value="light">{$t('nav.menu.colorscheme.light')}</option>
-        <option value="dark">{$t('nav.menu.colorscheme.dark')}</option>
+        <option value="system">
+          <Icon src={ComputerDesktop} size="16" mini />
+          {$t('nav.menu.colorscheme.system')}
+        </option>
+        <option value="light">
+          <Icon src={Sun} size="16" mini />
+          {$t('nav.menu.colorscheme.light')}
+        </option>
+        <option value="dark">
+          <Icon src={Moon} size="16" mini />
+          {$t('nav.menu.colorscheme.dark')}
+        </option>
       </Select>
     </div>
   </MenuButton>