diff --git a/src/api/public.js b/src/api/public.js index 5cfd529cd..1e91676f0 100644 --- a/src/api/public.js +++ b/src/api/public.js @@ -13,21 +13,14 @@ import { } from 'src/services/entity_normalizer/entity_normalizer.service.js' import { RegistrationError, StatusCodeError } from 'src/services/errors/errors' -const MASTODON_SUGGESTIONS_URL = '/api/v1/suggestions' +const SUGGESTIONS_URL = '/api/v1/suggestions' const MASTODON_LOGIN_URL = '/api/v1/accounts/verify_credentials' const MASTODON_REGISTRATION_URL = '/api/v1/accounts' const MASTODON_PASSWORD_RESET_URL = ({ email }) => `/auth/password${paramsString({ email })}` -const MASTODON_USER_NOTIFICATIONS_URL = ({ - minId, - sinceId, - maxId, - limit, - includeTypes, - replyVisibility, -}) => - `/api/v1/notifications${paramsString({ minId, sinceId, maxId, limit, includeTypes, replyVisibility })}` +const MASTODON_USER_FAVORITES_TIMELINE_URL = '/api/v1/favourites' +const MASTODON_USER_NOTIFICATIONS_URL = '/api/v1/notifications' const MASTODON_FOLLOWING_URL = ( id, { minId, maxId, sinceId, limit, withRelationships }, @@ -38,117 +31,37 @@ const MASTODON_FOLLOWERS_URL = ( { minId, maxId, sinceId, limit, withRelationships }, ) => `/api/v1/accounts/${id}/followers${paramsString({ minId, maxId, sinceId, limit, withRelationships })}` - -const MASTODON_USER_HOME_TIMELINE_URL = ({ - minId, - sinceId, - maxId, - limit, - replyVisibility, -}) => - `/api/v1/timelines/home${paramsString({ minId, sinceId, maxId, limit, replyVisibility })}` -const MASTODON_LIST_TIMELINE_URL = ( - id, - { minId, sinceId, maxId, limit, replyVisibility }, -) => - `/api/v1/timelines/list/${id}${paramsString({ minId, sinceId, maxId, limit, replyVisibility })}` -const MASTODON_DIRECT_MESSAGES_TIMELINE_URL = ({ - minId, - sinceId, - maxId, - limit, - replyVisibility, -}) => - `/api/v1/timelines/direct${paramsString({ minId, sinceId, maxId, limit, replyVisibility })}` -const MASTODON_PUBLIC_TIMELINE = ({ - minId, - sinceId, - maxId, - limit, - replyVisibility, - local, - remote, - onlyMedia, -}) => - `/api/v1/timelines/public${paramsString({ minId, sinceId, maxId, limit, replyVisibility, local, remote, onlyMedia })}` -const MASTODON_TAG_TIMELINE_URL = ( - tag, - { minId, sinceId, maxId, limit, replyVisibility }, -) => - `/api/v1/timelines/tag/${tag}${paramsString({ minId, sinceId, maxId, limit, replyVisibility })}` -const MASTODON_USER_TIMELINE_URL = ( - id, - { minId, sinceId, maxId, limit, replyVisibility, pinned, onlyMedia }, -) => - `/api/v1/accounts/${id}/statuses${paramsString({ minId, sinceId, maxId, limit, replyVisibility, pinned, onlyMedia })}` -const MASTODON_USER_FAVORITES_TIMELINE_URL = ({ - minId, - sinceId, - maxId, - limit, - replyVisibility, -}) => - `/api/v1/favourites${paramsString({ minId, sinceId, maxId, limit, replyVisibility })}` -const MASTODON_BOOKMARK_TIMELINE_URL = ({ - minId, - sinceId, - maxId, - limit, - replyVisibility, - folderId, -}) => - `/api/v1/bookmarks${paramsString({ minId, sinceId, maxId, limit, replyVisibility, folderId })}` -const PLEROMA_STATUS_QUOTES_URL = ( - id, - { minId, sinceId, maxId, limit, replyVisibility }, -) => - `/api/v1/pleroma/statuses/${id}/quotes${paramsString({ minId, sinceId, maxId, limit, replyVisibility })}` -const PLEROMA_USER_FAVORITES_TIMELINE_URL = ( - id, - { minId, sinceId, maxId, limit, replyVisibility }, -) => - `/api/v1/pleroma/accounts/${id}/favourites${paramsString({ minId, sinceId, maxId, limit, replyVisibility })}` -const AKKOMA_BUBBLE_TIMELINE_URL = ({ - minId, - sinceId, - maxId, - limit, - replyVisibility, -}) => - `/api/v1/timelines/bubble${paramsString({ minId, sinceId, maxId, limit, replyVisibility })}` - +const MASTODON_USER_HOME_TIMELINE_URL = '/api/v1/timelines/home' +const MASTODON_LIST_TIMELINE_URL = (id) => `/api/v1/timelines/list/${id}` +const MASTODON_BOOKMARK_TIMELINE_URL = '/api/v1/bookmarks' +const MASTODON_DIRECT_MESSAGES_TIMELINE_URL = '/api/v1/timelines/direct' +const MASTODON_PUBLIC_TIMELINE = '/api/v1/timelines/public' export const MASTODON_STATUS_URL = (id) => `/api/v1/statuses/${id}` 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_POLL_URL = (id = '') => `/api/v1/polls/${id}` +const MASTODON_USER_TIMELINE_URL = (id) => `/api/v1/accounts/${id}/statuses` +const MASTODON_TAG_TIMELINE_URL = (tag) => `/api/v1/timelines/tag/${tag}` +const AKKOMA_BUBBLE_TIMELINE_URL = '/api/v1/timelines/bubble' +const MASTODON_POLL_URL = (id) => `/api/v1/polls/${id}` const MASTODON_STATUS_FAVORITEDBY_URL = (id) => `/api/v1/statuses/${id}/favourited_by` const MASTODON_STATUS_REBLOGGEDBY_URL = (id) => `/api/v1/statuses/${id}/reblogged_by` -const MASTODON_SEARCH_2 = ({ - q, - resolve, - limit, - offset, - following, - type, - withRelationships, - accountId, - excludeUnreviewed, -}) => - `/api/v2/search${paramsString({ q, resolve, limit, offset, following, type, withRelationships, accountId, excludeUnreviewed })}` -const MASTODON_USER_SEARCH_URL = ({ q, resolve }) => - `/api/v1/accounts/search${paramsString({ q, resolve })}` -const MASTODON_STREAMING = ({ accessToken, stream }) => - `/api/v1/streaming${paramsString({ accessToken, stream })}` +const MASTODON_SEARCH_2 = '/api/v2/search' +const MASTODON_USER_SEARCH_URL = '/api/v1/accounts/search' +const MASTODON_STREAMING = '/api/v1/streaming' const MASTODON_KNOWN_DOMAIN_LIST_URL = '/api/v1/instance/peers' const PLEROMA_EMOJI_REACTIONS_URL = (id) => `/api/v1/pleroma/statuses/${id}/reactions` const PLEROMA_SCROBBLES_URL = (id, { maxId, sinceId, minId, limit, offset }) => `/api/v1/pleroma/accounts/${id}/scrobbles${paramsString({ maxId, sinceId, minId, limit, offset })}` +const PLEROMA_STATUS_QUOTES_URL = (id) => + `/api/v1/pleroma/statuses/${id}/quotes` +const PLEROMA_USER_FAVORITES_TIMELINE_URL = (id) => + `/api/v1/pleroma/accounts/${id}/favourites` const EMOJI_PACKS_URL = (page, pageSize) => `/api/v1/pleroma/emoji/packs${paramsString({ page, pageSize })}` @@ -297,32 +210,23 @@ export const fetchTimeline = ({ bookmarkFolderId, }) => { const timelineUrls = { - friends: MASTODON_USER_HOME_TIMELINE_URL, public: MASTODON_PUBLIC_TIMELINE, - publicAndExternal: MASTODON_PUBLIC_TIMELINE, + friends: MASTODON_USER_HOME_TIMELINE_URL, dms: MASTODON_DIRECT_MESSAGES_TIMELINE_URL, + notifications: MASTODON_USER_NOTIFICATIONS_URL, + publicAndExternal: MASTODON_PUBLIC_TIMELINE, user: MASTODON_USER_TIMELINE_URL, media: MASTODON_USER_TIMELINE_URL, list: MASTODON_LIST_TIMELINE_URL, favorites: MASTODON_USER_FAVORITES_TIMELINE_URL, publicFavorites: PLEROMA_USER_FAVORITES_TIMELINE_URL, - bookmarks: MASTODON_BOOKMARK_TIMELINE_URL, - bubble: AKKOMA_BUBBLE_TIMELINE_URL, tag: MASTODON_TAG_TIMELINE_URL, + bookmarks: MASTODON_BOOKMARK_TIMELINE_URL, quotes: PLEROMA_STATUS_QUOTES_URL, - - notifications: MASTODON_USER_NOTIFICATIONS_URL, + bubble: AKKOMA_BUBBLE_TIMELINE_URL, } - const twoArgs = new Set([ - 'user', - 'media', - 'list', - 'publicFavorites', - 'tag', - 'quotes', - ]) - + const isNotifications = timeline === 'notifications' const params = { minId, sinceId, @@ -330,46 +234,54 @@ export const fetchTimeline = ({ limit: 20, } - const id = (() => { - switch (timeline) { - case 'user': - case 'media': - return userId - case 'list': - return listId - case 'quotes': - return statusId - case 'tag': - return tag - } - })() + let url = timelineUrls[timeline] - const isNotifications = timeline === 'notifications' + if (timeline === 'favorites' && userId) { + url = timelineUrls.publicFavorites(userId) + } - const urlFunc = timelineUrls[timeline] + if (timeline === 'user' || timeline === 'media') { + url = url(userId) + } + + if (timeline === 'list') { + url = url(listId) + } + + if (timeline === 'quotes') { + url = url(statusId) + } + + if (tag) { + url = url(tag) + } if (timeline === 'media') { - params.onlyMedia = true + params.onlyMedia = 1 } if (timeline === 'public') { params.local = true } + if (timeline === 'public' || timeline === 'publicAndExternal') { + params.onlyMedia = false + } if (timeline !== 'favorites' && timeline !== 'bookmarks') { params.withMuted = withMuted } if (replyVisibility !== 'all') { params.replyVisibility = replyVisibility } + if (includeTypes.size > 0) { + params.includeTypes = includeTypes + } if (timeline === 'bookmarks' && bookmarkFolderId) { params.folderId = bookmarkFolderId } - if (isNotifications && includeTypes.size > 0) { - params.includeTypes = includeTypes - } - - const url = twoArgs.has(timeline) ? urlFunc(id, params) : urlFunc(params) - return promisedRequest({ url, credentials }).then((result) => { + return promisedRequest({ + url: url + paramsString(params), + credentials, + }).then(async (result) => { const pagination = parseLinkHeaderPagination( result.response.headers.get('Link'), { @@ -392,7 +304,7 @@ export const listEmojiPacks = ({ page, pageSize, credentials }) => export const fetchPinnedStatuses = ({ id, credentials }) => promisedRequest({ - url: MASTODON_USER_TIMELINE_URL(id, { pinned: true }), + url: MASTODON_USER_TIMELINE_URL(id) + '?pinned=true', credentials, }).then(({ data, ...rest }) => ({ ...rest, data: data.map(parseStatus) })) @@ -411,7 +323,7 @@ export const resetPassword = ({ email }) => { export const suggestions = ({ credentials }) => promisedRequest({ - url: MASTODON_SUGGESTIONS_URL, + url: SUGGESTIONS_URL, credentials, }) @@ -450,7 +362,11 @@ export const fetchEmojiReactions = ({ id, credentials }) => export const searchUsers = ({ credentials, query }) => promisedRequest({ - url: MASTODON_USER_SEARCH_URL({ q: query, resolve: true }), + url: MASTODON_USER_SEARCH_URL, + params: { + q: query, + resolve: true, + }, credentials, }).then(({ data, ...rest }) => ({ ...rest, data: data.map(parseUser) })) @@ -463,16 +379,42 @@ export const search2 = ({ following, type, }) => { + let url = MASTODON_SEARCH_2 + const params = [] + + if (q) { + params.push(['q', encodeURIComponent(q)]) + } + + if (resolve) { + params.push(['resolve', resolve]) + } + + if (limit) { + params.push(['limit', limit]) + } + + if (offset) { + params.push(['offset', offset]) + } + + if (following) { + params.push(['following', true]) + } + + if (type) { + params.push(['type', type]) + } + + params.push(['with_relationships', true]) + + const queryString = map(params, (param) => `${param[0]}=${param[1]}`).join( + '&', + ) + url += `?${queryString}` + return promisedRequest({ - url: MASTODON_SEARCH_2({ - q, - resolve, - limit, - offset, - following, - type, - withRelationships: true, - }), + url, credentials, }) .then(({ data, ...rest }) => { @@ -488,8 +430,21 @@ export const search2 = ({ export const fetchKnownDomains = ({ credentials }) => promisedRequest({ url: MASTODON_KNOWN_DOMAIN_LIST_URL, credentials }) -export const getMastodonSocketURI = ({ credentials, stream }, base) => { - return base + MASTODON_STREAMING({ accessToken: credentials, stream }) +export const getMastodonSocketURI = ( + { credentials, stream, args = {} }, + base, +) => { + const url = new URL(MASTODON_STREAMING, base) + if (credentials) { + url.searchParams.append('access_token', credentials) + } + if (stream) { + url.searchParams.append('stream', stream) + } + Object.entries(args).forEach(([key, val]) => { + url.searchParams.append(key, val) + }) + return url } const MASTODON_STREAMING_EVENTS = new Set([ diff --git a/src/components/login_form/login_form.js b/src/components/login_form/login_form.js index d1164c562..8f705f269 100644 --- a/src/components/login_form/login_form.js +++ b/src/components/login_form/login_form.js @@ -56,26 +56,25 @@ const LoginForm = { instance: this.server, username: this.user.username, password: this.user.password, - }) - .then(({ data: result }) => { - this.login(result).then(() => { - this.$router.push({ name: 'friends' }) - }) - }) - .catch((error) => { - if (error === 'mfa_required') { - this.requireMFA({ settings: error }) - } else if (error.identifier === 'password_reset_required') { + }).then((result) => { + if (result.error) { + if (result.error === 'mfa_required') { + this.requireMFA({ settings: result }) + } else if (result.identifier === 'password_reset_required') { this.$router.push({ name: 'password-reset', params: { passwordResetRequested: true }, }) } else { - this.error = error + this.error = result.error this.focusOnPasswordInput() } return + } + this.login(result).then(() => { + this.$router.push({ name: 'friends' }) }) + }) }) }, clearError() { diff --git a/src/modules/statuses.js b/src/modules/statuses.js index 445d1d436..378759a82 100644 --- a/src/modules/statuses.js +++ b/src/modules/statuses.js @@ -792,7 +792,7 @@ const statuses = { fetchRebloggedByUsers({ id, credentials: useOAuthStore().token, - }).then(({ data }) => data), + }).then(({ data }) => data),, ]).then(([favoritedByUsers, rebloggedByUsers]) => { commit('addFavs', { id, diff --git a/src/modules/users.js b/src/modules/users.js index d6b1adaaa..d4efec2be 100644 --- a/src/modules/users.js +++ b/src/modules/users.js @@ -1,4 +1,3 @@ -import Cookies from 'js-cookie' import { compact, concat, @@ -718,6 +717,7 @@ const users = { .then(() => { store.commit('clearCurrentUser') store.dispatch('disconnectFromSocket') + oauth.clearToken() store.dispatch('stopFetchingTimeline', 'friends') store.dispatch('stopFetchingNotifications') useListsStore().stopFetching() @@ -726,8 +726,6 @@ const users = { store.commit('clearNotifications') store.commit('resetStatuses') store.dispatch('resetChats') - oauth.clearToken() - Cookies.remove('__Host-pleroma_key', { path: '/' }) useInterfaceStore().setLastTimeline('public-timeline') useInterfaceStore().setLayoutWidth(windowWidth()) useInterfaceStore().setLayoutHeight(windowHeight())