sjw/pleroma-fe
1
0
Fork 0
mirror of https://git.pleroma.social/sjw/pleroma-fe.git synced 2024-11-04 22:01:59 +01:00
Code Issues Releases Wiki Activity

Merge branch 'tusooa/nomore-mapundef' into 'develop'

Browse Source 
Display better error message for unauthenticated timelines

Closes #1235 and #1044

See merge request pleroma/pleroma-fe!1756
This commit is contained in:
HJ 2023-01-15 12:36:44 +00:00
commit e7fb5e81c3
1 changed files with 13 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/services/api/api.service.js
View File

@ -734,26 +734,22 @@ const fetchTimeline = ({
const queryString = map(params, (param) => `${param[0]}=${param[1]}`).join('&') const queryString = map(params, (param) => `${param[0]}=${param[1]}`).join('&')
url += `?${queryString}` url += `?${queryString}`
let status = ''
let statusText = ''
let pagination = {}
return fetch(url, { headers: authHeaders(credentials) }) return fetch(url, { headers: authHeaders(credentials) })
.then((data) => { .then(async (response) => {
status = data.status const success = response.ok
statusText = data.statusText
pagination = parseLinkHeaderPagination(data.headers.get('Link'), { const data = await response.json()
if (success && !data.errors) {
const pagination = parseLinkHeaderPagination(response.headers.get('Link'), {
flakeId: timeline !== 'bookmarks' && timeline !== 'notifications' flakeId: timeline !== 'bookmarks' && timeline !== 'notifications'
}) })
return data
})
.then((data) => data.json())
.then((data) => {
if (!data.errors) {
return { data: data.map(isNotifications ? parseNotification : parseStatus), pagination } return { data: data.map(isNotifications ? parseNotification : parseStatus), pagination }
} else { } else {
data.status = status data.errors ||= []
data.statusText = statusText data.status = response.status
data.statusText = response.statusText
return data return data
} }
}) })