address PR comments

ForumMagnum · Jun 10, 2024 · 3bdc7d0 · 3bdc7d0
1 parent 8a2f1f1
commit 3bdc7d0
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 7 deletions.
diff --git a/packages/lesswrong/components/users/FollowUserButton.tsx b/packages/lesswrong/components/users/FollowUserButton.tsx
@@ -32,9 +32,16 @@ export const FollowUserButton = ({user, classes}: {
     hideFlashes: true,
   });
 
+  const onSubscribeWithDM = async (ev: React.MouseEvent<Element, MouseEvent>) => {
+    const onSubscribeNullSafe = onSubscribe ?? (() => Promise.resolve())
+
+    await onSubscribeNullSafe(ev);
+    return await sendNewFollowDM({ variables: { eventType: "newFollowSubscription" } });
+  }
+
   const [subscribed, toggleSubscribed] = useOptimisticToggle(
     isSubscribed ?? false,
-    onSubscribe ?? (() => {}),
+    onSubscribeWithDM
   );
 
   const [sendNewFollowDM] = useMutation(gql`
@@ -47,7 +54,6 @@ export const FollowUserButton = ({user, classes}: {
 
   const handleSubscribe = (ev: React.MouseEvent<HTMLDivElement, MouseEvent>) => {
     void toggleSubscribed(ev);
-    void sendNewFollowDM({variables: {eventType: "newFollowSubscription"}})
     captureEvent("followUserButtonClick", {subcribedToUser: user._id, subscribed: !subscribed})
   }
 

diff --git a/packages/lesswrong/server/resolvers/conversationResolvers.ts b/packages/lesswrong/server/resolvers/conversationResolvers.ts
@@ -14,7 +14,7 @@ const followSubscriptionStartDate = forumSelect({
 })
 
 const getTriggeredDmContents = (eventType: DmTriggeringEvent) => {
-    const adminEmail = adminAccountSetting.get()?.email ?? "";
+  const adminEmail = adminAccountSetting.get()?.email ?? "";
 
   switch (eventType) {
     case "newFollowSubscription":
@@ -77,10 +77,10 @@ defineMutation({
         createdAt: {$gt: followSubscriptionStartDate}
       }).count();
 
-      // if (numUsersFollows > 1) {
-      //   // already has followed and received a DM
-      //   return false;
-      // }
+      if (numUsersFollows > 1) {
+        // already has followed and received a DM
+        return false;
+      }
     }
 
     const { title, message } = getTriggeredDmContents(eventType);