Merge remote-tracking branch 'upstream/main' into dev

sharunkumar · Aug 13, 2024 · 8c944e5 · 8c944e5
2 parents 92ab40d + 6556c01
commit 8c944e5
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 8 deletions.
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -7,8 +7,8 @@ android {
         applicationId "app.vger.voyager"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 259
-        versionName "2.16.0"
+        versionCode 260
+        versionName "2.17.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         aaptOptions {
              // Files and dirs to omit from the packaged assets dir, modified to accommodate modern web apps.

diff --git a/ios/App/App/Info.plist b/ios/App/App/Info.plist
@@ -17,7 +17,7 @@
     <key>CFBundlePackageType</key>
     <string>APPL</string>
     <key>CFBundleShortVersionString</key>
-    <string>2.16.0</string>
+    <string>2.17.0</string>
     <key>CFBundleURLTypes</key>
     <array>
       <dict>
@@ -32,7 +32,7 @@
       </dict>
     </array>
     <key>CFBundleVersion</key>
-    <string>259</string>
+    <string>260</string>
     <key>ITSAppUsesNonExemptEncryption</key>
     <false/>
     <key>LSRequiresIPhoneOS</key>

diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "name": "voyager",
   "description": "A progressive webapp Lemmy client",
   "private": true,
-  "version": "2.16.0",
+  "version": "2.17.0",
   "type": "module",
   "packageManager": "pnpm@9.6.0+sha512.38dc6fba8dba35b39340b9700112c2fe1e12f10b17134715a4aa98ccf7bb035e76fd981cf0bb384dfa98f8d6af5481c2bef2f4266a24bfa20c34eb7147ce0b5e",
   "scripts": {

diff --git a/src/features/community/CommunitySummary.tsx b/src/features/community/CommunitySummary.tsx
@@ -83,6 +83,7 @@ export default function CommunitySummary({ community }: CommunitySummaryProps) {
             community={community.community}
             showInstanceWhenRemote
             subscribed={community.subscribed}
+            hideSubscribed
           />
           <RightContainer>
             <ActionButton

diff --git a/src/features/labels/links/CommunityLink.tsx b/src/features/labels/links/CommunityLink.tsx
@@ -31,7 +31,7 @@ const StyledItemIcon = styled(ItemIcon)`
 `;
 
 const SubscribedIcon = styled(IonIcon)`
-  color: var(--ion-color-danger);
+  color: var(--ion-color-primary);
   vertical-align: middle;
 
   margin-bottom: 1px;
@@ -51,6 +51,7 @@ interface CommunityLinkProps {
   tinyIcon?: boolean;
   disableInstanceClick?: boolean;
   hideIcon?: boolean;
+  hideSubscribed?: boolean;
 
   className?: string;
 }
@@ -63,6 +64,7 @@ export default function CommunityLink({
   tinyIcon,
   disableInstanceClick,
   hideIcon,
+  hideSubscribed,
 }: CommunityLinkProps) {
   const [present] = useIonActionSheet();
 
@@ -126,7 +128,9 @@ export default function CommunityLink({
   const end = (
     <>
       {instance}
-      {showSubscribed && isSubscribed && <SubscribedIcon icon={heart} />}
+      {showSubscribed && !hideSubscribed && isSubscribed && (
+        <SubscribedIcon icon={heart} />
+      )}
     </>
   );
 

diff --git a/src/services/lemmy.ts b/src/services/lemmy.ts
@@ -50,7 +50,9 @@ export async function _uploadImage(client: LemmyHttp, image: File) {
     image: compressedImageIfNeeded as File,
   });
 
-  if (!response.url) throw new Error(response.msg);
+  // lemm.ee uses response.message for error messages (e.g. account too new)
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  if (!response.url) throw new Error(response.msg ?? (response as any).message);
 
   return response;
 }