diff --git a/models/event.ts b/models/event.ts index a11827a..5dcb873 100644 --- a/models/event.ts +++ b/models/event.ts @@ -1,9 +1,6 @@ import { by_character, by_lurid } from '@andyburke/fsdb/organizers'; import { FSDB_COLLECTION } from '@andyburke/fsdb'; import { FSDB_INDEXER_SYMLINKS } from '@andyburke/fsdb/indexers'; -import { EMOJI_MAP as JS_EMOJI_MAP } from '../public/js/emojis/en.js'; - -const EMOJI_MAP: Record = JS_EMOJI_MAP; /** * @typedef {object} TIMESTAMPS @@ -113,37 +110,7 @@ export function VALIDATE_EVENT(event: EVENT) { }); } break; - case 'reaction': - if (typeof event.parent_id !== 'string') { - errors.push({ - cause: 'reaction_missing_parent_id', - message: 'A reaction must have a parent_id that refers to another event.' - }); - } else if (typeof event.data?.reaction !== 'string') { - errors.push({ - cause: 'reaction_must_be_an_emoji', - message: 'A reaction event must have a `data.reaction` that is an emoji.' - }); - } else if (typeof EMOJI_MAP[event.data.reaction] === 'undefined') { - errors.push({ - cause: 'reaction_must_be_an_emoji', - message: 'A reaction event must have a `data.reaction` that is an emoji.' - }); - } - break; - case 'test': - if (Deno.env.get('DENO_ENV') !== 'test') { - errors.push({ - cause: 'unknown_event_type', - message: 'Event types allowed: ' + ['chat', 'post', 'blurb', 'essay', 'reaction'].join(', ') - }); - } - break; default: - errors.push({ - cause: 'unknown_event_type', - message: 'Event types allowed: ' + ['chat', 'post', 'blurb', 'essay', 'reaction'].join(', ') - }); break; } diff --git a/models/invites.ts b/models/invites.ts index b7a07e7..d81088b 100644 --- a/models/invites.ts +++ b/models/invites.ts @@ -8,7 +8,7 @@ export type INVITE_CODE = { code: string; timestamps: { created: string; - expires: string; + expires?: string; cancelled?: string; }; }; @@ -30,7 +30,7 @@ export const INVITE_CODES = new FSDB_COLLECTION({ } }); -const MAX_INVITE_EXPIRE_TIME = 28 * 24 * 60 * 60 * 1_000; +// TODO: separate out these different validators somewhere? export function VALIDATE_INVITE_CODE(invite_code: INVITE_CODE) { const errors: any[] = []; @@ -41,6 +41,7 @@ export function VALIDATE_INVITE_CODE(invite_code: INVITE_CODE) { }); } + // TODO: further invite code validation if (typeof invite_code.code !== 'string' || invite_code.id.length < 3) { errors.push({ cause: 'invalid_invite_code_code', @@ -48,20 +49,5 @@ export function VALIDATE_INVITE_CODE(invite_code: INVITE_CODE) { }); } - if (typeof invite_code.timestamps?.expires !== 'string') { - errors.push({ - cause: 'missing_invite_expiration', - message: 'Invite codes must have an expiration set.' - }); - } - - const expiration_delta = new Date(invite_code.timestamps.expires).valueOf() - new Date(invite_code.timestamps.created).valueOf(); - if (expiration_delta > MAX_INVITE_EXPIRE_TIME || expiration_delta < 0) { - errors.push({ - cause: 'invite_expiration_invalid', - message: 'Invite codes must expire within a limited window after they are created.' - }); - } - return errors.length ? errors : undefined; } diff --git a/public/api/users/:user_id/invites/index.ts b/public/api/users/:user_id/invites/index.ts index d4a74e5..991167c 100644 --- a/public/api/users/:user_id/invites/index.ts +++ b/public/api/users/:user_id/invites/index.ts @@ -8,7 +8,6 @@ import { INVITE_CODE, INVITE_CODES, VALIDATE_INVITE_CODE } from '../../../../../ export const PRECHECKS: PRECHECK_TABLE = {}; const INVITE_CODES_ALLOWED_PER_MINUTE = parseInt(Deno.env.get('INVITE_CODES_ALLOWED_PER_MINUTE') ?? '3', 10); -const DEFAULT_INVITE_EXPIRE_TIME: number = 28 * 24 * 60 * 60 * 1_000; // 28 days max invite length // GET /api/users/:user_id/invites - get invites this user has created // query parameters: @@ -95,8 +94,6 @@ export async function POST(req: Request, meta: Record): Promise): Promise): Promise= (invite_code?.timestamps.expires ?? '0000-01-01T00:00:00.000Z'); + const is_expired = invite_code?.timestamps.expires ? now <= invite_code.timestamps.expires : false; const is_used = (await SIGNUPS.find({ referring_invite_code_id: invite_code?.id }, { diff --git a/public/tabs/chat/chat.css b/public/tabs/chat/chat.css index f09ab3a..59c9aac 100644 --- a/public/tabs/chat/chat.css +++ b/public/tabs/chat/chat.css @@ -6,7 +6,6 @@ #chat #chat-content { overflow-y: scroll; - scroll-behavior: smooth; position: absolute; top: 0; left: 0;