From a6f526b9c4e7e6600852bcc5c7c10f3b11b12084 Mon Sep 17 00:00:00 2001
From: Karina Kwiatek <kjk@kjk.dog>
Date: Fri, 16 Jun 2023 18:07:53 +0200
Subject: [PATCH] Update inbox/notification counters when paginating

---
 app/views/inbox/show.turbo_stream.haml              | 12 ++++++++++++
 app/views/navigation/_desktop.html.haml             | 10 +++-------
 app/views/navigation/_mobile.html.haml              |  7 ++++---
 app/views/navigation/icons/_notifications.html.haml |  6 ++++++
 app/views/notifications/index.turbo_stream.haml     |  3 +++
 5 files changed, 28 insertions(+), 10 deletions(-)
 create mode 100644 app/views/navigation/icons/_notifications.html.haml

diff --git a/app/views/inbox/show.turbo_stream.haml b/app/views/inbox/show.turbo_stream.haml
index bbd233bd..e88cfc8d 100644
--- a/app/views/inbox/show.turbo_stream.haml
+++ b/app/views/inbox/show.turbo_stream.haml
@@ -1,3 +1,5 @@
+- inbox_count = current_user.unread_inbox_count
+
 = turbo_stream.append "entries" do
   - @inbox.each do |i|
     = render "inbox/entry", i:
@@ -10,3 +12,13 @@
       params: { last_id: @inbox_last_id, author: @author }.compact,
       data: { controller: :hotkey, hotkey: "." },
       form: { data: { turbo_stream: true } }
+
+= turbo_stream.update "nav-inbox-desktop" do
+  = nav_entry t("navigation.inbox"), "/inbox",
+              badge: inbox_count, badge_attr: { data: { controller: "pwa-badge" } },
+              icon: "inbox", hotkey: "g i"
+
+= turbo_stream.update "nav-inbox-mobile" do
+  = nav_entry t("navigation.inbox"), "/inbox",
+              badge: inbox_count, badge_color: "primary", badge_pill: true,
+              icon: "inbox", icon_only: true
diff --git a/app/views/navigation/_desktop.html.haml b/app/views/navigation/_desktop.html.haml
index 05e9a6a3..167ff830 100644
--- a/app/views/navigation/_desktop.html.haml
+++ b/app/views/navigation/_desktop.html.haml
@@ -10,7 +10,8 @@
           DEV
     %ul.nav.navbar-nav.me-auto
       = nav_entry t("navigation.timeline"), root_path, icon: "home", hotkey: "g t"
-      = nav_entry t("navigation.inbox"), "/inbox", icon: "inbox", badge: inbox_count, badge_attr: { data: { controller: "pwa-badge" } }, hotkey: "g i"
+      #nav-inbox-desktop
+        = nav_entry t("navigation.inbox"), "/inbox", icon: "inbox", badge: inbox_count, badge_attr: { data: { controller: "pwa-badge" } }, hotkey: "g i"
       - if APP_CONFIG.dig(:features, :discover, :enabled) || current_user.mod?
         = nav_entry t("navigation.discover"), discover_path, icon: "compass", hotkey: "g d"
     %ul.nav.navbar-nav
@@ -23,12 +24,7 @@
       %li.nav-item.dropdown.d-none.d-sm-block
         %a.nav-link.dropdown-toggle{ href: '#', data: { bs_toggle: :dropdown } }
           %turbo-frame#notification-desktop-icon
-            - if notification_count.nil?
-              %i.fa.fa-bell-o
-            - else
-              %i.fa.fa-bell
-            %span.visually-hidden= t("navigation.notifications")
-            %span.badge= notification_count
+            = render "navigation/icons/notifications", notification_count:
         .dropdown-menu.dropdown-menu-end.notification-dropdown
           %turbo-frame#notifications-dropdown-list
             - cache current_user.notification_dropdown_cache_key do
diff --git a/app/views/navigation/_mobile.html.haml b/app/views/navigation/_mobile.html.haml
index 97e37ccc..9c53586d 100644
--- a/app/views/navigation/_mobile.html.haml
+++ b/app/views/navigation/_mobile.html.haml
@@ -3,9 +3,10 @@
   .container
     %ul.nav.navbar-nav.navbar-icon-row
       = nav_entry t("navigation.timeline"), root_path, icon: 'home', icon_only: true
-      = nav_entry t("navigation.inbox"), '/inbox',
-        badge: inbox_count, badge_color: 'primary', badge_pill: true,
-        icon: 'inbox', icon_only: true
+      #nav-inbox-mobile
+        = nav_entry t("navigation.inbox"), '/inbox',
+          badge: inbox_count, badge_color: 'primary', badge_pill: true,
+          icon: 'inbox', icon_only: true
       - if APP_CONFIG.dig(:features, :discover, :enabled) || current_user.mod?
         = nav_entry t("navigation.discover"), discover_path, icon: 'compass', icon_only: true
       = nav_entry t("navigation.notifications"), notifications_path("all"), icon: notifications_icon,
diff --git a/app/views/navigation/icons/_notifications.html.haml b/app/views/navigation/icons/_notifications.html.haml
new file mode 100644
index 00000000..767ee980
--- /dev/null
+++ b/app/views/navigation/icons/_notifications.html.haml
@@ -0,0 +1,6 @@
+- if notification_count.nil?
+  %i.fa.fa-bell-o
+- else
+  %i.fa.fa-bell
+%span.visually-hidden= t("navigation.notifications")
+%span.badge= notification_count
diff --git a/app/views/notifications/index.turbo_stream.haml b/app/views/notifications/index.turbo_stream.haml
index 4339faae..378a9a44 100644
--- a/app/views/notifications/index.turbo_stream.haml
+++ b/app/views/notifications/index.turbo_stream.haml
@@ -13,3 +13,6 @@
       params: { last_id: @notifications_last_id },
       data: { controller: :hotkey, hotkey: "." },
       form: { data: { turbo_stream: true } }
+
+= turbo_stream.update "notification-desktop-icon" do
+  = render "navigation/icons/notifications", notification_count: current_user.unread_notification_count