Merge pull request #3766 from tloncorp/promote-dev-7-18

ops: promote dev 7-18
tloncorp · Jul 18, 2024 · b419244 · b419244
2 parents aef55b7 + e201410
commit b419244
Show file tree

Hide file tree

Showing 166 changed files with 18,743 additions and 7,101 deletions.
diff --git a/apps/tlon-mobile/android/app/src/main/java/io/tlon/landscape/api/TalkApi.java b/apps/tlon-mobile/android/app/src/main/java/io/tlon/landscape/api/TalkApi.java
@@ -126,7 +126,7 @@ private void poke(String app, String mark, JSONObject json) throws JSONException
     }
 
     public void fetchYarn(String uid, TalkObjectCallback callback) {
-        fetchObject("/~/scry/hark/yarn/" + uid, 8_000, 3, callback);
+        fetchObject("/apps/groups/~/notify/note/" + uid + "/hark-yarn", 8_000, 3, callback);
     }
 
     public void fetchClub(String channelId, TalkObjectCallback callback) {

diff --git a/apps/tlon-mobile/cosmos.imports.ts b/apps/tlon-mobile/cosmos.imports.ts
@@ -3,29 +3,30 @@
 import { RendererConfig, UserModuleWrappers } from 'react-cosmos-core';
 
 import * as fixture0 from './src/App.fixture';
-import * as fixture31 from './src/fixtures/ActionSheet.fixture';
-import * as fixture30 from './src/fixtures/AudioEmbed.fixture';
+import * as fixture32 from './src/fixtures/ActionSheet.fixture';
+import * as fixture31 from './src/fixtures/AudioEmbed.fixture';
+import * as fixture30 from './src/fixtures/Avatar.fixture';
 import * as fixture29 from './src/fixtures/BlockSectionList.fixture';
 import * as fixture28 from './src/fixtures/Button.fixture';
 import * as fixture27 from './src/fixtures/Channel.fixture';
 import * as fixture26 from './src/fixtures/ChannelDivider.fixture';
 import * as fixture25 from './src/fixtures/ChannelHeader.fixture';
 import * as fixture24 from './src/fixtures/ChannelSwitcherSheet.fixture';
 import * as fixture23 from './src/fixtures/ChatMessage.fixture';
-import * as fixture22 from './src/fixtures/ChatReference.fixture';
-import * as fixture21 from './src/fixtures/ContactList.fixture';
-import * as fixture20 from './src/fixtures/DetailView.fixture';
-import * as fixture19 from './src/fixtures/GalleryPost.fixture';
-import * as fixture18 from './src/fixtures/GroupList.fixture';
-import * as fixture17 from './src/fixtures/GroupListItem.fixture';
-import * as fixture16 from './src/fixtures/GroupMetaScreen.fixture';
-import * as fixture15 from './src/fixtures/HeaderButton.fixture';
-import * as fixture14 from './src/fixtures/ImageViewer.fixture';
-import * as fixture13 from './src/fixtures/Input.fixture';
-import * as fixture12 from './src/fixtures/InputToolbar.fixture';
-import * as fixture11 from './src/fixtures/MessageActions.fixture';
-import * as fixture10 from './src/fixtures/MessageInput.fixture';
-import * as fixture9 from './src/fixtures/OutsideEmbed.fixture';
+import * as fixture22 from './src/fixtures/ContactList.fixture';
+import * as fixture21 from './src/fixtures/DetailView.fixture';
+import * as fixture20 from './src/fixtures/GalleryPost.fixture';
+import * as fixture19 from './src/fixtures/GroupList.fixture';
+import * as fixture18 from './src/fixtures/GroupListItem.fixture';
+import * as fixture17 from './src/fixtures/GroupMetaScreen.fixture';
+import * as fixture16 from './src/fixtures/HeaderButton.fixture';
+import * as fixture15 from './src/fixtures/ImageViewer.fixture';
+import * as fixture14 from './src/fixtures/Input.fixture';
+import * as fixture13 from './src/fixtures/InputToolbar.fixture';
+import * as fixture12 from './src/fixtures/MessageActions.fixture';
+import * as fixture11 from './src/fixtures/MessageInput.fixture';
+import * as fixture10 from './src/fixtures/OutsideEmbed.fixture';
+import * as fixture9 from './src/fixtures/PostReference.fixture';
 import * as fixture8 from './src/fixtures/PostScreen.fixture';
 import * as fixture7 from './src/fixtures/ProfileSheet.fixture';
 import * as fixture6 from './src/fixtures/ProfileWidget.fixture';
@@ -37,7 +38,7 @@ import * as fixture1 from './src/fixtures/VideoEmbed.fixture';
 import * as decorator0 from './src/fixtures/cosmos.decorator';
 
 export const rendererConfig: RendererConfig = {
-  playgroundUrl: 'http://localhost:5000',
+  playgroundUrl: 'http://localhost:5001',
   rendererUrl: null,
 };
 
@@ -51,29 +52,30 @@ const fixtures = {
   'src/fixtures/ProfileWidget.fixture.tsx': { module: fixture6 },
   'src/fixtures/ProfileSheet.fixture.tsx': { module: fixture7 },
   'src/fixtures/PostScreen.fixture.tsx': { module: fixture8 },
-  'src/fixtures/OutsideEmbed.fixture.tsx': { module: fixture9 },
-  'src/fixtures/MessageInput.fixture.tsx': { module: fixture10 },
-  'src/fixtures/MessageActions.fixture.tsx': { module: fixture11 },
-  'src/fixtures/InputToolbar.fixture.tsx': { module: fixture12 },
-  'src/fixtures/Input.fixture.tsx': { module: fixture13 },
-  'src/fixtures/ImageViewer.fixture.tsx': { module: fixture14 },
-  'src/fixtures/HeaderButton.fixture.tsx': { module: fixture15 },
-  'src/fixtures/GroupMetaScreen.fixture.tsx': { module: fixture16 },
-  'src/fixtures/GroupListItem.fixture.tsx': { module: fixture17 },
-  'src/fixtures/GroupList.fixture.tsx': { module: fixture18 },
-  'src/fixtures/GalleryPost.fixture.tsx': { module: fixture19 },
-  'src/fixtures/DetailView.fixture.tsx': { module: fixture20 },
-  'src/fixtures/ContactList.fixture.tsx': { module: fixture21 },
-  'src/fixtures/ChatReference.fixture.tsx': { module: fixture22 },
+  'src/fixtures/PostReference.fixture.tsx': { module: fixture9 },
+  'src/fixtures/OutsideEmbed.fixture.tsx': { module: fixture10 },
+  'src/fixtures/MessageInput.fixture.tsx': { module: fixture11 },
+  'src/fixtures/MessageActions.fixture.tsx': { module: fixture12 },
+  'src/fixtures/InputToolbar.fixture.tsx': { module: fixture13 },
+  'src/fixtures/Input.fixture.tsx': { module: fixture14 },
+  'src/fixtures/ImageViewer.fixture.tsx': { module: fixture15 },
+  'src/fixtures/HeaderButton.fixture.tsx': { module: fixture16 },
+  'src/fixtures/GroupMetaScreen.fixture.tsx': { module: fixture17 },
+  'src/fixtures/GroupListItem.fixture.tsx': { module: fixture18 },
+  'src/fixtures/GroupList.fixture.tsx': { module: fixture19 },
+  'src/fixtures/GalleryPost.fixture.tsx': { module: fixture20 },
+  'src/fixtures/DetailView.fixture.tsx': { module: fixture21 },
+  'src/fixtures/ContactList.fixture.tsx': { module: fixture22 },
   'src/fixtures/ChatMessage.fixture.tsx': { module: fixture23 },
   'src/fixtures/ChannelSwitcherSheet.fixture.tsx': { module: fixture24 },
   'src/fixtures/ChannelHeader.fixture.tsx': { module: fixture25 },
   'src/fixtures/ChannelDivider.fixture.tsx': { module: fixture26 },
   'src/fixtures/Channel.fixture.tsx': { module: fixture27 },
   'src/fixtures/Button.fixture.tsx': { module: fixture28 },
   'src/fixtures/BlockSectionList.fixture.tsx': { module: fixture29 },
-  'src/fixtures/AudioEmbed.fixture.tsx': { module: fixture30 },
-  'src/fixtures/ActionSheet.fixture.tsx': { module: fixture31 },
+  'src/fixtures/Avatar.fixture.tsx': { module: fixture30 },
+  'src/fixtures/AudioEmbed.fixture.tsx': { module: fixture31 },
+  'src/fixtures/ActionSheet.fixture.tsx': { module: fixture32 },
 };
 
 const decorators = {

diff --git a/apps/tlon-mobile/eas.json b/apps/tlon-mobile/eas.json
@@ -28,6 +28,10 @@
       "extends": "base",
       "channel": "production",
       "autoIncrement": true,
+      "env": {
+        "NOTIFY_PROVIDER": "rivfur-livmet",
+        "NOTIFY_SERVICE": "groups-native"
+      },
       "android": {
         "gradleCommand": ":app:bundleProductionRelease"
       },

diff --git a/apps/tlon-mobile/ios/Landscape/Networking/PocketNotificationsAPI.swift b/apps/tlon-mobile/ios/Landscape/Networking/PocketNotificationsAPI.swift
@@ -10,7 +10,7 @@ import Foundation
 
 final class PocketNotificationsAPI: PocketAPI {
     static func fetchPushNotificationContents(_ uid: String) async throws -> Yarn {
-        let yarn: Yarn = try await PocketAPI.fetchDecodable("/~/scry/hark/yarn/\(uid)", timeoutInterval: 8)
+        let yarn: Yarn = try await PocketAPI.fetchDecodable("/apps/groups/~/notify/note/\(uid)/hark-yarn", timeoutInterval: 8)
         return yarn
     }
 }
diff --git a/apps/tlon-mobile/src/App.main.tsx b/apps/tlon-mobile/src/App.main.tsx
@@ -12,6 +12,7 @@ import {
 import { createNativeStackNavigator } from '@react-navigation/native-stack';
 import { QueryClientProvider, queryClient } from '@tloncorp/shared/dist/api';
 import { TamaguiProvider } from '@tloncorp/ui';
+import { usePreloadedEmojis } from '@tloncorp/ui';
 import { PostHogProvider } from 'posthog-react-native';
 import type { PropsWithChildren } from 'react';
 import { useEffect, useState } from 'react';
@@ -64,6 +65,7 @@ const App = ({
   const [connected, setConnected] = useState(true);
   const { lure, priorityToken } = useBranch();
   const screenOptions = useScreenOptions();
+  usePreloadedEmojis();
 
   useEffect(() => {
     const unsubscribeFromNetInfo = NetInfo.addEventListener(

diff --git a/apps/tlon-mobile/src/components/AddGroupSheet.tsx b/apps/tlon-mobile/src/components/AddGroupSheet.tsx
@@ -10,9 +10,9 @@ import {
 import { QueryClientProvider, queryClient } from '@tloncorp/shared/dist/api';
 import * as db from '@tloncorp/shared/dist/db';
 import {
+  AppDataContextProvider,
   Button,
   ContactBook,
-  ContactsProvider,
   CreateGroupWidget,
   GroupPreviewPane,
   Icon,
@@ -113,7 +113,7 @@ export default function AddGroupSheet({
       <Sheet.Overlay />
       <Sheet.LazyFrame>
         <QueryClientProvider client={queryClient}>
-          <ContactsProvider contacts={contacts ?? null}>
+          <AppDataContextProvider contacts={contacts ?? null}>
             <Sheet.Handle marginBottom="$l" />
             <KeyboardAvoidingView style={{ flex: 1 }}>
               <NavigationContainer independent={true} ref={navigationRef}>
@@ -150,7 +150,7 @@ export default function AddGroupSheet({
                 </ActionContext.Provider>
               </NavigationContainer>
             </KeyboardAvoidingView>
-          </ContactsProvider>
+          </AppDataContextProvider>
         </QueryClientProvider>
       </Sheet.LazyFrame>
     </Sheet>

diff --git a/apps/tlon-mobile/src/fixtures/Channel.fixture.tsx b/apps/tlon-mobile/src/fixtures/Channel.fixture.tsx
@@ -95,9 +95,9 @@ export const ChannelFixture = (props: {
         goToDm={() => {}}
         goToPost={() => {}}
         goToImageViewer={() => {}}
-        messageSender={() => {}}
+        messageSender={async () => {}}
         markRead={() => {}}
-        editPost={() => {}}
+        editPost={async () => {}}
         uploadInfo={defaultUploadInfo}
         onPressRef={() => {}}
         usePost={usePostWithRelations}
@@ -133,9 +133,9 @@ export const NotebookChannelFixture = (props: { theme?: 'light' | 'dark' }) => {
         goToDm={() => {}}
         goToPost={() => {}}
         goToImageViewer={() => {}}
-        messageSender={() => {}}
+        messageSender={async () => {}}
         markRead={() => {}}
-        editPost={() => {}}
+        editPost={async () => {}}
         getDraft={async () => ({})}
         storeDraft={() => {}}
         clearDraft={() => {}}
@@ -190,9 +190,9 @@ const ChannelFixtureWithImage = () => {
         goToPost={() => {}}
         goToDm={() => {}}
         goToImageViewer={() => {}}
-        messageSender={() => {}}
+        messageSender={async () => {}}
         markRead={() => {}}
-        editPost={() => {}}
+        editPost={async () => {}}
         negotiationMatch={true}
         isLoadingPosts={false}
         uploadInfo={{

diff --git a/apps/tlon-mobile/src/fixtures/ChannelDivider.fixture.tsx b/apps/tlon-mobile/src/fixtures/ChannelDivider.fixture.tsx
@@ -11,12 +11,10 @@ export default (
     <ChatMessage
       showAuthor={true}
       showReplies={true}
-      currentUserId="~solfer-magfed"
       post={posts[0]}
     ></ChatMessage>
     <ChannelDivider index={0} post={posts[1]} unreadCount={3} />
     <ChatMessage
-      currentUserId="~solfer-magfed"
       post={posts[1]}
       showAuthor={true}
       showReplies={true}

diff --git a/apps/tlon-mobile/src/fixtures/ChatMessage.fixture.tsx b/apps/tlon-mobile/src/fixtures/ChatMessage.fixture.tsx
@@ -22,23 +22,19 @@ const fakeBlockQuotePost = createFakePost('chat', fakeBlockQuoteContent);
 
 const ChatMessageFixtureWithMention = () => (
   <FixtureWrapper fillWidth>
-    <ChatMessage post={fakeMentionPost} currentUserId="~zod" />
+    <ChatMessage post={fakeMentionPost} />
   </FixtureWrapper>
 );
 
 const ChatMessageFixtureWithBlockQuote = () => (
   <FixtureWrapper fillWidth>
-    <ChatMessage post={fakeBlockQuotePost} currentUserId="~zod" />
+    <ChatMessage post={fakeBlockQuotePost} />
   </FixtureWrapper>
 );
 
 const ChatMessageFixtureIsNotice = () => (
   <FixtureWrapper fillWidth>
-    <ChatMessage
-      post={fakeNoticePost}
-      showReplies={false}
-      currentUserId="~zod"
-    />
+    <ChatMessage post={fakeNoticePost} showReplies={false} />
   </FixtureWrapper>
 );
 

diff --git a/apps/tlon-mobile/src/fixtures/ChatReference.fixture.tsx b/apps/tlon-mobile/src/fixtures/ChatReference.fixture.tsx
diff --git a/apps/tlon-mobile/src/fixtures/ContactList.fixture.tsx b/apps/tlon-mobile/src/fixtures/ContactList.fixture.tsx
@@ -1,4 +1,8 @@
-import { CalmProvider, ContactList, ContactsProvider } from '@tloncorp/ui';
+import {
+  AppDataContextProvider,
+  CalmProvider,
+  ContactList,
+} from '@tloncorp/ui';
 
 import { FixtureWrapper } from './FixtureWrapper';
 import { initialContacts } from './fakeData';
@@ -14,7 +18,7 @@ const ContactListFixture = ({
 }) => {
   return (
     <FixtureWrapper>
-      <ContactsProvider contacts={initialContacts}>
+      <AppDataContextProvider contacts={initialContacts}>
         <CalmProvider
           calmSettings={{
             disableNicknames: false,
@@ -31,13 +35,13 @@ const ContactListFixture = ({
                 justifyContent="flex-start"
                 padding="$s"
                 key={contact.id}
-                contact={contact}
+                contactId={contact.id}
                 matchText={matchText}
               />
             ))}
           </ContactList>
         </CalmProvider>
-      </ContactsProvider>
+      </AppDataContextProvider>
     </FixtureWrapper>
   );
 };

diff --git a/apps/tlon-mobile/src/fixtures/DetailView.fixture.tsx b/apps/tlon-mobile/src/fixtures/DetailView.fixture.tsx
@@ -26,10 +26,10 @@ const NotebookDetailViewFixture = () => {
         contacts={[]}
         channel={tlonLocalGettingStarted}
         currentUserId={notebookPost.authorId}
-        sendReply={() => {}}
+        sendReply={async () => {}}
         groupMembers={[]}
         negotiationMatch={true}
-        editPost={() => {}}
+        editPost={async () => {}}
         uploadInfo={{
           uploading: false,
           uploadedImage: null,
@@ -57,10 +57,10 @@ const GalleryDetailViewFixture = () => {
         contacts={[]}
         channel={tlonLocalBulletinBoard}
         currentUserId={galleryPost.authorId}
-        sendReply={() => {}}
+        sendReply={async () => {}}
         groupMembers={[]}
         negotiationMatch={true}
-        editPost={() => {}}
+        editPost={async () => {}}
         uploadInfo={{
           uploading: false,
           uploadedImage: null,

diff --git a/apps/tlon-mobile/src/fixtures/GroupList.fixture.tsx b/apps/tlon-mobile/src/fixtures/GroupList.fixture.tsx
@@ -102,6 +102,7 @@ export default {
       <ChatList
         activeTab="all"
         setActiveTab={() => {}}
+        showFilters={false}
         pinned={[groupWithLongTitle, groupWithImage].map((g) =>
           makeChannelSummary({ group: g })
         )}
@@ -120,6 +121,7 @@ export default {
       <ChatList
         activeTab="all"
         setActiveTab={() => {}}
+        showFilters={false}
         pinned={[dmSummary, groupDmSummary]}
         unpinned={[
           groupWithColorAndNoImage,
@@ -136,6 +138,7 @@ export default {
       <ChatList
         activeTab="all"
         setActiveTab={() => {}}
+        showFilters={false}
         pinned={[]}
         unpinned={[]}
         pendingChats={[]}

diff --git a/apps/tlon-mobile/src/fixtures/MessageActions.fixture.tsx b/apps/tlon-mobile/src/fixtures/MessageActions.fixture.tsx
@@ -26,7 +26,6 @@ function MessageActions() {
     return (
       <Modal visible={true} onDismiss={() => null}>
         <ChatMessageActions
-          currentUserId={'~latter-bolden'}
           post={post}
           postRef={refStub}
           onDismiss={() => null}

diff --git a/apps/tlon-mobile/src/fixtures/MessageInput.fixture.tsx b/apps/tlon-mobile/src/fixtures/MessageInput.fixture.tsx
@@ -14,7 +14,7 @@ const ChatMessageInputFixture = () => {
         <MessageInput
           shouldBlur={inputShouldBlur}
           setShouldBlur={setInputShouldBlur}
-          send={() => {}}
+          send={async () => {}}
           channelId="channel-id"
           uploadInfo={{
             imageAttachment: null,
@@ -44,7 +44,7 @@ const NotebookInputFixture = () => {
           channelType="notebook"
           shouldBlur={inputShouldBlur}
           setShouldBlur={setInputShouldBlur}
-          send={() => {}}
+          send={async () => {}}
           channelId="channel-id"
           groupMembers={group.members ?? []}
           getDraft={async () => ({})}