hj/pleroma-fe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'api-refactor' into shigusegubu-themes3

Browse source
This commit is contained in:
Henry Jameson 2026-06-22 20:21:13 +03:00
commit 59d3aaadef
32 changed files with 101 additions and 124 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/api/helpers.js
View file

@ -106,6 +106,8 @@ export const promisedRequest = async ({
.get('content-type')
.split(';')
.map((x) => x.toLowerCase().trim())
const contentLength = parseInt(response.headers.get('content-length'))
if (contentLength === 0) return null
switch (contentType) {
case 'text/plain':
@ -130,8 +132,7 @@ export const promisedRequest = async ({
)
}
} catch (error) {
throw new StatusCodeError(
response.status,
throw new Error(
error,
{ url, options },
response,

14
src/api/public.js
View file

@ -122,7 +122,7 @@ const MASTODON_STATUS_CONTEXT_URL = (id) => `/api/v1/statuses/${id}/context`
const MASTODON_STATUS_SOURCE_URL = (id) => `/api/v1/statuses/${id}/source`
const MASTODON_STATUS_HISTORY_URL = (id) => `/api/v1/statuses/${id}/history`
const MASTODON_USER_URL = '/api/v1/accounts'
const MASTODON_USER_LOOKUP_URL = '/api/v1/accounts/lookup'
const MASTODON_USER_LOOKUP_URL = ({ acct }) => `/api/v1/accounts/lookup${paramsString({ acct })}`
const MASTODON_POLL_URL = (id = '') => `/api/v1/polls/${id}`
const MASTODON_STATUS_FAVORITEDBY_URL = (id) =>
`/api/v1/statuses/${id}/favourited_by`
@ -194,9 +194,8 @@ export const fetchUser = ({ id, credentials }) =>
export const fetchUserByName = ({ name, credentials }) =>
promisedRequest({
url: MASTODON_USER_LOOKUP_URL,
url: MASTODON_USER_LOOKUP_URL({ acct: name }),
credentials,
params: { acct: name },
})
.then(({ data }) => data.id)
.catch((error) => {
@ -274,10 +273,10 @@ export const fetchStatusHistory = ({ status, credentials }) =>
promisedRequest({
url: MASTODON_STATUS_HISTORY_URL(status.id),
credentials,
}).then(({ data }) => {
}).then(({ data, ...rest }) => {
return [...data].reverse().map((item) => {
item.originalStatus = status
return parseStatus(item)
return { ...rest, data: parseStatus(item) }
})
})
@ -313,6 +312,7 @@ export const fetchTimeline = ({
notifications: MASTODON_USER_NOTIFICATIONS_URL,
}
const urlFunc = timelineUrls[timeline]
const twoArgs = new Set([
'user',
@ -346,8 +346,6 @@ export const fetchTimeline = ({
const isNotifications = timeline === 'notifications'
const urlFunc = timelineUrls[timeline]
if (timeline === 'media') {
params.onlyMedia = true
}
@ -364,7 +362,7 @@ export const fetchTimeline = ({
params.folderId = bookmarkFolderId
}
if (isNotifications && includeTypes.size > 0) {
if (isNotifications && includeTypes.length > 0) {
params.includeTypes = includeTypes
}

2
src/components/bookmark_folder_edit/bookmark_folder_edit.js
View file

@ -27,7 +27,7 @@ const BookmarkFolderEdit = {
fetchBookmarkFolders({
credentials: useOAuthStore().token,
}).then((folders) => {
}).then(({ data: folders }) => {
const folder = folders.find((folder) => folder.id === this.id)
if (!folder) return

7
src/components/chat/chat.js
View file

@ -278,7 +278,7 @@ const Chat = {
maxId,
sinceId,
credentials: useOAuthStore().token,
}).then((messages) => {
}).then(({ data: messages }) => {
// Clear the current chat in case we're recovering from a ws connection loss.
if (isFirstFetch) {
chatService.clear(chatMessageService)
@ -310,10 +310,11 @@ const Chat = {
let chat = this.findOpenedChatByRecipientId(this.recipientId)
if (!chat) {
try {
chat = await getOrCreateChat({
const { data } = await getOrCreateChat({
accountId: this.recipientId,
credentials: useOAuthStore().token,
})
chat = data
} catch (e) {
console.error('Error creating or getting a chat', e)
this.errorLoadingChat = true
@ -383,7 +384,7 @@ const Chat = {
params,
credentials: useOAuthStore().token,
})
.then((data) => {
.then(({ data }) => {
this.$store.dispatch('addChatMessages', {
chatId: this.currentChat.id,
updateMaxId: false,

2
src/components/login_form/login_form.js
View file

@ -63,7 +63,7 @@ const LoginForm = {
})
})
.catch((error) => {
if (error === 'mfa_required') {
if (error.errorData?.error === 'mfa_required') {
this.requireMFA({ settings: error })
} else if (error.identifier === 'password_reset_required') {
this.$router.push({

5
src/components/post_status_form/post_status_form.js
View file

@ -635,11 +635,6 @@ const PostStatusForm = {
// Don't apply preview if not loading, because it means
// user has closed the preview manually.
if (!this.previewLoading) return
if (!data.error) {
this.preview = data
} else {
this.preview = { error: data.error }
}
})
.catch((error) => {
this.preview = { error }

2
src/components/remote_user_resolver/remote_user_resolver.js
View file

@ -16,7 +16,7 @@ const RemoteUserResolver = {
id,
credentials: useOAuthStore().token,
})
.then((externalUser) => {
.then(({ data: externalUser }) => {
if (externalUser.error) {
this.error = true
} else {

2
src/components/settings_modal/tabs/appearance_tab.js
View file

@ -490,7 +490,7 @@ const AppearanceTab = {
background,
credentials: useOAuthStore().token,
})
.then((data) => {
.then(({ data }) => {
this.$store.commit('addNewUsers', [data])
this.$store.commit('setCurrentUser', data)
this.backgroundPreview = null

2
src/components/settings_modal/tabs/composing_tab.js
View file

@ -169,7 +169,7 @@ const ComposingTab = {
updateProfile({
params,
credentials: useOAuthStore().token,
}).then((user) => {
}).then(({ data: user }) => {
this.$store.commit('addNewUsers', [user])
this.$store.commit('setCurrentUser', user)
})

10
src/components/settings_modal/tabs/data_import_export_tab.js
View file

@ -64,7 +64,7 @@ const DataImportExportTab = {
return importFollows({
file,
credentials: useOAuthStore().token,
}).then((status) => {
}).then(({ data: status }) => {
if (!status) {
throw new Error('failed')
}
@ -74,7 +74,7 @@ const DataImportExportTab = {
return importBlocks({
file,
credentials: useOAuthStore().token,
}).then((status) => {
}).then(({ data: status }) => {
if (!status) {
throw new Error('failed')
}
@ -84,13 +84,13 @@ const DataImportExportTab = {
return importMutes({
file,
credentials: useOAuthStore().token,
}).then((status) => {
}).then(({ data: status }) => {
if (!status) {
throw new Error('failed')
}
})
},
generateExportableUsersContent(users) {
generateExportableUsersContent({ data: users }) {
// Get addresses
return users
.map((user) => {
@ -121,7 +121,7 @@ const DataImportExportTab = {
listBackups({
credentials: useOAuthStore().token,
})
.then((res) => {
.then(({ data: res }) => {
this.backups = res
this.listBackupsError = false
})

2
src/components/settings_modal/tabs/general_tab.js
View file

@ -63,7 +63,7 @@ const GeneralTab = {
updateProfile({
params,
credentials: useOAuthStore().token,
}).then((user) => {
}).then(({ data: user }) => {
this.$store.commit('addNewUsers', [user])
this.$store.commit('setCurrentUser', user)
})

4
src/components/settings_modal/tabs/mutes_and_blocks_tab.js
View file

@ -60,7 +60,7 @@ const MutesAndBlocks = {
return importFollows({
file,
credentials: useOAuthStore().token,
}).then((status) => {
}).then(({ data: status }) => {
if (!status) {
throw new Error('failed')
}
@ -70,7 +70,7 @@ const MutesAndBlocks = {
return importBlocks({
file,
credentials: useOAuthStore().token,
}).then((status) => {
}).then(({ data: status }) => {
if (!status) {
throw new Error('failed')
}

2
src/components/settings_modal/tabs/profile_tab.js
View file

@ -43,7 +43,7 @@ const ProfileTab = {
params,
credentials: useOAuthStore().token,
})
.then((user) => {
.then(({ data: user }) => {
this.$store.commit('addNewUsers', [user])
this.$store.commit('setCurrentUser', user)
})

18
src/components/settings_modal/tabs/security_tab/mfa.js
View file

@ -95,7 +95,7 @@ const Mfa = {
return generateMfaBackupCodes({
credentials: useOAuthStore().token,
}).then((res) => {
}).then(({ data: res }) => {
this.backupCodes.codes = res.codes
this.backupCodes.inProgress = false
})
@ -122,7 +122,7 @@ const Mfa = {
this.setupState.setupOTPState = 'prepare'
mfaSetupOTP({
credentials: useOAuthStore().token,
}).then((res) => {
}).then(({ data: res }) => {
this.otpSettings = res
this.setupState.setupOTPState = 'confirm'
})
@ -134,13 +134,13 @@ const Mfa = {
token: this.otpConfirmToken,
password: this.currentPassword,
credentials: useOAuthStore().token,
}).then((res) => {
if (res.error) {
this.error = res.error
return
}
this.completeSetup()
})
.then(() => {
this.completeSetup()
})
.catch((error) => {
this.error = error
})
},
completeSetup() {
@ -161,7 +161,7 @@ const Mfa = {
// fetch settings from server
async fetchSettings() {
const result = await settingsMFA({
const { data: result } = await settingsMFA({
credentials: useOAuthStore().token,
})
if (result.error) return

2
src/components/settings_modal/tabs/security_tab/mfa_totp.js
View file

@ -40,7 +40,7 @@ export default {
mfaDisableOTP({
password: this.currentPassword,
credentials: useOAuthStore().token,
}).then((res) => {
}).then(({ data: res }) => {
this.inProgress = false
if (res.error) {
this.error = res.error

10
src/components/settings_modal/tabs/security_tab/security_tab.js
View file

@ -78,7 +78,7 @@ const SecurityTab = {
deleteAccount({
credentials: useOAuthStore().token,
password: this.deleteAccountConfirmPasswordInput,
}).then((res) => {
}).then(({ data: res }) => {
if (res.status === 'success') {
this.$store.dispatch('logout')
this.$router.push({ name: 'root' })
@ -94,7 +94,7 @@ const SecurityTab = {
newPasswordConfirmation: this.changePasswordInputs[2],
credentials: useOAuthStore().token,
}
changePassword(params).then((res) => {
changePassword(params).then(({ data: res }) => {
if (res.status === 'success') {
this.changedPassword = true
this.changePasswordError = false
@ -111,7 +111,7 @@ const SecurityTab = {
password: this.changeEmailPassword,
credentials: useOAuthStore().token,
}
changeEmail(params).then((res) => {
changeEmail(params).then(({ data: res }) => {
if (res.status === 'success') {
this.changedEmail = true
this.changeEmailError = false
@ -127,7 +127,7 @@ const SecurityTab = {
password: this.moveAccountPassword,
credentials: useOAuthStore().token,
}
moveAccount(params).then((res) => {
moveAccount(params).then(({ data: res }) => {
if (res.status === 'success') {
this.movedAccount = true
this.moveAccountError = false
@ -163,7 +163,7 @@ const SecurityTab = {
listAliases({
credentials: useOAuthStore().token,
})
.then((res) => {
.then(({ data: res }) => {
this.aliases = res.aliases
this.listAliasesError = false
})

2
src/components/user_card/user_card.js
View file

@ -600,7 +600,7 @@ export default {
}
updateProfile({ params })
.then((user) => {
.then(({ data: user }) => {
this.newFields.splice(this.newFields.length)
merge(this.newFields, user.fields)
this.$store.commit('addNewUsers', [user])

4
src/components/who_to_follow/who_to_follow.js
View file

@ -23,7 +23,7 @@ const WhoToFollow = {
fetchUser({
id,
credentials: useOAuthStore().token,
}).then((externalUser) => {
}).then(({ data: externalUser }) => {
if (!externalUser.error) {
this.$store.commit('addNewUsers', [externalUser])
this.users.push(externalUser)
@ -34,7 +34,7 @@ const WhoToFollow = {
getWhoToFollow() {
const credentials = useOAuthStore().token
if (credentials) {
suggestions({ credentials }).then((reply) => {
suggestions({ credentials }).then(({ data: reply }) => {
this.showWhoToFollow(reply)
})
}

4
src/components/who_to_follow_panel/who_to_follow_panel.js
View file

@ -21,7 +21,7 @@ function showWhoToFollow(panel, reply) {
fetchUser({
id: name,
credentials: useOAuthStore().token,
}).then((externalUser) => {
}).then(({ data: externalUser }) => {
if (!externalUser.error) {
panel.$store.commit('addNewUsers', [externalUser])
toFollow.id = externalUser.id
@ -36,7 +36,7 @@ function getWhoToFollow(panel) {
panel.usersToFollow.forEach((toFollow) => {
toFollow.name = 'Loading...'
})
suggestions({ credentials }).then((reply) => {
suggestions({ credentials }).then(({ data: reply }) => {
showWhoToFollow(panel, reply)
})
}

4
src/modules/profileConfig.js
View file

@ -10,7 +10,7 @@ const defaultApi = ({ rootState, commit }, { path, value }) => {
return updateProfile({
params,
credentials: useOAuthStore().token,
}).then((result) => {
}).then(({ data: result }) => {
commit('addNewUsers', [result])
commit('setCurrentUser', result)
})
@ -22,7 +22,7 @@ const notificationsApi = ({ rootState, commit }, { path, value, oldValue }) => {
return updateNotificationSettings({
settings,
credentials: useOAuthStore().token,
}).then((result) => {
}).then(({ data: result }) => {
if (result.status === 'success') {
commit('confirmProfileOption', { name, value })
} else {

6
src/services/errors/errors.js
View file

@ -13,8 +13,10 @@ function humanizeErrors(errors) {
export function StatusCodeError(statusCode, body, options, response) {
this.name = 'StatusCodeError'
this.statusCode = statusCode
this.message =
statusCode + ' - ' + (JSON && JSON.stringify ? JSON.stringify(body) : body)
this.statusText = body.error.error || body.error
this.details = JSON && JSON.stringify ? JSON.stringify(body) : body
this.errorData = body.error
this.message = statusCode + ' - ' + statusText
this.error = body // legacy attribute
this.options = options
this.response = response

2
src/services/follow_request_fetcher/follow_request_fetcher.service.js
View file

@ -4,7 +4,7 @@ import { promiseInterval } from 'src/services/promise_interval/promise_interval.
const fetchAndUpdate = ({ store, credentials }) => {
return fetchFollowRequests({ credentials })
.then(
(requests) => {
({ data: requests }) => {
store.commit('setFollowRequests', requests)
store.commit('addNewUsers', requests)
},

28
src/services/notifications_fetcher/notifications_fetcher.service.js
View file

@ -83,27 +83,23 @@ const fetchAndUpdate = ({ store, credentials, older = false, sinceId }) => {
const fetchNotifications = ({ store, args, older }) => {
return fetchTimeline(args)
.then((response) => {
if (response.errors) {
if (
response.status === 400 &&
response.statusText.includes('Invalid value for enum')
) {
response.statusText
.matchAll(/(\w+) - Invalid value for enum./g)
.toArray()
.map((x) => x[1])
.forEach((x) => mastoApiNotificationTypes.delete(x))
return fetchNotifications({ store, args, older })
} else {
throw new Error(`${response.status} ${response.statusText}`)
}
}
const notifications = response.data
update({ store, notifications, older })
return notifications
})
.catch((error) => {
if (
error.statusCode === 400 &&
error.statusText.includes('Invalid value for enum')
) {
error.statusText
.matchAll(/(\w+) - Invalid value for enum./g)
.toArray()
.map((x) => x[1])
.forEach((x) => mastoApiNotificationTypes.delete(x))
return fetchNotifications({ store, args, older })
}
useInterfaceStore().pushGlobalNotice({
level: 'error',
messageKey: 'notifications.error',

26
src/services/status_poster/status_poster.service.js
View file

@ -36,24 +36,16 @@ const postStatus = ({
poll,
preview,
idempotencyKey,
}).then(({ data }) => {
if (!preview) store.dispatch('addNewStatuses', {
statuses: [data],
timeline: 'friends',
showImmediately: true,
noIdUpdate: true, // To prevent missing notices on next pull.
})
return data
})
.then(({ data }) => {
if (preview) return data
store.dispatch('addNewStatuses', {
statuses: [data],
timeline: 'friends',
showImmediately: true,
noIdUpdate: true, // To prevent missing notices on next pull.
})
return data
})
.catch((err) => {
return {
error: err.message,
}
})
}
const editStatus = ({

25
src/services/timeline_fetcher/timeline_fetcher.service.js
View file

@ -36,11 +36,11 @@ const fetchAndUpdate = ({
timeline = 'friends',
older = false,
showImmediately = false,
userId = false,
listId = false,
statusId = false,
bookmarkFolderId = false,
tag = false,
userId,
listId,
statusId,
bookmarkFolderId,
tag,
maxId,
sinceId,
}) => {
@ -52,7 +52,8 @@ const fetchAndUpdate = ({
const loggedIn = !!rootState.users.currentUser
if (older) {
args.maxId = maxId || timelineData.minId
// When minId = 0 we need to fetch without maxId param
args.maxId = maxId || timelineData.minId || null
} else {
if (sinceId === undefined) {
args.sinceId = timelineData.maxId
@ -78,14 +79,6 @@ const fetchAndUpdate = ({
return fetchTimeline(args)
.then((response) => {
if (response.errors) {
if (timeline === 'favorites') {
useInstanceCapabilitiesStore().pleromaPublicFavouritesAvailable = false
return
}
throw new Error(`${response.status} ${response.statusText}`)
}
const { data: statuses, pagination } = response
if (
!older &&
@ -107,6 +100,10 @@ const fetchAndUpdate = ({
return { statuses, pagination }
})
.catch((error) => {
if (error.statusCode === 403 && timeline === 'favorites') {
useInstanceCapabilitiesStore().pleromaPublicFavouritesAvailable = false
return
}
useInterfaceStore().pushGlobalNotice({
level: 'error',
messageKey: 'timeline.error',

2
src/stores/admin_settings.js
View file

@ -601,7 +601,7 @@ export const useAdminSettingsStore = defineStore('adminSettings', {
}).then(({ data }) => data)
},
deleteEmojiPack({ name }) {
return createEmojiPack({
return deleteEmojiPack({
name,
credentials: useOAuthStore().token,
}).then(({ data }) => data)

10
src/stores/emoji.js
View file

@ -192,7 +192,7 @@ export const useEmojiStore = defineStore('emoji', {
listEmojiPacks({
...params,
credentials: useOAuthStore().token,
}),
}).then(({ data }) => data),
)
this.adminPacksLocalLoading = false
},
@ -210,10 +210,6 @@ export const useEmojiStore = defineStore('emoji', {
pageSize: 0,
})
.then((data) => {
if (data.error !== undefined) {
return Promise.reject(data.error)
}
const promises = []
for (let i = 0; i < Math.ceil(data.count / pageSize); i++) {
@ -223,10 +219,6 @@ export const useEmojiStore = defineStore('emoji', {
page: i,
pageSize,
}).then((pageData) => {
if (pageData.error !== undefined) {
return Promise.reject(pageData.error)
}
return pageData.packs
}),
)

3
src/stores/instance.js
View file

@ -211,9 +211,10 @@ export const useInstanceStore = defineStore('instance', {
},
async getKnownDomains() {
try {
this.knownDomains = await fetchKnownDomains({
const { data } = await fetchKnownDomains({
credentials: window.vuex.state.users.currentUser.credentials,
})
this.knownDomains = data
} catch (e) {
console.warn("Can't load known domains\n", e)
}

8
src/stores/lists.js
View file

@ -54,7 +54,7 @@ export const useListsStore = defineStore('lists', {
return await createList({
title,
credentials: useOAuthStore().token,
}).then((list) => {
}).then(({ data: list }) => {
this.setList({ listId: list.id, title })
return list
})
@ -63,13 +63,15 @@ export const useListsStore = defineStore('lists', {
return await getList({
listId,
credentials: useOAuthStore().token,
}).then((list) => this.setList({ listId: list.id, title: list.title }))
}).then(({ data: list }) =>
this.setList({ listId: list.id, title: list.title }),
)
},
async fetchListAccounts({ listId }) {
return await getListAccounts({
listId,
credentials: useOAuthStore().token,
}).then((accountIds) => {
}).then(({ data: accountIds }) => {
if (!this.allListsObject[listId]) {
this.allListsObject[listId] = { accountIds: [] }
}

6
src/stores/oauth_tokens.js
View file

@ -12,7 +12,7 @@ export const useOAuthTokensStore = defineStore('oauthTokens', {
fetchTokens() {
fetchOAuthTokens({
credentials: useOAuthStore().token,
}).then((tokens) => {
}).then(({ data: tokens }) => {
this.swapTokens(tokens)
})
},
@ -20,8 +20,8 @@ export const useOAuthTokensStore = defineStore('oauthTokens', {
revokeOAuthToken({
id,
credentials: useOAuthStore().token,
}).then((response) => {
if (response.status === 201) {
}).then(({ status }) => {
if (status === 201) {
this.swapTokens(this.tokens.filter((token) => token.id !== id))
}
})

4
src/stores/polls.js
View file

@ -27,7 +27,7 @@ export const usePollsStore = defineStore('polls', {
fetchPoll({
pollId,
credentials: useOAuthStore().token,
}).then((poll) => {
}).then(({ data: poll }) => {
setTimeout(() => {
if (this.trackedPolls[pollId]) {
this.updateTrackedPoll(pollId)
@ -60,7 +60,7 @@ export const usePollsStore = defineStore('polls', {
pollId,
choices,
credentials: useOAuthStore().token,
}).then((poll) => {
}).then(({ data: poll }) => {
this.mergeOrAddPoll(poll)
return poll
})

2
src/stores/user_highlight.js
View file

@ -350,7 +350,7 @@ export const useUserHighlightStore = defineStore('user_highlight', {
updateProfileJSON({
params,
credentials: useOAuthStore().token,
}).then((user) => {
}).then(({ data: user }) => {
this.initUserHighlight(user)
this.dirty = false
})