From b8350423d97cf81708795ec6383803413e7bff98 Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@FreeBSD.org>
Date: Thu, 28 May 2020 10:57:02 -0500
Subject: Updated Notification Settings API use

---
 src/components/user_settings/user_settings.vue | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

(limited to 'src/components')

diff --git a/src/components/user_settings/user_settings.vue b/src/components/user_settings/user_settings.vue
index ad184520..253607f9 100644
--- a/src/components/user_settings/user_settings.vue
+++ b/src/components/user_settings/user_settings.vue
@@ -384,23 +384,18 @@
               <span class="label">{{ $t('settings.notification_setting') }}</span>
               <ul class="option-list">
                 <li>
-                  <Checkbox v-model="notificationSettings.follows">
-                    {{ $t('settings.notification_setting_follows') }}
+                  <Checkbox v-model="notificationSettings.from_following">
+                    {{ $t('settings.notification_setting_from_following') }}
                   </Checkbox>
                 </li>
                 <li>
-                  <Checkbox v-model="notificationSettings.followers">
-                    {{ $t('settings.notification_setting_followers') }}
+                  <Checkbox v-model="notificationSettings.from_followers">
+                    {{ $t('settings.notification_setting_from_followers') }}
                   </Checkbox>
                 </li>
                 <li>
-                  <Checkbox v-model="notificationSettings.non_follows">
-                    {{ $t('settings.notification_setting_non_follows') }}
-                  </Checkbox>
-                </li>
-                <li>
-                  <Checkbox v-model="notificationSettings.non_followers">
-                    {{ $t('settings.notification_setting_non_followers') }}
+                  <Checkbox v-model="notificationSettings.from_strangers">
+                    {{ $t('settings.notification_setting_from_strangers') }}
                   </Checkbox>
                 </li>
               </ul>
-- 
cgit v1.2.3-70-g09d2


From 5321415641d977c40421d11647574fa832e55258 Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@FreeBSD.org>
Date: Fri, 26 Jun 2020 16:56:31 -0500
Subject: Update notification filters to reflect new settings

---
 src/components/settings_modal/tabs/notifications_tab.vue | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

(limited to 'src/components')

diff --git a/src/components/settings_modal/tabs/notifications_tab.vue b/src/components/settings_modal/tabs/notifications_tab.vue
index 19dedf45..d33e2a04 100644
--- a/src/components/settings_modal/tabs/notifications_tab.vue
+++ b/src/components/settings_modal/tabs/notifications_tab.vue
@@ -5,16 +5,6 @@
       <div class="select-multiple">
         <span class="label">{{ $t('settings.notification_setting') }}</span>
         <ul class="option-list">
-          <li>
-            <Checkbox v-model="notificationSettings.from_following">
-              {{ $t('settings.notification_setting_from_following') }}
-            </Checkbox>
-          </li>
-          <li>
-            <Checkbox v-model="notificationSettings.from_followers">
-              {{ $t('settings.notification_setting_from_followers') }}
-            </Checkbox>
-          </li>
           <li>
             <Checkbox v-model="notificationSettings.from_strangers">
               {{ $t('settings.notification_setting_from_strangers') }}
@@ -27,8 +17,8 @@
     <div class="setting-item">
       <h2>{{ $t('settings.notification_setting_privacy') }}</h2>
       <p>
-        <Checkbox v-model="notificationSettings.privacy_option">
-          {{ $t('settings.notification_setting_privacy_option') }}
+        <Checkbox v-model="notificationSettings.hide_notification_contents">
+          {{ $t('settings.notification_setting_hide_notification_contents') }}
         </Checkbox>
       </p>
     </div>
-- 
cgit v1.2.3-70-g09d2


From 2eda3d687e8c986a982057c6f5eb969aa8d403d5 Mon Sep 17 00:00:00 2001
From: Mark Felder <feld@FreeBSD.org>
Date: Fri, 26 Jun 2020 17:02:17 -0500
Subject: Sync up key names properly

---
 src/components/settings_modal/tabs/notifications_tab.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/components')

diff --git a/src/components/settings_modal/tabs/notifications_tab.vue b/src/components/settings_modal/tabs/notifications_tab.vue
index d33e2a04..eb9d5598 100644
--- a/src/components/settings_modal/tabs/notifications_tab.vue
+++ b/src/components/settings_modal/tabs/notifications_tab.vue
@@ -6,8 +6,8 @@
         <span class="label">{{ $t('settings.notification_setting') }}</span>
         <ul class="option-list">
           <li>
-            <Checkbox v-model="notificationSettings.from_strangers">
-              {{ $t('settings.notification_setting_from_strangers') }}
+            <Checkbox v-model="notificationSettings.block_from_strangers">
+              {{ $t('settings.notification_setting_block_from_strangers') }}
             </Checkbox>
           </li>
         </ul>
-- 
cgit v1.2.3-70-g09d2