diff --git a/server/routes/inclusive.ts b/server/routes/inclusive.ts index d95390aba..e634530bc 100644 --- a/server/routes/inclusive.ts +++ b/server/routes/inclusive.ts @@ -1,7 +1,7 @@ import { Router } from 'express'; import SQL from 'sql-template-strings'; import { ulid } from 'ulid'; -import { isTroll, handleErrorAsync, sortClearedLinkedText } from '../../src/helpers.ts'; +import { handleErrorAsync, sortClearedLinkedText } from '../../src/helpers.ts'; import { caches } from '../../src/cache.ts'; import auditLog from '../audit.ts'; import type { Database } from '../db.ts'; @@ -73,10 +73,6 @@ router.post('/inclusive/submit', handleErrorAsync(async (req, res) => { return res.status(401).json({ error: 'Unauthorised' }); } - if (!(req.user && req.user.admin) && isTroll(JSON.stringify(req.body))) { - return res.json('ok'); - } - const id = ulid(); await req.db.get(SQL` INSERT INTO inclusive (id, insteadOf, say, because, approved, base_id, locale, author_id, categories, links, clarification) diff --git a/server/routes/names.ts b/server/routes/names.ts index d78f11037..68c29ff0a 100644 --- a/server/routes/names.ts +++ b/server/routes/names.ts @@ -1,7 +1,7 @@ import { Router } from 'express'; import SQL from 'sql-template-strings'; import { ulid } from 'ulid'; -import { handleErrorAsync, isTroll } from '../../src/helpers.ts'; +import { handleErrorAsync } from '../../src/helpers.ts'; import { caches } from '../../src/cache.ts'; import auditLog from '../audit.ts'; import type { Database } from '../db.ts'; @@ -63,10 +63,6 @@ router.post('/names/submit', handleErrorAsync(async (req, res) => { return res.status(401).json({ error: 'Unauthorised' }); } - if (!(req.user && req.user.admin) && isTroll(JSON.stringify(req.body))) { - return res.json('ok'); - } - const id = ulid(); await req.db.get(SQL` INSERT INTO names (id, name, locale, origin, meaning, usage, legally, pros, cons, notablePeople, links, namedays, namedaysComment, deleted, approved, base_id, author_id) diff --git a/server/routes/nouns.ts b/server/routes/nouns.ts index 3ef6c62a2..19d756003 100644 --- a/server/routes/nouns.ts +++ b/server/routes/nouns.ts @@ -4,7 +4,7 @@ import SQL from 'sql-template-strings'; import { ulid } from 'ulid'; import { createCanvas, loadImage, registerFont } from 'canvas'; import { loadSuml } from '../loader.ts'; -import { clearKey, handleErrorAsync, isTroll } from '../../src/helpers.ts'; +import { clearKey, handleErrorAsync } from '../../src/helpers.ts'; import { caches } from '../../src/cache.ts'; import { registerLocaleFont } from '../localeFont.ts'; import auditLog from '../audit.ts'; @@ -128,10 +128,6 @@ router.post('/nouns/submit', handleErrorAsync(async (req, res) => { return res.status(401).json({ error: 'Unauthorised' }); } - if (!(req.user && req.user.admin) && isTroll(JSON.stringify(req.body))) { - return res.json('ok'); - } - const id = ulid(); await req.db.get(SQL` INSERT INTO nouns (id, masc, fem, neutr, mascPl, femPl, neutrPl, sources, approved, base_id, locale, author_id) diff --git a/server/routes/terms.ts b/server/routes/terms.ts index 4dc8b0473..816d79758 100644 --- a/server/routes/terms.ts +++ b/server/routes/terms.ts @@ -2,7 +2,7 @@ import type { Request } from 'express'; import { Router } from 'express'; import SQL from 'sql-template-strings'; import { ulid } from 'ulid'; -import { isTroll, handleErrorAsync, sortClearedLinkedText, clearKey } from '../../src/helpers.ts'; +import { handleErrorAsync, sortClearedLinkedText, clearKey } from '../../src/helpers.ts'; import { caches } from '../../src/cache.ts'; import auditLog from '../audit.ts'; import type { Database } from '../db.ts'; @@ -106,10 +106,6 @@ router.post('/terms/submit', handleErrorAsync(async (req, res) => { return res.status(401).json({ error: 'Unauthorised' }); } - if (!(req.user && req.user.admin) && isTroll(JSON.stringify(req.body))) { - return res.json('ok'); - } - const id = ulid(); await req.db.get(SQL` INSERT INTO terms (id, term, original, key, definition, approved, base_id, locale, author_id, category, flags, images) diff --git a/src/helpers.ts b/src/helpers.ts index 2aefb043d..ed86f0cf3 100644 --- a/src/helpers.ts +++ b/src/helpers.ts @@ -211,10 +211,6 @@ export const isEmoji = (char: string): boolean => { return _.toArray(char).length === 1 && !!char.trim().match(/(?:[\u2700-\u27bf]|(?:\ud83c[\udde6-\uddff]){2}|[\ud800-\udbff][\udc00-\udfff]|[\u0023-\u0039]\ufe0f?\u20e3|\u3299|\u3297|\u303d|\u3030|\u24c2|\ud83c[\udd70-\udd71]|\ud83c[\udd7e-\udd7f]|\ud83c\udd8e|\ud83c[\udd91-\udd9a]|\ud83c[\udde6-\uddff]|\ud83c[\ude01-\ude02]|\ud83c\ude1a|\ud83c\ude2f|\ud83c[\ude32-\ude3a]|\ud83c[\ude50-\ude51]|\u203c|\u2049|[\u25aa-\u25ab]|\u25b6|\u25c0|[\u25fb-\u25fe]|\u00a9|\u00ae|\u2122|\u2139|\ud83c\udc04|[\u2600-\u26FF]|\u2b05|\u2b06|\u2b07|\u2b1b|\u2b1c|\u2b50|\u2b55|\u231a|\u231b|\u2328|\u23cf|[\u23e9-\u23f3]|[\u23f8-\u23fa]|\ud83c\udccf|\u2934|\u2935|[\u2190-\u21ff])/); }; -export const isTroll = (body: string): boolean => { - return ['cipeusz', 'feminazi', 'bruksela', 'zboczeń'].some((t) => body.indexOf(t) > -1); -}; - export function zip(list: [K, V][], reverse: false): Record; export function zip(list: [V, K][], reverse: true): Record; export function zip(list: [K, V][] | [V, K][], reverse: boolean): Record {