Add safe membership event parsing by default

src/MatrixTypes/MembershipEvent.ts

@@ -12,8 +12,6 @@
 import { Static, StaticDecode, Type } from '@sinclair/typebox';
 import { StateEvent, StrippedStateEvent, UnsignedData } from './Events';
 import { StringUserID } from './StringlyTypedMatrix';
-import { registerDefaultDecoder } from './EventDecoder';
-import { Value } from '../Interface/Value';
 
 export type MembershipEventUnsigned = Static<typeof MembershipEventUnsigned>;
 export const MembershipEventUnsigned = Type.Composite([
@@ -93,22 +91,20 @@ export const MembershipEventContent = Type.Object({
   ),
 });
 
-export type MembershipEvent = StaticDecode<typeof MembershipEvent>;
-export const MembershipEvent = Type.Composite([
-  Type.Omit(StateEvent(MembershipEventContent), [
-    'content',
-    'state_key',
-    'unsigned',
-    'type',
-  ]),
+export type BaseMembershipEvent = StaticDecode<typeof BaseMembershipEvent>;
+export const BaseMembershipEvent = Type.Composite([
+  Type.Omit(StateEvent(Type.Object({})), ['state_key', 'unsigned', 'type']),
   Type.Object({
-    content: MembershipEventContent,
     state_key: StringUserID,
     type: Type.Literal('m.room.member'),
     unsigned: Type.Optional(MembershipEventUnsigned),
   }),
 ]);
 
-registerDefaultDecoder('m.room.member', (event) =>
-  Value.Decode(MembershipEvent, event)
-);
+export type MembershipEvent = StaticDecode<typeof MembershipEvent>;
+export const MembershipEvent = Type.Composite([
+  Type.Omit(BaseMembershipEvent, ['content']),
+  Type.Object({
+    content: MembershipEventContent,
+  }),
+]);

src/SafeMatrixEvents/SafeMembershipEvent.ts

@@ -2,9 +2,13 @@
 //
 // SPDX-License-Identifier: AFL-3.0
 
-import { ActionResult, Ok, isOk } from '../Interface/Action';
+import { ActionResult, Ok, isError, isOk } from '../Interface/Action';
 import { DecodeException, Value } from '../Interface/Value';
-import { MembershipEventContent } from '../MatrixTypes/MembershipEvent';
+import { registerDefaultDecoder } from '../MatrixTypes/EventDecoder';
+import {
+  BaseMembershipEvent,
+  MembershipEventContent,
+} from '../MatrixTypes/MembershipEvent';
 import { ValuePointer } from '@sinclair/typebox/value';
 
 /**
@@ -94,3 +98,19 @@ export const SafeMembershipEventMirror = Object.freeze({
 });
 
 export type SafeMembershipEventMirror = typeof SafeMembershipEventMirror;
+
+registerDefaultDecoder('m.room.member', (event) => {
+  const baseEventResult = Value.Decode(BaseMembershipEvent, event);
+  if (isError(baseEventResult)) {
+    return baseEventResult;
+  }
+  const safeContentResult = SafeMembershipEventMirror.parse(
+    baseEventResult.ok.content
+  );
+  if (isError(safeContentResult)) {
+    return safeContentResult;
+  }
+  const completeEvent = baseEventResult.ok;
+  completeEvent.content = safeContentResult.ok;
+  return Ok(completeEvent);
+});