From b7c7e4d32da3e4063958b18bf340dc7b45e2072f Mon Sep 17 00:00:00 2001
From: ssmucny <smucny.sam@gmail.com>
Date: Mon, 22 May 2023 22:09:12 -0400
Subject: [PATCH] Add Event schema to metadata - add types from
 https://schema.org/Event - updated MkEvent to display new fields - minor
 refactoring

---
 .../core/activitypub/models/ApEventService.ts |  8 +--
 packages/backend/src/models/entities/Event.ts | 43 ++++++++++++-
 .../api/endpoints/notes/events/search.ts      |  2 +-
 packages/frontend/src/components/MkEvent.vue  | 63 ++++++++++++++++++-
 packages/misskey-js/src/api.types.ts          |  2 +-
 5 files changed, 106 insertions(+), 12 deletions(-)

diff --git a/packages/backend/src/core/activitypub/models/ApEventService.ts b/packages/backend/src/core/activitypub/models/ApEventService.ts
index 81d40a88f6..b525f09ae0 100644
--- a/packages/backend/src/core/activitypub/models/ApEventService.ts
+++ b/packages/backend/src/core/activitypub/models/ApEventService.ts
@@ -3,13 +3,13 @@ import { DI } from '@/di-symbols.js';
 import type { EventsRepository, NotesRepository } from '@/models/index.js';
 import type { Config } from '@/config.js';
 import type Logger from '@/logger.js';
+import { bindThis } from '@/decorators.js';
+import { IEvent } from '@/models/entities/Event.js';
 import { isEvent } from '../type.js';
 import { ApLoggerService } from '../ApLoggerService.js';
 import { ApResolverService } from '../ApResolverService.js';
 import type { Resolver } from '../ApResolverService.js';
 import type { IObject } from '../type.js';
-import { bindThis } from '@/decorators.js';
-import { IEvent } from '@/models/entities/Event.js';
 
 @Injectable()
 export class ApEventService {
@@ -32,8 +32,8 @@ export class ApEventService {
 	}
 
 	@bindThis
-	public async extractEventFromNote(source: string | IObject, resolver?: Resolver): Promise<IEvent> {
-		if (resolver == null) resolver = this.apResolverService.createResolver();
+	public async extractEventFromNote(source: string | IObject, resolverParam?: Resolver): Promise<IEvent> {
+		const resolver = resolverParam ?? this.apResolverService.createResolver();
 
 		const note = await resolver.resolve(source);
 
diff --git a/packages/backend/src/models/entities/Event.ts b/packages/backend/src/models/entities/Event.ts
index 57d2b50543..bad8b5d8ac 100644
--- a/packages/backend/src/models/entities/Event.ts
+++ b/packages/backend/src/models/entities/Event.ts
@@ -35,13 +35,13 @@ export class Event {
 	public title: string;
 
 	@Column('jsonb', {
-		default: { 
+		default: {
 			'@context': 'https://schema.org/',
 			'@type': 'Event',
 		},
 		comment: 'metadata object describing the event. Follows https://schema.org/Event',
 	})
-	public metadata: unknown;
+	public metadata: EventSchema;
 
 	//#region Denormalized fields
 	@Column('enum', {
@@ -74,9 +74,46 @@ export class Event {
 	}
 }
 
+export type EventSchema = {
+	'@context': 'https://schema.org';
+	'@type': 'Event';
+	name?: string;
+	url?: string;
+	description?: string;
+	audience?: {
+		'@type': 'Audience';
+		name: string;
+	};
+	doorTime?: string;
+	startDate?: string;
+	endDate?: string;
+	eventStatus?: 'https://schema.org/EventCancelled' | 'https://schema.org/EventMovedOnline' | 'https://schema.org/EventPostponed' | 'https://schema.org/EventRescheduled' | 'https://schema.org/EventScheduled';
+	inLanguage?: string;
+	isAccessibleForFree?: boolean;
+	keywords?: string;
+	location?: string;
+	offers?: {
+		'@type': 'Offer';
+		price?: string;
+		priceCurrency?: string;
+		availabilityStarts?: string;
+		availabilityEnds?: string;
+		url?: string;
+	};
+	organizer?: {
+		name: string;
+		sameAs?: string; // ie. URL to website/social
+	};
+	performer?: {
+		name: string;
+		sameAs?: string; // ie. URL to website/social
+	}[];
+	typicalAgeRange?: string;
+}
+
 export type IEvent = {
 	start: Date;
 	end: Date | null
 	title: string;
-	metadata: Record<string, string>;
+	metadata: EventSchema;
 }
diff --git a/packages/backend/src/server/api/endpoints/notes/events/search.ts b/packages/backend/src/server/api/endpoints/notes/events/search.ts
index dfc614039c..737867b1ef 100644
--- a/packages/backend/src/server/api/endpoints/notes/events/search.ts
+++ b/packages/backend/src/server/api/endpoints/notes/events/search.ts
@@ -67,7 +67,7 @@ export const paramDef = {
 	},
 } as const;
 
-function notAlphaNumeric(s: string) {
+function notAlphaNumeric(s: string): boolean {
 	return null !== s.match(/[^\w]/);
 }
 
diff --git a/packages/frontend/src/components/MkEvent.vue b/packages/frontend/src/components/MkEvent.vue
index 3b445ce1b5..a3dd01e796 100644
--- a/packages/frontend/src/components/MkEvent.vue
+++ b/packages/frontend/src/components/MkEvent.vue
@@ -15,9 +15,66 @@
 				<MkTime :time="note.event!.end" mode="detail"/>
 			</dd>
 		</template>
-		<template v-for="[key, value] of Object.entries(note.event!.detail)" :key="key">
-			<dt :class="$style.key">{{ key }}</dt>
-			<dd :class="$style.value">{{ value }}</dd>
+		<template v-if="note.event!.metadata.doorTime">
+			<dt :class="$style.key">{{ "Door Time" }}</dt> 
+			<dd :class="$style.value">{{ note.event!.metadata.doorTime }}</dd>
+		</template>
+		<template v-if="note.event!.metadata.location">
+			<dt :class="$style.key">{{ "Location" }}</dt> 
+			<dd :class="$style.value">{{ note.event!.metadata.location }}</dd>
+		</template>
+		<template v-if="note.event!.metadata.url">
+			<dt :class="$style.key">{{ "URL" }}</dt> 
+			<dd :class="$style.value">{{ note.event!.metadata.url }}</dd>
+		</template>
+		<template v-if="note.event!.metadata.organizer">
+			<dt :class="$style.key">{{ "Organizer" }}</dt> 
+			<dd :class="$style.value">{{ note.event!.metadata.organizer.name }}</dd>
+		</template>
+		<template v-if="note.event!.metadata.audience">
+			<dt :class="$style.key">{{ "Audience" }}</dt> 
+			<dd :class="$style.value">{{ note.event!.metadata.audience.name }}</dd>
+		</template>
+		<template v-if="note.event!.metadata.inLanguage">
+			<dt :class="$style.key">{{ "Language" }}</dt> 
+			<dd :class="$style.value">{{ note.event!.metadata.inLanguage }}</dd>
+		</template>
+		<template v-if="note.event!.metadata.typicalAgeRange">
+			<dt :class="$style.key">{{ "Ages" }}</dt> 
+			<dd :class="$style.value">{{ note.event!.metadata.typicalAgeRange }}</dd>
+		</template>
+		<template v-if="note.event!.metadata.performer">
+			<dt :class="$style.key">{{ "Performers" }}</dt> 
+			<dd :class="$style.value">{{ note.event!.metadata.performer.join(', ') }}</dd>
+		</template>
+		<template v-if="note.event!.metadata.offers?.url">
+			<dt :class="$style.key">{{ "Tickets" }}</dt> 
+			<dd :class="$style.value">{{ note.event!.metadata.url }}</dd>
+		</template>
+		<template v-if="note.event!.metadata.isAccessibleForFree">
+			<dt :class="$style.key">{{ "Free" }}</dt> 
+			<dd :class="$style.value">{{ "Yes" }}</dd>
+		</template>
+		<template v-if="note.event!.metadata.offers?.price">
+			<dt :class="$style.key">{{ "Price" }}</dt> 
+			<dd :class="$style.value">{{ note.event!.metadata.offers.price }}</dd>
+		</template>
+		<template v-if="note.event!.metadata.offers?.url">
+			<dt :class="$style.key">{{ "Tickets Available" }}</dt> 
+			<dd :class="$style.value">
+				{{ [
+					(note.event!.metadata.offers.availabilityStarts ? 'From ' + note.event!.metadata.offers.availabilityStarts : ''), 
+					(note.event!.metadata.offers.availabilityEnds ? 'Until ' + note.event!.metadata.offers.availabilityEnds : '')]
+					.join(' ') }}
+			</dd>
+		</template>
+		<template v-if="note.event!.metadata.offers?.url">
+			<dt :class="$style.key">{{ "Tickets" }}</dt> 
+			<dd :class="$style.value">{{ note.event!.metadata.url }}</dd>
+		</template>
+		<template v-if="note.event!.metadata.keywords">
+			<dt :class="$style.key">{{ "Keywords" }}</dt> 
+			<dd :class="$style.value">{{ note.event!.metadata.keywords }}</dd>
 		</template>
 	</dl>
 </div>
diff --git a/packages/misskey-js/src/api.types.ts b/packages/misskey-js/src/api.types.ts
index d098feddbc..9aff6876db 100644
--- a/packages/misskey-js/src/api.types.ts
+++ b/packages/misskey-js/src/api.types.ts
@@ -515,7 +515,7 @@ export type Endpoints = {
 		sinceDate?: number;
 		untilDate?: number;
 		sortBy?: 'startDate' | 'craetedAt';
-		filters?: { key: string, values: (string | null)[] }[];
+		filters?: { key: string[], values: (string | null)[] }[];
 	}; res: Note[]; };
 	'notes/reactions': { req: { noteId: Note['id']; type?: string | null; limit?: number; }; res: NoteReaction[]; };
 	'notes/reactions/create': { req: { noteId: Note['id']; reaction: string; }; res: null; };