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

Compare commits

base: dice:always-use-@
Branches Tags
dice:main
dice:add-altStyleId
dice:always-use-@
OpenNeo:main
..
compare: OpenNeo:main
Branches Tags
OpenNeo:main
dice:main
dice:add-altStyleId
dice:always-use-@

No commits in common. "always-use-@" and "main" have entirely different histories.
always-use ... main

1 changed files with 7 additions and 6 deletions
Show stats Expand all files Collapse all files

13
src/server/load-pet-data.js
View file

@ -33,11 +33,13 @@ export async function loadCustomPetData(petName) {
// prepending "@", which is a special code that can *also* be used in the // prepending "@", which is a special code that can *also* be used in the
// CustomPetService in place of name, to get a pet's appearance from its image // CustomPetService in place of name, to get a pet's appearance from its image
// hash. // hash.
const imageHash = await loadImageHashFromPetName(petName); if (petName.match(/^[0-9]/)) {
console.debug( const imageHash = await loadImageHashFromPetName(petName);
`[loadCustomPetData] Converted pet name ${petName} to @${imageHash}`, console.debug(
); `[loadCustomPetData] Converted pet name ${petName} to @${imageHash}`,
petName = "@" + imageHash; );
petName = "@" + imageHash;
}
try { try {
return neopetsAmfphpCall("CustomPetService.getViewerData", [petName]); return neopetsAmfphpCall("CustomPetService.getViewerData", [petName]);
@ -58,7 +60,6 @@ const PETS_CP_URL_PATTERN =
/https?:\/\/pets\.neopets\.com\/cp\/([a-z0-9]+)\/[0-9]+\/[0-9]+\.png/; /https?:\/\/pets\.neopets\.com\/cp\/([a-z0-9]+)\/[0-9]+\/[0-9]+\.png/;
async function loadImageHashFromPetName(petName) { async function loadImageHashFromPetName(petName) {
const res = await fetch(`https://pets.neopets.com/cpn/${petName}/1/1.png`, { const res = await fetch(`https://pets.neopets.com/cpn/${petName}/1/1.png`, {
method: "HEAD",
redirect: "manual", redirect: "manual",
}); });
if (res.status !== 302) { if (res.status !== 302) {