@planningcenter/chat-react-native 4.4.1-qa-staging.9 → 4.4.1-qa-staging.11

package/src/types/jolt_events/message_events.ts

@@ -1,5 +1,6 @@
 import type { CustomMessage } from '@planningcenter/jolt-client/dist/types/JoltConnection'
 import { DenormalizedAttachmentResource } from '../resources/denormalized_attachment_resource'
+import type { SystemTextFormat } from '../resources/message'
 
 interface BaseMessageEventData extends Record<string, unknown> {
   data: {
@@ -21,6 +22,7 @@ interface BaseMessageEventData extends Record<string, unknown> {
     message_type: string
     system_event_person_ids: number[] | null
     system_text_parts: { names: string[]; overflow_count: number; action: string } | null
+    system_text_format: SystemTextFormat | null
   }
 }
 

package/src/types/resources/conversation.ts

@@ -6,7 +6,7 @@ import { MemberAbilityResource } from './member_ability'
 import { ReactionCountResource } from './reaction'
 
 export interface ConversationPreviewData {
-  kind: 'reaction' | 'message'
+  kind: 'reaction' | 'message' | 'system'
   authorName: string
   value: ReactionCountResource['value'] | null
   text: string

package/src/types/resources/message.ts

@@ -3,6 +3,8 @@ import { DenormalizedAttachmentResourceForCreate } from './denormalized_attachme
 import type { PersonResource } from './person'
 import type { ReactionCountResource } from './reaction'
 
+export type SystemTextFormat = 'people' | 'actor'
+
 export interface MessageResource {
   type: 'Message'
   id: string
@@ -22,6 +24,7 @@ export interface MessageResource {
   messageType: string
   personIdsForSystemEvent?: number[] | null
   systemTextParts?: { names: string[]; overflowCount: number; action: string } | null
+  systemTextFormat?: SystemTextFormat | null
 
   // Custom Local Properties we set for rendering
   renderAuthor?: boolean

package/src/utils/__tests__/date.test.ts

@@ -0,0 +1,19 @@
+import { formatEventDateTime } from '../date'
+
+describe('formatEventDateTime', () => {
+  beforeEach(() => {
+    jest.useFakeTimers({ now: new Date(2026, 5, 15, 12, 0) })
+  })
+
+  afterEach(() => {
+    jest.useRealTimers()
+  })
+
+  it('leaves out the year for dates in the current year', () => {
+    expect(formatEventDateTime(new Date(2026, 1, 3, 14, 18))).toBe('Feb 3 at 2:18pm')
+  })
+
+  it('includes the year for dates in other years', () => {
+    expect(formatEventDateTime(new Date(2025, 1, 3, 14, 18))).toBe('Feb 3, 2025 at 2:18pm')
+  })
+})

package/src/utils/__tests__/group_messages.test.ts

@@ -206,6 +206,7 @@ describe('groupMessages — system messages', () => {
     const messages = [
       message('sys', {
         messageType: 'user_joined',
+        systemTextFormat: 'people',
         systemTextParts: { names: ['A'], overflowCount: 0, action: 'joined' },
         personIdsForSystemEvent: [1],
       }),

package/src/utils/date.ts

@@ -1,4 +1,4 @@
-import { date as formatDate } from '@planningcenter/datetime-fmt'
+import { date as formatDate, time as formatTime } from '@planningcenter/datetime-fmt'
 import dayjs from './dayjs'
 
 export type DateProps = string | number | Date
@@ -61,3 +61,10 @@ export function relativeTime(date: DateProps): string {
     return dayjs(date).format('h:mma')
   }
 }
+
+export function formatEventDateTime(date: DateProps) {
+  const { isThisYear } = getRelativeDateStatus(date)
+  const timeZone = Intl.DateTimeFormat().resolvedOptions().timeZone
+  const day = formatDate(date, { style: 'abbreviated', year: !isThisYear, timeZone })
+  return `${day} at ${formatTime(date, { timeZone })}`
+}

package/src/utils/jolt/__tests__/transform_message_event_data_to_message_resource.test.ts

@@ -0,0 +1,35 @@
+import type { MessageCreatedEvent } from '../../../types/jolt_events/message_events'
+import { isSystemMessage } from '../../system_messages'
+import { transformMessageEventDataToMessageResource } from '../transform_message_event_data_to_message_resource'
+
+const archivedEventData: MessageCreatedEvent['data']['data'] = {
+  author_avatar: '',
+  author_id: 1,
+  author_name: 'Wes',
+  conversation_id: 1,
+  created_at: '2026-01-01T00:00:00Z',
+  deleted_at: null,
+  organization_id: 1,
+  sort_key: '01J0000000000000000000001',
+  text: 'This conversation was archived by Wes',
+  text_edited_at: null,
+  html: '',
+  attachments: [],
+  reply_count: 0,
+  reply_root_id: null,
+  message_type: 'conversation_archived',
+  system_event_person_ids: [1],
+  system_text_parts: null,
+  system_text_format: 'actor',
+}
+
+describe('transformMessageEventDataToMessageResource', () => {
+  it('keeps the system text format so realtime archive events render as system messages', () => {
+    const message = transformMessageEventDataToMessageResource({
+      data: archivedEventData,
+      currentPersonId: 2,
+    })
+
+    expect(isSystemMessage(message)).toBe(true)
+  })
+})

package/src/utils/jolt/transform_message_event_data_to_message_resource.ts

@@ -39,5 +39,6 @@ export function transformMessageEventDataToMessageResource({
           action: data.system_text_parts.action,
         }
       : null,
+    systemTextFormat: data.system_text_format,
   }
 }

package/src/utils/request/messages_data_options.ts

@@ -14,6 +14,7 @@ export const getMessageFields = {
     'message_type',
     'person_ids_for_system_event',
     'system_text_parts',
+    'system_text_format',
   ],
   Person: ['name', 'avatar'],
   ReactionCount: ['value', 'count', 'mine', 'message_id', 'author_ids'],

package/src/utils/system_messages.ts

@@ -1,16 +1,25 @@
 import type { MessageResource } from '../types'
 
-const SYSTEM_MESSAGE_TYPES = ['user_joined'] as const
-
-type SystemMessageType = (typeof SYSTEM_MESSAGE_TYPES)[number]
-
-export interface SystemMessageResource extends MessageResource {
-  messageType: SystemMessageType
+export interface PeopleSystemMessageResource extends MessageResource {
+  systemTextFormat: 'people'
   systemTextParts: { names: string[]; overflowCount: number; action: string }
   personIdsForSystemEvent: number[]
 }
 
-export const isSystemMessage = (message: MessageResource): message is SystemMessageResource =>
-  SYSTEM_MESSAGE_TYPES.includes(message.messageType as SystemMessageType) &&
-  message.systemTextParts != null &&
-  message.personIdsForSystemEvent != null
+export interface ActorSystemMessageResource extends MessageResource {
+  systemTextFormat: 'actor'
+  text: string
+}
+
+export type SystemMessageResource = PeopleSystemMessageResource | ActorSystemMessageResource
+
+export const isSystemMessage = (message: MessageResource): message is SystemMessageResource => {
+  switch (message.systemTextFormat) {
+    case 'people':
+      return message.systemTextParts != null && message.personIdsForSystemEvent != null
+    case 'actor':
+      return !!message.text
+    default:
+      return false
+  }
+}