unreads: more polish for desktop

packages/app/navigation/desktop/TopLevelDrawer.tsx

@@ -30,6 +30,7 @@ const Drawer = createDrawerNavigator<RootDrawerParamList>();
 
 const DrawerContent = (props: DrawerContentComponentProps) => {
   const userId = useCurrentUserId();
+  // const { data: baseUnread } = store.useBaseUnread();
   const haveUnreadUnseenActivity = store.useHaveUnreadUnseenActivity();
   const { webAppNeedsUpdate, triggerWebAppUpdate } = useWebAppUpdate();
   const lastHomeStateRef =

packages/app/ui/components/Channel/index.tsx

@@ -180,11 +180,12 @@ export const Channel = forwardRef<ChannelMethods, ChannelProps>(
 
     const inView = useIsFocused();
     const hasLoaded = !!(posts && channel);
+    const hasUnreads = (channel?.unread?.count ?? 0) > 0;
     useEffect(() => {
-      if (hasLoaded && inView) {
+      if (hasUnreads && hasLoaded && inView) {
         markRead();
       }
-    }, [hasLoaded, inView, markRead]);
+    }, [hasUnreads, hasLoaded, inView, markRead]);
 
     const handleRefPress = useCallback(
       (refChannel: db.Channel, post: db.Post) => {

packages/shared/src/api/activityApi.ts

@@ -2,6 +2,7 @@ import { unixToDa } from '@urbit/aura';
 import { backOff } from 'exponential-backoff';
 
 import * as db from '../db';
+import { BASE_UNREADS_SINGLETON_KEY } from '../db/schema';
 import { createDevLogger, runIfDev } from '../debug';
 import { normalizeUrbitColor } from '../logic';
 import * as ub from '../urbit';
@@ -13,7 +14,7 @@ import {
   parseGroupId,
   udToDate,
 } from './apiUtils';
-import { poke, scry, subscribe } from './urbit';
+import { getCurrentUserId, poke, scry, subscribe } from './urbit';
 
 const logger = createDevLogger('activityApi', false);
 
@@ -378,6 +379,7 @@ function getInfoFromMessageKey(
 }
 
 export type ActivityEvent =
+  | { type: 'updateBaseUnread'; unread: db.BaseUnread }
   | {
       type: 'updateChannelUnread';
       activity: db.ChannelUnread;
@@ -414,6 +416,18 @@ export function subscribeToActivity(handler: (event: ActivityEvent) => void) {
           const source = sourceIdToSource(sourceId);
 
           switch (source.type) {
+            // case 'base':
+            //   handler({
+            //     type: 'updateBaseUnread',
+            //     unread: {
+            //       id: BASE_UNREADS_SINGLETON_KEY,
+            //       count: summary.count,
+            //       notify: summary.notify,
+            //       notifyCount: summary['notify-count'],
+            //       updatedAt: summary.recency,
+            //     },
+            //   });
+            //   break;
             case 'group':
               handler({
                 type: 'updateGroupUnread',
@@ -724,6 +738,10 @@ export function getMessageKey(
   Sources can be represented as a string or an object (see urbit/activity.ts for details).
 */
 
+interface ClientBaseSource {
+  type: 'base';
+}
+
 interface ClientGroupSource {
   type: 'group';
   groupId: string;
@@ -751,13 +769,18 @@ interface ClientContactSource {
 }
 
 export type ClientSource =
+  | ClientBaseSource
   | ClientGroupSource
   | ClientChannelSource
   | ClientThreadSource
   | ClientUnknownSource
   | ClientContactSource;
 
 export function sourceIdToSource(sourceId: string): ClientSource {
+  if (sourceId === 'base') {
+    return { type: 'base' };
+  }
+
   const parts = sourceId.split('/');
   const sourceType = parts[0];
 
@@ -934,6 +957,7 @@ export async function getPushNotificationsSetting(): Promise<ub.PushNotification
 }
 
 export type ActivityUpdateQueue = {
+  baseUnread?: db.BaseUnread;
   groupUnreads: db.GroupUnread[];
   channelUnreads: db.ChannelUnread[];
   threadUnreads: db.ThreadUnreadState[];
@@ -942,6 +966,7 @@ export type ActivityUpdateQueue = {
 };
 
 export type ActivityInit = {
+  baseUnread?: db.BaseUnread;
   groupUnreads: db.GroupUnread[];
   channelUnreads: db.ChannelUnread[];
   threadActivity: db.ThreadUnreadState[];
@@ -951,8 +976,18 @@ export const toClientUnreads = (activity: ub.Activity): ActivityInit => {
   const groupUnreads: db.GroupUnread[] = [];
   const channelUnreads: db.ChannelUnread[] = [];
   const threadActivity: db.ThreadUnreadState[] = [];
+  let baseUnread: db.BaseUnread | undefined = undefined;
 
   Object.entries(activity).forEach(([sourceId, summary]) => {
+    if (sourceId === 'base') {
+      baseUnread = {
+        id: BASE_UNREADS_SINGLETON_KEY,
+        count: summary.count,
+        notify: summary.notify,
+        notifyCount: summary['notify-count'],
+        updatedAt: summary.recency,
+      };
+    }
     const [activityId, ...rest] = sourceId.split('/');
     if (activityId === 'ship' || activityId === 'club') {
       const channelId = rest.join('/');
@@ -984,7 +1019,7 @@ export const toClientUnreads = (activity: ub.Activity): ActivityInit => {
     }
   });
 
-  return { channelUnreads, threadActivity, groupUnreads };
+  return { baseUnread, channelUnreads, threadActivity, groupUnreads };
 };
 
 export const toGroupUnread = (

packages/shared/src/db/migrations/0000_sour_wonder_man.sql → packages/shared/src/db/migrations/0000_amused_leopardon.sql

@@ -3,7 +3,7 @@ CREATE TABLE `activity_event_contact_group_pins` (
 	`group_id` text NOT NULL,
 	PRIMARY KEY(`activity_event_id`, `group_id`),
 	FOREIGN KEY (`activity_event_id`) REFERENCES `activity_events`(`id`) ON UPDATE no action ON DELETE cascade,
-	FOREIGN KEY (`group_id`) REFERENCES `groups`(`id`) ON UPDATE no action ON DELETE no action
+	FOREIGN KEY (`group_id`) REFERENCES `groups`(`id`) ON UPDATE no action ON DELETE cascade
 );
 --> statement-breakpoint
 CREATE TABLE `activity_events` (
@@ -28,6 +28,14 @@ CREATE TABLE `activity_events` (
 	PRIMARY KEY(`id`, `bucket_id`)
 );
 --> statement-breakpoint
+CREATE TABLE `base_unreads` (
+	`id` text PRIMARY KEY DEFAULT 'base_unreads' NOT NULL,
+	`notify` integer,
+	`count` integer,
+	`notify_count` integer,
+	`updated_at` integer NOT NULL
+);
+--> statement-breakpoint
 CREATE TABLE `channel_readers` (
 	`channel_id` text NOT NULL,
 	`role_id` text NOT NULL,
@@ -103,7 +111,7 @@ CREATE TABLE `contact_group_pins` (
 	`group_id` text NOT NULL,
 	PRIMARY KEY(`contact_id`, `group_id`),
 	FOREIGN KEY (`contact_id`) REFERENCES `contacts`(`id`) ON UPDATE no action ON DELETE cascade,
-	FOREIGN KEY (`group_id`) REFERENCES `groups`(`id`) ON UPDATE no action ON DELETE no action
+	FOREIGN KEY (`group_id`) REFERENCES `groups`(`id`) ON UPDATE no action ON DELETE cascade
 );
 --> statement-breakpoint
 CREATE TABLE `contacts` (
@@ -165,8 +173,8 @@ CREATE TABLE `group_nav_section_channels` (
 	`channel_id` text,
 	`channel_index` integer,
 	PRIMARY KEY(`group_nav_section_id`, `channel_id`),
-	FOREIGN KEY (`group_nav_section_id`) REFERENCES `group_nav_sections`(`id`) ON UPDATE no action ON DELETE no action,
-	FOREIGN KEY (`channel_id`) REFERENCES `channels`(`id`) ON UPDATE no action ON DELETE no action
+	FOREIGN KEY (`group_nav_section_id`) REFERENCES `group_nav_sections`(`id`) ON UPDATE no action ON DELETE cascade,
+	FOREIGN KEY (`channel_id`) REFERENCES `channels`(`id`) ON UPDATE no action ON DELETE cascade
 );
 --> statement-breakpoint
 CREATE TABLE `group_nav_sections` (
@@ -247,15 +255,15 @@ CREATE TABLE `post_images` (
 	`width` integer,
 	`height` integer,
 	PRIMARY KEY(`post_id`, `src`),
-	FOREIGN KEY (`post_id`) REFERENCES `posts`(`id`) ON UPDATE no action ON DELETE no action
+	FOREIGN KEY (`post_id`) REFERENCES `posts`(`id`) ON UPDATE no action ON DELETE cascade
 );
 --> statement-breakpoint
 CREATE TABLE `post_reactions` (
 	`contact_id` text NOT NULL,
 	`post_id` text NOT NULL,
 	`value` text NOT NULL,
 	PRIMARY KEY(`contact_id`, `post_id`),
-	FOREIGN KEY (`post_id`) REFERENCES `posts`(`id`) ON UPDATE no action ON DELETE no action
+	FOREIGN KEY (`post_id`) REFERENCES `posts`(`id`) ON UPDATE no action ON DELETE cascade
 );
 --> statement-breakpoint
 CREATE TABLE `post_windows` (
@@ -299,15 +307,16 @@ CREATE TABLE `posts` (
 	`last_edit_title` text,
 	`last_edit_image` text,
 	`synced_at` integer,
-	`backend_time` text
+	`backend_time` text,
+	FOREIGN KEY (`channel_id`) REFERENCES `channels`(`id`) ON UPDATE no action ON DELETE cascade
 );
 --> statement-breakpoint
 CREATE UNIQUE INDEX `posts_sent_at_unique` ON `posts` (`sent_at`);--> statement-breakpoint
 CREATE UNIQUE INDEX `cache_id` ON `posts` (`author_id`,`sent_at`);--> statement-breakpoint
 CREATE INDEX `posts_channel_id` ON `posts` (`channel_id`,`id`);--> statement-breakpoint
 CREATE INDEX `posts_group_id` ON `posts` (`group_id`,`id`);--> statement-breakpoint
 CREATE TABLE `settings` (
-	`user_id` text PRIMARY KEY NOT NULL,
+	`id` text PRIMARY KEY DEFAULT 'settings' NOT NULL,
 	`theme` text,
 	`disable_app_tile_unreads` integer,
 	`disable_avatars` integer,

packages/shared/src/db/migrations/meta/0000_snapshot.json

@@ -1,7 +1,7 @@
 {
   "version": "6",
   "dialect": "sqlite",
-  "id": "fa25c16a-e15a-45be-9783-6405cc7a2e14",
+  "id": "05c115b9-7747-4c40-8ebf-c8e7baecb098",
   "prevId": "00000000-0000-0000-0000-000000000000",
   "tables": {
     "activity_event_contact_group_pins": {
@@ -47,7 +47,7 @@
           "columnsTo": [
             "id"
           ],
-          "onDelete": "no action",
+          "onDelete": "cascade",
           "onUpdate": "no action"
         }
       },
@@ -207,6 +207,52 @@
       "uniqueConstraints": {},
       "checkConstraints": {}
     },
+    "base_unreads": {
+      "name": "base_unreads",
+      "columns": {
+        "id": {
+          "name": "id",
+          "type": "text",
+          "primaryKey": true,
+          "notNull": true,
+          "autoincrement": false,
+          "default": "'base_unreads'"
+        },
+        "notify": {
+          "name": "notify",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "count": {
+          "name": "count",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "notify_count": {
+          "name": "notify_count",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": false,
+          "autoincrement": false
+        },
+        "updated_at": {
+          "name": "updated_at",
+          "type": "integer",
+          "primaryKey": false,
+          "notNull": true,
+          "autoincrement": false
+        }
+      },
+      "indexes": {},
+      "foreignKeys": {},
+      "compositePrimaryKeys": {},
+      "uniqueConstraints": {},
+      "checkConstraints": {}
+    },
     "channel_readers": {
       "name": "channel_readers",
       "columns": {
@@ -639,21 +685,7 @@
         }
       },
       "indexes": {},
-      "foreignKeys": {
-        "group_members_chat_id_channels_id_fk": {
-          "name": "group_members_chat_id_channels_id_fk",
-          "tableFrom": "group_members",
-          "tableTo": "channels",
-          "columnsFrom": [
-            "chat_id"
-          ],
-          "columnsTo": [
-            "id"
-          ],
-          "onDelete": "cascade",
-          "onUpdate": "no action"
-        }
-      },
+      "foreignKeys": {},
       "compositePrimaryKeys": {
         "group_members_chat_id_contact_id_pk": {
           "columns": [
@@ -709,7 +741,7 @@
           "columnsTo": [
             "id"
           ],
-          "onDelete": "no action",
+          "onDelete": "cascade",
           "onUpdate": "no action"
         }
       },
@@ -1125,7 +1157,7 @@
           "columnsTo": [
             "id"
           ],
-          "onDelete": "no action",
+          "onDelete": "cascade",
           "onUpdate": "no action"
         },
         "group_nav_section_channels_channel_id_channels_id_fk": {
@@ -1138,7 +1170,7 @@
           "columnsTo": [
             "id"
           ],
-          "onDelete": "no action",
+          "onDelete": "cascade",
           "onUpdate": "no action"
         }
       },
@@ -1659,7 +1691,7 @@
           "columnsTo": [
             "id"
           ],
-          "onDelete": "no action",
+          "onDelete": "cascade",
           "onUpdate": "no action"
         }
       },
@@ -1712,7 +1744,7 @@
           "columnsTo": [
             "id"
           ],
-          "onDelete": "no action",
+          "onDelete": "cascade",
           "onUpdate": "no action"
         }
       },
@@ -2069,12 +2101,13 @@
     "settings": {
       "name": "settings",
       "columns": {
-        "user_id": {
-          "name": "user_id",
+        "id": {
+          "name": "id",
           "type": "text",
           "primaryKey": true,
           "notNull": true,
-          "autoincrement": false
+          "autoincrement": false,
+          "default": "'settings'"
         },
         "theme": {
           "name": "theme",

packages/shared/src/db/migrations/meta/_journal.json

@@ -5,8 +5,8 @@
     {
       "idx": 0,
       "version": "6",
-      "when": 1742234785697,
-      "tag": "0000_sour_wonder_man",
+      "when": 1742590441336,
+      "tag": "0000_amused_leopardon",
       "breakpoints": true
     }
   ]

packages/shared/src/db/migrations/migrations.js

@@ -1,7 +1,7 @@
 // This file is required for Expo/React Native SQLite migrations - https://orm.drizzle.team/quick-sqlite/expo
 
 import journal from './meta/_journal.json';
-import m0000 from './0000_sour_wonder_man.sql';
+import m0000 from './0000_amused_leopardon.sql';
 
   export default {
     journal,