Lomanic/bibliogram
1
0
Fork 0
mirror of https://git.sr.ht/~cadence/bibliogram synced 2024-11-25 01:17:29 +00:00
Code Issues Releases Wiki Activity

Fix shortcode fetching

Browse Source
This commit is contained in:
Cadence Ember 2021-11-02 01:58:03 +13:00
parent 2a233e4f32
commit d660c84941
No known key found for this signature in database
GPG Key ID: BC1C2C61CF521B17
1 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/lib/collectors.js
View File

@ -407,23 +407,18 @@ async function getOrFetchShortcode(shortcode) {
* @returns {Promise<{result: import("./types").TimelineEntryN3, fromCache: boolean}>} * @returns {Promise<{result: import("./types").TimelineEntryN3, fromCache: boolean}>}
*/ */
function fetchShortcodeData(shortcode) { function fetchShortcodeData(shortcode) {
// example actual query from web: // embed endpoint unfortunately only returns a single image, or a single video thumbnail
// query_hash=2b0673e0dc4580674a88d426fe00ea90&variables={"shortcode":"xxxxxxxxxxx","child_comment_count":3,"fetch_comment_count":40,"parent_comment_count":24,"has_threaded_comments":true}
// we will not include params about comments, which means we will not receive comments, but everything else should still work fine
const p = new URLSearchParams()
p.set("query_hash", constants.external.shortcode_query_hash)
p.set("variables", JSON.stringify({shortcode}))
return requestCache.getOrFetchPromise("shortcode/"+shortcode, () => { return requestCache.getOrFetchPromise("shortcode/"+shortcode, () => {
return switcher.request("post_graphql", `https://www.instagram.com/graphql/query/?${p.toString()}`, async res => { return switcher.request("post_graphql", `https://www.instagram.com/p/${shortcode}/embed/captioned/`, async res => {
if (res.status === 302) throw constants.symbols.INSTAGRAM_BLOCK_TYPE_DECEMBER
if (res.status === 429) throw constants.symbols.RATE_LIMITED if (res.status === 429) throw constants.symbols.RATE_LIMITED
}).then(res => res.json()).then(root => { }).then(res => res.text()).then(text => {
/** @type {import("./types").TimelineEntryN3} */ const textData = text.match(/window\.__additionalDataLoaded\('extra',(.*)\);<\/script>/)[1]
const data = root.data.shortcode_media let data = JSON.parse(textData)
if (data == null) { if (data == null) {
// the thing doesn't exist // the thing doesn't exist
throw constants.symbols.NOT_FOUND throw constants.symbols.NOT_FOUND
} else { } else {
data = data.shortcode_media
history.report("post", true) history.report("post", true)
if (constants.caching.db_post_n3) { if (constants.caching.db_post_n3) {
db.prepare("REPLACE INTO Posts (shortcode, id, id_as_numeric, username, json) VALUES (@shortcode, @id, @id_as_numeric, @username, @json)") db.prepare("REPLACE INTO Posts (shortcode, id, id_as_numeric, username, json) VALUES (@shortcode, @id, @id_as_numeric, @username, @json)")
@ -440,7 +435,7 @@ function fetchShortcodeData(shortcode) {
return data return data
} }
}).catch(error => { }).catch(error => {
if (error === constants.symbols.RATE_LIMITED || error === constants.symbols.INSTAGRAM_BLOCK_TYPE_DECEMBER) { if (error === constants.symbols.RATE_LIMITED) {
history.report("post", false, error) history.report("post", false, error)
} }
throw error throw error