remaining backend interactor removals
This commit is contained in:
Henry Jameson
parent
28efd7ebd2
commit
0d9709825f
45 changed files with 1118 additions and 856 deletions
|
|
@ -1,20 +1,28 @@
|
|||
import { Socket } from 'phoenix'
|
||||
|
||||
import { WSConnectionStatus } from '../services/api/api.service.js'
|
||||
import backendInteractorService from '../services/backend_interactor_service/backend_interactor_service.js'
|
||||
import { maybeShowChatNotification } from '../services/chat_utils/chat_utils.js'
|
||||
|
||||
import { useCredentialsStore } from 'src/stores/credentials.js'
|
||||
import { useInstanceStore } from 'src/stores/instance.js'
|
||||
import { useInstanceCapabilitiesStore } from 'src/stores/instance_capabilities.js'
|
||||
import { useInterfaceStore } from 'src/stores/interface.js'
|
||||
import { useShoutStore } from 'src/stores/shout.js'
|
||||
|
||||
import {
|
||||
fetchTimeline,
|
||||
getMastodonSocketURI,
|
||||
ProcessedWS,
|
||||
} from 'src/services/api/api.service.js'
|
||||
import followRequestFetcher from 'src/services/follow_request_fetcher/follow_request_fetcher.service'
|
||||
import notificationsFetcher from 'src/services/notifications_fetcher/notifications_fetcher.service.js'
|
||||
import timelineFetcher from 'src/services/timeline_fetcher/timeline_fetcher.service.js'
|
||||
|
||||
const retryTimeout = (multiplier) => 1000 * multiplier
|
||||
|
||||
const api = {
|
||||
state: {
|
||||
retryMultiplier: 1,
|
||||
backendInteractor: backendInteractorService(),
|
||||
fetchers: {},
|
||||
socket: null,
|
||||
mastoUserSocket: null,
|
||||
|
|
@ -25,9 +33,6 @@ const api = {
|
|||
followRequestCount: (state) => state.followRequests.length,
|
||||
},
|
||||
mutations: {
|
||||
setBackendInteractor(state, backendInteractor) {
|
||||
state.backendInteractor = backendInteractor
|
||||
},
|
||||
addFetcher(state, { fetcherName, fetcher }) {
|
||||
state.fetchers[fetcherName] = fetcher
|
||||
},
|
||||
|
|
@ -91,9 +96,17 @@ const api = {
|
|||
try {
|
||||
const { state, commit, dispatch, rootState } = store
|
||||
const timelineData = rootState.statuses.timelines.friends
|
||||
state.mastoUserSocket = state.backendInteractor.startUserSocket({
|
||||
store,
|
||||
|
||||
const serv = useInstanceStore().server.replace('http', 'ws')
|
||||
const credentials = useCredentialsStore().current
|
||||
const url = getMastodonSocketURI({ credentials }, serv)
|
||||
|
||||
state.mastoUserSocket = ProcessedWS({
|
||||
url,
|
||||
id: 'Unified',
|
||||
credentials,
|
||||
})
|
||||
|
||||
state.mastoUserSocket.addEventListener(
|
||||
'pleroma:authenticated',
|
||||
() => {
|
||||
|
|
@ -245,7 +258,7 @@ const api = {
|
|||
return
|
||||
if (store.state.fetchers[timeline]) return
|
||||
|
||||
const fetcher = store.state.backendInteractor.startFetchingTimeline({
|
||||
const fetcher = timelineFetcher.startFetching({
|
||||
timeline,
|
||||
store,
|
||||
userId,
|
||||
|
|
@ -253,7 +266,9 @@ const api = {
|
|||
statusId,
|
||||
bookmarkFolderId,
|
||||
tag,
|
||||
credentials: useCredentialsStore().current,
|
||||
})
|
||||
|
||||
store.commit('addFetcher', { fetcherName: timeline, fetcher })
|
||||
},
|
||||
stopFetchingTimeline(store, timeline) {
|
||||
|
|
@ -261,19 +276,22 @@ const api = {
|
|||
if (!fetcher) return
|
||||
store.commit('removeFetcher', { fetcherName: timeline, fetcher })
|
||||
},
|
||||
|
||||
fetchTimeline(store, { timeline, ...rest }) {
|
||||
store.state.backendInteractor.fetchTimeline({
|
||||
fetchTimeline({
|
||||
store,
|
||||
timeline,
|
||||
...rest,
|
||||
credentials: useCredentialsStore().current,
|
||||
})
|
||||
},
|
||||
|
||||
// Notifications
|
||||
startFetchingNotifications(store) {
|
||||
if (store.state.fetchers.notifications) return
|
||||
const fetcher = store.state.backendInteractor.startFetchingNotifications({
|
||||
const fetcher = notificationsFetcher.startFetching({
|
||||
store,
|
||||
credentials: useCredentialsStore().current,
|
||||
})
|
||||
store.commit('addFetcher', { fetcherName: 'notifications', fetcher })
|
||||
},
|
||||
|
|
@ -282,19 +300,14 @@ const api = {
|
|||
if (!fetcher) return
|
||||
store.commit('removeFetcher', { fetcherName: 'notifications', fetcher })
|
||||
},
|
||||
fetchNotifications(store, { ...rest }) {
|
||||
store.state.backendInteractor.fetchNotifications({
|
||||
store,
|
||||
...rest,
|
||||
})
|
||||
},
|
||||
|
||||
// Follow requests
|
||||
startFetchingFollowRequests(store) {
|
||||
if (store.state.fetchers.followRequests) return
|
||||
const fetcher = store.state.backendInteractor.startFetchingFollowRequests(
|
||||
{ store },
|
||||
)
|
||||
const fetcher = followRequestFetcher.startFetchingFollowRequests({
|
||||
store,
|
||||
credentials: useCredentialsStore().current,
|
||||
})
|
||||
|
||||
store.commit('addFetcher', { fetcherName: 'followRequests', fetcher })
|
||||
},
|
||||
|
|
@ -303,39 +316,6 @@ const api = {
|
|||
if (!fetcher) return
|
||||
store.commit('removeFetcher', { fetcherName: 'followRequests', fetcher })
|
||||
},
|
||||
removeFollowRequest(store, request) {
|
||||
const requests = store.state.followRequests.filter((it) => it !== request)
|
||||
store.commit('setFollowRequests', requests)
|
||||
},
|
||||
|
||||
// Lists
|
||||
startFetchingLists(store) {
|
||||
if (store.state.fetchers.lists) return
|
||||
const fetcher = store.state.backendInteractor.startFetchingLists({
|
||||
store,
|
||||
})
|
||||
store.commit('addFetcher', { fetcherName: 'lists', fetcher })
|
||||
},
|
||||
stopFetchingLists(store) {
|
||||
const fetcher = store.state.fetchers.lists
|
||||
if (!fetcher) return
|
||||
store.commit('removeFetcher', { fetcherName: 'lists', fetcher })
|
||||
},
|
||||
|
||||
// Bookmark folders
|
||||
startFetchingBookmarkFolders(store) {
|
||||
if (store.state.fetchers.bookmarkFolders) return
|
||||
if (!useInstanceCapabilitiesStore().pleromaBookmarkFoldersAvailable)
|
||||
return
|
||||
const fetcher =
|
||||
store.state.backendInteractor.startFetchingBookmarkFolders({ store })
|
||||
store.commit('addFetcher', { fetcherName: 'bookmarkFolders', fetcher })
|
||||
},
|
||||
stopFetchingBookmarkFolders(store) {
|
||||
const fetcher = store.state.fetchers.bookmarkFolders
|
||||
if (!fetcher) return
|
||||
store.commit('removeFetcher', { fetcherName: 'bookmarkFolders', fetcher })
|
||||
},
|
||||
|
||||
// Pleroma websocket
|
||||
setWsToken(store, token) {
|
||||
|
|
|
|||
|
|
@ -11,7 +11,11 @@ import { promiseInterval } from '../services/promise_interval/promise_interval.j
|
|||
|
||||
import { useCredentialsStore } from 'src/stores/credentials.js'
|
||||
|
||||
import { chats } from 'src/services/api/api.service.js'
|
||||
import {
|
||||
chats,
|
||||
deleteChatMessage,
|
||||
readChat,
|
||||
} from 'src/services/api/api.service.js'
|
||||
|
||||
const emptyChatList = () => ({
|
||||
data: [],
|
||||
|
|
@ -119,11 +123,18 @@ const chatsModule = {
|
|||
commit('readChat', { id, lastReadId })
|
||||
|
||||
if (isNewMessage) {
|
||||
rootState.api.backendInteractor.readChat({ id, lastReadId })
|
||||
readChat({
|
||||
id,
|
||||
lastReadId,
|
||||
credentials: useCredentialsStore().current,
|
||||
})
|
||||
}
|
||||
},
|
||||
deleteChatMessage({ rootState, commit }, value) {
|
||||
rootState.api.backendInteractor.deleteChatMessage(value)
|
||||
deleteChatMessage({
|
||||
...value,
|
||||
credentials: useCredentialsStore().current,
|
||||
})
|
||||
commit('deleteChatMessage', { commit, ...value })
|
||||
},
|
||||
resetChats({ commit, dispatch }) {
|
||||
|
|
|
|||
|
|
@ -9,11 +9,14 @@ import {
|
|||
maybeShowNotification,
|
||||
} from '../services/notification_utils/notification_utils.js'
|
||||
|
||||
import { useCredentialsStore } from 'src/stores/credentials.js'
|
||||
import { useI18nStore } from 'src/stores/i18n.js'
|
||||
import { useMergedConfigStore } from 'src/stores/merged_config.js'
|
||||
import { useReportsStore } from 'src/stores/reports.js'
|
||||
import { useSyncConfigStore } from 'src/stores/sync_config.js'
|
||||
|
||||
import { dismissNotification } from 'src/services/api/api.service.js'
|
||||
|
||||
const emptyNotifications = () => ({
|
||||
desktopNotificationSilence: true,
|
||||
maxId: 0,
|
||||
|
|
@ -176,7 +179,10 @@ export const notifications = {
|
|||
},
|
||||
dismissNotification({ rootState, commit }, { id }) {
|
||||
commit('dismissNotification', { id })
|
||||
rootState.api.backendInteractor.dismissNotification({ id })
|
||||
dismissNotification({
|
||||
id,
|
||||
credentials: useCredentialsStore().current,
|
||||
})
|
||||
},
|
||||
updateNotification({ commit }, { id, updater }) {
|
||||
commit('updateNotification', { id, updater })
|
||||
|
|
|
|||
|
|
@ -1,28 +1,37 @@
|
|||
import { get, set } from 'lodash'
|
||||
|
||||
import { useCredentialsStore } from 'src/stores/credentials.js'
|
||||
|
||||
import {
|
||||
updateNotificationSettings,
|
||||
updateProfile,
|
||||
} from 'src/services/api/api.service.js'
|
||||
|
||||
const defaultApi = ({ rootState, commit }, { path, value }) => {
|
||||
const params = {}
|
||||
set(params, path, value)
|
||||
return rootState.api.backendInteractor
|
||||
.updateProfile({ params })
|
||||
.then((result) => {
|
||||
commit('addNewUsers', [result])
|
||||
commit('setCurrentUser', result)
|
||||
})
|
||||
return updateProfile({
|
||||
params,
|
||||
credentials: useCredentialsStore().current,
|
||||
}).then((result) => {
|
||||
commit('addNewUsers', [result])
|
||||
commit('setCurrentUser', result)
|
||||
})
|
||||
}
|
||||
|
||||
const notificationsApi = ({ rootState, commit }, { path, value, oldValue }) => {
|
||||
const settings = {}
|
||||
set(settings, path, value)
|
||||
return rootState.api.backendInteractor
|
||||
.updateNotificationSettings({ settings })
|
||||
.then((result) => {
|
||||
if (result.status === 'success') {
|
||||
commit('confirmProfileOption', { name, value })
|
||||
} else {
|
||||
commit('confirmProfileOption', { name, value: oldValue })
|
||||
}
|
||||
})
|
||||
return updateNotificationSettings({
|
||||
settings,
|
||||
credentials: useCredentialsStore().current,
|
||||
}).then((result) => {
|
||||
if (result.status === 'success') {
|
||||
commit('confirmProfileOption', { name, value })
|
||||
} else {
|
||||
commit('confirmProfileOption', { name, value: oldValue })
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -14,10 +14,28 @@ import {
|
|||
} from 'lodash'
|
||||
|
||||
import {
|
||||
bookmarkStatus,
|
||||
deleteStatus,
|
||||
favorite,
|
||||
fetchEmojiReactions,
|
||||
fetchFavoritedByUsers,
|
||||
fetchPinnedStatuses,
|
||||
fetchRebloggedByUsers,
|
||||
fetchScrobbles,
|
||||
fetchStatus,
|
||||
fetchStatusHistory,
|
||||
fetchStatusSource,
|
||||
muteConversation,
|
||||
pinOwnStatus,
|
||||
reactWithEmoji,
|
||||
retweet,
|
||||
search2,
|
||||
unbookmarkStatus,
|
||||
unfavorite,
|
||||
unmuteConversation,
|
||||
unpinOwnStatus,
|
||||
unreactWithEmoji,
|
||||
unretweet,
|
||||
} from '../services/api/api.service.js'
|
||||
|
||||
import { useCredentialsStore } from 'src/stores/credentials.js'
|
||||
|
|
@ -607,9 +625,9 @@ const statuses = {
|
|||
})
|
||||
},
|
||||
fetchStatus({ rootState, dispatch }, id) {
|
||||
return rootState.api.backendInteractor
|
||||
.fetchStatus({ id })
|
||||
.then((status) => dispatch('addNewStatuses', { statuses: [status] }))
|
||||
return fetchStatus({ id }).then((status) =>
|
||||
dispatch('addNewStatuses', { statuses: [status] }),
|
||||
)
|
||||
},
|
||||
fetchStatusSource({ rootState }, status) {
|
||||
return fetchStatusSource({
|
||||
|
|
@ -647,99 +665,111 @@ const statuses = {
|
|||
favorite({ rootState, commit }, status) {
|
||||
// Optimistic favoriting...
|
||||
commit('setFavorited', { status, value: true })
|
||||
rootState.api.backendInteractor
|
||||
.favorite({ id: status.id })
|
||||
.then((status) =>
|
||||
commit('setFavoritedConfirm', {
|
||||
status,
|
||||
user: rootState.users.currentUser,
|
||||
}),
|
||||
)
|
||||
favorite({
|
||||
id: status.id,
|
||||
credentials: useCredentialsStore().current,
|
||||
}).then((status) =>
|
||||
commit('setFavoritedConfirm', {
|
||||
status,
|
||||
user: rootState.users.currentUser,
|
||||
}),
|
||||
)
|
||||
},
|
||||
unfavorite({ rootState, commit }, status) {
|
||||
// Optimistic unfavoriting...
|
||||
commit('setFavorited', { status, value: false })
|
||||
rootState.api.backendInteractor
|
||||
.unfavorite({ id: status.id })
|
||||
.then((status) =>
|
||||
commit('setFavoritedConfirm', {
|
||||
status,
|
||||
user: rootState.users.currentUser,
|
||||
}),
|
||||
)
|
||||
unfavorite({
|
||||
id: status.id,
|
||||
credentials: useCredentialsStore().current,
|
||||
}).then((status) =>
|
||||
commit('setFavoritedConfirm', {
|
||||
status,
|
||||
user: rootState.users.currentUser,
|
||||
}),
|
||||
)
|
||||
},
|
||||
fetchPinnedStatuses({ rootState, dispatch }, userId) {
|
||||
rootState.api.backendInteractor
|
||||
.fetchPinnedStatuses({ id: userId })
|
||||
.then((statuses) =>
|
||||
dispatch('addNewStatuses', {
|
||||
statuses,
|
||||
timeline: 'user',
|
||||
userId,
|
||||
showImmediately: true,
|
||||
noIdUpdate: true,
|
||||
}),
|
||||
)
|
||||
fetchPinnedStatuses({
|
||||
id: userId,
|
||||
credentials: useCredentialsStore().current,
|
||||
}).then((statuses) =>
|
||||
dispatch('addNewStatuses', {
|
||||
statuses,
|
||||
timeline: 'user',
|
||||
userId,
|
||||
showImmediately: true,
|
||||
noIdUpdate: true,
|
||||
}),
|
||||
)
|
||||
},
|
||||
pinStatus({ rootState, dispatch }, statusId) {
|
||||
return rootState.api.backendInteractor
|
||||
.pinOwnStatus({ id: statusId })
|
||||
.then((status) => dispatch('addNewStatuses', { statuses: [status] }))
|
||||
return pinOwnStatus({
|
||||
id: statusId,
|
||||
credentials: useCredentialsStore().current,
|
||||
}).then((status) => dispatch('addNewStatuses', { statuses: [status] }))
|
||||
},
|
||||
unpinStatus({ rootState, dispatch }, statusId) {
|
||||
return rootState.api.backendInteractor
|
||||
.unpinOwnStatus({ id: statusId })
|
||||
.then((status) => dispatch('addNewStatuses', { statuses: [status] }))
|
||||
return unpinOwnStatus({
|
||||
id: statusId,
|
||||
credentials: useCredentialsStore().current,
|
||||
}).then((status) => dispatch('addNewStatuses', { statuses: [status] }))
|
||||
},
|
||||
muteConversation({ rootState, commit }, { id: statusId }) {
|
||||
return rootState.api.backendInteractor
|
||||
.muteConversation({ id: statusId })
|
||||
.then((status) => commit('setMutedStatus', status))
|
||||
return muteConversation({
|
||||
id: statusId,
|
||||
credentials: useCredentialsStore().current,
|
||||
}).then((status) => commit('setMutedStatus', status))
|
||||
},
|
||||
unmuteConversation({ rootState, commit }, { id: statusId }) {
|
||||
return rootState.api.backendInteractor
|
||||
.unmuteConversation({ id: statusId })
|
||||
.then((status) => commit('setMutedStatus', status))
|
||||
return unmuteConversation({
|
||||
id: statusId,
|
||||
credentials: useCredentialsStore().current,
|
||||
}).then((status) => commit('setMutedStatus', status))
|
||||
},
|
||||
retweet({ rootState, commit }, status) {
|
||||
// Optimistic retweeting...
|
||||
commit('setRetweeted', { status, value: true })
|
||||
rootState.api.backendInteractor
|
||||
.retweet({ id: status.id })
|
||||
.then((status) =>
|
||||
commit('setRetweetedConfirm', {
|
||||
status: status.retweeted_status,
|
||||
user: rootState.users.currentUser,
|
||||
}),
|
||||
)
|
||||
retweet({
|
||||
id: status.id,
|
||||
credentials: useCredentialsStore().current,
|
||||
}).then((status) =>
|
||||
commit('setRetweetedConfirm', {
|
||||
status: status.retweeted_status,
|
||||
user: rootState.users.currentUser,
|
||||
}),
|
||||
)
|
||||
},
|
||||
unretweet({ rootState, commit }, status) {
|
||||
// Optimistic unretweeting...
|
||||
commit('setRetweeted', { status, value: false })
|
||||
rootState.api.backendInteractor
|
||||
.unretweet({ id: status.id })
|
||||
.then((status) =>
|
||||
commit('setRetweetedConfirm', {
|
||||
status,
|
||||
user: rootState.users.currentUser,
|
||||
}),
|
||||
)
|
||||
unretweet({
|
||||
id: status.id,
|
||||
credentials: useCredentialsStore().current,
|
||||
}).then((status) =>
|
||||
commit('setRetweetedConfirm', {
|
||||
status,
|
||||
user: rootState.users.currentUser,
|
||||
}),
|
||||
)
|
||||
},
|
||||
bookmark({ rootState, commit }, status) {
|
||||
commit('setBookmarked', { status, value: true })
|
||||
rootState.api.backendInteractor
|
||||
.bookmarkStatus({ id: status.id, folder_id: status.bookmark_folder_id })
|
||||
.then((status) => {
|
||||
commit('setBookmarkedConfirm', { status })
|
||||
})
|
||||
bookmarkStatus({
|
||||
id: status.id,
|
||||
folder_id: status.bookmark_folder_id,
|
||||
credentials: useCredentialsStore().current,
|
||||
}).then((status) => {
|
||||
commit('setBookmarkedConfirm', { status })
|
||||
})
|
||||
},
|
||||
unbookmark({ rootState, commit }, status) {
|
||||
commit('setBookmarked', { status, value: false })
|
||||
rootState.api.backendInteractor
|
||||
.unbookmarkStatus({ id: status.id })
|
||||
.then((status) => {
|
||||
commit('setBookmarkedConfirm', { status })
|
||||
})
|
||||
unbookmarkStatus({
|
||||
id: status.id,
|
||||
credentials: useCredentialsStore().current,
|
||||
}).then((status) => {
|
||||
commit('setBookmarkedConfirm', { status })
|
||||
})
|
||||
},
|
||||
queueFlush({ commit }, { timeline, id }) {
|
||||
commit('queueFlush', { timeline, id })
|
||||
|
|
@ -749,8 +779,14 @@ const statuses = {
|
|||
},
|
||||
fetchFavsAndRepeats({ rootState, commit }, id) {
|
||||
Promise.all([
|
||||
rootState.api.backendInteractor.fetchFavoritedByUsers({ id }),
|
||||
rootState.api.backendInteractor.fetchRebloggedByUsers({ id }),
|
||||
fetchFavoritedByUsers({
|
||||
id,
|
||||
credentials: useCredentialsStore().current,
|
||||
}),
|
||||
fetchRebloggedByUsers({
|
||||
id,
|
||||
credentials: useCredentialsStore().current,
|
||||
}),
|
||||
]).then(([favoritedByUsers, rebloggedByUsers]) => {
|
||||
commit('addFavs', {
|
||||
id,
|
||||
|
|
@ -769,7 +805,11 @@ const statuses = {
|
|||
if (!currentUser) return
|
||||
|
||||
commit('addOwnReaction', { id, emoji, currentUser })
|
||||
rootState.api.backendInteractor.reactWithEmoji({ id, emoji }).then(() => {
|
||||
reactWithEmoji({
|
||||
id,
|
||||
emoji,
|
||||
credentials: useCredentialsStore().current,
|
||||
}).then(() => {
|
||||
dispatch('fetchEmojiReactionsBy', id)
|
||||
})
|
||||
},
|
||||
|
|
@ -778,59 +818,70 @@ const statuses = {
|
|||
if (!currentUser) return
|
||||
|
||||
commit('removeOwnReaction', { id, emoji, currentUser })
|
||||
rootState.api.backendInteractor
|
||||
.unreactWithEmoji({ id, emoji })
|
||||
.then(() => {
|
||||
dispatch('fetchEmojiReactionsBy', id)
|
||||
})
|
||||
unreactWithEmoji({
|
||||
id,
|
||||
emoji,
|
||||
currentUser: rootState.users.currentUser,
|
||||
}).then(() => {
|
||||
dispatch('fetchEmojiReactionsBy', id)
|
||||
})
|
||||
},
|
||||
fetchEmojiReactionsBy({ rootState, commit }, id) {
|
||||
return rootState.api.backendInteractor
|
||||
.fetchEmojiReactions({ id })
|
||||
.then((emojiReactions) => {
|
||||
commit('addEmojiReactionsBy', {
|
||||
id,
|
||||
emojiReactions,
|
||||
currentUser: rootState.users.currentUser,
|
||||
})
|
||||
return fetchEmojiReactions({
|
||||
id,
|
||||
credentials: useCredentialsStore().current,
|
||||
}).then((emojiReactions) => {
|
||||
commit('addEmojiReactionsBy', {
|
||||
id,
|
||||
emojiReactions,
|
||||
currentUser: rootState.users.currentUser,
|
||||
})
|
||||
})
|
||||
},
|
||||
fetchFavs({ rootState, commit }, id) {
|
||||
rootState.api.backendInteractor
|
||||
.fetchFavoritedByUsers({ id })
|
||||
.then((favoritedByUsers) =>
|
||||
commit('addFavs', {
|
||||
id,
|
||||
favoritedByUsers,
|
||||
currentUser: rootState.users.currentUser,
|
||||
}),
|
||||
)
|
||||
fetchFavoritedByUsers({
|
||||
id,
|
||||
credentials: useCredentialsStore().current,
|
||||
}).then((favoritedByUsers) =>
|
||||
commit('addFavs', {
|
||||
id,
|
||||
favoritedByUsers,
|
||||
currentUser: rootState.users.currentUser,
|
||||
}),
|
||||
)
|
||||
},
|
||||
fetchRepeats({ rootState, commit }, id) {
|
||||
rootState.api.backendInteractor
|
||||
.fetchRebloggedByUsers({ id })
|
||||
.then((rebloggedByUsers) =>
|
||||
commit('addRepeats', {
|
||||
id,
|
||||
rebloggedByUsers,
|
||||
currentUser: rootState.users.currentUser,
|
||||
}),
|
||||
)
|
||||
fetchRebloggedByUsers({
|
||||
id,
|
||||
credentials: useCredentialsStore().current,
|
||||
}).then((rebloggedByUsers) =>
|
||||
commit('addRepeats', {
|
||||
id,
|
||||
rebloggedByUsers,
|
||||
currentUser: rootState.users.currentUser,
|
||||
}),
|
||||
)
|
||||
},
|
||||
search(store, { q, resolve, limit, offset, following, type }) {
|
||||
return store.rootState.api.backendInteractor
|
||||
.search2({ q, resolve, limit, offset, following, type })
|
||||
.then((data) => {
|
||||
store.commit('addNewUsers', data.accounts)
|
||||
store.commit(
|
||||
'addNewUsers',
|
||||
data.statuses.map((s) => s.user).filter((u) => u),
|
||||
)
|
||||
data.statuses = store.commit('addNewStatuses', {
|
||||
statuses: data.statuses,
|
||||
})
|
||||
return data
|
||||
return search2({
|
||||
q,
|
||||
resolve,
|
||||
limit,
|
||||
offset,
|
||||
following,
|
||||
type,
|
||||
credentials: useCredentialsStore().current,
|
||||
}).then((data) => {
|
||||
store.commit('addNewUsers', data.accounts)
|
||||
store.commit(
|
||||
'addNewUsers',
|
||||
data.statuses.map((s) => s.user).filter((u) => u),
|
||||
)
|
||||
data.statuses = store.commit('addNewStatuses', {
|
||||
statuses: data.statuses,
|
||||
})
|
||||
return data
|
||||
})
|
||||
},
|
||||
setVirtualHeight({ commit }, { statusId, height }) {
|
||||
commit('setVirtualHeight', { statusId, height })
|
||||
|
|
|
|||
|
|
@ -10,7 +10,6 @@ import {
|
|||
} from 'lodash'
|
||||
|
||||
import { register } from '../services/api/api.service.js'
|
||||
import backendInteractorService from '../services/backend_interactor_service/backend_interactor_service.js'
|
||||
import oauthApi from '../services/new_api/oauth.js'
|
||||
import {
|
||||
registerPushNotifications,
|
||||
|
|
@ -21,15 +20,35 @@ import {
|
|||
windowWidth,
|
||||
} from '../services/window_utils/window_utils'
|
||||
|
||||
import { useBookmarkFoldersStore } from 'src/stores/bookmark_folders.js'
|
||||
import { useCredentialsStore } from 'src/stores/credentials.js'
|
||||
import { useEmojiStore } from 'src/stores/emoji.js'
|
||||
import { useInstanceStore } from 'src/stores/instance.js'
|
||||
import { useInstanceCapabilitiesStore } from 'src/stores/instance_capabilities.js'
|
||||
import { useInterfaceStore } from 'src/stores/interface.js'
|
||||
import { useListsStore } from 'src/stores/lists.js'
|
||||
import { useMergedConfigStore } from 'src/stores/merged_config.js'
|
||||
import { useOAuthStore } from 'src/stores/oauth.js'
|
||||
import { useSyncConfigStore } from 'src/stores/sync_config.js'
|
||||
import { useUserHighlightStore } from 'src/stores/user_highlight.js'
|
||||
|
||||
import {
|
||||
fetchBlocks,
|
||||
fetchDomainMutes,
|
||||
fetchFollowers,
|
||||
fetchFriends,
|
||||
fetchMutes,
|
||||
fetchUser,
|
||||
fetchUserByName,
|
||||
fetchUserInLists,
|
||||
fetchUserRelationship,
|
||||
followUser,
|
||||
getCaptcha,
|
||||
muteUser,
|
||||
searchUsers,
|
||||
verifyCredentials,
|
||||
} from 'src/services/api/api.service.js'
|
||||
|
||||
// TODO: Unify with mergeOrAdd in statuses.js
|
||||
export const mergeOrAdd = (arr, obj, item) => {
|
||||
if (!item) {
|
||||
|
|
@ -72,46 +91,38 @@ const blockUser = (store, args) => {
|
|||
store.commit('updateUserRelationship', [predictedRelationship])
|
||||
store.commit('addBlockId', id)
|
||||
|
||||
return store.rootState.api.backendInteractor
|
||||
.blockUser({ id, expiresIn })
|
||||
.then((relationship) => {
|
||||
store.commit('updateUserRelationship', [relationship])
|
||||
store.commit('addBlockId', id)
|
||||
return blockUser({ id, expiresIn }).then((relationship) => {
|
||||
store.commit('updateUserRelationship', [relationship])
|
||||
store.commit('addBlockId', id)
|
||||
|
||||
store.commit('removeStatus', { timeline: 'friends', userId: id })
|
||||
store.commit('removeStatus', { timeline: 'public', userId: id })
|
||||
store.commit('removeStatus', {
|
||||
timeline: 'publicAndExternal',
|
||||
userId: id,
|
||||
})
|
||||
store.commit('removeStatus', { timeline: 'friends', userId: id })
|
||||
store.commit('removeStatus', { timeline: 'public', userId: id })
|
||||
store.commit('removeStatus', {
|
||||
timeline: 'publicAndExternal',
|
||||
userId: id,
|
||||
})
|
||||
})
|
||||
}
|
||||
|
||||
const unblockUser = (store, id) => {
|
||||
return store.rootState.api.backendInteractor
|
||||
.unblockUser({ id })
|
||||
.then((relationship) =>
|
||||
store.commit('updateUserRelationship', [relationship]),
|
||||
)
|
||||
return unblockUser({ id }).then((relationship) =>
|
||||
store.commit('updateUserRelationship', [relationship]),
|
||||
)
|
||||
}
|
||||
|
||||
const removeUserFromFollowers = (store, id) => {
|
||||
return store.rootState.api.backendInteractor
|
||||
.removeUserFromFollowers({ id })
|
||||
.then((relationship) =>
|
||||
store.commit('updateUserRelationship', [relationship]),
|
||||
)
|
||||
return removeUserFromFollowers({ id }).then((relationship) =>
|
||||
store.commit('updateUserRelationship', [relationship]),
|
||||
)
|
||||
}
|
||||
|
||||
const editUserNote = (store, { id, comment }) => {
|
||||
return store.rootState.api.backendInteractor
|
||||
.editUserNote({ id, comment })
|
||||
.then((relationship) =>
|
||||
store.commit('updateUserRelationship', [relationship]),
|
||||
)
|
||||
return editUserNote({ id, comment }).then((relationship) =>
|
||||
store.commit('updateUserRelationship', [relationship]),
|
||||
)
|
||||
}
|
||||
|
||||
const muteUser = (store, args) => {
|
||||
const localMuteUser = (store, args) => {
|
||||
const id = typeof args === 'object' ? args.id : args
|
||||
const expiresIn = typeof args === 'object' ? args.expiresIn : 0
|
||||
|
||||
|
|
@ -119,12 +130,14 @@ const muteUser = (store, args) => {
|
|||
store.commit('updateUserRelationship', [predictedRelationship])
|
||||
store.commit('addMuteId', id)
|
||||
|
||||
return store.rootState.api.backendInteractor
|
||||
.muteUser({ id, expiresIn })
|
||||
.then((relationship) => {
|
||||
store.commit('updateUserRelationship', [relationship])
|
||||
store.commit('addMuteId', id)
|
||||
})
|
||||
return muteUser({
|
||||
id,
|
||||
expiresIn,
|
||||
credentials: useCredentialsStore().current,
|
||||
}).then((relationship) => {
|
||||
store.commit('updateUserRelationship', [relationship])
|
||||
store.commit('addMuteId', id)
|
||||
})
|
||||
}
|
||||
|
||||
const unmuteUser = (store, id) => {
|
||||
|
|
@ -132,39 +145,43 @@ const unmuteUser = (store, id) => {
|
|||
predictedRelationship.muting = false
|
||||
store.commit('updateUserRelationship', [predictedRelationship])
|
||||
|
||||
return store.rootState.api.backendInteractor
|
||||
.unmuteUser({ id })
|
||||
.then((relationship) =>
|
||||
store.commit('updateUserRelationship', [relationship]),
|
||||
)
|
||||
return unmuteUser({ id }).then((relationship) =>
|
||||
store.commit('updateUserRelationship', [relationship]),
|
||||
)
|
||||
}
|
||||
|
||||
const hideReblogs = (store, userId) => {
|
||||
return store.rootState.api.backendInteractor
|
||||
.followUser({ id: userId, reblogs: false })
|
||||
.then((relationship) => {
|
||||
store.commit('updateUserRelationship', [relationship])
|
||||
})
|
||||
return followUser({
|
||||
id: userId,
|
||||
reblogs: false,
|
||||
credentials: useCredentialsStore().current,
|
||||
}).then((relationship) => {
|
||||
store.commit('updateUserRelationship', [relationship])
|
||||
})
|
||||
}
|
||||
|
||||
const showReblogs = (store, userId) => {
|
||||
return store.rootState.api.backendInteractor
|
||||
.followUser({ id: userId, reblogs: true })
|
||||
.then((relationship) =>
|
||||
store.commit('updateUserRelationship', [relationship]),
|
||||
)
|
||||
return followUser({
|
||||
id: userId,
|
||||
reblogs: true,
|
||||
credentials: useCredentialsStore().current,
|
||||
}).then((relationship) =>
|
||||
store.commit('updateUserRelationship', [relationship]),
|
||||
)
|
||||
}
|
||||
|
||||
const muteDomain = (store, domain) => {
|
||||
return store.rootState.api.backendInteractor
|
||||
.muteDomain({ domain })
|
||||
.then(() => store.commit('addDomainMute', domain))
|
||||
return muteDomain({
|
||||
domain,
|
||||
credentials: useCredentialsStore().current,
|
||||
}).then(() => store.commit('addDomainMute', domain))
|
||||
}
|
||||
|
||||
const unmuteDomain = (store, domain) => {
|
||||
return store.rootState.api.backendInteractor
|
||||
.unmuteDomain({ domain })
|
||||
.then(() => store.commit('removeDomainMute', domain))
|
||||
return unmuteDomain({
|
||||
domain,
|
||||
credentials: useCredentialsStore().current,
|
||||
}).then(() => store.commit('removeDomainMute', domain))
|
||||
}
|
||||
|
||||
export const mutations = {
|
||||
|
|
@ -385,55 +402,60 @@ const users = {
|
|||
})
|
||||
},
|
||||
fetchUser(store, id) {
|
||||
return store.rootState.api.backendInteractor
|
||||
.fetchUser({ id })
|
||||
.then((user) => {
|
||||
store.commit('addNewUsers', [user])
|
||||
return user
|
||||
})
|
||||
return fetchUser({
|
||||
id,
|
||||
credentials: useCredentialsStore().current,
|
||||
}).then((user) => {
|
||||
store.commit('addNewUsers', [user])
|
||||
return user
|
||||
})
|
||||
},
|
||||
fetchUserByName(store, name) {
|
||||
return store.rootState.api.backendInteractor
|
||||
.fetchUserByName({ name })
|
||||
.then((user) => {
|
||||
store.commit('addNewUsers', [user])
|
||||
return user
|
||||
})
|
||||
return fetchUserByName({
|
||||
name,
|
||||
credentials: useCredentialsStore().current,
|
||||
}).then((user) => {
|
||||
store.commit('addNewUsers', [user])
|
||||
return user
|
||||
})
|
||||
},
|
||||
fetchUserRelationship(store, id) {
|
||||
if (store.state.currentUser) {
|
||||
store.rootState.api.backendInteractor
|
||||
.fetchUserRelationship({ id })
|
||||
.then((relationships) =>
|
||||
store.commit('updateUserRelationship', relationships),
|
||||
)
|
||||
fetchUserRelationship({
|
||||
id,
|
||||
credentials: useCredentialsStore().current,
|
||||
}).then((relationships) =>
|
||||
store.commit('updateUserRelationship', relationships),
|
||||
)
|
||||
}
|
||||
},
|
||||
fetchUserInLists(store, id) {
|
||||
if (store.state.currentUser) {
|
||||
store.rootState.api.backendInteractor
|
||||
.fetchUserInLists({ id })
|
||||
.then((inLists) => store.commit('updateUserInLists', { id, inLists }))
|
||||
fetchUserInLists({
|
||||
id,
|
||||
credentials: useCredentialsStore().current,
|
||||
}).then((inLists) => store.commit('updateUserInLists', { id, inLists }))
|
||||
}
|
||||
},
|
||||
fetchBlocks(store, args) {
|
||||
const { reset } = args || {}
|
||||
|
||||
const maxId = store.state.currentUser.blockIdsMaxId
|
||||
return store.rootState.api.backendInteractor
|
||||
.fetchBlocks({ maxId })
|
||||
.then((blocks) => {
|
||||
if (reset) {
|
||||
store.commit('saveBlockIds', map(blocks, 'id'))
|
||||
} else {
|
||||
map(blocks, 'id').map((id) => store.commit('addBlockId', id))
|
||||
}
|
||||
if (blocks.length) {
|
||||
store.commit('setBlockIdsMaxId', last(blocks).id)
|
||||
}
|
||||
store.commit('addNewUsers', blocks)
|
||||
return blocks
|
||||
})
|
||||
return fetchBlocks({
|
||||
maxId,
|
||||
credentials: useCredentialsStore().current,
|
||||
}).then((blocks) => {
|
||||
if (reset) {
|
||||
store.commit('saveBlockIds', map(blocks, 'id'))
|
||||
} else {
|
||||
map(blocks, 'id').map((id) => store.commit('addBlockId', id))
|
||||
}
|
||||
if (blocks.length) {
|
||||
store.commit('setBlockIdsMaxId', last(blocks).id)
|
||||
}
|
||||
store.commit('addNewUsers', blocks)
|
||||
return blocks
|
||||
})
|
||||
},
|
||||
blockUser(store, data) {
|
||||
return blockUser(store, data)
|
||||
|
|
@ -457,23 +479,24 @@ const users = {
|
|||
const { reset } = args || {}
|
||||
|
||||
const maxId = store.state.currentUser.muteIdsMaxId
|
||||
return store.rootState.api.backendInteractor
|
||||
.fetchMutes({ maxId })
|
||||
.then((mutes) => {
|
||||
if (reset) {
|
||||
store.commit('saveMuteIds', map(mutes, 'id'))
|
||||
} else {
|
||||
map(mutes, 'id').map((id) => store.commit('addMuteId', id))
|
||||
}
|
||||
if (mutes.length) {
|
||||
store.commit('setMuteIdsMaxId', last(mutes).id)
|
||||
}
|
||||
store.commit('addNewUsers', mutes)
|
||||
return mutes
|
||||
})
|
||||
return fetchMutes({
|
||||
maxId,
|
||||
credentials: useCredentialsStore().current,
|
||||
}).then((mutes) => {
|
||||
if (reset) {
|
||||
store.commit('saveMuteIds', map(mutes, 'id'))
|
||||
} else {
|
||||
map(mutes, 'id').map((id) => store.commit('addMuteId', id))
|
||||
}
|
||||
if (mutes.length) {
|
||||
store.commit('setMuteIdsMaxId', last(mutes).id)
|
||||
}
|
||||
store.commit('addNewUsers', mutes)
|
||||
return mutes
|
||||
})
|
||||
},
|
||||
muteUser(store, data) {
|
||||
return muteUser(store, data)
|
||||
return localMuteUser(store, data)
|
||||
},
|
||||
unmuteUser(store, id) {
|
||||
return unmuteUser(store, id)
|
||||
|
|
@ -485,18 +508,18 @@ const users = {
|
|||
return showReblogs(store, id)
|
||||
},
|
||||
muteUsers(store, data = []) {
|
||||
return Promise.all(data.map((d) => muteUser(store, d)))
|
||||
return Promise.all(data.map((d) => localMuteUser(store, d)))
|
||||
},
|
||||
unmuteUsers(store, ids = []) {
|
||||
return Promise.all(ids.map((d) => unmuteUser(store, d)))
|
||||
},
|
||||
fetchDomainMutes(store) {
|
||||
return store.rootState.api.backendInteractor
|
||||
.fetchDomainMutes()
|
||||
.then((domainMutes) => {
|
||||
store.commit('saveDomainMutes', domainMutes)
|
||||
return domainMutes
|
||||
})
|
||||
return fetchDomainMutes({
|
||||
credentials: useCredentialsStore().current,
|
||||
}).then((domainMutes) => {
|
||||
store.commit('saveDomainMutes', domainMutes)
|
||||
return domainMutes
|
||||
})
|
||||
},
|
||||
muteDomain(store, domain) {
|
||||
return muteDomain(store, domain)
|
||||
|
|
@ -513,24 +536,28 @@ const users = {
|
|||
fetchFriends({ rootState, commit }, id) {
|
||||
const user = rootState.users.usersObject[id]
|
||||
const maxId = last(user.friendIds)
|
||||
return rootState.api.backendInteractor
|
||||
.fetchFriends({ id, maxId })
|
||||
.then((friends) => {
|
||||
commit('addNewUsers', friends)
|
||||
commit('saveFriendIds', { id, friendIds: map(friends, 'id') })
|
||||
return friends
|
||||
})
|
||||
return fetchFriends({
|
||||
id,
|
||||
maxId,
|
||||
credentials: useCredentialsStore().current,
|
||||
}).then((friends) => {
|
||||
commit('addNewUsers', friends)
|
||||
commit('saveFriendIds', { id, friendIds: map(friends, 'id') })
|
||||
return friends
|
||||
})
|
||||
},
|
||||
fetchFollowers({ rootState, commit }, id) {
|
||||
const user = rootState.users.usersObject[id]
|
||||
const maxId = last(user.followerIds)
|
||||
return rootState.api.backendInteractor
|
||||
.fetchFollowers({ id, maxId })
|
||||
.then((followers) => {
|
||||
commit('addNewUsers', followers)
|
||||
commit('saveFollowerIds', { id, followerIds: map(followers, 'id') })
|
||||
return followers
|
||||
})
|
||||
return fetchFollowers({
|
||||
id,
|
||||
maxId,
|
||||
credentials: useCredentialsStore().current,
|
||||
}).then((followers) => {
|
||||
commit('addNewUsers', followers)
|
||||
commit('saveFollowerIds', { id, followerIds: map(followers, 'id') })
|
||||
return followers
|
||||
})
|
||||
},
|
||||
clearFriends({ commit }, userId) {
|
||||
commit('clearFriends', userId)
|
||||
|
|
@ -539,18 +566,22 @@ const users = {
|
|||
commit('clearFollowers', userId)
|
||||
},
|
||||
subscribeUser({ rootState, commit }, id) {
|
||||
return rootState.api.backendInteractor
|
||||
.followUser({ id, notify: true })
|
||||
.then((relationship) =>
|
||||
commit('updateUserRelationship', [relationship]),
|
||||
)
|
||||
return followUser({
|
||||
id,
|
||||
notify: true,
|
||||
credentials: useCredentialsStore().current,
|
||||
}).then((relationship) =>
|
||||
commit('updateUserRelationship', [relationship]),
|
||||
)
|
||||
},
|
||||
unsubscribeUser({ rootState, commit }, id) {
|
||||
return rootState.api.backendInteractor
|
||||
.followUser({ id, notify: false })
|
||||
.then((relationship) =>
|
||||
commit('updateUserRelationship', [relationship]),
|
||||
)
|
||||
return followUser({
|
||||
id,
|
||||
notify: false,
|
||||
credentials: useCredentialsStore().current,
|
||||
}).then((relationship) =>
|
||||
commit('updateUserRelationship', [relationship]),
|
||||
)
|
||||
},
|
||||
registerPushNotifications(store) {
|
||||
const token = store.state.currentUser.credentials
|
||||
|
|
@ -611,12 +642,13 @@ const users = {
|
|||
})
|
||||
},
|
||||
searchUsers({ rootState, commit }, { query }) {
|
||||
return rootState.api.backendInteractor
|
||||
.searchUsers({ query })
|
||||
.then((users) => {
|
||||
commit('addNewUsers', users)
|
||||
return users
|
||||
})
|
||||
return searchUsers({
|
||||
query,
|
||||
credentials: useCredentialsStore().current,
|
||||
}).then((users) => {
|
||||
commit('addNewUsers', users)
|
||||
return users
|
||||
})
|
||||
},
|
||||
async signUp(store, userInfo) {
|
||||
const oauthStore = useOAuthStore()
|
||||
|
|
@ -645,8 +677,10 @@ const users = {
|
|||
throw e
|
||||
}
|
||||
},
|
||||
async getCaptcha(store) {
|
||||
return store.rootState.api.backendInteractor.getCaptcha()
|
||||
getCaptcha(store) {
|
||||
return getCaptcha({
|
||||
credentials: useCredentialsStore().current,
|
||||
})
|
||||
},
|
||||
|
||||
logout(store) {
|
||||
|
|
@ -670,13 +704,10 @@ const users = {
|
|||
store.dispatch('disconnectFromSocket')
|
||||
oauth.clearToken()
|
||||
store.dispatch('stopFetchingTimeline', 'friends')
|
||||
store.commit(
|
||||
'setBackendInteractor',
|
||||
backendInteractorService(oauth.getToken),
|
||||
)
|
||||
useCredentialsStore().setCredentials(null)
|
||||
store.dispatch('stopFetchingNotifications')
|
||||
store.dispatch('stopFetchingLists')
|
||||
store.dispatch('stopFetchingBookmarkFolders')
|
||||
useListsStore().stopFetching()
|
||||
useBookmarkFoldersStore().stopFetching()
|
||||
store.dispatch('stopFetchingFollowRequests')
|
||||
store.commit('clearNotifications')
|
||||
store.commit('resetStatuses')
|
||||
|
|
@ -691,8 +722,9 @@ const users = {
|
|||
const commit = store.commit
|
||||
const dispatch = store.dispatch
|
||||
commit('beginLogin')
|
||||
store.rootState.api.backendInteractor
|
||||
.verifyCredentials(accessToken)
|
||||
verifyCredentials({
|
||||
credentials: useCredentialsStore().current,
|
||||
})
|
||||
.then((data) => {
|
||||
if (!data.error) {
|
||||
const user = data
|
||||
|
|
@ -721,11 +753,8 @@ const users = {
|
|||
useInterfaceStore().setNotificationPermission(permission),
|
||||
)
|
||||
|
||||
// Set our new backend interactor
|
||||
commit(
|
||||
'setBackendInteractor',
|
||||
backendInteractorService(accessToken),
|
||||
)
|
||||
// Update credentials
|
||||
useCredentialsStore().setCredentials(accessToken)
|
||||
|
||||
// Do server-side storage migrations
|
||||
|
||||
|
|
@ -764,8 +793,8 @@ const users = {
|
|||
}
|
||||
}
|
||||
|
||||
dispatch('startFetchingLists')
|
||||
dispatch('startFetchingBookmarkFolders')
|
||||
useListsStore().startFetching()
|
||||
useBookmarkFoldersStore().startFetching()
|
||||
|
||||
if (user.locked) {
|
||||
dispatch('startFetchingFollowRequests')
|
||||
|
|
@ -799,9 +828,9 @@ const users = {
|
|||
useInterfaceStore().setLayoutHeight(windowHeight())
|
||||
|
||||
// Fetch our friends
|
||||
store.rootState.api.backendInteractor
|
||||
.fetchFriends({ id: user.id })
|
||||
.then((friends) => commit('addNewUsers', friends))
|
||||
fetchFriends({ id: user.id }).then((friends) =>
|
||||
commit('addNewUsers', friends),
|
||||
)
|
||||
} else {
|
||||
const response = data.error
|
||||
// Authentication failed
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue