alois/ManyCoqDecks
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Generate Random Names for New Users

Browse Source
This commit is contained in:
CookieCoder15
2020-10-03 21:04:43 +01:00
committed by Gareth Latty
parent 97af52ecd1
commit 99e65d352d
3 changed files with 119 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/package-lock.json
Generated
+5
View File
@@ -3566,6 +3566,11 @@
"debug": "^2.2.0"
}
},
"unique-names-generator": {
"version": "4.3.1",
"resolved": "https://registry.npmjs.org/unique-names-generator/-/unique-names-generator-4.3.1.tgz",
"integrity": "sha512-oxkKrDXbwx6I5M963SdfmMH2t8n1OIfYyzoJ25BmDeETlyWAZjTbMXwIEMiQDex4lkD2pqe+9gxDJQAB2IOfDg=="
},
"unique-string": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/unique-string/-/unique-string-2.0.0.tgz",
server/package.json
+1
View File
@@ -37,6 +37,7 @@
"pg": "^8.2.1",
"postgres-migrations": "^4.0.3",
"source-map-support": "^0.5.19",
"unique-names-generator": "^4.3.1",
"uuid": "^8.1.0",
"winston": "^3.2.1"
},
server/src/ts/store.ts
+113 -105
View File
@@ -8,6 +8,8 @@ import * as Errors from "./errors";
import * as uuid from "uuid";
import * as User from "./user";
import * as Code from "./deck/code";
import { uniqueNamesGenerator, Config, adjectives, colors, animals } from 'unique-names-generator';
import { Console } from "winston/lib/winston/transports";
const migrateConfig = {
logger: (msg: string) => Logging.logger.info(msg),
@@ -24,8 +26,8 @@ export const init = async (config: Pg.PoolConfig): Promise<Store> => {
const db = config.database
? config.database
: config.user
? config.user
: "manydecks";
? config.user
: "manydecks";
await Migrate.createDb(db, { client }, migrateConfig);
await Migrate.migrate({ client }, "src/sql", migrateConfig);
@@ -66,51 +68,57 @@ export class Store {
return result.rows.map((row) => row.code);
});
generateUsername(): string {
return uniqueNamesGenerator({
dictionaries: [adjectives, colors, animals]
});
}
public findOrCreateUser: (
googleId: string,
googleName?: string
) => Promise<User.User> = async (googleId, googleName) =>
await this.withClient(async (client) => {
const existingResult = await client.query(
`SELECT id, name FROM manydecks.users WHERE google_id = $1;`,
[googleId]
);
if (existingResult.rowCount > 0) {
const [user] = existingResult.rows;
return { id: user.id, name: user.name };
} else {
const newId = User.id();
const newName = googleName === undefined ? "New User" : googleName;
await client.query(
`INSERT INTO manydecks.users (id, name, google_id) VALUES ($1, $2, $3);`,
[newId, newName, googleId]
await this.withClient(async (client) => {
const existingResult = await client.query(
`SELECT id, name FROM manydecks.users WHERE google_id = $1;`,
[googleId]
);
return { id: newId, name: newName };
}
});
if (existingResult.rowCount > 0) {
const [user] = existingResult.rows;
return { id: user.id, name: user.name };
} else {
const newId = User.id();
const newName = googleName === undefined ? this.generateUsername() : googleName;
await client.query(
`INSERT INTO manydecks.users (id, name, google_id) VALUES ($1, $2, $3);`,
[newId, newName, googleId]
);
return { id: newId, name: newName };
}
});
public findOrCreateTwitchUser: (
twitchId: string,
twitchName?: string
) => Promise<User.User> = async (twitchId, twitchName) =>
await this.withClient(async (client) => {
const existingResult = await client.query(
`SELECT id, name FROM manydecks.users WHERE twitch_id = $1;`,
[twitchId]
);
if (existingResult.rowCount > 0) {
const [user] = existingResult.rows;
return { id: user.id, name: user.name };
} else {
const newId = User.id();
const newName = twitchName === undefined ? "New User" : twitchName;
await client.query(
`INSERT INTO manydecks.users (id, name, twitch_id) VALUES ($1, $2, $3);`,
[newId, newName, twitchId]
await this.withClient(async (client) => {
const existingResult = await client.query(
`SELECT id, name FROM manydecks.users WHERE twitch_id = $1;`,
[twitchId]
);
return { id: newId, name: newName };
}
});
if (existingResult.rowCount > 0) {
const [user] = existingResult.rows;
return { id: user.id, name: user.name };
} else {
const newId = User.id();
const newName = twitchName === undefined ? this.generateUsername() : twitchName;
await client.query(
`INSERT INTO manydecks.users (id, name, twitch_id) VALUES ($1, $2, $3);`,
[newId, newName, twitchId]
);
return { id: newId, name: newName };
}
});
public findOrCreateGuestUser: () => Promise<User.User> = async () =>
await this.withClient(async (client) => {
@@ -122,7 +130,7 @@ export class Store {
return { id: user.id, name: user.name };
} else {
const newId = User.id();
const newName = "Guest";
const newName = this.generateUsername();
await client.query(
`INSERT INTO manydecks.users (id, name, is_guest) VALUES ($1, $2, True);`,
[newId, newName]
@@ -151,22 +159,22 @@ export class Store {
d: Deck.EditableDeck,
user: string
) => Promise<number> = async (d, user) =>
await this.withClient(async (client) => {
let deck;
try {
deck = Deck.validate(d);
} catch (error) {
throw new Errors.BadDeck();
}
const insert = await client.query(
`
await this.withClient(async (client) => {
let deck;
try {
deck = Deck.validate(d);
} catch (error) {
throw new Errors.BadDeck();
}
const insert = await client.query(
`
INSERT INTO manydecks.decks (deck, author) VALUES ($1, $2) RETURNING id;
`,
[deck, user]
);
const [inserted] = insert.rows;
return inserted.id;
});
[deck, user]
);
const [inserted] = insert.rows;
return inserted.id;
});
public getDeck: (id: number, user?: string) => Promise<Deck.Deck> = async (
id,
@@ -246,7 +254,7 @@ export class Store {
};
});
private static *summariesFromRows(
private static * summariesFromRows(
result: Pg.QueryResult
): Iterable<Deck.CodeAndSummary> {
for (const deck of result.rows) {
@@ -276,42 +284,42 @@ export class Store {
user,
publicOnly = true
) =>
await this.withClient(async (client) => {
const result = await client.query(
`
await this.withClient(async (client) => {
const result = await client.query(
`
SELECT id, name, author_id, author, language, calls, responses, public, version
FROM manydecks.summaries WHERE summaries.author_id = $1 AND (NOT $2 OR summaries.public)
ORDER BY id DESC;
`,
[user, publicOnly]
);
return Store.summariesFromRows(result);
});
[user, publicOnly]
);
return Store.summariesFromRows(result);
});
public browse: (
query?: string,
language?: string,
page?: number
) => Promise<Iterable<Deck.CodeAndSummary>> = async (query, language, page) =>
await this.withClient(async (client) => {
const pageSize = 20;
const p = page === undefined ? 0 : page;
const l = language === undefined ? null : language;
let result;
if (query === undefined) {
result = await client.query(
`
await this.withClient(async (client) => {
const pageSize = 20;
const p = page === undefined ? 0 : page;
const l = language === undefined ? null : language;
let result;
if (query === undefined) {
result = await client.query(
`
SELECT id, name, author_id, author, language, calls, responses, public, version
FROM manydecks.summaries
WHERE summaries.public AND ($3::text IS NULL OR summaries.language = $3::text)
ORDER BY id DESC
OFFSET $1::int * $2::int LIMIT $2
`,
[p, pageSize, l]
);
} else {
result = await client.query(
`
[p, pageSize, l]
);
} else {
result = await client.query(
`
SELECT id, name, author_id, author, language, calls, responses, public, version, ts_rank_cd(deck_search , query) AS rank
FROM manydecks.summaries, to_tsquery($4) query
WHERE summaries.public AND ($3::text IS NULL OR summaries.language = $3::text)
@@ -319,49 +327,49 @@ export class Store {
ORDER BY rank DESC
OFFSET $1::int * $2::int LIMIT $2
`,
[p, pageSize, l, query]
);
}
return Store.summariesFromRows(result);
});
[p, pageSize, l, query]
);
}
return Store.summariesFromRows(result);
});
public updateDeck: (
id: number,
user: string,
patch: Patch.Operation[]
) => Promise<Deck.Deck> = async (id, user, patch) =>
await this.withClient(async (client) => {
const deck = await this.getDeck(id);
try {
JsonPatch.applyPatch(deck, patch);
} catch (error) {
if (
error instanceof JsonPatch.JsonPatchError &&
error.name === "TEST_OPERATION_FAILED"
) {
throw new Errors.PatchTestFailed();
} else {
await this.withClient(async (client) => {
const deck = await this.getDeck(id);
try {
JsonPatch.applyPatch(deck, patch);
} catch (error) {
if (
error instanceof JsonPatch.JsonPatchError &&
error.name === "TEST_OPERATION_FAILED"
) {
throw new Errors.PatchTestFailed();
} else {
throw new Errors.BadPatch();
}
}
let updated;
try {
updated = Deck.validate({
...deck,
author: undefined,
version: undefined,
});
} catch (error) {
throw new Errors.BadPatch();
}
}
let updated;
try {
updated = Deck.validate({
...deck,
author: undefined,
version: undefined,
});
} catch (error) {
throw new Errors.BadPatch();
}
await client.query(
`
await client.query(
`
UPDATE manydecks.decks SET deck = $1 WHERE id = $2;
`,
[updated, id]
);
return deck;
});
[updated, id]
);
return deck;
});
public deleteDeck: (id: number, user: string) => Promise<void> = async (
id,