KayFaraday
/
Zaimki
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[sec] remove apostrophes from keys

This commit is contained in:
Avris 2021-08-11 23:29:41 +02:00
parent 04ce228bb8
commit cd6d64c240
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
server/routes/nouns.js
View File

@ -3,7 +3,7 @@ import SQL from 'sql-template-strings';
import {ulid} from "ulid";
import {createCanvas, loadImage, registerFont} from "canvas";
import {loadSuml} from "../loader";
import {handleErrorAsync, isTroll} from "../../src/helpers";
import {clearKey, handleErrorAsync, isTroll} from "../../src/helpers";
import { caches } from "../../src/cache";
const translations = loadSuml('translations');
@ -28,7 +28,7 @@ const approve = async (db, id) => {
const addVersions = async (req, nouns) => {
const keys = new Set();
nouns.filter(s => !!s && s.sources)
.forEach(s => s.sources.split(',').forEach(k => keys.add(`'` + k.split('#')[0] + `'`)));
.forEach(s => s.sources.split(',').forEach(k => keys.add(`'` + clearKey(k.split('#')[0]) + `'`)));
const sources = await req.db.all(SQL`
SELECT s.*, u.username AS submitter FROM sources s

2
server/routes/sources.js
View File

@ -20,7 +20,7 @@ const approve = async (db, id) => {
}
const linkOtherVersions = async (req, sources) => {
const keys = new Set(sources.filter(s => !!s && s.key).map(s => `'` + s.key + `'`));
const keys = new Set(sources.filter(s => !!s && s.key).map(s => `'` + clearKey(s.key) + `'`));
const otherVersions = await req.db.all(SQL`
SELECT s.*, u.username AS submitter FROM sources s

2
server/routes/terms.js
View File

@ -22,7 +22,7 @@ const approve = async (db, id) => {
}
const linkOtherVersions = async (req, terms) => {
const keys = new Set(terms.filter(s => !!s && s.key).map(s => `'` + s.key + `'`));
const keys = new Set(terms.filter(s => !!s && s.key).map(s => `'` + clearKey(s.key) + `'`));
const otherVersions = await req.db.all(SQL`
SELECT t.*, u.username AS author FROM terms t