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

missing { data } extraction

Browse source
This commit is contained in:
Henry Jameson 2026-06-22 19:44:44 +03:00
commit a39d3b1b56
23 changed files with 44 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

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/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)
})

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 {

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)
},

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: [] }
}

4
src/stores/oauth_tokens.js
View file

@ -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))
}
})

2
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)

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
})