From 5d74dae63e3f38b406c996012bc55f4c9ce1b9f2 Mon Sep 17 00:00:00 2001
From: k2xl <k2xl.com@gmail.com>
Date: Mon, 10 Jul 2023 19:10:08 -0400
Subject: [PATCH] Message email (#927)

* wip. email notifications

* Notification and push notif customization in settings

* don't send if it is not enabled by user

* on signup add all notification types that exist to the list

* merge from main (#931)

* fixes #928

* Revert "npm update"

This reverts commit fe61f21c2ebca6df3c164acb61bc7f663acebf5c.

* achievement unlock improvements

* handle long user input

* truncate in multiplayer

---------

Co-authored-by: Spencer Spenst <spencerspenst@gmail.com>

* updated package lock

* small cleanup

* test for notification preferences

* fix test in signup

* reset password test fix

* make sure new users have notifications on

* rename notification preferences test

* add test for guest account

* Update initializeLocalDb.ts

* follow button tweak; package-lock revert

* cleanup package-lock again

* move to sep file

* level of the day

* fix a longstanding bug where we sent email digests to guest users

* tweak css

* fix test

* level of day email

* labels

* move level of the day to notifications tab

* email body css

* set emailLog.type notification type

* update deafult emailNotificationsList

* fix tests

---------

Co-authored-by: Spencer Spenst <spencerspenst@gmail.com>
---
 components/followButton.tsx                   |  40 +--
 components/settings/settingsAccount.tsx       |  56 +---
 components/settings/settingsNotifications.tsx | 247 ++++++++++++++++++
 constants/emailDigest.ts                      |   3 +-
 constants/testId.ts                           |   1 +
 helpers/emails/getEmailBody.tsx               |  77 +++---
 lib/initializeLocalDb.ts                      |  17 ++
 models/db/emailLog.d.ts                       |   3 +-
 models/db/userConfig.d.ts                     |   3 +
 models/schemas/emailLogSchema.ts              |   3 +-
 models/schemas/queueMessageSchema.ts          |   3 +-
 models/schemas/userConfigSchema.ts            |  11 +
 pages/api/follow/index.ts                     |  12 +-
 pages/api/internal-jobs/email-digest/index.ts |  27 +-
 pages/api/internal-jobs/worker/index.ts       | 111 ++++----
 .../worker/sendEmailNotification.ts           |  39 +++
 .../worker/sendPushNotification.ts            |  70 +++++
 pages/api/signup/index.ts                     |   5 +
 pages/api/user-config/index.ts                |  17 +-
 pages/settings/[[...tab]].tsx                 |  11 +-
 tests/pages/api/follow/follow.test.ts         |  18 +-
 .../email-single-email-a-day.test.ts          |  22 +-
 .../api/reset-password/reset-password.test.ts |   8 +-
 tests/pages/api/review/review.test.ts         |   6 +-
 tests/pages/api/signup/signup.test.ts         |  20 +-
 .../notification-preferences.test.ts          | 151 +++++++++++
 tests/pages/users/users.page.test.ts          |   2 +-
 27 files changed, 755 insertions(+), 228 deletions(-)
 create mode 100644 components/settings/settingsNotifications.tsx
 create mode 100644 pages/api/internal-jobs/worker/sendEmailNotification.ts
 create mode 100644 pages/api/internal-jobs/worker/sendPushNotification.ts
 create mode 100644 tests/pages/api/user-config/notification-preferences.test.ts

diff --git a/components/followButton.tsx b/components/followButton.tsx
index 0b59b4447..250f4b276 100644
--- a/components/followButton.tsx
+++ b/components/followButton.tsx
@@ -12,32 +12,26 @@ interface FollowButtonProps {
 }
 
 export default function FollowButton({ isFollowing, onResponse, user }: FollowButtonProps) {
-  const [_isFollowing, setIsFollowing] = useState<boolean>(isFollowing);
+  const [_isFollowing, setIsFollowing] = useState(isFollowing);
+  const [disabled, setDisabled] = useState(false);
 
-  const onFollowButtonPress = async (ele: React.MouseEvent<HTMLButtonElement>) => {
-    // disable button and make it opacity 0.5
-    const targ = ele.currentTarget;
+  const onFollowButtonPress = async () => {
+    setDisabled(true);
 
-    targ.disabled = true;
-    targ.style.opacity = '0.5';
+    const queryParams = new URLSearchParams({
+      action: GraphType.FOLLOW,
+      id: user._id.toString(),
+      targetModel: 'User',
+    });
 
-    const res = await fetch('/api/follow', {
+    const res = await fetch(`/api/follow?${queryParams}`, {
       method: !_isFollowing ? 'PUT' : 'DELETE',
       headers: {
         'Content-Type': 'application/json',
       },
       credentials: 'include',
-
-      body: JSON.stringify({
-        action: GraphType.FOLLOW,
-        id: user._id,
-        targetModel: 'User',
-      }),
     });
 
-    targ.disabled = false;
-    targ.style.opacity = '1';
-
     if (res.status === 200) {
       const resp: FollowData = await res.json();
 
@@ -50,13 +44,19 @@ export default function FollowButton({ isFollowing, onResponse, user }: FollowBu
       toast.dismiss();
       toast.error('Something went wrong following this user');
     }
+
+    setDisabled(false);
   };
 
   return (
-    <button className={classNames(
-      'font-bold py-2 px-4 rounded focus:outline-none focus:shadow-outline cursor-pointer',
-      _isFollowing ? 'bg-button' : 'bg-blue-500 hover:bg-blue-700 text-white',
-    )} onClick={onFollowButtonPress}>
+    <button
+      className={classNames(
+        'font-bold py-2 px-4 rounded focus:outline-none focus:shadow-outline disabled:opacity-50',
+        _isFollowing ? 'bg-button' : 'bg-blue-500 hover:bg-blue-700 text-white',
+      )}
+      disabled={disabled}
+      onClick={onFollowButtonPress}
+    >
       {!_isFollowing ? 'Follow' : 'Unfollow'}
     </button>
   );
diff --git a/components/settings/settingsAccount.tsx b/components/settings/settingsAccount.tsx
index 2921bb449..66b65c00a 100644
--- a/components/settings/settingsAccount.tsx
+++ b/components/settings/settingsAccount.tsx
@@ -1,9 +1,7 @@
 import User from '@root/models/db/user';
 import UserConfig from '@root/models/db/userConfig';
-import React, { useCallback, useState } from 'react';
+import React, { useState } from 'react';
 import toast from 'react-hot-toast';
-import Select from 'react-select';
-import { EmailDigestSettingTypes } from '../../constants/emailDigest';
 
 interface SettingsAccountProps {
   user: User;
@@ -13,8 +11,6 @@ interface SettingsAccountProps {
 export default function SettingsAccount({ user, userConfig }: SettingsAccountProps) {
   const [currentPassword, setCurrentPassword] = useState<string>('');
   const [email, setEmail] = useState<string>(user.email);
-  const [emailDigest, setEmailDigest] = useState<EmailDigestSettingTypes>(userConfig?.emailDigest ?? EmailDigestSettingTypes.ONLY_NOTIFICATIONS);
-  const [isUserConfigLoading, setIsUserConfigLoading] = useState<boolean>(false);
   const [password, setPassword] = useState<string>('');
   const [password2, setPassword2] = useState<string>('');
   const [showPlayStats, setShowPlayStats] = useState(userConfig?.showPlayStats ?? false);
@@ -84,7 +80,6 @@ export default function SettingsAccount({ user, userConfig }: SettingsAccountPro
   ) {
     toast.dismiss();
     toast.loading(`Updating ${property}...`);
-    setIsUserConfigLoading(true);
 
     fetch('/api/user-config', {
       method: 'PUT',
@@ -107,8 +102,6 @@ export default function SettingsAccount({ user, userConfig }: SettingsAccountPro
       console.error(err);
       toast.dismiss();
       toast.error(`Error updating ${property}`);
-    }).finally(() => {
-      setIsUserConfigLoading(false);
     });
   }
 
@@ -186,14 +179,6 @@ export default function SettingsAccount({ user, userConfig }: SettingsAccountPro
 
   const inputClass = 'shadow appearance-none border mb-2 rounded w-full py-2 px-3 text-gray-700 leading-tight focus:outline-none focus:shadow-outline';
 
-  const emailDigestLabels = useCallback(() => {
-    return {
-      [EmailDigestSettingTypes.DAILY]: 'Daily digest',
-      [EmailDigestSettingTypes.ONLY_NOTIFICATIONS]: 'Only for unread notifications',
-      [EmailDigestSettingTypes.NONE]: 'None',
-    };
-  }, []);
-
   async function clearTours() {
     const res = await fetch('/api/user-config', {
       method: 'PUT',
@@ -249,45 +234,6 @@ export default function SettingsAccount({ user, userConfig }: SettingsAccountPro
             </label>
           </div>
         </div>
-        <div>
-          <div className='block font-bold mb-2'>
-            Email Notifications
-          </div>
-          <div>
-            <Select
-              className='text-black w-full text-sm'
-              components={{
-                IndicatorSeparator: null,
-              }}
-              isDisabled={isUserConfigLoading}
-              isLoading={isUserConfigLoading}
-              loadingMessage={() => 'Loading...'}
-              onChange={option => {
-                if (!option) {
-                  return;
-                }
-
-                updateUserConfig(
-                  JSON.stringify({
-                    emailDigest: option.value,
-                  }), 'email notifications',
-                );
-
-                setEmailDigest(option.value);
-              }}
-              options={Object.keys(EmailDigestSettingTypes).map(emailDigestKey => {
-                return {
-                  label: emailDigestLabels()[emailDigestKey as EmailDigestSettingTypes],
-                  value: emailDigestKey as EmailDigestSettingTypes,
-                };
-              })}
-              value={{
-                label: emailDigestLabels()[emailDigest],
-                value: emailDigest,
-              }}
-            />
-          </div>
-        </div>
         <form className='flex flex-col items-start' onSubmit={updateUsername}>
           <label className='block font-bold mb-2' htmlFor='username'>
             Username
diff --git a/components/settings/settingsNotifications.tsx b/components/settings/settingsNotifications.tsx
new file mode 100644
index 000000000..983261ea5
--- /dev/null
+++ b/components/settings/settingsNotifications.tsx
@@ -0,0 +1,247 @@
+import { EmailDigestSettingTypes } from '@root/constants/emailDigest';
+import NotificationType from '@root/constants/notificationType';
+import { AppContext } from '@root/contexts/appContext';
+import React, { useContext, useEffect, useMemo, useState } from 'react';
+import toast from 'react-hot-toast';
+import Select from 'react-select';
+
+export default function SettingsNotifications() {
+  const [emailDigest, setEmailDigest] = useState(EmailDigestSettingTypes.DAILY);
+  const [isUserConfigLoading, setIsUserConfigLoading] = useState(false);
+  const { mutateUser, userConfig } = useContext(AppContext);
+
+  const emailDigestLabels = useMemo(() => {
+    return {
+      [EmailDigestSettingTypes.DAILY]: 'Daily',
+      [EmailDigestSettingTypes.NONE]: 'None',
+    };
+  }, []);
+
+  useEffect(() => {
+    if (userConfig?.emailDigest) {
+      setEmailDigest(userConfig.emailDigest);
+    }
+  }, [userConfig]);
+
+  function updateUserConfig(
+    body: string,
+    property: string,
+  ) {
+    toast.dismiss();
+    toast.loading(`Updating ${property}...`);
+    setIsUserConfigLoading(true);
+
+    fetch('/api/user-config', {
+      method: 'PUT',
+      body: body,
+      credentials: 'include',
+      headers: {
+        'Content-Type': 'application/json'
+      },
+    }).then(async res => {
+      const { updated } = await res.json();
+
+      if (!updated) {
+        toast.dismiss();
+        toast.error(`Error updating ${property}`);
+      } else {
+        toast.dismiss();
+        toast.success(`Updated ${property}`);
+      }
+    }).catch(err => {
+      console.error(err);
+      toast.dismiss();
+      toast.error(`Error updating ${property}`);
+    }).finally(() => {
+      mutateUser();
+      setIsUserConfigLoading(false);
+    });
+  }
+
+  const allNotifs = Object.values(NotificationType);
+
+  const notifLabels = {
+    [NotificationType.NEW_ACHIEVEMENT]: 'New achievement',
+    [NotificationType.NEW_FOLLOWER]: 'New follower',
+    [NotificationType.NEW_LEVEL]: 'New level from someone you follow',
+    [NotificationType.NEW_LEVEL_ADDED_TO_COLLECTION]: 'Someone adds your level to a collection',
+    [NotificationType.NEW_RECORD_ON_A_LEVEL_YOU_BEAT]: 'New record on a level you previously beat',
+    [NotificationType.NEW_REVIEW_ON_YOUR_LEVEL]: 'New review on one of your levels',
+    [NotificationType.NEW_WALL_POST]: 'New profile comment',
+    [NotificationType.NEW_WALL_REPLY]: 'New reply to profile comment',
+  };
+
+  const emailNotifs = userConfig?.emailNotificationsList || [];
+  const pushNotifs = userConfig?.pushNotificationsList || [];
+  // Create a formatted list of all notification types with two checkboxes... one for email and one for mobile push notifications.
+
+  const updateNotifs = (notif: NotificationType, type: 'email' | 'push') => {
+    const notifList = type === 'email' ? emailNotifs : pushNotifs;
+    const notifIndex = notifList.indexOf(notif);
+
+    if (notifIndex === -1) {
+      notifList.push(notif);
+    } else {
+      notifList.splice(notifIndex, 1);
+    }
+
+    updateUserConfig(
+      JSON.stringify({
+        emailNotificationsList: emailNotifs,
+        pushNotificationsList: pushNotifs,
+      }),
+      'notification settings',
+    );
+  };
+
+  const notifList = (
+    <div>
+      <table className='table-fixed'>
+        <thead>
+          <tr className='border-b'>
+            <th className='w-1/2 px-4 py-2 text-left'>Notification</th>
+            <th className='px-4 py-2'>
+              <div id='toggleAllEmailNotifs' className='flex justify-center gap-2'>
+                <label className='text-sm' htmlFor='toggleAllEmailNotifs'>
+                  Email
+                </label>
+                <input
+                  checked={emailNotifs.length === allNotifs.length}
+                  id='toggleAllEmailNotifs'
+                  name='toggleAllEmailNotifs'
+
+                  onChange={() => {
+                    if (emailNotifs.length === allNotifs.length) {
+                      updateUserConfig(
+                        JSON.stringify({
+                          emailNotificationsList: [],
+                        }),
+                        'notification settings',
+                      );
+                    } else {
+                      updateUserConfig(
+                        JSON.stringify({
+                          emailNotificationsList: allNotifs,
+                        }),
+                        'notification settings',
+                      );
+                    }
+                  }}
+                  type='checkbox'
+                />
+              </div>
+            </th>
+            <th className='px-4 py-2'>
+              <div id='toggleAllPushNotifs' className='flex justify-center gap-2'>
+                <label className='text-sm' htmlFor='toggleAllPushNotifs'>
+                  Push
+                </label>
+                <input
+                  checked={pushNotifs.length === allNotifs.length}
+                  id='toggleAllPushNotifs'
+                  name='toggleAllPushNotifs'
+                  onChange={() => {
+                    if (pushNotifs.length === allNotifs.length) {
+                      updateUserConfig(
+                        JSON.stringify({
+                          pushNotificationsList: [],
+                        }),
+                        'notification settings',
+                      );
+                    } else {
+                      updateUserConfig(
+                        JSON.stringify({
+                          pushNotificationsList: allNotifs,
+                        }),
+                        'notification settings',
+                      );
+                    }
+                  }}
+                  type='checkbox'
+                />
+              </div>
+            </th>
+          </tr>
+        </thead>
+        <tbody>
+          {allNotifs.map((notif) => {
+            const label = notifLabels[notif];
+
+            return (
+              <tr key={notif} className='border-b'>
+                <td className='px-4 py-2'>
+                  <label className='text-sm' htmlFor={notif}>
+                    {label}
+                  </label>
+                </td>
+                <td className='px-4 py-2 text-center'>
+                  <input
+                    checked={emailNotifs.includes(notif)}
+                    id={notif + '-email'}
+                    name={notif}
+                    onChange={() => updateNotifs(notif, 'email')}
+                    type='checkbox'
+                  />
+                </td>
+                <td className='px-4 py-2 text-center'>
+                  <input
+                    checked={pushNotifs.includes(notif)}
+                    id={notif + '-push'}
+                    name={notif}
+                    onChange={() => updateNotifs(notif, 'push')}
+                    type='checkbox'
+                  />
+                </td>
+              </tr>
+            );
+          })}
+        </tbody>
+      </table>
+    </div>
+  );
+
+  return (
+    <div className='flex flex-col items-center gap-8 mb-4'>
+      <div>
+        <div className='block font-bold mb-2'>
+          Level of the day
+        </div>
+        <div>
+          <Select
+            className='text-black w-52 max-w-full text-sm'
+            components={{
+              IndicatorSeparator: null,
+            }}
+            isDisabled={isUserConfigLoading}
+            isLoading={isUserConfigLoading}
+            loadingMessage={() => 'Loading...'}
+            onChange={option => {
+              if (!option) {
+                return;
+              }
+
+              updateUserConfig(
+                JSON.stringify({
+                  emailDigest: option.value,
+                }), 'email notifications',
+              );
+
+              setEmailDigest(option.value);
+            }}
+            options={Object.keys(EmailDigestSettingTypes).map(emailDigestKey => {
+              return {
+                label: emailDigestLabels[emailDigestKey as EmailDigestSettingTypes],
+                value: emailDigestKey as EmailDigestSettingTypes,
+              };
+            })}
+            value={{
+              label: emailDigestLabels[emailDigest],
+              value: emailDigest,
+            }}
+          />
+        </div>
+      </div>
+      {notifList}
+    </div>
+  );
+}
diff --git a/constants/emailDigest.ts b/constants/emailDigest.ts
index 75157d363..3f9b53d7c 100644
--- a/constants/emailDigest.ts
+++ b/constants/emailDigest.ts
@@ -5,10 +5,11 @@ export enum EmailType {
   EMAIL_7D_REACTIVATE = 'EMAIL_7D_REACTIVATE',
   EMAIL_10D_AUTO_UNSUBSCRIBE = 'EMAIL_10D_AUTO_UNSUBSCRIBE',
   EMAIL_PASSWORD_RESET = 'EMAIL_PASSWORD_RESET',
+  EMAIL_WALL_POST = 'EMAIL_WALL_POST',
+  EMAIL_WALL_REPLY = 'EMAIL_WALL_REPLY',
 }
 
 export enum EmailDigestSettingTypes {
   DAILY = 'DAILY',
-  ONLY_NOTIFICATIONS = 'ONLY_NOTIFICATIONS',
   NONE = 'NONE',
 }
diff --git a/constants/testId.ts b/constants/testId.ts
index 93601b326..449ec3600 100644
--- a/constants/testId.ts
+++ b/constants/testId.ts
@@ -15,6 +15,7 @@ enum TestId {
   USER_B = '600000000000000000000006',
   USER_C = 'cccccccccccccccccccccccc',
   USER_D = 'dddddddddddddddddddddddd',
+  USER_GUEST = 'eeeeeeeeeeeeeeeeeeeeeeee',
 }
 
 export default TestId;
diff --git a/helpers/emails/getEmailBody.tsx b/helpers/emails/getEmailBody.tsx
index 3f0b5ae93..46d3aa164 100644
--- a/helpers/emails/getEmailBody.tsx
+++ b/helpers/emails/getEmailBody.tsx
@@ -13,6 +13,8 @@ export default function getEmailBody(
   title: string,
   user: User,
   message?: string,
+  linkHref?: string,
+  linkText?: string,
 ) {
   return renderToStaticMarkup(
     <html>
@@ -31,7 +33,8 @@ export default function getEmailBody(
             }}>
               <table role='presentation' cellPadding='0' cellSpacing='0' style={{
                 color: '#000',
-                maxWidth: 580,
+                maxWidth: '75%',
+                width: '100%'
               }}>
                 <tr>
                   <td>
@@ -41,6 +44,7 @@ export default function getEmailBody(
                       borderStyle: 'solid',
                       borderWidth: 1,
                       padding: 20,
+                      textAlign: 'center',
                     }}>
                       <a href='https://pathology.gg'>
                         {/* eslint-disable-next-line @next/next/no-img-element */}
@@ -57,48 +61,61 @@ export default function getEmailBody(
                       {message && (
                         <p>{message}</p>
                       )}
-                      {levelOfDay &&
-                      <div>
-                        <h2>Check out the level of the day:</h2>
-                        <div style={{
-                          textAlign: 'center',
-                        }}>
-                          <a href={`https://pathology.gg/level/${levelOfDay.slug}`} style={{
-                            color: '#4890ce',
-                            textDecoration: 'none',
-                          }}>
-                            {levelOfDay.name}
-                          </a>
-                          {' by '}
-                          <a href={`https://pathology.gg/profile/${encodeURI(levelOfDay.userId.name)}`} style={{
-                            color: '#4890ce',
+                      {linkHref && linkText &&
+                        <a
+                          href={linkHref}
+                          style={{
+                            margin: '0 auto',
+                            backgroundColor: 'rgb(96 165 250)',
+                            borderRadius: 4,
+                            color: '#FFF',
+                            display: 'inline-block',
+                            padding: '10px 20px',
                             textDecoration: 'none',
-                          }}>
-                            {levelOfDay.userId.name}
-                          </a>
+                          }}
+                        >
+                          {linkText}
+                        </a>
+                      }
+                      {levelOfDay &&
+                        <div>
+                          <h2>Check out the level of the day:</h2>
                           <div style={{
-                            padding: 20,
+                            textAlign: 'center',
                           }}>
                             <a href={`https://pathology.gg/level/${levelOfDay.slug}`} style={{
                               color: '#4890ce',
                               textDecoration: 'none',
                             }}>
-                              {/* eslint-disable-next-line @next/next/no-img-element */}
-                              <img src={`https://pathology.gg/api/level/image/${levelOfDay._id}.png`} width='100%' alt={levelOfDay.name} />
+                              {levelOfDay.name}
                             </a>
+                            {' by '}
+                            <a href={`https://pathology.gg/profile/${encodeURI(levelOfDay.userId.name)}`} style={{
+                              color: '#4890ce',
+                              textDecoration: 'none',
+                            }}>
+                              {levelOfDay.userId.name}
+                            </a>
+                            <div style={{
+                              padding: 20,
+                            }}>
+                              <a href={`https://pathology.gg/level/${levelOfDay.slug}`} style={{
+                                color: '#4890ce',
+                                textDecoration: 'none',
+                              }}>
+                                {/* eslint-disable-next-line @next/next/no-img-element */}
+                                <img src={`https://pathology.gg/api/level/image/${levelOfDay._id}.png`} width='100%' alt={levelOfDay.name} />
+                              </a>
+                            </div>
                           </div>
                         </div>
-                      </div>
                       }
-                      <div style={{
-                        padding: 10,
-                        textAlign: 'center',
-                      }}>
-                      Thanks for playing <a href='https://pathology.gg' style={{
+                      <p>
+                        Thanks for playing <a href='https://pathology.gg' style={{
                           color: '#4890ce',
                           textDecoration: 'none',
                         }}>Pathology</a>!
-                      </div>
+                      </p>
                       <div id='footer' style={{
                         fontSize: '10px',
                         color: '#999',
@@ -108,7 +125,7 @@ export default function getEmailBody(
                           color: '#4890ce',
                           textDecoration: 'none',
                         }}>Pathology Discord</a> to chat with other players and the developers!</p>
-                        <p><a href='https://pathology.gg/settings' style={{
+                        <p><a href='https://pathology.gg/settings/notifications' style={{
                           color: '#4890ce',
                           textDecoration: 'none',
                         }}>Manage your email notification settings</a></p>
diff --git a/lib/initializeLocalDb.ts b/lib/initializeLocalDb.ts
index 8de3783e9..959cbc925 100644
--- a/lib/initializeLocalDb.ts
+++ b/lib/initializeLocalDb.ts
@@ -74,6 +74,23 @@ export default async function initializeLocalDb() {
     // no ts
   }));
 
+  // user guest
+  promises.push(UserModel.create({
+    _id: new Types.ObjectId(TestId.USER_GUEST),
+    calc_records: 0,
+    email: 'guest@guest.com',
+    name: 'BBB',
+    password: 'BBB12345',
+    score: 0,
+    roles: [Role.GUEST],
+    ts: ts,
+  }));
+  promises.push(UserConfigModel.create({
+    _id: new Types.ObjectId(),
+    theme: Theme.Modern,
+    userId: new Types.ObjectId(TestId.USER_GUEST),
+    emailConfirmed: false,
+  }));
   // LEVEL
   promises.push(LevelModel.create({
     _id: new Types.ObjectId(TestId.LEVEL),
diff --git a/models/db/emailLog.d.ts b/models/db/emailLog.d.ts
index b0d2fe0a6..85f0854b9 100644
--- a/models/db/emailLog.d.ts
+++ b/models/db/emailLog.d.ts
@@ -1,3 +1,4 @@
+import NotificationType from '@root/constants/notificationType';
 import { Types } from 'mongoose';
 import { EmailType } from '../../constants/emailDigest';
 import { EmailState } from '../schemas/emailLogSchema';
@@ -9,7 +10,7 @@ interface EmailLog {
   error: string,
   state: EmailState;
   subject: string;
-  type: EmailType;
+  type: EmailType | NotificationType;
   updatedAt: Date;
   userId: Types.ObjectId & User;
 }
diff --git a/models/db/userConfig.d.ts b/models/db/userConfig.d.ts
index 606dcaf79..304f36c93 100644
--- a/models/db/userConfig.d.ts
+++ b/models/db/userConfig.d.ts
@@ -1,3 +1,4 @@
+import NotificationType from '@root/constants/notificationType';
 import { TourType } from '@root/hooks/useTour';
 import { Types } from 'mongoose';
 import EmailDigestSettingTypes from '../../constants/emailDigest';
@@ -8,7 +9,9 @@ interface UserConfig {
   emailConfirmationToken: string;
   emailConfirmed: boolean;
   emailDigest: EmailDigestSettingTypes;
+  emailNotificationsList: NotificationType[];
   mobileDeviceTokens: string[];
+  pushNotificationsList: NotificationType[];
   showPlayStats: boolean;
   stripeCustomerId: string;
   theme: string;
diff --git a/models/schemas/emailLogSchema.ts b/models/schemas/emailLogSchema.ts
index 91107d412..5ab0f83eb 100644
--- a/models/schemas/emailLogSchema.ts
+++ b/models/schemas/emailLogSchema.ts
@@ -1,3 +1,4 @@
+import NotificationType from '@root/constants/notificationType';
 import mongoose from 'mongoose';
 import { EmailType } from '../../constants/emailDigest';
 import EmailLog from '../db/emailLog';
@@ -37,7 +38,7 @@ const EmailLogSchema = new mongoose.Schema<EmailLog>(
     type: {
       type: String,
       required: true,
-      enum: EmailType,
+      enum: Object.values({ ...EmailType, ...NotificationType }),
     },
   },
   {
diff --git a/models/schemas/queueMessageSchema.ts b/models/schemas/queueMessageSchema.ts
index f8c8a9345..12ddff849 100644
--- a/models/schemas/queueMessageSchema.ts
+++ b/models/schemas/queueMessageSchema.ts
@@ -10,9 +10,10 @@ export enum QueueMessageState {
 export enum QueueMessageType {
   CALC_CREATOR_COUNTS = 'CALC_CREATOR_COUNTS',
   CALC_PLAY_ATTEMPTS = 'CALC_PLAY_ATTEMPTS',
+  EMAIL_NOTIFICATION = 'EMAIL_NOTIFICAITON',
   FETCH = 'FETCH',
-  REFRESH_INDEX_CALCULATIONS = 'REFRESH_INDEX_CALCULATIONS',
   PUSH_NOTIFICATION = 'PUSH_NOTIFICATION',
+  REFRESH_INDEX_CALCULATIONS = 'REFRESH_INDEX_CALCULATIONS',
 }
 
 const QueueMessageSchema = new mongoose.Schema<QueueMessage>({
diff --git a/models/schemas/userConfigSchema.ts b/models/schemas/userConfigSchema.ts
index 4935952f9..7ae2473b8 100644
--- a/models/schemas/userConfigSchema.ts
+++ b/models/schemas/userConfigSchema.ts
@@ -1,3 +1,4 @@
+import NotificationType from '@root/constants/notificationType';
 import { TourType } from '@root/hooks/useTour';
 import mongoose from 'mongoose';
 import { EmailDigestSettingTypes } from '../../constants/emailDigest';
@@ -23,6 +24,11 @@ const UserConfigSchema = new mongoose.Schema<UserConfig>(
       enum: EmailDigestSettingTypes,
       default: EmailDigestSettingTypes.DAILY,
     },
+    emailNotificationsList: {
+      type: [{ type: String, enum: NotificationType }],
+      required: false,
+      default: [],
+    },
     mobileDeviceTokens: {
       type: [String],
       required: false,
@@ -30,6 +36,11 @@ const UserConfigSchema = new mongoose.Schema<UserConfig>(
       default: [],
       maxlength: 100, // max 100 devices @TODO: should probably 'rotate' this list and remove oldest device tokens on push of new one
     },
+    pushNotificationsList: {
+      type: [{ type: String, enum: NotificationType }],
+      required: false,
+      default: [],
+    },
     showPlayStats: {
       type: Boolean,
       default: false,
diff --git a/pages/api/follow/index.ts b/pages/api/follow/index.ts
index 92894015f..6552d439a 100644
--- a/pages/api/follow/index.ts
+++ b/pages/api/follow/index.ts
@@ -14,14 +14,14 @@ export default withAuth({
     }
   },
   PUT: {
-    body: {
+    query: {
       action: ValidEnum(Object.values(GraphType)),
       id: ValidObjectId(),
       targetModel: ValidEnum(['User', 'Collection']),
     }
   },
   DELETE: {
-    body: {
+    query: {
       action: ValidEnum(Object.values(GraphType)),
       id: ValidObjectId(),
       targetModel: ValidEnum(['User', 'Collection']),
@@ -35,7 +35,7 @@ export default withAuth({
     return res.json(followData);
   }
 
-  const { action, id, targetModel } = req.body;
+  const { action, id, targetModel } = req.query;
 
   // @TODO: Check if user has blocked (future feature) to disallow following
   const query = {
@@ -59,7 +59,7 @@ export default withAuth({
     });
 
     if (updateResult.upsertedCount === 1) {
-      await createNewFollowerNotification(req.userId, id);
+      await createNewFollowerNotification(req.userId, id as string);
     }
   } else if (req.method === 'DELETE') {
     const deleteResult = await GraphModel.deleteOne(query);
@@ -69,11 +69,11 @@ export default withAuth({
         error: 'Not following',
       });
     } else {
-      await clearNotifications(undefined, req.user._id, id, NotificationType.NEW_FOLLOWER);
+      await clearNotifications(undefined, req.user._id, id as string, NotificationType.NEW_FOLLOWER);
     }
   }
 
-  const followData = await getFollowData(id, req.user);
+  const followData = await getFollowData(id as string, req.user);
 
   return res.status(200).json(followData);
 });
diff --git a/pages/api/internal-jobs/email-digest/index.ts b/pages/api/internal-jobs/email-digest/index.ts
index 0fa541f67..f3f9c7a0c 100644
--- a/pages/api/internal-jobs/email-digest/index.ts
+++ b/pages/api/internal-jobs/email-digest/index.ts
@@ -1,6 +1,7 @@
 import * as aws from '@aws-sdk/client-ses';
 import { defaultProvider } from '@aws-sdk/credential-provider-node';
 import Discord from '@root/constants/discord';
+import NotificationType from '@root/constants/notificationType';
 import Role from '@root/constants/role';
 import queueDiscordWebhook from '@root/helpers/discordWebhook';
 import { convert } from 'html-to-text';
@@ -43,7 +44,7 @@ const transporter = isLocal() ? nodemailer.createTransport({
   sendingRate: 10 // max 10 messages/second
 });
 
-export async function sendMail(batchId: Types.ObjectId, type: EmailType, user: User, subject: string, body: string) {
+export async function sendMail(batchId: Types.ObjectId, type: EmailType | NotificationType, user: User, subject: string, body: string) {
   /* istanbul ignore next */
   const textVersion = convert(body, {
     wordwrap: 130,
@@ -87,7 +88,7 @@ export async function sendEmailDigests(batchId: Types.ObjectId, totalEmailedSoFa
   const userConfigsAggQ = UserConfigModel.aggregate([{
     $match: {
       emailDigest: {
-        $in: [EmailDigestSettingTypes.DAILY, EmailDigestSettingTypes.ONLY_NOTIFICATIONS],
+        $in: [EmailDigestSettingTypes.DAILY],
       }
     },
   }, {
@@ -102,6 +103,7 @@ export async function sendEmailDigests(batchId: Types.ObjectId, totalEmailedSoFa
             email: 1,
             name: 1,
             _id: 1,
+            roles: 1,
           }
         }
       ]
@@ -114,10 +116,18 @@ export async function sendEmailDigests(batchId: Types.ObjectId, totalEmailedSoFa
         _id: 1,
         email: 1,
         name: 1,
+        roles: 1,
       },
       emailDigest: 1,
     },
   },
+  {
+    $match: {
+      'userId.roles': {
+        $ne: Role.GUEST,
+      },
+    },
+  },
   // join notifications and count how many are unread, createdAt { $gte: new Date(Date.now() - 24 * 60 * 60 * 1000) }, and userId is the same as the user
   {
     $lookup: {
@@ -202,12 +212,6 @@ export async function sendEmailDigests(batchId: Types.ObjectId, totalEmailedSoFa
             { 'emailDigest': EmailDigestSettingTypes.DAILY },
           ],
         },
-        {
-          $and: [
-            { 'emailDigest': EmailDigestSettingTypes.ONLY_NOTIFICATIONS },
-            { 'notificationsCount': { $gt: 0 } },
-          ],
-        },
       ],
     },
   },
@@ -228,13 +232,8 @@ export async function sendEmailDigests(batchId: Types.ObjectId, totalEmailedSoFa
     }
 
     const user = userConfig.userId as User;
-    const [notificationsCount, lastSentEmailLog] = [userConfig.notificationsCount, userConfig.lastSentEmailLog];
 
-    if (userConfig.emailDigest === EmailDigestSettingTypes.ONLY_NOTIFICATIONS && notificationsCount === 0) {
-      // TODO: Should never get called
-      logger.error('should never get called. remove this after inspecting enough logs to confirm');
-      continue;
-    }
+    const [notificationsCount, lastSentEmailLog] = [userConfig.notificationsCount, userConfig.lastSentEmailLog];
 
     const lastSentTs = lastSentEmailLog ? new Date(lastSentEmailLog.createdAt) as unknown as Date : null;
 
diff --git a/pages/api/internal-jobs/worker/index.ts b/pages/api/internal-jobs/worker/index.ts
index 670cea6e1..383ac3cef 100644
--- a/pages/api/internal-jobs/worker/index.ts
+++ b/pages/api/internal-jobs/worker/index.ts
@@ -1,18 +1,18 @@
-import admin from 'firebase-admin';
+import UserConfig from '@root/models/db/userConfig';
 import mongoose, { QueryOptions, Types } from 'mongoose';
 import { NextApiRequest, NextApiResponse } from 'next';
 import apiWrapper, { ValidType } from '../../../../helpers/apiWrapper';
 import { getEnrichNotificationPipelineStages } from '../../../../helpers/enrich';
-import getMobileNotification from '../../../../helpers/getMobileNotification';
 import { logger } from '../../../../helpers/logger';
 import dbConnect from '../../../../lib/dbConnect';
-import Device from '../../../../models/db/device';
 import Notification from '../../../../models/db/notification';
 import QueueMessage from '../../../../models/db/queueMessage';
-import { DeviceModel, NotificationModel, QueueMessageModel } from '../../../../models/mongoose';
+import { NotificationModel, QueueMessageModel, UserConfigModel } from '../../../../models/mongoose';
 import { calcPlayAttempts, refreshIndexCalcs } from '../../../../models/schemas/levelSchema';
 import { QueueMessageState, QueueMessageType } from '../../../../models/schemas/queueMessageSchema';
-import { calcCreatorCounts } from '../../../../models/schemas/userSchema';
+import { calcCreatorCounts, USER_DEFAULT_PROJECTION } from '../../../../models/schemas/userSchema';
+import { sendEmailNotification } from './sendEmailNotification';
+import { sendPushNotification } from './sendPushNotification';
 
 const MAX_PROCESSING_ATTEMPTS = 3;
 
@@ -33,13 +33,30 @@ export async function queue(dedupeKey: string, type: QueueMessageType, message:
   });
 }
 
+export interface EmailQueueMessage {
+  toUser: Types.ObjectId | string;
+  fromUser: Types.ObjectId | string;
+  subject: string;
+  text: string;
+}
+
 export async function queuePushNotification(notificationId: Types.ObjectId, options?: QueryOptions) {
-  await queue(
-    notificationId.toString(),
-    QueueMessageType.PUSH_NOTIFICATION,
-    JSON.stringify({ notificationId: notificationId.toString() }),
-    options,
-  );
+  const message = JSON.stringify({ notificationId: notificationId.toString() });
+
+  await Promise.all([
+    queue(
+      `push-${notificationId.toString()}`,
+      QueueMessageType.PUSH_NOTIFICATION,
+      message,
+      options,
+    ),
+    queue(
+      `email-${notificationId.toString()}`,
+      QueueMessageType.EMAIL_NOTIFICATION,
+      message,
+      options,
+    )
+  ]);
 }
 
 export async function queueFetch(url: string, options: RequestInit, dedupeKey?: string, queryOptions?: QueryOptions) {
@@ -100,7 +117,7 @@ async function processQueueMessage(queueMessage: QueueMessage) {
       log = `${url}: ${e.message}`;
       error = true;
     }
-  } else if (queueMessage.type === QueueMessageType.PUSH_NOTIFICATION) {
+  } else if (queueMessage.type === QueueMessageType.PUSH_NOTIFICATION || queueMessage.type === QueueMessageType.EMAIL_NOTIFICATION) {
     try {
       const { notificationId } = JSON.parse(queueMessage.message) as { notificationId: string };
 
@@ -113,6 +130,14 @@ async function processQueueMessage(queueMessage: QueueMessage) {
             localField: 'userId',
             foreignField: '_id',
             as: 'userId',
+            pipeline: [
+              {
+                $project: {
+                  ...USER_DEFAULT_PROJECTION,
+                  email: 1,
+                }
+              }
+            ]
           },
         },
         {
@@ -127,59 +152,19 @@ async function processQueueMessage(queueMessage: QueueMessage) {
         log = `Notification ${notificationId} not sent: not found`;
       } else {
         const notification = notificationAgg[0];
-        const devices = await DeviceModel.find({ userId: notification.userId._id });
 
-        if (devices.length === 0) {
-          log = `Notification ${notificationId} not sent: no devices found`;
+        const whereSend = queueMessage.type === QueueMessageType.PUSH_NOTIFICATION ? sendPushNotification : sendEmailNotification;
+        const userConfig = await UserConfigModel.findOne({ userId: notification.userId._id }) as UserConfig;
+
+        const allowedEmail = userConfig.emailNotificationsList.includes(notification.type);
+        const allowedPush = userConfig.pushNotificationsList.includes(notification.type);
+
+        if (whereSend === sendEmailNotification && !allowedEmail) {
+          log = `Notification ${notificationId} not sent: ` + notification.type + ' not allowed by user (email)';
+        } else if (whereSend === sendPushNotification && !allowedPush) {
+          log = `Notification ${notificationId} not sent: ` + notification.type + ' not allowed by user (push)';
         } else {
-          const mobileNotification = getMobileNotification(notification);
-          const tokens = devices.map((token: Device) => token.deviceToken);
-
-          if (!global.firebaseApp) {
-            global.firebaseApp = admin.initializeApp({
-              credential: admin.credential.cert({
-                'client_email': process.env.FIREBASE_CLIENT_EMAIL,
-                'private_key': process.env.FIREBASE_PRIVATE_KEY?.replace(/\\n/g, '\n'),
-                'project_id': process.env.FIREBASE_PROJECT_ID,
-              } as admin.ServiceAccount),
-            });
-          }
-
-          const res = await global.firebaseApp.messaging().sendMulticast({
-            tokens: tokens,
-            data: {
-              notificationId: notification._id.toString(),
-              url: mobileNotification.url,
-            },
-            notification: {
-              title: mobileNotification.title,
-              body: mobileNotification.body,
-              imageUrl: mobileNotification.imageUrl,
-            },
-            apns: {
-              payload: {
-                aps: {
-                  'mutable-content': 1,
-                  'content-available': 1,
-                },
-                notifee_options: {
-                  data: {
-                    notificationId: notification._id.toString(),
-                    url: mobileNotification.url,
-                  },
-                  image: mobileNotification.imageUrl,
-                },
-              },
-            },
-            android: {
-              notification: {
-                imageUrl: mobileNotification.imageUrl,
-              },
-            },
-          });
-          const responseJSON = JSON.stringify(res);
-
-          log = `${responseJSON}`;
+          log = await whereSend(notification);
         }
       }
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
diff --git a/pages/api/internal-jobs/worker/sendEmailNotification.ts b/pages/api/internal-jobs/worker/sendEmailNotification.ts
new file mode 100644
index 000000000..8dce48fed
--- /dev/null
+++ b/pages/api/internal-jobs/worker/sendEmailNotification.ts
@@ -0,0 +1,39 @@
+import getEmailBody from '@root/helpers/emails/getEmailBody';
+import getMobileNotification from '@root/helpers/getMobileNotification';
+import Notification from '@root/models/db/notification';
+import { EmailLogModel, UserConfigModel, UserModel } from '@root/models/mongoose';
+import { Types } from 'mongoose';
+import { sendMail } from '../email-digest';
+
+export async function sendEmailNotification(notification: Notification) {
+  const userConfig = await UserConfigModel.findOne({ userId: notification.userId }, { emailNotificationsList: 1 }, { lean: true });
+  const validTypes = userConfig?.emailNotificationsList || [];
+
+  if (validTypes.includes(notification.type)) {
+    const lastSent = await EmailLogModel.findOne({
+      userId: notification.userId,
+      type: notification.type,
+    }).sort({ createdAt: -1 });
+
+    const lastSentTime = lastSent ? new Date(lastSent.createdAt).getTime() : 0;
+    const lastLoggedInTimeQuery = await UserModel.findOne({ _id: notification.userId }, { last_visited_at: 1 }, { lean: true });
+    const lastLoggedInTime = lastLoggedInTimeQuery?.last_visited_at ? new Date(1000 * lastLoggedInTimeQuery.last_visited_at).getTime() : 0;
+
+    // check if it has been less than 24 hours since last email
+    if (Date.now() - lastSentTime < 1000 * 60 * 60 * 24) {
+    // query last time we sent an email to this user. if they have not logged in since, do not send another email
+      if (lastLoggedInTime < lastSentTime) {
+        return 'email not sent [lastLoggedInTime < lastSentTime]';
+      }
+    }
+
+    const mobileNotification = getMobileNotification(notification);
+    const emailBody = getEmailBody(null, 0, mobileNotification.title, notification.userId, mobileNotification.body, mobileNotification.url, 'View');
+
+    await sendMail(new Types.ObjectId(), notification.type, notification.userId, mobileNotification.title, emailBody);
+
+    return 'email sent';
+  }
+
+  return 'email not sent (not enabled from user config)';
+}
diff --git a/pages/api/internal-jobs/worker/sendPushNotification.ts b/pages/api/internal-jobs/worker/sendPushNotification.ts
new file mode 100644
index 000000000..d417c7181
--- /dev/null
+++ b/pages/api/internal-jobs/worker/sendPushNotification.ts
@@ -0,0 +1,70 @@
+import getMobileNotification from '@root/helpers/getMobileNotification';
+import Device from '@root/models/db/device';
+import Notification from '@root/models/db/notification';
+import { DeviceModel } from '@root/models/mongoose';
+import admin from 'firebase-admin';
+
+export async function sendPushNotification(notification: Notification) {
+  if (!process.env.FIREBASE_CLIENT_EMAIL || !process.env.FIREBASE_PRIVATE_KEY || !process.env.FIREBASE_PROJECT_ID) {
+    return 'push not sent. Firebase environment variables not set';
+  }
+
+  const notificationId = notification._id.toString();
+  const devices = await DeviceModel.find({ userId: notification.userId._id });
+  let log = '';
+
+  if (devices.length === 0) {
+    log = `Notification ${notificationId} not sent: no devices found`;
+  } else {
+    const mobileNotification = getMobileNotification(notification);
+    const tokens = devices.map((token: Device) => token.deviceToken);
+
+    if (!global.firebaseApp) {
+      global.firebaseApp = admin.initializeApp({
+        credential: admin.credential.cert({
+          'client_email': process.env.FIREBASE_CLIENT_EMAIL,
+          'private_key': process.env.FIREBASE_PRIVATE_KEY?.replace(/\\n/g, '\n'),
+          'project_id': process.env.FIREBASE_PROJECT_ID,
+        } as admin.ServiceAccount),
+      });
+    }
+
+    const res = await global.firebaseApp.messaging().sendMulticast({
+      tokens: tokens,
+      data: {
+        notificationId: notification._id.toString(),
+        url: mobileNotification.url,
+      },
+      notification: {
+        title: mobileNotification.title,
+        body: mobileNotification.body,
+        imageUrl: mobileNotification.imageUrl,
+      },
+      apns: {
+        payload: {
+          aps: {
+            'mutable-content': 1,
+            'content-available': 1,
+          },
+          notifee_options: {
+            data: {
+              notificationId: notification._id.toString(),
+              url: mobileNotification.url,
+            },
+            image: mobileNotification.imageUrl,
+          },
+        },
+      },
+      android: {
+        notification: {
+          imageUrl: mobileNotification.imageUrl,
+        },
+      },
+    });
+    const responseJSON = JSON.stringify(res);
+
+    log = `${responseJSON}`;
+  }
+
+  return log;
+}
diff --git a/pages/api/signup/index.ts b/pages/api/signup/index.ts
index 218854c52..201f5f810 100644
--- a/pages/api/signup/index.ts
+++ b/pages/api/signup/index.ts
@@ -1,4 +1,5 @@
 import { EmailDigestSettingTypes } from '@root/constants/emailDigest';
+import NotificationType from '@root/constants/notificationType';
 import Role from '@root/constants/role';
 import { generatePassword } from '@root/helpers/generatePassword';
 import getEmailConfirmationToken from '@root/helpers/getEmailConfirmationToken';
@@ -28,6 +29,7 @@ async function createUser({ email, name, password, tutorialCompletedAt, roles }:
   }
 
   const emailConfirmationToken = getEmailConfirmationToken();
+
   const [userCreated, configCreated] = await Promise.all([
     UserModel.create([{
       _id: id,
@@ -46,6 +48,8 @@ async function createUser({ email, name, password, tutorialCompletedAt, roles }:
       emailConfirmed: false,
       emailConfirmationToken: emailConfirmationToken,
       emailDigest: emailDigest,
+      emailNotificationsList: [NotificationType.NEW_WALL_POST, NotificationType.NEW_WALL_REPLY],
+      pushNotificationsList: Object.values(NotificationType),
     }], queryOptions),
   ]);
 
@@ -80,6 +84,7 @@ export default apiWrapper({ POST: {
       headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
       body: `secret=${RECAPTCHA_SECRET}&response=${recaptchaToken}`,
     });
+
     const recaptchaData = await recaptchaResponse.json();
 
     if (!recaptchaResponse.ok || !recaptchaData?.success) {
diff --git a/pages/api/user-config/index.ts b/pages/api/user-config/index.ts
index 508490431..8bc046252 100644
--- a/pages/api/user-config/index.ts
+++ b/pages/api/user-config/index.ts
@@ -1,10 +1,10 @@
 import isGuest from '@root/helpers/isGuest';
+import { logger } from '@root/helpers/logger';
 import UserConfig from '@root/models/db/userConfig';
 import { Types } from 'mongoose';
 import type { NextApiResponse } from 'next';
 import Theme from '../../../constants/theme';
 import { ValidArray, ValidNumber, ValidType } from '../../../helpers/apiWrapper';
-import { logger } from '../../../helpers/logger';
 import dbConnect from '../../../lib/dbConnect';
 import withAuth, { NextApiRequestWithAuth } from '../../../lib/withAuth';
 import { UserConfigModel } from '../../../models/mongoose';
@@ -30,6 +30,9 @@ export default withAuth({
     body: {
       deviceToken: ValidType('string', false),
       emailDigest: ValidType('string', false),
+      emailNotificationsList: ValidArray(false),
+      pushNotificationsList: ValidArray(false),
+      showPlayStats: ValidType('boolean', false),
       theme: ValidType('string', false),
       tutorialCompletedAt: ValidNumber(false),
       toursCompleted: ValidArray(false),
@@ -46,6 +49,8 @@ export default withAuth({
     const {
       deviceToken,
       emailDigest,
+      emailNotificationsList,
+      pushNotificationsList,
       showPlayStats,
       theme,
       toursCompleted,
@@ -80,13 +85,19 @@ export default withAuth({
       setObj['toursCompleted'] = toursCompleted;
     }
 
+    if (emailNotificationsList) {
+      setObj['emailNotificationsList'] = emailNotificationsList;
+    }
+
+    if (pushNotificationsList) {
+      setObj['pushNotificationsList'] = pushNotificationsList;
+    }
+
     // check if setObj is blank
     if (!deviceToken && Object.keys(setObj).length === 0) {
       return res.status(400).json({ error: 'Missing required parameters' });
     }
 
-    await dbConnect();
-
     try {
       const updateResult = await UserConfigModel.updateOne({ userId: req.userId }, { $set: setObj, $addToSet: { mobileDeviceTokens: deviceToken } });
 
diff --git a/pages/settings/[[...tab]].tsx b/pages/settings/[[...tab]].tsx
index b18408289..c332e0a60 100644
--- a/pages/settings/[[...tab]].tsx
+++ b/pages/settings/[[...tab]].tsx
@@ -1,4 +1,5 @@
 import SettingsAccountGuest from '@root/components/settings/settingsAccountGuest';
+import SettingsNotifications from '@root/components/settings/settingsNotifications';
 import isGuest from '@root/helpers/isGuest';
 import User from '@root/models/db/user';
 import UserConfig from '@root/models/db/userConfig';
@@ -20,6 +21,7 @@ enum SettingsTab {
   Danger = 'danger',
   General = 'general',
   Pro = 'proaccount',
+  Notifications = 'notifications',
 }
 
 interface TabProps {
@@ -82,7 +84,7 @@ export async function getServerSideProps(context: GetServerSidePropsContext) {
 
   let userConfig: UserConfig | null = null;
 
-  if (tab === SettingsTab.Account) {
+  if (tab === SettingsTab.Account || tab === SettingsTab.Notifications) {
     userConfig = await getUserConfig(reqUser._id);
   }
 
@@ -136,6 +138,8 @@ export default function Settings({
       return <SettingsPro stripeCustomerPortalLink={stripeCustomerPortalLink} stripePaymentLink={stripePaymentLink} stripePaymentYearlyLink={stripePaymentYearlyLink} />;
     case SettingsTab.Danger:
       return <SettingsDanger />;
+    case SettingsTab.Notifications:
+      return <SettingsNotifications />;
     default:
       return <SettingsGeneral user={user} />;
     }
@@ -155,6 +159,11 @@ export default function Settings({
             label='Account'
             value={SettingsTab.Account}
           />
+          <Tab
+            activeTab={tab}
+            label='Notifications'
+            value={SettingsTab.Notifications}
+          />
           <Tab
             activeTab={tab}
             label={
diff --git a/tests/pages/api/follow/follow.test.ts b/tests/pages/api/follow/follow.test.ts
index fd8365c37..5d498825d 100644
--- a/tests/pages/api/follow/follow.test.ts
+++ b/tests/pages/api/follow/follow.test.ts
@@ -40,7 +40,7 @@ describe('api/follow', () => {
       handler: async (_, res) => {
         const req: NextApiRequestWithAuth = {
           ...defaultObj,
-          body: {
+          query: {
             action: GraphType.FOLLOW,
             id: TestId.USER,
             targetModel: 'User',
@@ -63,7 +63,7 @@ describe('api/follow', () => {
       handler: async (_, res) => {
         const req: NextApiRequestWithAuth = {
           ...defaultObj,
-          body: {
+          query: {
             action: GraphType.FOLLOW,
             id: TestId.USER_B,
             targetModel: 'User',
@@ -93,7 +93,7 @@ describe('api/follow', () => {
       handler: async (_, res) => {
         const req: NextApiRequestWithAuth = {
           ...defaultObj,
-          body: {
+          query: {
             action: GraphType.FOLLOW,
             id: TestId.USER_B,
             targetModel: 'User',
@@ -124,7 +124,7 @@ describe('api/follow', () => {
       handler: async (_, res) => {
         const req: NextApiRequestWithAuth = {
           ...defaultObj,
-          body: {
+          query: {
             action: GraphType.FOLLOW,
             id: TestId.USER_C,
             targetModel: 'User',
@@ -181,7 +181,7 @@ describe('api/follow', () => {
         const req: NextApiRequestWithAuth = {
           ...defaultObj,
           method: 'DELETE',
-          body: {
+          query: {
             action: GraphType.FOLLOW,
             id: TestId.USER_B,
             targetModel: 'User',
@@ -213,7 +213,7 @@ describe('api/follow', () => {
         const req: NextApiRequestWithAuth = {
           ...defaultObj,
           method: 'DELETE',
-          body: {
+          query: {
             action: GraphType.FOLLOW,
             id: TestId.USER_B,
             targetModel: 'User',
@@ -292,7 +292,7 @@ describe('api/follow', () => {
       handler: async (_, res) => {
         const req: NextApiRequestWithAuth = {
           ...defaultObj,
-          body: {
+          query: {
             action: GraphType.FOLLOW,
             id: TestId.USER_B,
             targetModel: 'User',
@@ -320,7 +320,7 @@ describe('api/follow', () => {
       handler: async (_, res) => {
         const req: NextApiRequestWithAuth = {
           ...defaultObj,
-          body: {
+          query: {
             action: GraphType.FOLLOW,
             id: TestId.USER_B,
             targetModel: 'User',
@@ -351,7 +351,7 @@ describe('api/follow', () => {
           cookies: {
             token: getTokenCookieValue(TestId.USER_C),
           },
-          body: {
+          query: {
             action: GraphType.FOLLOW,
             id: TestId.USER_B,
             targetModel: 'User',
diff --git a/tests/pages/api/internal-jobs/email-single-email-a-day.test.ts b/tests/pages/api/internal-jobs/email-single-email-a-day.test.ts
index f84eeb8c6..62ba901ac 100644
--- a/tests/pages/api/internal-jobs/email-single-email-a-day.test.ts
+++ b/tests/pages/api/internal-jobs/email-single-email-a-day.test.ts
@@ -56,7 +56,7 @@ describe('Email per day', () => {
     jest.spyOn(logger, 'error').mockImplementation(() => ({} as Logger));
     jest.spyOn(logger, 'info').mockImplementation(() => ({} as Logger));
     jest.spyOn(logger, 'warn').mockImplementation(() => ({} as Logger));
-    await UserConfigModel.findOneAndUpdate({ userId: TestId.USER }, { emailDigest: EmailDigestSettingTypes.ONLY_NOTIFICATIONS, emailConfirmed: false }, {});
+    await UserConfigModel.findOneAndUpdate({ userId: TestId.USER }, { emailDigest: EmailDigestSettingTypes.DAILY, emailConfirmed: false }, {});
 
     for (let day = 0; day < 21; day++) {
       await testApiHandler({
@@ -72,14 +72,16 @@ describe('Email per day', () => {
           const totalEmailsSent = await EmailLogModel.find({ userId: TestId.USER, state: EmailState.SENT });
 
           if (day <= 6) {
-            expect(totalEmailsSent.length).toBe(0); // No notifications
+            expect(totalEmailsSent.length).toBe(day + 1); // No notifications
             expect(response.emailUnsubscribeSent).toHaveLength(0);
-            expect(response.emailDigestSent).toHaveLength(1);
+            expect(response.emailDigestSent).toHaveLength(2);
             expect(response.emailReactivationSent).toHaveLength(0);
           } else if (day === 7) {
-            expect(totalEmailsSent.length).toBe(1); // +1 the reactivation?
-            expect(response.emailUnsubscribeSent).toHaveLength(0);
+            expect(totalEmailsSent.length).toBe(8); // +1 the reactivation?
+            expect(response.emailDigestSent).toHaveLength(1);
             expect(response.emailReactivationSent).toHaveLength(1);
+            expect(response.emailUnsubscribeSent).toHaveLength(0);
+
             expect(response.emailReactivationSent[0]).toBe('test@gmail.com');
 
             if (day === 7) {
@@ -87,24 +89,24 @@ describe('Email per day', () => {
               await createNewRecordOnALevelYouBeatNotifications([TestId.USER], TestId.USER_B, TestId.LEVEL, TestId.LEVEL);
             }
           } else if (day === 8) {
-            expect(totalEmailsSent.length).toBe(2); // +1 the notification daily digest?
+            expect(totalEmailsSent.length).toBe(9); // +1 the notification daily digest?
             expect(response.emailUnsubscribeSent).toHaveLength(0);
             expect(response.emailDigestSent).toHaveLength(2);
             expect(response.emailReactivationSent).toHaveLength(0);
             // Now let's make the user come back to the site!
             await UserModel.findByIdAndUpdate(TestId.USER, { last_visited_at: TimerUtil.getTs() });
           } else if (day > 8 && day < 18) {
-            expect(totalEmailsSent.length).toBe(2);
+            expect(totalEmailsSent.length).toBe(day + 1);
             expect(response.emailUnsubscribeSent).toHaveLength(0);
-            expect(response.emailDigestSent).toHaveLength(1);
+            expect(response.emailDigestSent).toHaveLength(2);
             expect(response.emailReactivationSent).toHaveLength(0);
           } else if (day === 18) {
-            expect(totalEmailsSent.length).toBe(3); // +1 the goodbye email too
+            expect(totalEmailsSent.length).toBe(day + 1); // +1 the goodbye email too
             expect(response.emailUnsubscribeSent).toHaveLength(1);
             expect(response.emailDigestSent).toHaveLength(1);
             expect(response.emailReactivationSent).toHaveLength(0);
           } else if (day > 19) {
-            expect(totalEmailsSent.length).toBe(3);
+            expect(totalEmailsSent.length).toBe(day - 1);
             expect(response.emailUnsubscribeSent).toHaveLength(0);
             expect(response.emailDigestSent).toHaveLength(1);
             expect(response.emailReactivationSent).toHaveLength(0);
diff --git a/tests/pages/api/reset-password/reset-password.test.ts b/tests/pages/api/reset-password/reset-password.test.ts
index bbe5610c0..259555c8c 100644
--- a/tests/pages/api/reset-password/reset-password.test.ts
+++ b/tests/pages/api/reset-password/reset-password.test.ts
@@ -11,13 +11,11 @@ import { NextApiRequestWithAuth } from '../../../../lib/withAuth';
 import { UserModel } from '../../../../models/mongoose';
 import resetPasswordHandler from '../../../../pages/api/reset-password/index';
 
-const sendMailMock: jest.Mock = jest.fn((obj: SentMessageInfo) => {
-  throw new Error('Email was not expected to be sent, but received' + obj);
-});
-
 jest.mock('nodemailer', () => ({
   createTransport: jest.fn().mockImplementation(() => ({
-    sendMail: sendMailMock,
+    sendMail: jest.fn((obj: SentMessageInfo) => {
+      throw new Error('Email was not expected to be sent, but received' + obj);
+    }),
   })),
 }));
 afterEach(() => {
diff --git a/tests/pages/api/review/review.test.ts b/tests/pages/api/review/review.test.ts
index ac9778b1b..e432d403c 100644
--- a/tests/pages/api/review/review.test.ts
+++ b/tests/pages/api/review/review.test.ts
@@ -462,7 +462,7 @@ describe('Reviewing levels should work correctly', () => {
         expect(review.score).toBe(3.5);
         expect(review.levelId._id.toString()).toBe(TestId.LEVEL_2);
 
-        expect(processQueueRes).toBe('Processed 2 messages with no errors');
+        expect(processQueueRes).toBe('Processed 3 messages with no errors');
 
         lvl = await LevelModel.findById(TestId.LEVEL_2);
         expect(lvl.calc_reviews_score_laplace.toFixed(2)).toBe('0.66');
@@ -586,7 +586,7 @@ describe('Reviewing levels should work correctly', () => {
         const response = await res.json();
         const processQueueRes = await processQueueMessages();
 
-        expect(processQueueRes).toBe('Processed 2 messages with no errors');
+        expect(processQueueRes).toBe('Processed 3 messages with no errors');
         expect(response.error).toBeUndefined();
         expect(response.levelId.toString()).toBe(TestId.LEVEL_2);
         expect(res.status).toBe(200);
@@ -664,7 +664,7 @@ describe('Reviewing levels should work correctly', () => {
         const response = await res.json();
         const processQueueRes = await processQueueMessages();
 
-        expect(processQueueRes).toBe('Processed 2 messages with no errors');
+        expect(processQueueRes).toBe('Processed 3 messages with no errors');
 
         expect(response.error).toBeUndefined();
         expect(response.levelId.toString()).toBe(TestId.LEVEL_2);
diff --git a/tests/pages/api/signup/signup.test.ts b/tests/pages/api/signup/signup.test.ts
index 177afa72b..37ac91735 100644
--- a/tests/pages/api/signup/signup.test.ts
+++ b/tests/pages/api/signup/signup.test.ts
@@ -1,3 +1,5 @@
+import NotificationType from '@root/constants/notificationType';
+import UserConfig from '@root/models/db/userConfig';
 import { enableFetchMocks } from 'jest-fetch-mock';
 import { testApiHandler } from 'next-test-api-route-handler';
 import { Logger } from 'winston';
@@ -6,7 +8,7 @@ import { logger } from '../../../../helpers/logger';
 import dbConnect, { dbDisconnect } from '../../../../lib/dbConnect';
 import { getTokenCookieValue } from '../../../../lib/getTokenCookie';
 import { NextApiRequestWithAuth } from '../../../../lib/withAuth';
-import { UserModel } from '../../../../models/mongoose';
+import { UserConfigModel, UserModel } from '../../../../models/mongoose';
 import loginUserHandler from '../../../../pages/api/login/index';
 import signupUserHandler from '../../../../pages/api/signup/index';
 
@@ -19,6 +21,9 @@ beforeEach(async () => {
 afterAll(async() => {
   await dbDisconnect();
 });
+afterEach(() => {
+  //jest.restoreAllMocks();
+});
 enableFetchMocks();
 
 jest.mock('nodemailer', () => ({
@@ -29,7 +34,7 @@ jest.mock('nodemailer', () => ({
   })),
 }));
 
-describe('pages/api/collection/index.ts', () => {
+describe('pages/api/signup', () => {
   const cookie = getTokenCookieValue(TestId.USER);
 
   test('Creating a user but not passing recaptcha should fail with 400', async () => {
@@ -64,12 +69,14 @@ describe('pages/api/collection/index.ts', () => {
     });
   });
   test('Creating a user, pass recaptcha where fetch fails', async () => {
+    jest.spyOn(logger, 'error').mockImplementation(() => ({} as Logger));
+
     process.env.RECAPTCHA_SECRET = 'defined';
 
     // mock fetch failing with 400
-    fetchMock.mockResponseOnce(JSON.stringify({}), { status: 408 });
+    fetchMock.mockResponseOnce(JSON.stringify({ 'mock': true }), { status: 408 });
 
-    jest.spyOn(logger, 'error').mockImplementation(() => ({} as Logger));
+    //    jest.spyOn(logger, 'error').mockImplementation(() => ({} as Logger));
     await testApiHandler({
       handler: async (_, res) => {
         const req: NextApiRequestWithAuth = {
@@ -298,6 +305,11 @@ describe('pages/api/collection/index.ts', () => {
         expect(db).toBeDefined();
         expect(db.name).toBe('Test2');
         expect(db.password).not.toBe('password2'); // should be salted
+        const config = await UserConfigModel.findOne({ userId: db._id }) as UserConfig;
+
+        expect(config).toBeDefined();
+        expect(config.emailNotificationsList.sort()).toStrictEqual([NotificationType.NEW_WALL_POST, NotificationType.NEW_WALL_REPLY]);
+        expect(config.pushNotificationsList.sort()).toStrictEqual(Object.values(NotificationType).sort());
       },
     });
   });
diff --git a/tests/pages/api/user-config/notification-preferences.test.ts b/tests/pages/api/user-config/notification-preferences.test.ts
new file mode 100644
index 000000000..88e08d2dd
--- /dev/null
+++ b/tests/pages/api/user-config/notification-preferences.test.ts
@@ -0,0 +1,151 @@
+import AchievementType from '@root/constants/achievementType';
+import NotificationType from '@root/constants/notificationType';
+import { createNewAchievement, createNewFollowerNotification, createNewReviewOnYourLevelNotification } from '@root/helpers/notificationHelper';
+import { processQueueMessages } from '@root/pages/api/internal-jobs/worker';
+import { enableFetchMocks } from 'jest-fetch-mock';
+import { Types } from 'mongoose';
+import { testApiHandler } from 'next-test-api-route-handler';
+import { EmailDigestSettingTypes } from '../../../../constants/emailDigest';
+import TestId from '../../../../constants/testId';
+import dbConnect, { dbDisconnect } from '../../../../lib/dbConnect';
+import { getTokenCookieValue } from '../../../../lib/getTokenCookie';
+import { NextApiRequestWithAuth } from '../../../../lib/withAuth';
+import UserConfig from '../../../../models/db/userConfig';
+import { UserConfigModel } from '../../../../models/mongoose';
+import handler from '../../../../pages/api/user-config/index';
+
+beforeAll(async () => {
+  await dbConnect();
+});
+afterAll(async() => {
+  await dbDisconnect();
+});
+afterEach(() => {
+  jest.restoreAllMocks();
+});
+enableFetchMocks();
+const defaultObj = {
+  method: 'PUT',
+  headers: {
+    'content-type': 'application/json',
+  },
+  cookies: {
+    token: getTokenCookieValue(TestId.USER)
+  }
+};
+
+const acceptMock = () => {
+  return { rejected: [] };
+};
+
+const sendMailRefMock = { ref: acceptMock };
+
+jest.mock('nodemailer', () => ({
+  createTransport: jest.fn().mockImplementation(() => ({
+    sendMail: jest.fn().mockImplementation(() => {
+      return sendMailRefMock.ref();
+    }),
+  })),
+}));
+
+describe('account settings notification preferences', () => {
+  const emailNotificationList = Object.values(NotificationType);
+  const pushNotificationList = Object.values(NotificationType);
+
+  // remove new follower notification from only emails
+  emailNotificationList.splice(emailNotificationList.indexOf(NotificationType.NEW_FOLLOWER), 1);
+
+  // enable all notifications
+  test('enable all notifications except for new follower', async () => {
+    await testApiHandler({
+      handler: async (_, res) => {
+        const req: NextApiRequestWithAuth = {
+          ...defaultObj,
+          body: {
+            emailNotificationsList: emailNotificationList,
+            pushNotificationsList: pushNotificationList,
+            emailDigestSetting: EmailDigestSettingTypes.DAILY,
+          }
+        } as unknown as NextApiRequestWithAuth;
+
+        await handler(req, res);
+      },
+      test: async ({ fetch }) => {
+        const res = await fetch();
+        const response = await res.json();
+
+        expect(res.status).toBe(200);
+        expect(response.updated).toBe(true);
+
+        // check the db
+        const config = await UserConfigModel.findOne<UserConfig>({ userId: TestId.USER }, {}, { lean: true }) as UserConfig;
+
+        expect(config.pushNotificationsList).toEqual(pushNotificationList);
+        expect(config.emailNotificationsList).toEqual(emailNotificationList);
+        // make sure it does not have new follower
+        expect(config.emailNotificationsList).not.toContain(NotificationType.NEW_FOLLOWER);
+        expect(config.pushNotificationsList).toContain(NotificationType.NEW_FOLLOWER);
+      },
+    });
+  });
+  test('create a new review on your level notification', async () => {
+    // spy on sendMailRefMock.ref
+
+    const originalSendEmail = jest.requireActual('@root/pages/api/internal-jobs/worker/sendEmailNotification');
+    const originalSendPush = jest.requireActual('@root/pages/api/internal-jobs/worker/sendPushNotification');
+
+    originalSendEmail.sendEmailNotification = jest.fn().mockImplementation(() => {
+      // do nothing
+    });
+    originalSendPush.sendPushNotification = jest.fn().mockImplementation(() => {
+      // do nothing
+    });
+    await createNewReviewOnYourLevelNotification(TestId.USER, TestId.USER_B, TestId.LEVEL, 'Sample review');
+
+    const queueProcessed = await processQueueMessages();
+
+    expect(queueProcessed).toBe('Processed 2 messages with no errors');
+    expect(originalSendEmail.sendEmailNotification).toHaveBeenCalledTimes(1);
+    expect(originalSendPush.sendPushNotification).toHaveBeenCalledTimes(1);
+  });
+  test('create a new follower notification', async () => {
+    // spy on sendMailRefMock.ref
+
+    const originalSendEmail = jest.requireActual('@root/pages/api/internal-jobs/worker/sendEmailNotification');
+    const originalSendPush = jest.requireActual('@root/pages/api/internal-jobs/worker/sendPushNotification');
+
+    originalSendEmail.sendEmailNotification = jest.fn().mockImplementation(() => {
+      // do nothing
+    });
+    originalSendPush.sendPushNotification = jest.fn().mockImplementation(() => {
+      // do nothing
+    });
+    await createNewFollowerNotification(TestId.USER_B, TestId.USER);
+
+    const queueProcessed = await processQueueMessages();
+
+    expect(queueProcessed).toBe('Processed 2 messages with no errors');
+    expect(originalSendEmail.sendEmailNotification).toHaveBeenCalledTimes(0); // important
+    expect(originalSendPush.sendPushNotification).toHaveBeenCalledTimes(1); // important!
+  });
+  test('create a new achievement notification', async () => {
+    // spy on sendMailRefMock.ref
+
+    const originalSendEmail = jest.requireActual('@root/pages/api/internal-jobs/worker/sendEmailNotification');
+    const originalSendPush = jest.requireActual('@root/pages/api/internal-jobs/worker/sendPushNotification');
+
+    originalSendEmail.sendEmailNotification = jest.fn().mockImplementation(() => {
+      // do nothing
+    });
+    originalSendPush.sendPushNotification = jest.fn().mockImplementation(() => {
+      // do nothing
+    });
+    await createNewAchievement(AchievementType.COMPLETED_LEVELS_100, new Types.ObjectId(TestId.USER_GUEST) );
+
+    const queueProcessed = await processQueueMessages();
+
+    expect(queueProcessed).toBe('Processed 2 messages with no errors');
+    expect(originalSendEmail.sendEmailNotification).toHaveBeenCalledTimes(0); // important
+    expect(originalSendPush.sendPushNotification).toHaveBeenCalledTimes(0); // important!
+  });
+});
diff --git a/tests/pages/users/users.page.test.ts b/tests/pages/users/users.page.test.ts
index 52492becc..52cd44d53 100644
--- a/tests/pages/users/users.page.test.ts
+++ b/tests/pages/users/users.page.test.ts
@@ -21,7 +21,7 @@ describe('pages/users page', () => {
     expect(ret).toBeDefined();
     expect(ret.props).toBeDefined();
     expect(ret.props.searchQuery).toStrictEqual(DEFAULT_QUERY);
-    expect(ret.props.totalRows).toBe(3);
+    expect(ret.props.totalRows).toBe(4);
     expect(ret.props.users[0]._id).toBe(TestId.USER);
     expect(ret.props.users[0].reviewCount).toBe(1);
   }