Compare commits
2 commits
9e8dc14029
...
6500d9a9be
| Author | SHA1 | Date | |
|---|---|---|---|
| 6500d9a9be | |||
| 10b3e9ff72 |
5 changed files with 57 additions and 5 deletions
|
|
@ -1,6 +1,9 @@
|
|||
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<string, string[]> = JS_EMOJI_MAP;
|
||||
|
||||
/**
|
||||
* @typedef {object} TIMESTAMPS
|
||||
|
|
@ -110,7 +113,37 @@ 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;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -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<INVITE_CODE>({
|
|||
}
|
||||
});
|
||||
|
||||
// TODO: separate out these different validators somewhere?
|
||||
const MAX_INVITE_EXPIRE_TIME = 28 * 24 * 60 * 60 * 1_000;
|
||||
export function VALIDATE_INVITE_CODE(invite_code: INVITE_CODE) {
|
||||
const errors: any[] = [];
|
||||
|
||||
|
|
@ -41,7 +41,6 @@ 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',
|
||||
|
|
@ -49,5 +48,20 @@ 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;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -8,6 +8,7 @@ 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:
|
||||
|
|
@ -94,6 +95,8 @@ export async function POST(req: Request, meta: Record<string, any>): Promise<Res
|
|||
invite_code.code = `${full_lurid.substring(0, 14).replace(/-/g, ' ')}${full_lurid.substring(39).replace(/-/g, ' ')}`;
|
||||
}
|
||||
|
||||
invite_code.timestamps.expires = invite_code.timestamps.expires ?? new Date(new Date(now).valueOf() + DEFAULT_INVITE_EXPIRE_TIME).toISOString();
|
||||
|
||||
const errors = VALIDATE_INVITE_CODE(invite_code);
|
||||
if (errors) {
|
||||
return Response.json({
|
||||
|
|
|
|||
|
|
@ -128,7 +128,8 @@ export async function POST(req: Request, meta: Record<string, any>): Promise<Res
|
|||
code: root_invite_code_secret,
|
||||
creator_id: new_user_id,
|
||||
timestamps: {
|
||||
created: now
|
||||
created: now,
|
||||
expires: new Date(new Date(now).valueOf() + 1_000).toISOString()
|
||||
}
|
||||
};
|
||||
|
||||
|
|
@ -151,7 +152,7 @@ export async function POST(req: Request, meta: Record<string, any>): Promise<Res
|
|||
code: secret_code
|
||||
})).shift()?.load();
|
||||
|
||||
const is_expired = invite_code?.timestamps.expires ? now <= invite_code.timestamps.expires : false;
|
||||
const is_expired = now >= (invite_code?.timestamps.expires ?? '0000-01-01T00:00:00.000Z');
|
||||
const is_used = (await SIGNUPS.find({
|
||||
referring_invite_code_id: invite_code?.id
|
||||
}, {
|
||||
|
|
|
|||
|
|
@ -6,6 +6,7 @@
|
|||
|
||||
#chat #chat-content {
|
||||
overflow-y: scroll;
|
||||
scroll-behavior: smooth;
|
||||
position: absolute;
|
||||
top: 0;
|
||||
left: 0;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue