mirror/ditto
mirror/ditto
1
0
Fork 0
mirror of https://gitlab.com/soapbox-pub/ditto.git synced 2025-12-06 11:29:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

captcha: rename puzzle to bg, and piece to puzzle

Browse source
This commit is contained in:
Alex Gleason 2024-10-04 14:21:54 -05:00
parent 68c0d437ee
commit 030bfa94d6
No known key found for this signature in database
GPG key ID: 7211D1F99744FBB7
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/controllers/api/captcha.ts
View file

@ -20,7 +20,7 @@ const captchas = new TTLCache<string, Point>();
/** Puzzle captcha controller. */ /** Puzzle captcha controller. */
export const captchaController: AppController = async (c) => { export const captchaController: AppController = async (c) => {
const { puzzle, piece, solution } = await generateCaptcha( const { bg, puzzle, solution } = await generateCaptcha(
await Deno.readFile(new URL('../../../captcha/tj-holowaychuk.jpg', import.meta.url)), await Deno.readFile(new URL('../../../captcha/tj-holowaychuk.jpg', import.meta.url)),
await Deno.readFile(new URL('../../../captcha/puzzle.png', import.meta.url)), await Deno.readFile(new URL('../../../captcha/puzzle.png', import.meta.url)),
{ {
@ -39,10 +39,10 @@ export const captchaController: AppController = async (c) => {
captchas.set(id, solution, { ttl }); captchas.set(id, solution, { ttl });
return c.json({ return c.json({
type: 'puzzle',
id, id,
type: 'puzzle',
bg: bg.toDataURL(),
puzzle: puzzle.toDataURL(), puzzle: puzzle.toDataURL(),
piece: piece.toDataURL(),
created_at: now.toISOString(), created_at: now.toISOString(),
expires_at: new Date(now.getTime() + ttl).toISOString(), expires_at: new Date(now.getTime() + ttl).toISOString(),
}); });
@ -61,22 +61,22 @@ async function generateCaptcha(
}, },
) { ) {
const { pw, ph, cw, ch, alpha } = opts; const { pw, ph, cw, ch, alpha } = opts;
const puzzle = createCanvas(cw, ch); const bg = createCanvas(cw, ch);
const ctx = puzzle.getContext('2d'); const ctx = bg.getContext('2d');
const image = await loadImage(from); const image = await loadImage(from);
ctx.drawImage(image, 0, 0, image.width(), image.height(), 0, 0, cw, ch); ctx.drawImage(image, 0, 0, image.width(), image.height(), 0, 0, cw, ch);
const piece = createCanvas(pw, ph); const puzzle = createCanvas(pw, ph);
const pctx = piece.getContext('2d'); const pctx = puzzle.getContext('2d');
const solution = getPieceCoords(puzzle.width, puzzle.height, pw, ph); const solution = getPieceCoords(bg.width, bg.height, pw, ph);
// Draw the piece onto the puzzle piece canvas but only where the mask allows // Draw the piece onto the puzzle piece canvas but only where the mask allows
const maskImage = await loadImage(mask); const maskImage = await loadImage(mask);
pctx.globalCompositeOperation = 'source-over'; pctx.globalCompositeOperation = 'source-over';
pctx.drawImage(maskImage, 0, 0, pw, ph); pctx.drawImage(maskImage, 0, 0, pw, ph);
pctx.globalCompositeOperation = 'source-in'; pctx.globalCompositeOperation = 'source-in';
pctx.drawImage(puzzle, solution.x, solution.y, pw, ph, 0, 0, pw, ph); pctx.drawImage(bg, solution.x, solution.y, pw, ph, 0, 0, pw, ph);
// Reset composite operation // Reset composite operation
pctx.globalCompositeOperation = 'source-over'; pctx.globalCompositeOperation = 'source-over';
@ -95,8 +95,8 @@ async function generateCaptcha(
ctx.drawImage(tempCanvas, solution.x, solution.y, pw, ph); ctx.drawImage(tempCanvas, solution.x, solution.y, pw, ph);
return { return {
bg,
puzzle, puzzle,
piece,
solution, solution,
}; };
} }