cleanup

ios/Memmy/Info.plist

@@ -173,7 +173,7 @@
 	<key>CFBundleVersion</key>
 	<string>2</string>
 	<key>CodePushDeploymentKey</key>
-	<string>l3pg50FJ4Bgt5LrFzkh0d10d8ukjpoAptMP2g</string>
+	<string>f3fsdf</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationCategoryType</key>

src/components/common/ImageViewer/ImageViewFooter.tsx

@@ -6,18 +6,29 @@ import { saveImage } from "../../../helpers/ImageHelper";
 import { shareLink } from "../../../helpers/ShareHelper";
 import IconButtonWithText from "../IconButtonWithText";
 import SFIcon from "../icons/SFIcon";
+import { useAppDispatch } from "../../../../store";
+import { showToast } from "../../../slices/toast/toastSlice";
 
 interface ImageViewFooterProps {
   source: string;
 }
 
 function ImageViewFooter({ source }: ImageViewFooterProps) {
   const theme = useTheme();
+  const dispatch = useAppDispatch();
 
   const onSave = async () => {
     onGenericHapticFeedback();
 
     await saveImage(source);
+
+    dispatch(
+      showToast({
+        message: "Image saved.",
+        duration: 1500,
+        variant: "success",
+      })
+    );
   };
 
   const onShare = async () => {

src/components/common/ImageViewer/ImageViewer.tsx

@@ -34,6 +34,7 @@ import { useAppSelector } from "../../../../store";
 import { selectSettings } from "../../../slices/settings/settingsSlice";
 import ImageButton from "../Buttons/ImageButton";
 import { onGenericHapticFeedback } from "../../../helpers/HapticFeedbackHelpers";
+import Toast from "../Toast";
 
 interface IProps {
   source: string;
@@ -618,6 +619,7 @@ function ImageViewer({
         </Pressable>
       )}
       <Modal visible={expanded} transparent>
+        <Toast />
         {/* eslint-disable-next-line react/style-prop-object */}
         <StatusBar style="dark" />
         <Animated.View style={[accessoriesStyle]}>

src/components/screens/Feed/components/FeedView.tsx

@@ -36,12 +36,18 @@ import {
 } from "../../../../stores/feeds/feedsStore";
 import { useCommunity } from "../../../../stores/communities/communitiesStore";
 import loadFeedPosts from "../../../../stores/feeds/actions/loadFeedPosts";
+import HideReadFAB from "../../../common/Buttons/HideReadFAB";
+import setFeedPosts from "../../../../stores/feeds/actions/setFeedPosts";
+import { removeReadPosts } from "../../../../helpers/LemmyHelpers";
 
 interface FeedViewProps {
   header?: () => React.ReactNode;
 }
 
 function FeedView({ header }: FeedViewProps) {
+  const { hideReadPostsOnFeed, showHideReadButton } =
+    useAppSelector(selectSettings);
+
   const { key } = useRoute();
 
   // Global state props
@@ -161,13 +167,13 @@ function FeedView({ header }: FeedViewProps) {
             getItemType={getItemType}
           />
         )}
-      {/* {hideReadPostsOnFeed && showHideReadButton && showFab && ( */}
-      {/*  <HideReadFAB */}
-      {/*    onPress={() => { */}
-      {/*      feed.setPosts(removeReadPosts(feed.posts)); */}
-      {/*    }} */}
-      {/*  /> */}
-      {/* )} */}
+      {hideReadPostsOnFeed && showHideReadButton && (
+        <HideReadFAB
+          onPress={() => {
+            setFeedPosts(key, removeReadPosts(posts));
+          }}
+        />
+      )}
     </View>
   );
 }

src/components/screens/Post/components/PostCommentItem.tsx

@@ -39,6 +39,32 @@ function PostCommentItem({ commentId }: IProps) {
       );
       prevComment.collapsed = !prevComment.collapsed;
       prev.rerenderComments = !prev.rerenderComments;
+
+      const prevToHide = prev.commentsState.comments.filter(
+        (c) =>
+          c.comment.comment.path.includes(prevComment.comment.comment.path) &&
+          c.comment.comment.id !== commentId
+      );
+
+      if (!prevComment.collapsed) {
+        prevToHide.forEach((c) => {
+          const shouldUnhide =
+            prevToHide.findIndex(
+              (cc) =>
+                cc.collapsed &&
+                c.comment.comment.path.includes(cc.comment.comment.path) &&
+                c.comment.comment.id !== cc.comment.comment.id
+            ) === -1;
+
+          if (shouldUnhide) {
+            c.hidden = false;
+          }
+        });
+      } else {
+        prevToHide.forEach((c) => {
+          c.hidden = true;
+        });
+      }
     });
   }, [comment.comment.comment.id]);
 

src/components/screens/Settings/Account/ViewAccountsScreen.tsx

@@ -160,7 +160,10 @@ function ViewAccountsScreen({ navigation }: ViewAccountsScreenProps) {
     <ScrollView backgroundColor={theme.colors.app.bg}>
       <LoadingModalTransparent loading={notifications.loading} />
       <CTable>
-        <CSection header={t("settings.accounts.current")}>
+        <CSection
+          header={t("settings.accounts.current")}
+          footer="To switch accounts, simply press and hold the Profile button in the tab bar."
+        >
           <CCell
             cellStyle="RightDetail"
             title={t("Server")}

src/hooks/comments/useNewComment.ts

@@ -32,7 +32,8 @@ const useNewComment = () => {
         parent_id: responseTo.comment
           ? responseTo.comment.comment.id
           : undefined,
-        language_id: responseTo.languageId,
+        language_id:
+          responseTo.languageId === 0 ? undefined : responseTo.languageId,
       });
 
       useUpdatesStore

src/hooks/post/usePost.ts

@@ -8,6 +8,8 @@ import {
 } from "../../stores/posts/postsStore";
 import { setPostCollapsed } from "../../stores/posts/actions";
 import loadPostComments from "../../stores/posts/actions/loadPostComments";
+import loadCommunity from "../../stores/communities/actions/loadCommunity";
+import { getBaseUrl } from "../../helpers/LinkHelper";
 
 export interface UsePost {
   doLoad: () => void;
@@ -22,8 +24,14 @@ const usePost = (): UsePost => {
 
   const doLoad = useCallback(() => {
     loadPostComments(postKey, {
-      sortType: commentsSortType, // TODO Use default here
+      sortType: commentsSortType,
     }).then();
+    loadCommunity(
+      `${currentPost.community.name}@${getBaseUrl(
+        currentPost.community.actor_id
+      )}`,
+      true
+    ).then();
   }, [currentPost.post.id, commentsSortType]);
 
   const onPostPress = useCallback(() => {

src/stores/communities/actions/loadCommunity.ts

@@ -2,7 +2,20 @@ import { useCommunitiesStore } from "../communitiesStore";
 import { lemmyAuthToken, lemmyInstance } from "../../../LemmyInstance";
 import { handleLemmyError } from "../../../helpers/LemmyErrorHelper";
 
-const loadCommunity = async (communityName: string) => {
+const loadCommunity = async (communityName: string, noRefresh = false) => {
+  const current = useCommunitiesStore
+    .getState()
+    .communityStates.get(communityName);
+
+  if (
+    noRefresh &&
+    current &&
+    !current.status.loading &&
+    !current.status.error
+  ) {
+    return;
+  }
+
   useCommunitiesStore.setState((state) => {
     if (!state.communityStates.has(communityName)) {
       state.communityStates.set(communityName, {

src/stores/posts/postsStore.ts

@@ -60,3 +60,21 @@ export const usePostComment = (postKey: string, commentId: number) =>
       .get(postKey)
       .commentsState.comments.find((c) => c.comment.comment.id === commentId)
   );
+
+export const usePostCommentCollapsed = (postKey: string, commentId: number) =>
+  usePostsStore(
+    (state) =>
+      state.posts
+        .get(postKey)
+        .commentsState.comments.find((c) => c.comment.comment.id === commentId)
+        .collapsed
+  );
+
+export const usePostCommentHidden = (postKey: string, commentId: number) =>
+  usePostsStore(
+    (state) =>
+      state.posts
+        .get(postKey)
+        .commentsState.comments.find((c) => c.comment.comment.id === commentId)
+        .hidden
+  );