@sideline/domain 0.7.1 → 0.9.0

package/dist/esm/rpc/guild/GuildRpcGroup.js

@@ -30,8 +30,8 @@ export const GuildRpcGroup = /*#__PURE__*/RpcGroup.make(Rpc.make('RegisterGuild'
     guild_id: Discord.Snowflake,
     members: Schema.Array(Schema.Struct({
       discord_id: Schema.String,
-      discord_username: Schema.String,
-      discord_avatar: Schema.NullOr(Schema.String),
+      username: Schema.String,
+      avatar: Schema.NullOr(Schema.String),
       roles: Schema.Array(Schema.String)
     }))
   }
@@ -39,8 +39,8 @@ export const GuildRpcGroup = /*#__PURE__*/RpcGroup.make(Rpc.make('RegisterGuild'
   payload: {
     guild_id: Discord.Snowflake,
     discord_id: Schema.String,
-    discord_username: Schema.String,
-    discord_avatar: Schema.NullOr(Schema.String),
+    username: Schema.String,
+    avatar: Schema.NullOr(Schema.String),
     roles: Schema.Array(Schema.String)
   }
 })).prefix('Guild/');

package/dist/esm/rpc/guild/GuildRpcGroup.js.map

@@ -1 +1 @@
-{"version":3,"file":"GuildRpcGroup.js","names":["Rpc","RpcGroup","Schema","Discord","GuildRpcGroup","make","payload","guild_id","Snowflake","guild_name","String","success","Boolean","channels","Array","Struct","channel_id","name","type","Number","parent_id","NullOr","members","discord_id","discord_username","discord_avatar","roles","prefix"],"sources":["../../../../src/rpc/guild/GuildRpcGroup.ts"],"sourcesContent":[null],"mappings":"AAAA,SAASA,GAAG,EAAEC,QAAQ,QAAQ,aAAa;AAC3C,SAASC,MAAM,QAAQ,QAAQ;AAC/B,SAASC,OAAO,QAAQ,gBAAa;AAErC,OAAO,MAAMC,aAAa,gBAAGH,QAAQ,CAACI,IAAI,CACxCL,GAAG,CAACK,IAAI,CAAC,eAAe,EAAE;EACxBC,OAAO,EAAE;IAAEC,QAAQ,EAAEJ,OAAO,CAACK,SAAS;IAAEC,UAAU,EAAEP,MAAM,CAACQ;EAAM;CAClE,CAAC,EACFV,GAAG,CAACK,IAAI,CAAC,iBAAiB,EAAE;EAC1BC,OAAO,EAAE;IAAEC,QAAQ,EAAEJ,OAAO,CAACK;EAAS;CACvC,CAAC,EACFR,GAAG,CAACK,IAAI,CAAC,mBAAmB,EAAE;EAC5BC,OAAO,EAAE;IAAEC,QAAQ,EAAEJ,OAAO,CAACK;EAAS,CAAE;EACxCG,OAAO,EAAET,MAAM,CAACU;CACjB,CAAC,EACFZ,GAAG,CAACK,IAAI,CAAC,mBAAmB,EAAE;EAC5BC,OAAO,EAAE;IACPC,QAAQ,EAAEJ,OAAO,CAACK,SAAS;IAC3BK,QAAQ,EAAEX,MAAM,CAACY,KAAK,CACpBZ,MAAM,CAACa,MAAM,CAAC;MACZC,UAAU,EAAEb,OAAO,CAACK,SAAS;MAC7BS,IAAI,EAAEf,MAAM,CAACQ,MAAM;MACnBQ,IAAI,EAAEhB,MAAM,CAACiB,MAAM;MACnBC,SAAS,EAAElB,MAAM,CAACmB,MAAM,CAAClB,OAAO,CAACK,SAAS;KAC3C,CAAC;;CAGP,CAAC,EACFR,GAAG,CAACK,IAAI,CAAC,kBAAkB,EAAE;EAC3BC,OAAO,EAAE;IACPC,QAAQ,EAAEJ,OAAO,CAACK,SAAS;IAC3Bc,OAAO,EAAEpB,MAAM,CAACY,KAAK,CACnBZ,MAAM,CAACa,MAAM,CAAC;MACZQ,UAAU,EAAErB,MAAM,CAACQ,MAAM;MACzBc,gBAAgB,EAAEtB,MAAM,CAACQ,MAAM;MAC/Be,cAAc,EAAEvB,MAAM,CAACmB,MAAM,CAACnB,MAAM,CAACQ,MAAM,CAAC;MAC5CgB,KAAK,EAAExB,MAAM,CAACY,KAAK,CAACZ,MAAM,CAACQ,MAAM;KAClC,CAAC;;CAGP,CAAC,EACFV,GAAG,CAACK,IAAI,CAAC,gBAAgB,EAAE;EACzBC,OAAO,EAAE;IACPC,QAAQ,EAAEJ,OAAO,CAACK,SAAS;IAC3Be,UAAU,EAAErB,MAAM,CAACQ,MAAM;IACzBc,gBAAgB,EAAEtB,MAAM,CAACQ,MAAM;IAC/Be,cAAc,EAAEvB,MAAM,CAACmB,MAAM,CAACnB,MAAM,CAACQ,MAAM,CAAC;IAC5CgB,KAAK,EAAExB,MAAM,CAACY,KAAK,CAACZ,MAAM,CAACQ,MAAM;;CAEpC,CAAC,CACH,CAACiB,MAAM,CAAC,QAAQ,CAAC","ignoreList":[]}
+{"version":3,"file":"GuildRpcGroup.js","names":["Rpc","RpcGroup","Schema","Discord","GuildRpcGroup","make","payload","guild_id","Snowflake","guild_name","String","success","Boolean","channels","Array","Struct","channel_id","name","type","Number","parent_id","NullOr","members","discord_id","username","avatar","roles","prefix"],"sources":["../../../../src/rpc/guild/GuildRpcGroup.ts"],"sourcesContent":[null],"mappings":"AAAA,SAASA,GAAG,EAAEC,QAAQ,QAAQ,aAAa;AAC3C,SAASC,MAAM,QAAQ,QAAQ;AAC/B,SAASC,OAAO,QAAQ,gBAAa;AAErC,OAAO,MAAMC,aAAa,gBAAGH,QAAQ,CAACI,IAAI,CACxCL,GAAG,CAACK,IAAI,CAAC,eAAe,EAAE;EACxBC,OAAO,EAAE;IAAEC,QAAQ,EAAEJ,OAAO,CAACK,SAAS;IAAEC,UAAU,EAAEP,MAAM,CAACQ;EAAM;CAClE,CAAC,EACFV,GAAG,CAACK,IAAI,CAAC,iBAAiB,EAAE;EAC1BC,OAAO,EAAE;IAAEC,QAAQ,EAAEJ,OAAO,CAACK;EAAS;CACvC,CAAC,EACFR,GAAG,CAACK,IAAI,CAAC,mBAAmB,EAAE;EAC5BC,OAAO,EAAE;IAAEC,QAAQ,EAAEJ,OAAO,CAACK;EAAS,CAAE;EACxCG,OAAO,EAAET,MAAM,CAACU;CACjB,CAAC,EACFZ,GAAG,CAACK,IAAI,CAAC,mBAAmB,EAAE;EAC5BC,OAAO,EAAE;IACPC,QAAQ,EAAEJ,OAAO,CAACK,SAAS;IAC3BK,QAAQ,EAAEX,MAAM,CAACY,KAAK,CACpBZ,MAAM,CAACa,MAAM,CAAC;MACZC,UAAU,EAAEb,OAAO,CAACK,SAAS;MAC7BS,IAAI,EAAEf,MAAM,CAACQ,MAAM;MACnBQ,IAAI,EAAEhB,MAAM,CAACiB,MAAM;MACnBC,SAAS,EAAElB,MAAM,CAACmB,MAAM,CAAClB,OAAO,CAACK,SAAS;KAC3C,CAAC;;CAGP,CAAC,EACFR,GAAG,CAACK,IAAI,CAAC,kBAAkB,EAAE;EAC3BC,OAAO,EAAE;IACPC,QAAQ,EAAEJ,OAAO,CAACK,SAAS;IAC3Bc,OAAO,EAAEpB,MAAM,CAACY,KAAK,CACnBZ,MAAM,CAACa,MAAM,CAAC;MACZQ,UAAU,EAAErB,MAAM,CAACQ,MAAM;MACzBc,QAAQ,EAAEtB,MAAM,CAACQ,MAAM;MACvBe,MAAM,EAAEvB,MAAM,CAACmB,MAAM,CAACnB,MAAM,CAACQ,MAAM,CAAC;MACpCgB,KAAK,EAAExB,MAAM,CAACY,KAAK,CAACZ,MAAM,CAACQ,MAAM;KAClC,CAAC;;CAGP,CAAC,EACFV,GAAG,CAACK,IAAI,CAAC,gBAAgB,EAAE;EACzBC,OAAO,EAAE;IACPC,QAAQ,EAAEJ,OAAO,CAACK,SAAS;IAC3Be,UAAU,EAAErB,MAAM,CAACQ,MAAM;IACzBc,QAAQ,EAAEtB,MAAM,CAACQ,MAAM;IACvBe,MAAM,EAAEvB,MAAM,CAACmB,MAAM,CAACnB,MAAM,CAACQ,MAAM,CAAC;IACpCgB,KAAK,EAAExB,MAAM,CAACY,KAAK,CAACZ,MAAM,CAACQ,MAAM;;CAEpC,CAAC,CACH,CAACiB,MAAM,CAAC,QAAQ,CAAC","ignoreList":[]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sideline/domain",
-  "version": "0.7.1",
+  "version": "0.9.0",
   "description": "The domain template",
   "license": "MIT",
   "repository": {

package/src/api/Auth.ts

@@ -25,8 +25,8 @@ export class UserTeam extends Schema.Class<UserTeam>('UserTeam')({
 export class CurrentUser extends Schema.Class<CurrentUser>('CurrentUser')({
   id: UserId,
   discordId: Schema.String,
-  discordUsername: Schema.String,
-  discordAvatar: Schema.NullOr(Schema.String),
+  username: Schema.String,
+  avatar: Schema.NullOr(Schema.String),
   isProfileComplete: Schema.Boolean,
   name: Schema.NullOr(Schema.String),
   birthDate: Schema.NullOr(Schema.String),

package/src/api/EventRsvpApi.ts

@@ -9,6 +9,7 @@ import { TeamMemberId } from '~/models/TeamMember.js';
 export class RsvpEntry extends Schema.Class<RsvpEntry>('RsvpEntry')({
   teamMemberId: TeamMemberId,
   memberName: Schema.NullOr(Schema.String),
+  username: Schema.NullOr(Schema.String),
   response: RsvpResponse,
   message: Schema.NullOr(Schema.String),
 }) {}
@@ -21,6 +22,7 @@ export class EventRsvpDetail extends Schema.Class<EventRsvpDetail>('EventRsvpDet
   noCount: Schema.Number,
   maybeCount: Schema.Number,
   canRsvp: Schema.Boolean,
+  minPlayersThreshold: Schema.Number,
 }) {}
 
 export class SubmitRsvpRequest extends Schema.Class<SubmitRsvpRequest>('SubmitRsvpRequest')({
@@ -46,6 +48,18 @@ export class RsvpDeadlinePassed extends Schema.TaggedError<RsvpDeadlinePassed>()
   HttpApiSchema.annotations({ status: 400 }),
 ) {}
 
+export class NonResponderEntry extends Schema.Class<NonResponderEntry>('NonResponderEntry')({
+  teamMemberId: TeamMemberId,
+  memberName: Schema.NullOr(Schema.String),
+  username: Schema.NullOr(Schema.String),
+}) {}
+
+export class NonRespondersResponse extends Schema.Class<NonRespondersResponse>(
+  'NonRespondersResponse',
+)({
+  nonResponders: Schema.Array(NonResponderEntry),
+}) {}
+
 export class EventRsvpApiGroup extends HttpApiGroup.make('eventRsvp')
   .add(
     HttpApiEndpoint.get('getRsvps', '/teams/:teamId/events/:eventId/rsvps')
@@ -64,4 +78,12 @@ export class EventRsvpApiGroup extends HttpApiGroup.make('eventRsvp')
       .setPath(Schema.Struct({ teamId: TeamId, eventId: EventId }))
       .setPayload(SubmitRsvpRequest)
       .middleware(AuthMiddleware),
+  )
+  .add(
+    HttpApiEndpoint.get('getNonResponders', '/teams/:teamId/events/:eventId/rsvps/non-responders')
+      .addSuccess(NonRespondersResponse)
+      .addError(Forbidden, { status: 403 })
+      .addError(EventNotFound, { status: 404 })
+      .setPath(Schema.Struct({ teamId: TeamId, eventId: EventId }))
+      .middleware(AuthMiddleware),
   ) {}

package/src/api/EventSeriesApi.ts

@@ -3,7 +3,7 @@ import { Schema } from 'effect';
 import { AuthMiddleware } from '~/api/Auth.js';
 import { Forbidden } from '~/api/EventApi.js';
 import {
-  DayOfWeek,
+  DaysOfWeek,
   EventSeriesId,
   EventSeriesStatus,
   RecurrenceFrequency,
@@ -16,7 +16,7 @@ export class EventSeriesInfo extends Schema.Class<EventSeriesInfo>('EventSeriesI
   teamId: TeamId,
   title: Schema.String,
   frequency: RecurrenceFrequency,
-  dayOfWeek: DayOfWeek,
+  daysOfWeek: DaysOfWeek,
   startDate: Schema.String,
   endDate: Schema.NullOr(Schema.String),
   status: EventSeriesStatus,
@@ -34,7 +34,7 @@ export class EventSeriesDetail extends Schema.Class<EventSeriesDetail>('EventSer
   title: Schema.String,
   description: Schema.NullOr(Schema.String),
   frequency: RecurrenceFrequency,
-  dayOfWeek: DayOfWeek,
+  daysOfWeek: DaysOfWeek,
   startDate: Schema.String,
   endDate: Schema.NullOr(Schema.String),
   status: EventSeriesStatus,
@@ -55,7 +55,7 @@ export class CreateEventSeriesRequest extends Schema.Class<CreateEventSeriesRequ
   trainingTypeId: Schema.NullOr(TrainingTypeId),
   description: Schema.NullOr(Schema.String),
   frequency: RecurrenceFrequency,
-  dayOfWeek: DayOfWeek,
+  daysOfWeek: DaysOfWeek,
   startDate: Schema.String,
   endDate: Schema.NullOr(Schema.String),
   startTime: Schema.String,
@@ -70,6 +70,7 @@ export class UpdateEventSeriesRequest extends Schema.Class<UpdateEventSeriesRequ
   title: Schema.optionalWith(Schema.NonEmptyString, { as: 'Option' }),
   trainingTypeId: Schema.optionalWith(Schema.OptionFromNullOr(TrainingTypeId), { as: 'Option' }),
   description: Schema.optionalWith(Schema.OptionFromNullOr(Schema.String), { as: 'Option' }),
+  daysOfWeek: Schema.optionalWith(DaysOfWeek, { as: 'Option' }),
   startTime: Schema.optionalWith(Schema.String, { as: 'Option' }),
   endTime: Schema.optionalWith(Schema.OptionFromNullOr(Schema.String), { as: 'Option' }),
   location: Schema.optionalWith(Schema.OptionFromNullOr(Schema.String), { as: 'Option' }),

package/src/api/GroupApi.ts

@@ -32,7 +32,7 @@ export class GroupDetail extends Schema.Class<GroupDetail>('GroupDetail')({
     Schema.Struct({
       memberId: TeamMemberId,
       name: Schema.NullOr(Schema.String),
-      discordUsername: Schema.String,
+      username: Schema.String,
     }),
   ),
 }) {}

package/src/api/Roster.ts

@@ -17,8 +17,8 @@ export class RosterPlayer extends Schema.Class<RosterPlayer>('RosterPlayer')({
   birthDate: Schema.NullOr(Schema.String),
   gender: Schema.NullOr(Gender),
   jerseyNumber: Schema.NullOr(Schema.Number),
-  discordUsername: Schema.String,
-  discordAvatar: Schema.NullOr(Schema.String),
+  username: Schema.String,
+  avatar: Schema.NullOr(Schema.String),
 }) {}
 
 export class UpdatePlayerRequest extends Schema.Class<UpdatePlayerRequest>('UpdatePlayerRequest')({

package/src/api/TeamSettingsApi.ts

@@ -7,6 +7,8 @@ import { TeamId } from '~/models/Team.js';
 export class TeamSettingsInfo extends Schema.Class<TeamSettingsInfo>('TeamSettingsInfo')({
   teamId: TeamId,
   eventHorizonDays: Schema.Int,
+  minPlayersThreshold: Schema.Int,
+  rsvpReminderHours: Schema.Int,
   discordChannelTraining: Schema.NullOr(Schema.String),
   discordChannelMatch: Schema.NullOr(Schema.String),
   discordChannelTournament: Schema.NullOr(Schema.String),
@@ -19,6 +21,12 @@ export class UpdateTeamSettingsRequest extends Schema.Class<UpdateTeamSettingsRe
   'UpdateTeamSettingsRequest',
 )({
   eventHorizonDays: Schema.Int.pipe(Schema.between(1, 365)),
+  minPlayersThreshold: Schema.optionalWith(Schema.Int.pipe(Schema.between(0, 100)), {
+    as: 'Option',
+  }),
+  rsvpReminderHours: Schema.optionalWith(Schema.Int.pipe(Schema.between(0, 168)), {
+    as: 'Option',
+  }),
   discordChannelTraining: Schema.optionalWith(Schema.OptionFromNullOr(Schema.String), {
     as: 'Option',
   }),

package/src/models/EventSeries.ts

@@ -13,6 +13,9 @@ export type RecurrenceFrequency = typeof RecurrenceFrequency.Type;
 export const DayOfWeek = Schema.Int.pipe(Schema.between(0, 6), Schema.brand('DayOfWeek'));
 export type DayOfWeek = typeof DayOfWeek.Type;
 
+export const DaysOfWeek = Schema.Array(DayOfWeek).pipe(Schema.minItems(1), Schema.maxItems(7));
+export type DaysOfWeek = typeof DaysOfWeek.Type;
+
 export const EventSeriesStatus = Schema.Literal('active', 'cancelled');
 export type EventSeriesStatus = typeof EventSeriesStatus.Type;
 
@@ -26,7 +29,7 @@ export class EventSeries extends Model.Class<EventSeries>('EventSeries')({
   end_time: Schema.NullOr(Schema.String),
   location: Schema.NullOr(Schema.String),
   frequency: RecurrenceFrequency,
-  day_of_week: DayOfWeek,
+  days_of_week: DaysOfWeek,
   start_date: Schema.DateFromSelf,
   end_date: Schema.NullOr(Schema.DateFromSelf),
   status: Model.FieldExcept('update')(EventSeriesStatus),

package/src/models/TeamSettings.ts

@@ -5,6 +5,8 @@ import { TeamId } from '~/models/Team.js';
 export class TeamSettings extends Model.Class<TeamSettings>('TeamSettings')({
   team_id: TeamId,
   event_horizon_days: Schema.Int,
+  min_players_threshold: Schema.Int,
+  rsvp_reminder_hours: Schema.Int,
   created_at: Model.DateTimeInsertFromDate,
   updated_at: Model.DateTimeUpdateFromDate,
 }) {}

package/src/models/User.ts

@@ -14,8 +14,8 @@ export type Locale = typeof Locale.Type;
 export class User extends Model.Class<User>('User')({
   id: Model.Generated(UserId),
   discord_id: Schema.String,
-  discord_username: Schema.String,
-  discord_avatar: Schema.NullOr(Schema.String),
+  username: Schema.String,
+  avatar: Schema.NullOr(Schema.String),
   name: Schema.NullOr(Schema.String),
   birth_date: Schema.OptionFromNullOr(Schemas.DateTimeFromDate),
   gender: Schema.NullOr(Gender),

package/src/rpc/event/EventRpcEvents.ts

@@ -39,10 +39,21 @@ export class EventCancelledEvent extends Schema.TaggedClass<EventCancelledEvent>
   },
 ) {}
 
+export class RsvpReminderEvent extends Schema.TaggedClass<RsvpReminderEvent>()('rsvp_reminder', {
+  id: Schema.String,
+  team_id: Team.TeamId,
+  guild_id: Discord.Snowflake,
+  event_id: Event.EventId,
+  title: Schema.String,
+  start_at: Schema.String,
+  discord_channel_id: Schema.NullOr(Schema.String),
+}) {}
+
 export const UnprocessedEventSyncEvent = Schema.Union(
   EventCreatedEvent,
   EventUpdatedEvent,
   EventCancelledEvent,
+  RsvpReminderEvent,
 );
 
 export type UnprocessedEventSyncEvent = Schema.Schema.Type<typeof UnprocessedEventSyncEvent>;

package/src/rpc/event/EventRpcGroup.ts

@@ -4,6 +4,10 @@ import { Discord, Event, EventRsvp, Team } from '~/index.js';
 import { UnprocessedEventSyncEvent } from './EventRpcEvents.js';
 import {
   ChannelEventEntry,
+  CreateEventForbidden,
+  CreateEventInvalidDate,
+  CreateEventNotMember,
+  CreateEventResult,
   EventDiscordMessage,
   EventEmbedInfo,
   RsvpAttendeesResult,
@@ -11,6 +15,7 @@ import {
   RsvpDeadlinePassed,
   RsvpEventNotFound,
   RsvpMemberNotFound,
+  RsvpReminderSummary,
 } from './EventRpcModels.js';
 
 export const EventRpcGroup = RpcGroup.make(
@@ -62,4 +67,22 @@ export const EventRpcGroup = RpcGroup.make(
     payload: { event_id: Event.EventId, offset: Schema.Number, limit: Schema.Number },
     success: RsvpAttendeesResult,
   }),
+  Rpc.make('GetRsvpReminderSummary', {
+    payload: { event_id: Event.EventId },
+    success: RsvpReminderSummary,
+  }),
+  Rpc.make('CreateEvent', {
+    payload: {
+      guild_id: Discord.Snowflake,
+      discord_user_id: Discord.Snowflake,
+      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),
+    },
+    success: CreateEventResult,
+    error: Schema.Union(CreateEventNotMember, CreateEventForbidden, CreateEventInvalidDate),
+  }),
 ).prefix('Event/');

package/src/rpc/event/EventRpcModels.ts

@@ -49,6 +49,26 @@ export class RsvpEventNotFound extends Schema.TaggedError<RsvpEventNotFound>()(
   {},
 ) {}
 
+export class CreateEventNotMember extends Schema.TaggedError<CreateEventNotMember>()(
+  'CreateEventNotMember',
+  {},
+) {}
+
+export class CreateEventForbidden extends Schema.TaggedError<CreateEventForbidden>()(
+  'CreateEventForbidden',
+  {},
+) {}
+
+export class CreateEventInvalidDate extends Schema.TaggedError<CreateEventInvalidDate>()(
+  'CreateEventInvalidDate',
+  {},
+) {}
+
+export class CreateEventResult extends Schema.Class<CreateEventResult>('CreateEventResult')({
+  event_id: Schema.String,
+  title: Schema.String,
+}) {}
+
 export class RsvpAttendeeEntry extends Schema.Class<RsvpAttendeeEntry>('RsvpAttendeeEntry')({
   discord_id: Schema.NullOr(Schema.String),
   name: Schema.NullOr(Schema.String),
@@ -60,3 +80,18 @@ export class RsvpAttendeesResult extends Schema.Class<RsvpAttendeesResult>('Rsvp
   attendees: Schema.Array(RsvpAttendeeEntry),
   total: Schema.Number,
 }) {}
+
+export class NonResponderRpcEntry extends Schema.Class<NonResponderRpcEntry>(
+  'NonResponderRpcEntry',
+)({
+  discord_id: Schema.NullOr(Schema.String),
+  name: Schema.NullOr(Schema.String),
+  username: Schema.NullOr(Schema.String),
+}) {}
+
+export class RsvpReminderSummary extends Schema.Class<RsvpReminderSummary>('RsvpReminderSummary')({
+  yesCount: Schema.Number,
+  noCount: Schema.Number,
+  maybeCount: Schema.Number,
+  nonResponders: Schema.Array(NonResponderRpcEntry),
+}) {}

package/src/rpc/guild/GuildRpcGroup.ts

@@ -32,8 +32,8 @@ export const GuildRpcGroup = RpcGroup.make(
       members: Schema.Array(
         Schema.Struct({
           discord_id: Schema.String,
-          discord_username: Schema.String,
-          discord_avatar: Schema.NullOr(Schema.String),
+          username: Schema.String,
+          avatar: Schema.NullOr(Schema.String),
           roles: Schema.Array(Schema.String),
         }),
       ),
@@ -43,8 +43,8 @@ export const GuildRpcGroup = RpcGroup.make(
     payload: {
       guild_id: Discord.Snowflake,
       discord_id: Schema.String,
-      discord_username: Schema.String,
-      discord_avatar: Schema.NullOr(Schema.String),
+      username: Schema.String,
+      avatar: Schema.NullOr(Schema.String),
       roles: Schema.Array(Schema.String),
     },
   }),