quilling.dev
An ATproto social media client -- with an independent Appview.
Follow redirects for soundcloud shortlinks (#8614)
* follow redirects for soundcloud shortlinks
* clear timeout in `finally`
samuel.fm
+19
-13
src/lib/link-meta/link-meta.ts
+19
-13
src/lib/link-meta/link-meta.ts
···
1
-
import {BskyAgent} from '@atproto/api'
1
+
import {type BskyAgent} from '@atproto/api'
2
2
3
3
import {LINK_META_PROXY} from '#/lib/constants'
4
4
import {getGiphyMetaUri} from '#/lib/strings/embed-player'
···
37
37
}
38
38
39
39
let urlp
40
+
let shouldFollowRedirect = false
40
41
try {
41
42
urlp = new URL(url)
42
43
···
46
47
url = giphyMetaUri
47
48
urlp = new URL(url)
48
49
}
50
+
// follow redirects for soundcloud shortlinks
51
+
// QUESTION - do we want to follow redirects in other cases? -sfn
52
+
shouldFollowRedirect = urlp.hostname === 'on.soundcloud.com'
49
53
} catch (e) {
50
54
return {
51
55
error: 'Invalid URL',
···
62
66
return meta
63
67
}
64
68
65
-
try {
66
-
const controller = new AbortController()
67
-
const to = setTimeout(() => controller.abort(), timeout || 5e3)
69
+
const controller = new AbortController()
70
+
const to = setTimeout(() => controller.abort(), timeout || 5e3)
68
71
72
+
try {
69
73
const response = await fetch(
70
-
`${LINK_META_PROXY(agent.service.toString() || '')}${encodeURIComponent(
74
+
`${LINK_META_PROXY(agent.serviceUrl.toString() || '')}${encodeURIComponent(
71
75
url,
72
76
)}`,
73
77
{signal: controller.signal},
74
78
)
75
79
76
80
const body = await response.json()
77
-
clearTimeout(to)
78
81
79
-
const {description, error, image, title} = body
80
-
81
-
if (error !== '') {
82
-
throw new Error(error)
82
+
if (body.error !== '') {
83
+
throw new Error(body.error)
83
84
}
84
85
85
-
meta.description = description
86
-
meta.image = image
87
-
meta.title = title
86
+
meta.description = body.description
87
+
meta.image = body.image
88
+
meta.title = body.title
89
+
if (shouldFollowRedirect) {
90
+
meta.url = body.url
91
+
}
88
92
} catch (e) {
89
93
// failed
90
94
console.error(e)
91
95
meta.error = e instanceof Error ? e.toString() : 'Failed to fetch link'
96
+
} finally {
97
+
clearTimeout(to)
92
98
}
93
99
94
100
return meta