Refactor and cleanup various toast messages (#1699)

aeharding · Nov 11, 2024 · af8791a · af8791a
1 parent a777e38
commit af8791a
Show file tree

Hide file tree

Showing 17 changed files with 197 additions and 201 deletions.
diff --git a/src/features/comment/useCommentActions.ts b/src/features/comment/useCommentActions.ts
@@ -37,7 +37,13 @@ import {
 } from "#/helpers/lemmy";
 import { getVoteErrorMessage } from "#/helpers/lemmyErrors";
 import { useBuildGeneralBrowseLink } from "#/helpers/routes";
-import { postLocked, saveError, saveSuccess } from "#/helpers/toastMessages";
+import {
+  commentDeleteFailed,
+  commentDeleted,
+  postLocked,
+  saveError,
+  saveSuccess,
+} from "#/helpers/toastMessages";
 import useAppToast from "#/helpers/useAppToast";
 import { useOptimizedIonRouter } from "#/helpers/useOptimizedIonRouter";
 import store, { useAppDispatch } from "#/store";
@@ -204,19 +210,12 @@ export default function useCommentActions({
                           try {
                             await dispatch(deleteComment(comment.id));
                           } catch (error) {
-                            presentToast({
-                              message:
-                                "Problem deleting comment. Please try again.",
-                              color: "danger",
-                            });
+                            presentToast(commentDeleteFailed);
 
                             throw error;
                           }
 
-                          presentToast({
-                            message: "Comment deleted!",
-                            color: "primary",
-                          });
+                          presentToast(commentDeleted);
                         })();
                       },
                     },

diff --git a/src/features/community/list/CommunityListItem.tsx b/src/features/community/list/CommunityListItem.tsx
@@ -70,9 +70,9 @@ export default function CommunityListItem({
 
     try {
       await dispatch(followCommunity(false, community.id));
-      presentToast(buildSuccessSubscribing(true, getHandle(community)));
+      presentToast(buildSuccessSubscribing(true));
     } catch (error) {
-      presentToast(buildProblemSubscribing(true, getHandle(community)));
+      presentToast(buildProblemSubscribing(true));
       throw error;
     }
   }
@@ -83,7 +83,7 @@ export default function CommunityListItem({
 
     dispatch(removeFavorite(communityHandle));
 
-    presentToast(buildFavorited(isFavorite, communityHandle));
+    presentToast(buildFavorited(isFavorite));
   }
 
   const slideActions = (() => {

diff --git a/src/features/community/useCommunityActions.tsx b/src/features/community/useCommunityActions.tsx
@@ -105,9 +105,9 @@ export default function useCommunityActions(
 
     try {
       await dispatch(followCommunity(!isSubscribed, communityId));
-      presentToast(buildSuccessSubscribing(isSubscribed, communityHandle));
+      presentToast(buildSuccessSubscribing(isSubscribed));
     } catch (error) {
-      presentToast(buildProblemSubscribing(isSubscribed, communityHandle));
+      presentToast(buildProblemSubscribing(isSubscribed));
       throw error;
     }
   };
@@ -121,7 +121,7 @@ export default function useCommunityActions(
       dispatch(removeFavorite(communityHandle));
     }
 
-    presentToast(buildFavorited(isFavorite, communityHandle));
+    presentToast(buildFavorited(isFavorite));
   };
 
   const block = async () => {
@@ -161,7 +161,7 @@ export default function useCommunityActions(
             handler: () => {
               (async () => {
                 await _block();
-                presentToast(buildBlocked(!isBlocked, communityHandle));
+                presentToast(buildBlocked(!isBlocked));
               })();
             },
           },
@@ -175,7 +175,7 @@ export default function useCommunityActions(
       db.setSetting("has_presented_block_nsfw_tip", true);
     } else {
       await _block();
-      presentToast(buildBlocked(!isBlocked, communityHandle));
+      presentToast(buildBlocked(!isBlocked));
     }
   };
 

diff --git a/src/features/moderation/ModqueueItemActions.tsx b/src/features/moderation/ModqueueItemActions.tsx
@@ -8,10 +8,10 @@ import { modRemovePost } from "#/features/post/postSlice";
 import { isPost } from "#/helpers/lemmy";
 import {
   commentApproved,
-  commentRemoved,
+  commentRemovedMod,
   commentRestored,
   postApproved,
-  postRemoved,
+  postRemovedMod,
   postRestored,
 } from "#/helpers/toastMessages";
 import useAppToast from "#/helpers/useAppToast";
@@ -42,7 +42,8 @@ export default function ModqueueItemActions({
       const action = isPost(item) ? resolvePostReport : resolveCommentReport;
       await dispatch(action(id));
 
-      if (remove) presentToast(isPost(item) ? postRemoved : commentRemoved);
+      if (remove)
+        presentToast(isPost(item) ? postRemovedMod : commentRemovedMod);
       else presentToast(isPost(item) ? postApproved : commentApproved);
 
       return;
@@ -54,8 +55,8 @@ export default function ModqueueItemActions({
 
     const toastMessage = (() => {
       if (remove) {
-        if (isPost(item)) return postRemoved;
-        else return commentRemoved;
+        if (isPost(item)) return postRemovedMod;
+        else return commentRemovedMod;
       } else {
         if (isPost(item)) return postRestored;
         else return commentRestored;

diff --git a/src/features/moderation/useCommentModActions.tsx b/src/features/moderation/useCommentModActions.tsx
@@ -24,7 +24,7 @@ import {
   buildBanned,
   commentApproved,
   commentDistinguished,
-  commentRemoved,
+  commentRemovedMod,
 } from "#/helpers/toastMessages";
 import useAppToast from "#/helpers/useAppToast";
 import store, { useAppDispatch } from "#/store";
@@ -103,7 +103,7 @@ export default function useCommentModActions(commentView: CommentView) {
                 (async () => {
                   await dispatch(modRemoveComment(comment.id, true));
 
-                  presentToast(commentRemoved);
+                  presentToast(commentRemovedMod);
                 })();
               },
             }
@@ -134,7 +134,7 @@ export default function useCommentModActions(commentView: CommentView) {
                         modRemoveComment(comment.id, true, reason),
                       );
 
-                      presentToast(commentRemoved);
+                      presentToast(commentRemovedMod);
                     })();
                   },
                 },

diff --git a/src/features/moderation/usePostModActions.tsx b/src/features/moderation/usePostModActions.tsx
@@ -25,7 +25,7 @@ import {
   buildLocked,
   buildStickied,
   postApproved,
-  postRemoved,
+  postRemovedMod,
   postRestored,
 } from "#/helpers/toastMessages";
 import useAppToast from "#/helpers/useAppToast";
@@ -80,7 +80,7 @@ export default function usePostModActions(post: PostView) {
                 (async () => {
                   await dispatch(modRemovePost(post.post.id, true));
 
-                  presentToast(postRemoved);
+                  presentToast(postRemovedMod);
                 })();
               },
             }
@@ -109,7 +109,7 @@ export default function usePostModActions(post: PostView) {
                     (async () => {
                       await dispatch(modRemovePost(post.post.id, true, reason));
 
-                      presentToast(postRemoved);
+                      presentToast(postRemovedMod);
                     })();
                   },
                 },

diff --git a/src/features/post/crosspost/create/CreateCrosspostDialog.tsx b/src/features/post/crosspost/create/CreateCrosspostDialog.tsx
@@ -10,7 +10,6 @@ import {
 } from "@ionic/react";
 import { css } from "@linaria/core";
 import { styled } from "@linaria/react";
-import { checkmark } from "ionicons/icons";
 import { CommunityView, PostView } from "lemmy-js-client";
 import { useContext, useEffect, useState } from "react";
 
@@ -21,6 +20,7 @@ import { buildPostLink } from "#/helpers/appLinkBuilder";
 import { isNative } from "#/helpers/device";
 import { buildCrosspostBody, getHandle } from "#/helpers/lemmy";
 import { useBuildGeneralBrowseLink } from "#/helpers/routes";
+import { crosspostFailed, crosspostSuccess } from "#/helpers/toastMessages";
 import useAppToast from "#/helpers/useAppToast";
 import useClient from "#/helpers/useClient";
 import { useOptimizedIonRouter } from "#/helpers/useOptimizedIonRouter";
@@ -129,11 +129,7 @@ export default function CreateCrosspostDialog({
         community_id: community.community.id,
       });
     } catch (error) {
-      presentToast({
-        message: "Failed to create crosspost",
-        color: "danger",
-        centerText: true,
-      });
+      presentToast(crosspostFailed);
       throw error;
     } finally {
       setLoading(false);
@@ -152,14 +148,7 @@ export default function CreateCrosspostDialog({
 
     onDismiss();
 
-    presentToast({
-      message: "Crossposted!",
-      color: "primary",
-      position: "top",
-      centerText: true,
-      fullscreen: true,
-      icon: checkmark,
-    });
+    presentToast(crosspostSuccess);
   }
 
   return (

diff --git a/src/features/post/new/PostEditorRoot.tsx b/src/features/post/new/PostEditorRoot.tsx
@@ -19,7 +19,7 @@ import {
 import { css } from "@linaria/core";
 import { styled } from "@linaria/react";
 import { startCase } from "es-toolkit";
-import { accessibility, cameraOutline, checkmark } from "ionicons/icons";
+import { accessibility, cameraOutline } from "ionicons/icons";
 import { Post } from "lemmy-js-client";
 import { useEffect, useMemo, useState } from "react";
 
@@ -32,7 +32,11 @@ import {
 import { isAndroid } from "#/helpers/device";
 import { getHandle, getRemoteHandle } from "#/helpers/lemmy";
 import { useBuildGeneralBrowseLink } from "#/helpers/routes";
-import { problemFetchingTitle } from "#/helpers/toastMessages";
+import {
+  postCreated,
+  postEdited,
+  problemFetchingTitle,
+} from "#/helpers/toastMessages";
 import { isUrlImage, isValidUrl } from "#/helpers/url";
 import useAppToast from "#/helpers/useAppToast";
 import useClient from "#/helpers/useClient";
@@ -299,14 +303,7 @@ export default function PostEditorRoot({
 
     dispatch(receivedPosts([postResponse.post_view]));
 
-    presentToast({
-      message: existingPost ? "Post edited!" : "Post created!",
-      color: "primary",
-      position: "top",
-      centerText: true,
-      fullscreen: true,
-      icon: checkmark,
-    });
+    presentToast(existingPost ? postEdited : postCreated);
 
     setCanDismiss(true);
 

diff --git a/src/features/post/shared/usePostActions.tsx b/src/features/post/shared/usePostActions.tsx
@@ -6,7 +6,6 @@ import {
   arrowUpOutline,
   bookmarkOutline,
   cameraOutline,
-  checkmark,
   eyeOffOutline,
   eyeOutline,
   flagOutline,
@@ -39,6 +38,10 @@ import {
 } from "#/helpers/lemmy";
 import { getVoteErrorMessage } from "#/helpers/lemmyErrors";
 import { useBuildGeneralBrowseLink } from "#/helpers/routes";
+import {
+  postDeleteFailed,
+  postDeleted as postDeletedToast,
+} from "#/helpers/toastMessages";
 import { postLocked, saveError, saveSuccess } from "#/helpers/toastMessages";
 import useAppToast from "#/helpers/useAppToast";
 import { useOptimizedIonRouter } from "#/helpers/useOptimizedIonRouter";
@@ -166,14 +169,15 @@ export default function usePostActions(post: PostView) {
                   role: "destructive",
                   handler: () => {
                     (async () => {
-                      await dispatch(deletePost(post.post.id));
+                      try {
+                        await dispatch(deletePost(post.post.id));
+                      } catch (error) {
+                        presentToast(postDeleteFailed);
+
+                        throw error;
+                      }
 
-                      presentToast({
-                        message: "Post deleted",
-                        color: "success",
-                        centerText: true,
-                        icon: checkmark,
-                      });
+                      presentToast(postDeletedToast);
                     })();
                   },
                 },

diff --git a/src/features/report/Report.tsx b/src/features/report/Report.tsx
@@ -4,6 +4,7 @@ import { CommentView, PostView, PrivateMessageView } from "lemmy-js-client";
 import { useImperativeHandle, useState } from "react";
 
 import { isLemmyError } from "#/helpers/lemmyErrors";
+import { buildReported } from "#/helpers/toastMessages";
 import useAppToast from "#/helpers/useAppToast";
 import useClient from "#/helpers/useClient";
 
@@ -78,9 +79,7 @@ export default function Report({
       throw error;
     }
 
-    presentToast({
-      message: `${type} reported!`,
-    });
+    if (type) presentToast(buildReported(type));
   }
 
   const submitCustomReason = async function (

diff --git a/src/features/share/asImage/ShareAsImage.tsx b/src/features/share/asImage/ShareAsImage.tsx
@@ -221,7 +221,7 @@ export default function ShareAsImage({ data, header }: ShareAsImageProps) {
       setBlob(() => blob ?? undefined);
     } catch (error) {
       presentToast({
-        message: "Error rendering image.",
+        message: "Error rendering image",
       });
 
       throw error;

diff --git a/src/features/shared/markdown/editing/modal/contents/CommentEditPage.tsx b/src/features/shared/markdown/editing/modal/contents/CommentEditPage.tsx
@@ -12,6 +12,7 @@ import { useEffect, useState } from "react";
 import { Centered, Spinner } from "#/features/auth/login/LoginNav";
 import { editComment } from "#/features/comment/commentSlice";
 import { isIosTheme } from "#/helpers/device";
+import { commentEdited } from "#/helpers/toastMessages";
 import useAppToast from "#/helpers/useAppToast";
 import { useAppDispatch } from "#/store";
 
@@ -61,13 +62,7 @@ export default function CommentEditPage({
       setLoading(false);
     }
 
-    presentToast({
-      message: "Comment edited!",
-      color: "primary",
-      position: "top",
-      centerText: true,
-      fullscreen: true,
-    });
+    presentToast(commentEdited);
 
     setCanDismiss(true);
     dismiss(comment);

diff --git a/src/features/shared/markdown/editing/modal/contents/CommentReplyPage.tsx b/src/features/shared/markdown/editing/modal/contents/CommentReplyPage.tsx
@@ -27,6 +27,7 @@ import { Centered, Spinner } from "#/features/auth/login/LoginNav";
 import { receivedComments } from "#/features/comment/commentSlice";
 import { isIosTheme } from "#/helpers/device";
 import { isLemmyError } from "#/helpers/lemmyErrors";
+import { commentPosted } from "#/helpers/toastMessages";
 import useAppToast from "#/helpers/useAppToast";
 import useClient from "#/helpers/useClient";
 import { getClient } from "#/services/lemmy";
@@ -216,13 +217,7 @@ export default function CommentReplyPage({
     }
 
     if (!silentError) {
-      presentToast({
-        message: "Comment posted!",
-        color: "primary",
-        position: "top",
-        centerText: true,
-        fullscreen: true,
-      });
+      presentToast(commentPosted);
     }
 
     if (reply) dispatch(receivedComments([reply]));