Skip to content

Commit 2ec1dcf

Browse files
howardchunghowardchung
committed
prettier
1 parent 1ab17d9 commit 2ec1dcf

20 files changed

+364
-278
lines changed

‎dev/rePatch.mjs

+1-2
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,7 @@ db.select(['match_id', 'start_time'])
1313
throw err;
1414
}
1515
matchIds.forEach(async (match) => {
16-
const patch =
17-
constants.patch[getPatchIndex(match.start_time)].name;
16+
const patch = constants.patch[getPatchIndex(match.start_time)].name;
1817
console.log(match.match_id, patch);
1918
await upsertPromise(
2019
db,

‎global.d.ts

+15-15
Original file line numberDiff line numberDiff line change
@@ -10,25 +10,25 @@ declare module 'uuid';
1010
declare namespace Express {
1111
export interface Request {
1212
originalQuery: string;
13-
queryObj: QueryObj
13+
queryObj: QueryObj;
1414
user: {
1515
account_id: number;
16-
}
16+
};
1717
}
1818
}
1919

20-
type ArrayifiedFilters = {[key: string]: number[]}
20+
type ArrayifiedFilters = { [key: string]: number[] };
2121
type QueryObj = {
22-
project: (keyof ParsedPlayerMatch)[],
23-
filter?: ArrayifiedFilters,
24-
sort?: keyof ParsedPlayerMatch,
22+
project: (keyof ParsedPlayerMatch)[];
23+
filter?: ArrayifiedFilters;
24+
sort?: keyof ParsedPlayerMatch;
2525
// Number of results to return after client filter/sort
26-
limit?: number,
27-
offset?: number,
28-
having?: number,
26+
limit?: number;
27+
offset?: number;
28+
having?: number;
2929
// Number of results to fetch from the database (before filter/sort)
30-
dbLimit?: number,
31-
}
30+
dbLimit?: number;
31+
};
3232

3333
type StringDict = { [key: string]: string };
3434
type NumberArrayDict = { [key: string]: number[] };
@@ -293,7 +293,7 @@ type PathVerbSpec = {
293293
func: (req: express.Request, res: express.Response, cb: ErrorCb) => void;
294294
};
295295

296-
type HttpVerb = 'get' | 'post'
296+
type HttpVerb = 'get' | 'post';
297297

298298
type OpenAPISpec = {
299299
openapi: string;
@@ -302,7 +302,7 @@ type OpenAPISpec = {
302302
components: any;
303303
paths: {
304304
[path: string]: {
305-
[verb: string]: PathVerbSpec;
306-
}
307-
}
305+
[verb: string]: PathVerbSpec;
306+
};
307+
};
308308
};

‎routes/api.mts

+5-1
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,11 @@ api.use('/players/:account_id/:info?', (req, res, cb) => {
6666
req.queryObj = {
6767
project: ['match_id', 'player_slot', 'radiant_win']
6868
.concat(filterCols)
69-
.concat((req.query.sort as [] || []).filter((f: keyof ParsedPlayerMatch) => subkeys[f])) as (keyof ParsedPlayerMatch)[],
69+
.concat(
70+
((req.query.sort as []) || []).filter(
71+
(f: keyof ParsedPlayerMatch) => subkeys[f]
72+
)
73+
) as (keyof ParsedPlayerMatch)[],
7074
filter: (req.query || {}) as unknown as ArrayifiedFilters,
7175
sort: req.query.sort as keyof ParsedPlayerMatch,
7276
limit: Number(req.query.limit),

‎routes/spec.mts

+59-44
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,17 @@ import search from '../store/search.mts';
88
import searchES from '../store/searchES.mts';
99
import buildMatch from '../store/buildMatch.mts';
1010
import { buildStatus } from '../store/buildStatus.mts';
11-
import { checkIfInExperiment, countPeers, generateJob, getData, isContributor, isRadiant, matchupToString, mergeObjects, redisCount } from '../util/utility.mts';
11+
import {
12+
checkIfInExperiment,
13+
countPeers,
14+
generateJob,
15+
getData,
16+
isContributor,
17+
isRadiant,
18+
matchupToString,
19+
mergeObjects,
20+
redisCount,
21+
} from '../util/utility.mts';
1222
import playerFields from './playerFields.mts';
1323
import db from '../store/db.mts';
1424
import redis from '../store/redis.mts';
@@ -205,7 +215,9 @@ The OpenDota API offers 50,000 free calls per month and a rate limit of 60 reque
205215
profile(cb) {
206216
getPlayer(db, accountId, (err, playerData) => {
207217
if (playerData !== null && playerData !== undefined) {
208-
playerData.is_contributor = isContributor(accountId.toString());
218+
playerData.is_contributor = isContributor(
219+
accountId.toString()
220+
);
209221
playerData.is_subscriber = Boolean(playerData?.status);
210222
}
211223
cb(err as any, playerData);
@@ -699,9 +711,14 @@ The OpenDota API offers 50,000 free calls per month and a rate limit of 60 reque
699711
}
700712
cache.forEach((m) => {
701713
Object.keys(subkeys).forEach((key) => {
702-
if (m[key as keyof ParsedPlayerMatch] !== null && m[key as keyof ParsedPlayerMatch] !== undefined) {
714+
if (
715+
m[key as keyof ParsedPlayerMatch] !== null &&
716+
m[key as keyof ParsedPlayerMatch] !== undefined
717+
) {
703718
result[key].n += 1;
704-
result[key].sum += Number(m[key as keyof ParsedPlayerMatch]);
719+
result[key].sum += Number(
720+
m[key as keyof ParsedPlayerMatch]
721+
);
705722
}
706723
});
707724
});
@@ -749,15 +766,22 @@ The OpenDota API offers 50,000 free calls per month and a rate limit of 60 reque
749766
cache.forEach((m) => {
750767
m.is_radiant = isRadiant(m);
751768
Object.keys(countCats).forEach((key) => {
752-
if (!result[key][Math.floor(m[key as keyof ParsedPlayerMatch])]) {
753-
result[key][Math.floor(m[key as keyof ParsedPlayerMatch])] = {
754-
games: 0,
755-
win: 0,
756-
};
769+
if (
770+
!result[key][Math.floor(m[key as keyof ParsedPlayerMatch])]
771+
) {
772+
result[key][Math.floor(m[key as keyof ParsedPlayerMatch])] =
773+
{
774+
games: 0,
775+
win: 0,
776+
};
757777
}
758-
result[key][Math.floor(m[key as keyof ParsedPlayerMatch])].games += 1;
778+
result[key][
779+
Math.floor(m[key as keyof ParsedPlayerMatch])
780+
].games += 1;
759781
const won = Number(m.radiant_win === isRadiant(m));
760-
result[key][Math.floor(m[key as keyof ParsedPlayerMatch])].win += won;
782+
result[key][
783+
Math.floor(m[key as keyof ParsedPlayerMatch])
784+
].win += won;
761785
});
762786
});
763787
return res.json(result);
@@ -881,7 +905,10 @@ The OpenDota API offers 50,000 free calls per month and a rate limit of 60 reque
881905
}
882906
cache.forEach((m) => {
883907
Object.keys(result).forEach((key) => {
884-
mergeObjects(result[key as keyof typeof result], m[key as keyof ParsedPlayerMatch]);
908+
mergeObjects(
909+
result[key as keyof typeof result],
910+
m[key as keyof ParsedPlayerMatch]
911+
);
885912
});
886913
});
887914
return res.json(result);
@@ -930,7 +957,10 @@ The OpenDota API offers 50,000 free calls per month and a rate limit of 60 reque
930957
}
931958
cache.forEach((m) => {
932959
Object.keys(result).forEach((key) => {
933-
mergeObjects(result[key as keyof typeof result], m[key as keyof ParsedPlayerMatch]);
960+
mergeObjects(
961+
result[key as keyof typeof result],
962+
m[key as keyof ParsedPlayerMatch]
963+
);
934964
});
935965
});
936966
return res.json(result);
@@ -1002,15 +1032,12 @@ The OpenDota API offers 50,000 free calls per month and a rate limit of 60 reque
10021032
},
10031033
route: () => '/players/:account_id/rankings',
10041034
func: (req, res, cb) => {
1005-
getPlayerHeroRankings(
1006-
req.params.account_id,
1007-
(err, result) => {
1008-
if (err) {
1009-
return cb(err);
1010-
}
1011-
return res.json(result);
1035+
getPlayerHeroRankings(req.params.account_id, (err, result) => {
1036+
if (err) {
1037+
return cb(err);
10121038
}
1013-
);
1039+
return res.json(result);
1040+
});
10141041
},
10151042
},
10161043
},
@@ -1465,18 +1492,12 @@ The OpenDota API offers 50,000 free calls per month and a rate limit of 60 reque
14651492
},
14661493
route: () => '/rankings',
14671494
func: (req, res, cb) => {
1468-
getHeroRankings(
1469-
db,
1470-
redis,
1471-
req.query.hero_id,
1472-
{},
1473-
(err, result) => {
1474-
if (err) {
1475-
return cb(err);
1476-
}
1477-
return res.json(result);
1495+
getHeroRankings(db, redis, req.query.hero_id, {}, (err, result) => {
1496+
if (err) {
1497+
return cb(err);
14781498
}
1479-
);
1499+
return res.json(result);
1500+
});
14801501
},
14811502
},
14821503
},
@@ -1551,7 +1572,7 @@ The OpenDota API offers 50,000 free calls per month and a rate limit of 60 reque
15511572
try {
15521573
const status = await buildStatus();
15531574
return res.json(status);
1554-
} catch(e) {
1575+
} catch (e) {
15551576
return cb(e);
15561577
}
15571578
},
@@ -2108,18 +2129,12 @@ The OpenDota API offers 50,000 free calls per month and a rate limit of 60 reque
21082129
route: () => '/heroes/:hero_id/itemPopularity',
21092130
func: (req, res, cb) => {
21102131
const heroId = req.params.hero_id;
2111-
getHeroItemPopularity(
2112-
db,
2113-
redis,
2114-
heroId,
2115-
{},
2116-
(err, result) => {
2117-
if (err) {
2118-
return cb(err);
2119-
}
2120-
return res.json(result);
2132+
getHeroItemPopularity(db, redis, heroId, {}, (err, result) => {
2133+
if (err) {
2134+
return cb(err);
21212135
}
2122-
);
2136+
return res.json(result);
2137+
});
21232138
},
21242139
},
21252140
},

‎store/buildMatch.mts

+15-9
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,13 @@
11
import constants from 'dotaconstants';
22
import config from '../config.js';
33
import compute from '../util/compute.mts';
4-
import { generateJob, getDataPromise, buildReplayUrl, isContributor, redisCount } from '../util/utility.mts';
4+
import {
5+
generateJob,
6+
getDataPromise,
7+
buildReplayUrl,
8+
isContributor,
9+
redisCount,
10+
} from '../util/utility.mts';
511
import redis from './redis.mts';
612
import db from './db.mts';
713
import {
@@ -78,9 +84,7 @@ async function backfill(matchId: string) {
7884
const matchObj = {
7985
match_id: Number(matchId),
8086
};
81-
const body = await getDataPromise(
82-
generateJob('api_details', matchObj).url
83-
);
87+
const body = await getDataPromise(generateJob('api_details', matchObj).url);
8488
// match details response
8589
const match = body.result;
8690
await insertMatchPromise(match, {
@@ -173,11 +177,13 @@ async function getMatch(matchId: string) {
173177
if (cosmetics) {
174178
const playersWithCosmetics = matchResult.players.map((p: ParsedPlayer) => {
175179
const hero = constants.heroes[p.hero_id] || {};
176-
const playerCosmetics = cosmetics.filter(Boolean).filter(
177-
(c) =>
178-
match?.cosmetics[c.item_id] === p.player_slot &&
179-
(!c.used_by_heroes || c.used_by_heroes === hero.name)
180-
);
180+
const playerCosmetics = cosmetics
181+
.filter(Boolean)
182+
.filter(
183+
(c) =>
184+
match?.cosmetics[c.item_id] === p.player_slot &&
185+
(!c.used_by_heroes || c.used_by_heroes === hero.name)
186+
);
181187
return {
182188
...p,
183189
cosmetics: playerCosmetics,

0 commit comments

Comments
 (0)