OpenNeo/impress-2020
OpenNeo/impress-2020
1
0
Fork 0
Code Pull requests Activity

Fix misc lint errors

Browse source 
I ran `yarn eslint src`, and fixed everything I saw!
This commit is contained in:
Emi Matchu 2021-05-03 15:06:07 -07:00
parent ec3aa1747d
commit 56e1ce595c
8 changed files with 53 additions and 72 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/server/auth.js
View file

@ -1,7 +1,6 @@
import util from "util"; import util from "util";
const jwtVerify = util.promisify(require("jsonwebtoken").verify);
import jwksClient from "jwks-rsa"; import jwksClient from "jwks-rsa";
const jwtVerify = util.promisify(require("jsonwebtoken").verify);
const jwks = jwksClient({ const jwks = jwksClient({
jwksUri: "https://openneo.us.auth0.com/.well-known/jwks.json", jwksUri: "https://openneo.us.auth0.com/.well-known/jwks.json",
@ -9,10 +8,10 @@ const jwks = jwksClient({
async function getJwtKey(header, callback) { async function getJwtKey(header, callback) {
jwks.getSigningKey(header.kid, (err, key) => { jwks.getSigningKey(header.kid, (err, key) => {
const signingKey = key.publicKey || key.rsaPublicKey;
if (err) { if (err) {
return callback(null, signingKey); return callback(null, signingKey);
} }
const signingKey = key.publicKey || key.rsaPublicKey;
callback(null, signingKey); callback(null, signingKey);
}); });
} }

88
src/server/loaders.js
View file

@ -5,7 +5,7 @@ import { normalizeRow } from "./util";
const buildClosetListLoader = (db) => const buildClosetListLoader = (db) =>
new DataLoader(async (ids) => { new DataLoader(async (ids) => {
const qs = ids.map((_) => "?").join(","); const qs = ids.map((_) => "?").join(",");
const [rows, _] = await db.execute( const [rows] = await db.execute(
`SELECT * FROM closet_lists WHERE id IN (${qs})`, `SELECT * FROM closet_lists WHERE id IN (${qs})`,
ids ids
); );
@ -18,7 +18,7 @@ const buildClosetListLoader = (db) =>
const buildColorLoader = (db) => { const buildColorLoader = (db) => {
const colorLoader = new DataLoader(async (colorIds) => { const colorLoader = new DataLoader(async (colorIds) => {
const qs = colorIds.map((_) => "?").join(","); const qs = colorIds.map((_) => "?").join(",");
const [rows, _] = await db.execute( const [rows] = await db.execute(
`SELECT * FROM colors WHERE id IN (${qs}) AND prank = 0`, `SELECT * FROM colors WHERE id IN (${qs}) AND prank = 0`,
colorIds colorIds
); );
@ -34,7 +34,7 @@ const buildColorLoader = (db) => {
}); });
colorLoader.loadAll = async () => { colorLoader.loadAll = async () => {
const [rows, _] = await db.execute(`SELECT * FROM colors WHERE prank = 0`); const [rows] = await db.execute(`SELECT * FROM colors WHERE prank = 0`);
const entities = rows.map(normalizeRow); const entities = rows.map(normalizeRow);
for (const color of entities) { for (const color of entities) {
@ -50,7 +50,7 @@ const buildColorLoader = (db) => {
const buildColorTranslationLoader = (db) => const buildColorTranslationLoader = (db) =>
new DataLoader(async (colorIds) => { new DataLoader(async (colorIds) => {
const qs = colorIds.map((_) => "?").join(","); const qs = colorIds.map((_) => "?").join(",");
const [rows, _] = await db.execute( const [rows] = await db.execute(
`SELECT * FROM color_translations `SELECT * FROM color_translations
WHERE color_id IN (${qs}) AND locale = "en"`, WHERE color_id IN (${qs}) AND locale = "en"`,
colorIds colorIds
@ -69,7 +69,7 @@ const buildColorTranslationLoader = (db) =>
const buildSpeciesLoader = (db) => { const buildSpeciesLoader = (db) => {
const speciesLoader = new DataLoader(async (speciesIds) => { const speciesLoader = new DataLoader(async (speciesIds) => {
const qs = speciesIds.map((_) => "?").join(","); const qs = speciesIds.map((_) => "?").join(",");
const [rows, _] = await db.execute( const [rows] = await db.execute(
`SELECT * FROM species WHERE id IN (${qs})`, `SELECT * FROM species WHERE id IN (${qs})`,
speciesIds speciesIds
); );
@ -85,7 +85,7 @@ const buildSpeciesLoader = (db) => {
}); });
speciesLoader.loadAll = async () => { speciesLoader.loadAll = async () => {
const [rows, _] = await db.execute(`SELECT * FROM species`); const [rows] = await db.execute(`SELECT * FROM species`);
const entities = rows.map(normalizeRow); const entities = rows.map(normalizeRow);
for (const species of entities) { for (const species of entities) {
@ -101,7 +101,7 @@ const buildSpeciesLoader = (db) => {
const buildSpeciesTranslationLoader = (db) => const buildSpeciesTranslationLoader = (db) =>
new DataLoader(async (speciesIds) => { new DataLoader(async (speciesIds) => {
const qs = speciesIds.map((_) => "?").join(","); const qs = speciesIds.map((_) => "?").join(",");
const [rows, _] = await db.execute( const [rows] = await db.execute(
`SELECT * FROM species_translations `SELECT * FROM species_translations
WHERE species_id IN (${qs}) AND locale = "en"`, WHERE species_id IN (${qs}) AND locale = "en"`,
speciesIds speciesIds
@ -140,7 +140,7 @@ const buildTradeMatchesLoader = (db) =>
}) })
.flat(); .flat();
const [rows, _] = await db.query( const [rows] = await db.query(
` `
SET SESSION group_concat_max_len = 4096; SET SESSION group_concat_max_len = 4096;
SELECT SELECT
@ -198,9 +198,7 @@ const buildTradeMatchesLoader = (db) =>
); );
const loadAllPetTypes = (db) => async () => { const loadAllPetTypes = (db) => async () => {
const [rows, _] = await db.execute( const [rows] = await db.execute(`SELECT species_id, color_id FROM pet_types`);
`SELECT species_id, color_id FROM pet_types`
);
const entities = rows.map(normalizeRow); const entities = rows.map(normalizeRow);
return entities; return entities;
}; };
@ -208,7 +206,7 @@ const loadAllPetTypes = (db) => async () => {
const buildItemLoader = (db) => const buildItemLoader = (db) =>
new DataLoader(async (ids) => { new DataLoader(async (ids) => {
const qs = ids.map((_) => "?").join(","); const qs = ids.map((_) => "?").join(",");
const [rows, _] = await db.execute( const [rows] = await db.execute(
`SELECT * FROM items WHERE id IN (${qs})`, `SELECT * FROM items WHERE id IN (${qs})`,
ids ids
); );
@ -226,7 +224,7 @@ const buildItemLoader = (db) =>
const buildItemTranslationLoader = (db) => const buildItemTranslationLoader = (db) =>
new DataLoader(async (itemIds) => { new DataLoader(async (itemIds) => {
const qs = itemIds.map((_) => "?").join(","); const qs = itemIds.map((_) => "?").join(",");
const [rows, _] = await db.execute( const [rows] = await db.execute(
`SELECT * FROM item_translations WHERE item_id IN (${qs}) AND locale = "en"`, `SELECT * FROM item_translations WHERE item_id IN (${qs}) AND locale = "en"`,
itemIds itemIds
); );
@ -246,7 +244,7 @@ const buildItemByNameLoader = (db, loaders) =>
async (names) => { async (names) => {
const qs = names.map((_) => "?").join(", "); const qs = names.map((_) => "?").join(", ");
const normalizedNames = names.map((name) => name.trim().toLowerCase()); const normalizedNames = names.map((name) => name.trim().toLowerCase());
const [rows, _] = await db.execute( const [rows] = await db.execute(
{ {
// NOTE: In our MySQL schema, this is a case-insensitive exact search. // NOTE: In our MySQL schema, this is a case-insensitive exact search.
sql: `SELECT items.*, item_translations.* FROM item_translations sql: `SELECT items.*, item_translations.* FROM item_translations
@ -351,7 +349,7 @@ const buildItemSearchLoader = (db, loaders) =>
...currentUserValues, ...currentUserValues,
]; ];
const [[rows, _], [totalRows, __]] = await Promise.all([ const [[rows], [totalRows]] = await Promise.all([
db.execute( db.execute(
` `
SELECT DISTINCT items.*, t.name FROM items SELECT DISTINCT items.*, t.name FROM items
@ -398,7 +396,7 @@ const buildNewestItemsLoader = (db, loaders) =>
); );
} }
const [rows, _] = await db.execute( const [rows] = await db.execute(
`SELECT * FROM items ORDER BY created_at DESC LIMIT 20;` `SELECT * FROM items ORDER BY created_at DESC LIMIT 20;`
); );
@ -420,7 +418,7 @@ const buildItemsThatNeedModelsLoader = (db) =>
throw new Error(`this loader can only be loaded with the key "all"`); throw new Error(`this loader can only be loaded with the key "all"`);
} }
const [rows, _] = await db.query( const [rows] = await db.query(
` `
SELECT T_ITEMS.item_id, SELECT T_ITEMS.item_id,
T_BODIES.color_id, T_BODIES.color_id,
@ -484,7 +482,7 @@ const buildItemsThatNeedModelsLoader = (db) =>
const buildItemBodiesWithAppearanceDataLoader = (db) => const buildItemBodiesWithAppearanceDataLoader = (db) =>
new DataLoader(async (itemIds) => { new DataLoader(async (itemIds) => {
const qs = itemIds.map((_) => "?").join(","); const qs = itemIds.map((_) => "?").join(",");
const [rows, _] = await db.execute( const [rows] = await db.execute(
// TODO: I'm not sure this ORDER BY clause will reliably get standard // TODO: I'm not sure this ORDER BY clause will reliably get standard
// bodies to the top, it seems like it depends how DISTINCT works? // bodies to the top, it seems like it depends how DISTINCT works?
`SELECT pet_types.body_id, pet_types.species_id, items.id AS item_id `SELECT pet_types.body_id, pet_types.species_id, items.id AS item_id
@ -514,7 +512,7 @@ const buildItemBodiesWithAppearanceDataLoader = (db) =>
const buildItemAllOccupiedZonesLoader = (db) => const buildItemAllOccupiedZonesLoader = (db) =>
new DataLoader(async (itemIds) => { new DataLoader(async (itemIds) => {
const qs = itemIds.map((_) => "?").join(", "); const qs = itemIds.map((_) => "?").join(", ");
const [rows, _] = await db.execute( const [rows] = await db.execute(
`SELECT items.id, GROUP_CONCAT(DISTINCT sa.zone_id) AS zone_ids FROM items `SELECT items.id, GROUP_CONCAT(DISTINCT sa.zone_id) AS zone_ids FROM items
INNER JOIN parents_swf_assets psa INNER JOIN parents_swf_assets psa
ON psa.parent_type = "Item" AND psa.parent_id = items.id ON psa.parent_type = "Item" AND psa.parent_id = items.id
@ -545,7 +543,7 @@ const buildItemTradesLoader = (db, loaders) =>
const values = itemIdOwnedPairs const values = itemIdOwnedPairs
.map(({ itemId, isOwned }) => [itemId, isOwned]) .map(({ itemId, isOwned }) => [itemId, isOwned])
.flat(); .flat();
const [rows, _] = await db.execute( const [rows] = await db.execute(
{ {
sql: ` sql: `
SELECT SELECT
@ -628,7 +626,7 @@ const buildItemWakaValueLoader = () =>
const buildPetTypeLoader = (db, loaders) => const buildPetTypeLoader = (db, loaders) =>
new DataLoader(async (petTypeIds) => { new DataLoader(async (petTypeIds) => {
const qs = petTypeIds.map((_) => "?").join(","); const qs = petTypeIds.map((_) => "?").join(",");
const [rows, _] = await db.execute( const [rows] = await db.execute(
`SELECT * FROM pet_types WHERE id IN (${qs})`, `SELECT * FROM pet_types WHERE id IN (${qs})`,
petTypeIds petTypeIds
); );
@ -657,7 +655,7 @@ const buildPetTypeBySpeciesAndColorLoader = (db, loaders) =>
values.push(speciesId, colorId); values.push(speciesId, colorId);
} }
const [rows, _] = await db.execute( const [rows] = await db.execute(
`SELECT * FROM pet_types WHERE ${conditions.join(" OR ")}`, `SELECT * FROM pet_types WHERE ${conditions.join(" OR ")}`,
values values
); );
@ -681,7 +679,7 @@ const buildPetTypeBySpeciesAndColorLoader = (db, loaders) =>
const buildPetTypesForColorLoader = (db, loaders) => const buildPetTypesForColorLoader = (db, loaders) =>
new DataLoader(async (colorIds) => { new DataLoader(async (colorIds) => {
const qs = colorIds.map((_) => "?").join(","); const qs = colorIds.map((_) => "?").join(",");
const [rows, _] = await db.execute( const [rows] = await db.execute(
`SELECT * FROM pet_types WHERE color_id IN (${qs})`, `SELECT * FROM pet_types WHERE color_id IN (${qs})`,
colorIds colorIds
); );
@ -704,7 +702,7 @@ const buildPetTypesForColorLoader = (db, loaders) =>
const buildSwfAssetLoader = (db) => const buildSwfAssetLoader = (db) =>
new DataLoader(async (swfAssetIds) => { new DataLoader(async (swfAssetIds) => {
const qs = swfAssetIds.map((_) => "?").join(","); const qs = swfAssetIds.map((_) => "?").join(",");
const [rows, _] = await db.execute( const [rows] = await db.execute(
`SELECT * FROM swf_assets WHERE id IN (${qs})`, `SELECT * FROM swf_assets WHERE id IN (${qs})`,
swfAssetIds swfAssetIds
); );
@ -719,7 +717,7 @@ const buildSwfAssetLoader = (db) =>
const buildSwfAssetCountLoader = (db) => const buildSwfAssetCountLoader = (db) =>
new DataLoader( new DataLoader(
async (requests) => { async (requests) => {
const [rows, _] = await db.execute( const [rows] = await db.execute(
` `
SELECT count(*) AS count, type, SELECT count(*) AS count, type,
(manifest IS NOT NULL AND manifest != "") AS is_converted (manifest IS NOT NULL AND manifest != "") AS is_converted
@ -759,7 +757,7 @@ const buildSwfAssetByRemoteIdLoader = (db) =>
const values = typeAndRemoteIdPairs const values = typeAndRemoteIdPairs
.map(({ type, remoteId }) => [type, remoteId]) .map(({ type, remoteId }) => [type, remoteId])
.flat(); .flat();
const [rows, _] = await db.execute( const [rows] = await db.execute(
`SELECT * FROM swf_assets WHERE ${qs}`, `SELECT * FROM swf_assets WHERE ${qs}`,
values values
); );
@ -785,7 +783,7 @@ const buildItemSwfAssetLoader = (db, loaders) =>
values.push(itemId, bodyId); values.push(itemId, bodyId);
} }
const [rows, _] = await db.execute( const [rows] = await db.execute(
`SELECT sa.*, rel.parent_id FROM swf_assets sa `SELECT sa.*, rel.parent_id FROM swf_assets sa
INNER JOIN parents_swf_assets rel ON INNER JOIN parents_swf_assets rel ON
rel.parent_type = "Item" AND rel.parent_type = "Item" AND
@ -813,7 +811,7 @@ const buildItemSwfAssetLoader = (db, loaders) =>
const buildPetSwfAssetLoader = (db, loaders) => const buildPetSwfAssetLoader = (db, loaders) =>
new DataLoader(async (petStateIds) => { new DataLoader(async (petStateIds) => {
const qs = petStateIds.map((_) => "?").join(","); const qs = petStateIds.map((_) => "?").join(",");
const [rows, _] = await db.execute( const [rows] = await db.execute(
`SELECT sa.*, rel.parent_id FROM swf_assets sa `SELECT sa.*, rel.parent_id FROM swf_assets sa
INNER JOIN parents_swf_assets rel ON INNER JOIN parents_swf_assets rel ON
rel.parent_type = "PetState" AND rel.parent_type = "PetState" AND
@ -836,7 +834,7 @@ const buildPetSwfAssetLoader = (db, loaders) =>
const buildNeopetsConnectionLoader = (db) => const buildNeopetsConnectionLoader = (db) =>
new DataLoader(async (ids) => { new DataLoader(async (ids) => {
const qs = ids.map((_) => "?").join(", "); const qs = ids.map((_) => "?").join(", ");
const [rows, _] = await db.execute( const [rows] = await db.execute(
`SELECT * FROM neopets_connections WHERE id IN (${qs})`, `SELECT * FROM neopets_connections WHERE id IN (${qs})`,
ids ids
); );
@ -849,7 +847,7 @@ const buildNeopetsConnectionLoader = (db) =>
const buildOutfitLoader = (db) => const buildOutfitLoader = (db) =>
new DataLoader(async (outfitIds) => { new DataLoader(async (outfitIds) => {
const qs = outfitIds.map((_) => "?").join(","); const qs = outfitIds.map((_) => "?").join(",");
const [rows, _] = await db.execute( const [rows] = await db.execute(
`SELECT * FROM outfits WHERE id IN (${qs})`, `SELECT * FROM outfits WHERE id IN (${qs})`,
outfitIds outfitIds
); );
@ -862,7 +860,7 @@ const buildOutfitLoader = (db) =>
const buildItemOutfitRelationshipsLoader = (db) => const buildItemOutfitRelationshipsLoader = (db) =>
new DataLoader(async (outfitIds) => { new DataLoader(async (outfitIds) => {
const qs = outfitIds.map((_) => "?").join(","); const qs = outfitIds.map((_) => "?").join(",");
const [rows, _] = await db.execute( const [rows] = await db.execute(
`SELECT * FROM item_outfit_relationships WHERE outfit_id IN (${qs})`, `SELECT * FROM item_outfit_relationships WHERE outfit_id IN (${qs})`,
outfitIds outfitIds
); );
@ -877,7 +875,7 @@ const buildItemOutfitRelationshipsLoader = (db) =>
const buildPetStateLoader = (db) => const buildPetStateLoader = (db) =>
new DataLoader(async (petStateIds) => { new DataLoader(async (petStateIds) => {
const qs = petStateIds.map((_) => "?").join(","); const qs = petStateIds.map((_) => "?").join(",");
const [rows, _] = await db.execute( const [rows] = await db.execute(
`SELECT * FROM pet_states WHERE id IN (${qs})`, `SELECT * FROM pet_states WHERE id IN (${qs})`,
petStateIds petStateIds
); );
@ -892,7 +890,7 @@ const buildPetStateLoader = (db) =>
const buildPetStatesForPetTypeLoader = (db, loaders) => const buildPetStatesForPetTypeLoader = (db, loaders) =>
new DataLoader(async (petTypeIds) => { new DataLoader(async (petTypeIds) => {
const qs = petTypeIds.map((_) => "?").join(","); const qs = petTypeIds.map((_) => "?").join(",");
const [rows, _] = await db.execute( const [rows] = await db.execute(
`SELECT * FROM pet_states `SELECT * FROM pet_states
WHERE pet_type_id IN (${qs}) WHERE pet_type_id IN (${qs})
ORDER BY (mood_id IS NULL) ASC, mood_id ASC, female DESC, ORDER BY (mood_id IS NULL) ASC, mood_id ASC, female DESC,
@ -928,7 +926,7 @@ const buildCanonicalPetStateForBodyLoader = (db, loaders) =>
const bodyCondition = bodyId !== "0" ? `pet_types.body_id = ?` : `1`; const bodyCondition = bodyId !== "0" ? `pet_types.body_id = ?` : `1`;
const bodyValues = bodyId !== "0" ? [bodyId] : []; const bodyValues = bodyId !== "0" ? [bodyId] : [];
const [rows, _] = await db.execute( const [rows] = await db.execute(
{ {
sql: ` sql: `
SELECT pet_states.*, pet_types.* FROM pet_states SELECT pet_states.*, pet_types.* FROM pet_states
@ -979,7 +977,7 @@ const buildPetStateByPetTypeAndAssetsLoader = (db, loaders) =>
const values = petTypeIdAndAssetIdsPairs const values = petTypeIdAndAssetIdsPairs
.map(({ petTypeId, swfAssetIds }) => [petTypeId, swfAssetIds]) .map(({ petTypeId, swfAssetIds }) => [petTypeId, swfAssetIds])
.flat(); .flat();
const [rows, _] = await db.execute( const [rows] = await db.execute(
`SELECT * FROM pet_states WHERE ${qs}`, `SELECT * FROM pet_states WHERE ${qs}`,
values values
); );
@ -1004,7 +1002,7 @@ const buildPetStateByPetTypeAndAssetsLoader = (db, loaders) =>
const buildUserLoader = (db) => const buildUserLoader = (db) =>
new DataLoader(async (ids) => { new DataLoader(async (ids) => {
const qs = ids.map((_) => "?").join(","); const qs = ids.map((_) => "?").join(",");
const [rows, _] = await db.execute( const [rows] = await db.execute(
`SELECT * FROM users WHERE id IN (${qs})`, `SELECT * FROM users WHERE id IN (${qs})`,
ids ids
); );
@ -1022,7 +1020,7 @@ const buildUserLoader = (db) =>
const buildUserByNameLoader = (db) => const buildUserByNameLoader = (db) =>
new DataLoader(async (names) => { new DataLoader(async (names) => {
const qs = names.map((_) => "?").join(","); const qs = names.map((_) => "?").join(",");
const [rows, _] = await db.execute( const [rows] = await db.execute(
`SELECT * FROM users WHERE name IN (${qs})`, `SELECT * FROM users WHERE name IN (${qs})`,
names names
); );
@ -1037,7 +1035,7 @@ const buildUserByNameLoader = (db) =>
const buildUserByEmailLoader = (db) => const buildUserByEmailLoader = (db) =>
new DataLoader(async (emails) => { new DataLoader(async (emails) => {
const qs = emails.map((_) => "?").join(","); const qs = emails.map((_) => "?").join(",");
const [rows, _] = await db.execute( const [rows] = await db.execute(
{ {
sql: ` sql: `
SELECT users.*, id_users.email FROM users SELECT users.*, id_users.email FROM users
@ -1060,7 +1058,7 @@ const buildUserByEmailLoader = (db) =>
const buildUserClosetHangersLoader = (db) => const buildUserClosetHangersLoader = (db) =>
new DataLoader(async (userIds) => { new DataLoader(async (userIds) => {
const qs = userIds.map((_) => "?").join(","); const qs = userIds.map((_) => "?").join(",");
const [rows, _] = await db.execute( const [rows] = await db.execute(
`SELECT closet_hangers.*, item_translations.name as item_name FROM closet_hangers `SELECT closet_hangers.*, item_translations.name as item_name FROM closet_hangers
INNER JOIN items ON items.id = closet_hangers.item_id INNER JOIN items ON items.id = closet_hangers.item_id
INNER JOIN item_translations ON INNER JOIN item_translations ON
@ -1079,7 +1077,7 @@ const buildUserClosetHangersLoader = (db) =>
const buildUserClosetListsLoader = (db, loaders) => const buildUserClosetListsLoader = (db, loaders) =>
new DataLoader(async (userIds) => { new DataLoader(async (userIds) => {
const qs = userIds.map((_) => "?").join(","); const qs = userIds.map((_) => "?").join(",");
const [rows, _] = await db.execute( const [rows] = await db.execute(
`SELECT * FROM closet_lists `SELECT * FROM closet_lists
WHERE user_id IN (${qs}) WHERE user_id IN (${qs})
ORDER BY name`, ORDER BY name`,
@ -1099,7 +1097,7 @@ const buildUserClosetListsLoader = (db, loaders) =>
const buildUserOutfitsLoader = (db, loaders) => const buildUserOutfitsLoader = (db, loaders) =>
new DataLoader(async (userIds) => { new DataLoader(async (userIds) => {
const qs = userIds.map((_) => "?").join(","); const qs = userIds.map((_) => "?").join(",");
const [rows, _] = await db.execute( const [rows] = await db.execute(
`SELECT * FROM outfits `SELECT * FROM outfits
WHERE user_id IN (${qs}) WHERE user_id IN (${qs})
ORDER BY name`, ORDER BY name`,
@ -1119,7 +1117,7 @@ const buildUserOutfitsLoader = (db, loaders) =>
const buildUserLastTradeActivityLoader = (db) => const buildUserLastTradeActivityLoader = (db) =>
new DataLoader(async (userIds) => { new DataLoader(async (userIds) => {
const qs = userIds.map((_) => "?").join(","); const qs = userIds.map((_) => "?").join(",");
const [rows, _] = await db.execute( const [rows] = await db.execute(
// This query has a custom index: index_closet_hangers_for_last_trade_activity. // This query has a custom index: index_closet_hangers_for_last_trade_activity.
// It's on (user_id, owned, list_id, updated_at). The intent is that this // It's on (user_id, owned, list_id, updated_at). The intent is that this
// will enable the query planner to find the max updated_at for each // will enable the query planner to find the max updated_at for each
@ -1173,7 +1171,7 @@ const buildUserLastTradeActivityLoader = (db) =>
const buildZoneLoader = (db) => { const buildZoneLoader = (db) => {
const zoneLoader = new DataLoader(async (ids) => { const zoneLoader = new DataLoader(async (ids) => {
const qs = ids.map((_) => "?").join(","); const qs = ids.map((_) => "?").join(",");
const [rows, _] = await db.execute( const [rows] = await db.execute(
`SELECT * FROM zones WHERE id IN (${qs})`, `SELECT * FROM zones WHERE id IN (${qs})`,
ids ids
); );
@ -1189,7 +1187,7 @@ const buildZoneLoader = (db) => {
}); });
zoneLoader.loadAll = async () => { zoneLoader.loadAll = async () => {
const [rows, _] = await db.execute(`SELECT * FROM zones`); const [rows] = await db.execute(`SELECT * FROM zones`);
const entities = rows.map(normalizeRow); const entities = rows.map(normalizeRow);
for (const zone of entities) { for (const zone of entities) {
@ -1205,7 +1203,7 @@ const buildZoneLoader = (db) => {
const buildZoneTranslationLoader = (db) => const buildZoneTranslationLoader = (db) =>
new DataLoader(async (zoneIds) => { new DataLoader(async (zoneIds) => {
const qs = zoneIds.map((_) => "?").join(","); const qs = zoneIds.map((_) => "?").join(",");
const [rows, _] = await db.execute( const [rows] = await db.execute(
`SELECT * FROM zone_translations WHERE zone_id IN (${qs}) AND locale = "en"`, `SELECT * FROM zone_translations WHERE zone_id IN (${qs}) AND locale = "en"`,
zoneIds zoneIds
); );

14
src/server/types/AppearanceLayer.js
View file

@ -70,16 +70,6 @@ const typeDefs = gql`
that our behavior _doesn't_ match official behavior. that our behavior _doesn't_ match official behavior.
""" """
knownGlitches: [AppearanceLayerKnownGlitch!]! knownGlitches: [AppearanceLayerKnownGlitch!]!
"""
The zones that this layer restricts, if any. Note that, for item layers,
this is generally empty and the restriction is on the ItemAppearance, not
the individual layers. For pet layers, this is generally used for
Unconverted pets.
Deprecated, aggregated into PetAppearance for a simpler API.
"""
restrictedZones: [Zone!]!
} }
enum AppearanceLayerKnownGlitch { enum AppearanceLayerKnownGlitch {
@ -171,10 +161,6 @@ const resolvers = {
const layer = await swfAssetLoader.load(id); const layer = await swfAssetLoader.load(id);
return { id: layer.zoneId }; return { id: layer.zoneId };
}, },
restrictedZones: async ({ id }, _, { swfAssetLoader }) => {
const layer = await swfAssetLoader.load(id);
return getRestrictedZoneIds(layer.zonesRestrict).map((id) => ({ id }));
},
swfUrl: async ({ id }, _, { swfAssetLoader }) => { swfUrl: async ({ id }, _, { swfAssetLoader }) => {
const layer = await swfAssetLoader.load(id); const layer = await swfAssetLoader.load(id);
return layer.url; return layer.url;

8
src/server/types/Item.js
View file

@ -425,7 +425,7 @@ const resolvers = {
{ preferredSpeciesId, preferredColorId }, { preferredSpeciesId, preferredColorId },
{ db } { db }
) => { ) => {
const [rows, _] = await db.query( const [rows] = await db.query(
` `
SELECT pet_types.body_id, pet_types.species_id FROM pet_types SELECT pet_types.body_id, pet_types.species_id FROM pet_types
INNER JOIN colors ON INNER JOIN colors ON
@ -476,7 +476,7 @@ const resolvers = {
})); }));
}, },
compatibleBodies: async ({ id }, _, { db }) => { compatibleBodies: async ({ id }, _, { db }) => {
const [rows, __] = await db.query( const [rows] = await db.query(
` `
SELECT DISTINCT swf_assets.body_id SELECT DISTINCT swf_assets.body_id
FROM items FROM items
@ -494,7 +494,7 @@ const resolvers = {
return bodies; return bodies;
}, },
compatibleBodiesAndTheirZones: async ({ id }, _, { db }) => { compatibleBodiesAndTheirZones: async ({ id }, _, { db }) => {
const [rows, __] = await db.query( const [rows] = await db.query(
` `
SELECT SELECT
swf_assets.body_id AS bodyId, swf_assets.body_id AS bodyId,
@ -525,7 +525,7 @@ const resolvers = {
}, },
allAppearances: async ({ id }, _, { db }) => { allAppearances: async ({ id }, _, { db }) => {
// HACK: Copy-pasted from `compatibleBodies`. Could be a loader? // HACK: Copy-pasted from `compatibleBodies`. Could be a loader?
const [rows, __] = await db.query( const [rows] = await db.query(
` `
SELECT DISTINCT swf_assets.body_id SELECT DISTINCT swf_assets.body_id
FROM items FROM items

3
src/server/types/Pet.js
View file

@ -1,5 +1,4 @@
import util from "util"; import util from "util";
import fetch from "node-fetch";
import { gql } from "apollo-server"; import { gql } from "apollo-server";
import xmlrpc from "xmlrpc"; import xmlrpc from "xmlrpc";
import { getPoseFromPetState } from "../util"; import { getPoseFromPetState } from "../util";
@ -118,7 +117,7 @@ const resolvers = {
swfAssetByRemoteIdLoader, swfAssetByRemoteIdLoader,
} }
) => { ) => {
const [customPetData, petMetaData, __] = await Promise.all([ const [customPetData, petMetaData] = await Promise.all([
loadCustomPetData(petName), loadCustomPetData(petName),
loadPetMetaData(petName), loadPetMetaData(petName),
]); ]);

4
src/server/types/PetAppearance.js
View file

@ -211,7 +211,7 @@ const resolvers = {
Body: { Body: {
species: ({ id, species }) => { species: ({ id, species }) => {
if (id == "0") { if (String(id) === "0") {
return null; return null;
} }
if (species) { if (species) {
@ -223,7 +223,7 @@ const resolvers = {
); );
}, },
representsAllBodies: ({ id }) => { representsAllBodies: ({ id }) => {
return id == "0"; return String(id) === "0";
}, },
canonicalAppearance: async ( canonicalAppearance: async (
{ id, species }, { id, species },

2
src/server/util.js
View file

@ -119,7 +119,7 @@ async function logToDiscord(body) {
if (!res.ok) { if (!res.ok) {
const resText = await res.text(); const resText = await res.text();
throw new Error( throw new Error(
`Discord returned ${res.status} ${res.statusText}: ` + `${resText}` `Discord returned ${res.status} ${res.statusText}: ${resText}`
); );
} }
} finally { } finally {

1
src/server/util.test.js
View file

@ -1,4 +1,3 @@
import gql from "graphql-tag";
import { getDbCalls } from "./query-tests/setup.js"; import { getDbCalls } from "./query-tests/setup.js";
import connectToDb from "./db"; import connectToDb from "./db";
import { loadBodyName } from "./util"; import { loadBodyName } from "./util";