@sideline/domain 0.9.0 → 0.10.0

package/src/rpc/event/EventRpcGroup.ts

@@ -10,6 +10,8 @@ import {
   CreateEventResult,
   EventDiscordMessage,
   EventEmbedInfo,
+  GuildEventListResult,
+  GuildNotFound,
   RsvpAttendeesResult,
   RsvpCountsResult,
   RsvpDeadlinePassed,
@@ -32,8 +34,8 @@ export const EventRpcGroup = RpcGroup.make(
   Rpc.make('SaveDiscordMessageId', {
     payload: {
       event_id: Event.EventId,
-      discord_channel_id: Schema.String,
-      discord_message_id: Schema.String,
+      discord_channel_id: Discord.Snowflake,
+      discord_message_id: Discord.Snowflake,
     },
   }),
   Rpc.make('GetDiscordMessageId', {
@@ -46,7 +48,7 @@ export const EventRpcGroup = RpcGroup.make(
       team_id: Team.TeamId,
       discord_user_id: Discord.Snowflake,
       response: EventRsvp.RsvpResponse,
-      message: Schema.NullOr(Schema.String),
+      message: Schema.OptionFromNullOr(Schema.String),
     },
     success: RsvpCountsResult,
     error: Schema.Union(RsvpMemberNotFound, RsvpDeadlinePassed, RsvpEventNotFound),
@@ -60,7 +62,7 @@ export const EventRpcGroup = RpcGroup.make(
     success: Schema.OptionFromNullOr(EventEmbedInfo),
   }),
   Rpc.make('GetChannelEvents', {
-    payload: { discord_channel_id: Schema.String },
+    payload: { discord_channel_id: Discord.Snowflake },
     success: Schema.Array(ChannelEventEntry),
   }),
   Rpc.make('GetRsvpAttendees', {
@@ -71,6 +73,15 @@ export const EventRpcGroup = RpcGroup.make(
     payload: { event_id: Event.EventId },
     success: RsvpReminderSummary,
   }),
+  Rpc.make('GetUpcomingGuildEvents', {
+    payload: {
+      guild_id: Discord.Snowflake,
+      offset: Schema.Number,
+      limit: Schema.Number,
+    },
+    success: GuildEventListResult,
+    error: GuildNotFound,
+  }),
   Rpc.make('CreateEvent', {
     payload: {
       guild_id: Discord.Snowflake,
@@ -78,9 +89,9 @@ export const EventRpcGroup = RpcGroup.make(
       event_type: Event.EventType,
       title: Schema.String,
       start_at: Schema.String,
-      end_at: Schema.NullOr(Schema.String),
-      location: Schema.NullOr(Schema.String),
-      description: Schema.NullOr(Schema.String),
+      end_at: Schema.OptionFromNullOr(Schema.String),
+      location: Schema.OptionFromNullOr(Schema.String),
+      description: Schema.OptionFromNullOr(Schema.String),
     },
     success: CreateEventResult,
     error: Schema.Union(CreateEventNotMember, CreateEventForbidden, CreateEventInvalidDate),

package/src/rpc/event/EventRpcModels.ts

@@ -1,8 +1,10 @@
+import * as Schemas from '@sideline/effect-lib/Schemas';
 import { Schema } from 'effect';
+import { Snowflake } from '~/models/Discord.js';
 
 export class EventDiscordMessage extends Schema.Class<EventDiscordMessage>('EventDiscordMessage')({
-  discord_channel_id: Schema.String,
-  discord_message_id: Schema.String,
+  discord_channel_id: Snowflake,
+  discord_message_id: Snowflake,
 }) {}
 
 export class RsvpCountsResult extends Schema.Class<RsvpCountsResult>('RsvpCountsResult')({
@@ -15,8 +17,8 @@ export class RsvpCountsResult extends Schema.Class<RsvpCountsResult>('RsvpCounts
 export class EventEmbedInfo extends Schema.Class<EventEmbedInfo>('EventEmbedInfo')({
   title: Schema.String,
   description: Schema.OptionFromNullOr(Schema.String),
-  start_at: Schema.String,
-  end_at: Schema.OptionFromNullOr(Schema.String),
+  start_at: Schemas.DateTimeFromIsoString,
+  end_at: Schema.OptionFromNullOr(Schemas.DateTimeFromIsoString),
   location: Schema.OptionFromNullOr(Schema.String),
   event_type: Schema.String,
 }) {}
@@ -25,13 +27,13 @@ export class ChannelEventEntry extends Schema.Class<ChannelEventEntry>('ChannelE
   event_id: Schema.String,
   team_id: Schema.String,
   title: Schema.String,
-  description: Schema.NullOr(Schema.String),
-  start_at: Schema.String,
-  end_at: Schema.NullOr(Schema.String),
-  location: Schema.NullOr(Schema.String),
+  description: Schema.OptionFromNullOr(Schema.String),
+  start_at: Schemas.DateTimeFromIsoString,
+  end_at: Schema.OptionFromNullOr(Schemas.DateTimeFromIsoString),
+  location: Schema.OptionFromNullOr(Schema.String),
   event_type: Schema.String,
   status: Schema.String,
-  discord_message_id: Schema.String,
+  discord_message_id: Snowflake,
 }) {}
 
 export class RsvpMemberNotFound extends Schema.TaggedError<RsvpMemberNotFound>()(
@@ -69,11 +71,33 @@ export class CreateEventResult extends Schema.Class<CreateEventResult>('CreateEv
   title: Schema.String,
 }) {}
 
+export class GuildEventListEntry extends Schema.Class<GuildEventListEntry>('GuildEventListEntry')({
+  event_id: Schema.String,
+  title: Schema.String,
+  start_at: Schemas.DateTimeFromIsoString,
+  end_at: Schema.OptionFromNullOr(Schemas.DateTimeFromIsoString),
+  location: Schema.OptionFromNullOr(Schema.String),
+  event_type: Schema.String,
+  yes_count: Schema.Number,
+  no_count: Schema.Number,
+  maybe_count: Schema.Number,
+}) {}
+
+export class GuildEventListResult extends Schema.Class<GuildEventListResult>(
+  'GuildEventListResult',
+)({
+  events: Schema.Array(GuildEventListEntry),
+  total: Schema.Number,
+  team_id: Schema.String,
+}) {}
+
+export class GuildNotFound extends Schema.TaggedError<GuildNotFound>()('GuildNotFound', {}) {}
+
 export class RsvpAttendeeEntry extends Schema.Class<RsvpAttendeeEntry>('RsvpAttendeeEntry')({
-  discord_id: Schema.NullOr(Schema.String),
-  name: Schema.NullOr(Schema.String),
+  discord_id: Schema.OptionFromNullOr(Snowflake),
+  name: Schema.OptionFromNullOr(Schema.String),
   response: Schema.Literal('yes', 'no', 'maybe'),
-  message: Schema.NullOr(Schema.String),
+  message: Schema.OptionFromNullOr(Schema.String),
 }) {}
 
 export class RsvpAttendeesResult extends Schema.Class<RsvpAttendeesResult>('RsvpAttendeesResult')({
@@ -84,9 +108,9 @@ export class RsvpAttendeesResult extends Schema.Class<RsvpAttendeesResult>('Rsvp
 export class NonResponderRpcEntry extends Schema.Class<NonResponderRpcEntry>(
   'NonResponderRpcEntry',
 )({
-  discord_id: Schema.NullOr(Schema.String),
-  name: Schema.NullOr(Schema.String),
-  username: Schema.NullOr(Schema.String),
+  discord_id: Schema.OptionFromNullOr(Snowflake),
+  name: Schema.OptionFromNullOr(Schema.String),
+  username: Schema.OptionFromNullOr(Schema.String),
 }) {}
 
 export class RsvpReminderSummary extends Schema.Class<RsvpReminderSummary>('RsvpReminderSummary')({

package/src/rpc/guild/GuildRpcGroup.ts

@@ -21,7 +21,7 @@ export const GuildRpcGroup = RpcGroup.make(
           channel_id: Discord.Snowflake,
           name: Schema.String,
           type: Schema.Number,
-          parent_id: Schema.NullOr(Discord.Snowflake),
+          parent_id: Schema.OptionFromNullOr(Discord.Snowflake),
         }),
       ),
     },
@@ -33,7 +33,7 @@ export const GuildRpcGroup = RpcGroup.make(
         Schema.Struct({
           discord_id: Schema.String,
           username: Schema.String,
-          avatar: Schema.NullOr(Schema.String),
+          avatar: Schema.OptionFromNullOr(Schema.String),
           roles: Schema.Array(Schema.String),
         }),
       ),
@@ -44,7 +44,7 @@ export const GuildRpcGroup = RpcGroup.make(
       guild_id: Discord.Snowflake,
       discord_id: Schema.String,
       username: Schema.String,
-      avatar: Schema.NullOr(Schema.String),
+      avatar: Schema.OptionFromNullOr(Schema.String),
       roles: Schema.Array(Schema.String),
     },
   }),