-
-
-
-
-
-
- {{ $t('shoutbox.title') }}
-
-
-
-
-
- ![]()
-
-
-
-
- {{ message.author.username }}
-
-
- - {{ message.text }} - -
- - - {{ message.text }} - -
-
-
-
-
-
-
-
-
-
diff --git a/src/components/side_drawer/side_drawer.js b/src/components/side_drawer/side_drawer.js
index c5c28698..9bfee6bd 100644
--- a/src/components/side_drawer/side_drawer.js
+++ b/src/components/side_drawer/side_drawer.js
@@ -1,4 +1,4 @@
-import { mapState, mapGetters } from 'vuex'
+import { mapGetters } from 'vuex'
import UserCard from '../user_card/user_card.vue'
import { unseenNotificationsFromStore } from '../../services/notification_utils/notification_utils'
import GestureService from '../../services/gesture_service/gesture_service'
@@ -51,7 +51,6 @@ const SideDrawer = {
currentUser () {
return this.$store.state.users.currentUser
},
- shout () { return this.$store.state.shout.joined },
unseenNotifications () {
return unseenNotificationsFromStore(this.$store)
},
@@ -85,10 +84,7 @@ const SideDrawer = {
}
return this.currentUser ? 'friends' : 'public-timeline'
},
- ...mapState({
- pleromaChatMessagesAvailable: state => state.instance.pleromaChatMessagesAvailable
- }),
- ...mapGetters(['unreadChatCount', 'unreadAnnouncementCount'])
+ ...mapGetters(['unreadAnnouncementCount'])
},
methods: {
toggleDrawer () {
diff --git a/src/components/side_drawer/side_drawer.vue b/src/components/side_drawer/side_drawer.vue
index 0b6fb8d9..4bbc43bb 100644
--- a/src/components/side_drawer/side_drawer.vue
+++ b/src/components/side_drawer/side_drawer.vue
@@ -67,27 +67,6 @@
/> {{ $t("nav.lists") }}
-
-
-
-
-
-
- - @@ -117,18 +96,6 @@ -
-
-
- -{{ $t("shoutbox.title") }} -
- 1000 * multiplier @@ -102,19 +100,6 @@ const api = { }) } else if (message.event === 'delete') { dispatch('deleteStatusById', message.id) - } else if (message.event === 'pleroma:chat_update') { - // The setTimeout wrapper is a temporary band-aid to avoid duplicates for the user's own messages when doing optimistic sending. - // The cause of the duplicates is the WS event arriving earlier than the HTTP response. - // This setTimeout wrapper can be removed once the commit `8e41baff` is in the stable Pleroma release. - // (`8e41baff` adds the idempotency key to the chat message entity, which PleromaFE uses when it's available, and it makes this artificial delay unnecessary). - setTimeout(() => { - dispatch('addChatMessages', { - chatId: message.chatUpdate.id, - messages: [message.chatUpdate.lastMessage] - }) - dispatch('updateChat', { chat: message.chatUpdate }) - maybeShowChatNotification(store, message.chatUpdate) - }, 100) } } ) @@ -134,15 +119,12 @@ const api = { ]).has(state.mastoUserSocketStatus)) { dispatch('stopFetchingTimeline', { timeline: 'friends' }) dispatch('stopFetchingNotifications') - dispatch('stopFetchingChats') } commit('resetRetryMultiplier') commit('setMastoUserSocketStatus', WSConnectionStatus.JOINED) }) state.mastoUserSocket.addEventListener('error', ({ detail: error }) => { console.error('Error in MastoAPI websocket:', error) - // TODO is this needed? - dispatch('clearOpenedChats') }) state.mastoUserSocket.addEventListener('close', ({ detail: closeEvent }) => { const ignoreCodes = new Set([ @@ -162,7 +144,6 @@ const api = { if (state.mastoUserSocketStatus !== WSConnectionStatus.ERROR) { dispatch('startFetchingTimeline', { timeline: 'friends' }) dispatch('startFetchingNotifications') - dispatch('startFetchingChats') dispatch('startFetchingAnnouncements') dispatch('pushGlobalNotice', { level: 'error', @@ -173,7 +154,6 @@ const api = { } commit('setMastoUserSocketStatus', WSConnectionStatus.ERROR) } - dispatch('clearOpenedChats') }) resolve() } catch (e) { @@ -184,7 +164,6 @@ const api = { stopMastoUserSocket ({ state, dispatch }) { dispatch('startFetchingTimeline', { timeline: 'friends' }) dispatch('startFetchingNotifications') - dispatch('startFetchingChats') state.mastoUserSocket.close() }, @@ -278,17 +257,6 @@ const api = { setWsToken (store, token) { store.commit('setWsToken', token) }, - initializeSocket ({ dispatch, commit, state, rootState }) { - // Set up websocket connection - const token = state.wsToken - if (rootState.instance.shoutAvailable && typeof token !== 'undefined' && state.socket === null) { - const socket = new Socket('/socket', { params: { token } }) - socket.connect() - - commit('setSocket', socket) - dispatch('initializeShout', socket) - } - }, disconnectFromSocket ({ commit, state }) { state.socket && state.socket.disconnect() commit('setSocket', null) diff --git a/src/modules/chats.js b/src/modules/chats.js deleted file mode 100644 index b5aa24b9..00000000 --- a/src/modules/chats.js +++ /dev/null @@ -1,240 +0,0 @@ -import { reactive } from 'vue' -import { find, omitBy, orderBy, sumBy } from 'lodash' -import chatService from '../services/chat_service/chat_service.js' -import { parseChat, parseChatMessage } from '../services/entity_normalizer/entity_normalizer.service.js' -import { maybeShowChatNotification } from '../services/chat_utils/chat_utils.js' -import { promiseInterval } from '../services/promise_interval/promise_interval.js' - -const emptyChatList = () => ({ - data: [], - idStore: {} -}) - -const defaultState = { - chatList: emptyChatList(), - chatListFetcher: null, - openedChats: reactive({}), - openedChatMessageServices: reactive({}), - fetcher: undefined, - currentChatId: null, - lastReadMessageId: null -} - -const getChatById = (state, id) => { - return find(state.chatList.data, { id }) -} - -const sortedChatList = (state) => { - return orderBy(state.chatList.data, ['updated_at'], ['desc']) -} - -const unreadChatCount = (state) => { - return sumBy(state.chatList.data, 'unread') -} - -const chats = { - state: { ...defaultState }, - getters: { - currentChat: state => state.openedChats[state.currentChatId], - currentChatMessageService: state => state.openedChatMessageServices[state.currentChatId], - findOpenedChatByRecipientId: state => recipientId => find(state.openedChats, c => c.account.id === recipientId), - sortedChatList, - unreadChatCount - }, - actions: { - // Chat list - startFetchingChats ({ dispatch, commit }) { - const fetcher = () => dispatch('fetchChats', { latest: true }) - fetcher() - commit('setChatListFetcher', { - fetcher: () => promiseInterval(fetcher, 60000) - }) - }, - stopFetchingChats ({ commit }) { - commit('setChatListFetcher', { fetcher: undefined }) - }, - fetchChats ({ dispatch, rootState, commit }, params = {}) { - return rootState.api.backendInteractor.chats() - .then(({ chats }) => { - dispatch('addNewChats', { chats }) - return chats - }) - }, - addNewChats (store, { chats }) { - const { commit, dispatch, rootGetters } = store - const newChatMessageSideEffects = (chat) => { - maybeShowChatNotification(store, chat) - } - commit('addNewChats', { dispatch, chats, rootGetters, newChatMessageSideEffects }) - }, - updateChat ({ commit }, { chat }) { - commit('updateChat', { chat }) - }, - - // Opened Chats - startFetchingCurrentChat ({ commit, dispatch }, { fetcher }) { - dispatch('setCurrentChatFetcher', { fetcher }) - }, - setCurrentChatFetcher ({ rootState, commit }, { fetcher }) { - commit('setCurrentChatFetcher', { fetcher }) - }, - addOpenedChat ({ rootState, commit, dispatch }, { chat }) { - commit('addOpenedChat', { dispatch, chat: parseChat(chat) }) - dispatch('addNewUsers', [chat.account]) - }, - addChatMessages ({ commit }, value) { - commit('addChatMessages', { commit, ...value }) - }, - resetChatNewMessageCount ({ commit }, value) { - commit('resetChatNewMessageCount', value) - }, - clearCurrentChat ({ rootState, commit, dispatch }, value) { - commit('setCurrentChatId', { chatId: undefined }) - commit('setCurrentChatFetcher', { fetcher: undefined }) - }, - readChat ({ rootState, commit, dispatch }, { id, lastReadId }) { - const isNewMessage = rootState.chats.lastReadMessageId !== lastReadId - - dispatch('resetChatNewMessageCount') - commit('readChat', { id, lastReadId }) - - if (isNewMessage) { - rootState.api.backendInteractor.readChat({ id, lastReadId }) - } - }, - deleteChatMessage ({ rootState, commit }, value) { - rootState.api.backendInteractor.deleteChatMessage(value) - commit('deleteChatMessage', { commit, ...value }) - }, - resetChats ({ commit, dispatch }) { - dispatch('clearCurrentChat') - commit('resetChats', { commit }) - }, - clearOpenedChats ({ rootState, commit, dispatch, rootGetters }) { - commit('clearOpenedChats', { commit }) - }, - handleMessageError ({ commit }, value) { - commit('handleMessageError', { commit, ...value }) - }, - cullOlderMessages ({ commit }, chatId) { - commit('cullOlderMessages', chatId) - } - }, - mutations: { - setChatListFetcher (state, { commit, fetcher }) { - const prevFetcher = state.chatListFetcher - if (prevFetcher) { - prevFetcher.stop() - } - state.chatListFetcher = fetcher && fetcher() - }, - setCurrentChatFetcher (state, { fetcher }) { - const prevFetcher = state.fetcher - if (prevFetcher) { - prevFetcher.stop() - } - state.fetcher = fetcher && fetcher() - }, - addOpenedChat (state, { _dispatch, chat }) { - state.currentChatId = chat.id - state.openedChats[chat.id] = chat - - if (!state.openedChatMessageServices[chat.id]) { - state.openedChatMessageServices[chat.id] = chatService.empty(chat.id) - } - }, - setCurrentChatId (state, { chatId }) { - state.currentChatId = chatId - }, - addNewChats (state, { chats, newChatMessageSideEffects }) { - chats.forEach((updatedChat) => { - const chat = getChatById(state, updatedChat.id) - - if (chat) { - const isNewMessage = (chat.lastMessage && chat.lastMessage.id) !== (updatedChat.lastMessage && updatedChat.lastMessage.id) - chat.lastMessage = updatedChat.lastMessage - chat.unread = updatedChat.unread - chat.updated_at = updatedChat.updated_at - if (isNewMessage && chat.unread) { - newChatMessageSideEffects(updatedChat) - } - } else { - state.chatList.data.push(updatedChat) - state.chatList.idStore[updatedChat.id] = updatedChat - } - }) - }, - updateChat (state, { _dispatch, chat: updatedChat, _rootGetters }) { - const chat = getChatById(state, updatedChat.id) - if (chat) { - chat.lastMessage = updatedChat.lastMessage - chat.unread = updatedChat.unread - chat.updated_at = updatedChat.updated_at - } - if (!chat) { state.chatList.data.unshift(updatedChat) } - state.chatList.idStore[updatedChat.id] = updatedChat - }, - deleteChat (state, { _dispatch, id, _rootGetters }) { - state.chats.data = state.chats.data.filter(conversation => - conversation.last_status.id !== id - ) - state.chats.idStore = omitBy(state.chats.idStore, conversation => conversation.last_status.id === id) - }, - resetChats (state, { commit }) { - state.chatList = emptyChatList() - state.currentChatId = null - commit('setChatListFetcher', { fetcher: undefined }) - for (const chatId in state.openedChats) { - chatService.clear(state.openedChatMessageServices[chatId]) - delete state.openedChats[chatId] - delete state.openedChatMessageServices[chatId] - } - }, - setChatsLoading (state, { value }) { - state.chats.loading = value - }, - addChatMessages (state, { chatId, messages, updateMaxId }) { - const chatMessageService = state.openedChatMessageServices[chatId] - if (chatMessageService) { - chatService.add(chatMessageService, { messages: messages.map(parseChatMessage), updateMaxId }) - } - }, - deleteChatMessage (state, { chatId, messageId }) { - const chatMessageService = state.openedChatMessageServices[chatId] - if (chatMessageService) { - chatService.deleteMessage(chatMessageService, messageId) - } - }, - resetChatNewMessageCount (state, _value) { - const chatMessageService = state.openedChatMessageServices[state.currentChatId] - chatService.resetNewMessageCount(chatMessageService) - }, - // Used when a connection loss occurs - clearOpenedChats (state) { - const currentChatId = state.currentChatId - for (const chatId in state.openedChats) { - if (currentChatId !== chatId) { - chatService.clear(state.openedChatMessageServices[chatId]) - delete state.openedChats[chatId] - delete state.openedChatMessageServices[chatId] - } - } - }, - readChat (state, { id, lastReadId }) { - state.lastReadMessageId = lastReadId - const chat = getChatById(state, id) - if (chat) { - chat.unread = 0 - } - }, - handleMessageError (state, { chatId, fakeId, isRetry }) { - const chatMessageService = state.openedChatMessageServices[chatId] - chatService.handleMessageError(chatMessageService, fakeId, isRetry) - }, - cullOlderMessages (state, chatId) { - chatService.cullOlderMessages(state.openedChatMessageServices[chatId]) - } - } -} - -export default chats diff --git a/src/modules/config.js b/src/modules/config.js index 6eeafe78..93d7487f 100644 --- a/src/modules/config.js +++ b/src/modules/config.js @@ -28,7 +28,6 @@ export const defaultState = { customThemeSource: undefined, hideISP: false, hideInstanceWallpaper: false, - hideShoutbox: false, // bad name: actually hides posts of muted USERS hideMutedPosts: undefined, // instance default hideMutedThreads: undefined, // instance default @@ -59,7 +58,6 @@ export const defaultState = { moves: true, emojiReactions: true, followRequest: true, - chatMention: true, polls: true }, webPushNotifications: false, diff --git a/src/modules/instance.js b/src/modules/instance.js index 63704ab1..8fe7f7a0 100644 --- a/src/modules/instance.js +++ b/src/modules/instance.js @@ -74,9 +74,6 @@ const defaultState = { knownDomains: [], // Feature-set, apparently, not everything here is reported... - shoutAvailable: false, - pleromaChatMessagesAvailable: false, - gopherAvailable: false, mediaProxyAvailable: false, suggestionsEnabled: false, suggestionsWeb: '', @@ -127,11 +124,6 @@ const instance = { case 'name': dispatch('setPageTitle') break - case 'shoutAvailable': - if (value) { - dispatch('initializeSocket') - } - break case 'theme': dispatch('setTheme', value) break diff --git a/src/modules/serverSideConfig.js b/src/modules/serverSideConfig.js index 4b73af26..e7a6c95c 100644 --- a/src/modules/serverSideConfig.js +++ b/src/modules/serverSideConfig.js @@ -47,10 +47,6 @@ export const settingsMap = { }, // Privacy 'locked': 'locked', - 'acceptChatMessages': { - get: 'pleroma.accepts_chat_messages', - set: 'accepts_chat_messages' - }, 'allowFollowingMove': { get: 'pleroma.allow_following_move', set: 'allow_following_move' diff --git a/src/modules/shout.js b/src/modules/shout.js deleted file mode 100644 index 88aefbfe..00000000 --- a/src/modules/shout.js +++ /dev/null @@ -1,46 +0,0 @@ -const shout = { - state: { - messages: [], - channel: { state: '' }, - joined: false - }, - mutations: { - setChannel (state, channel) { - state.channel = channel - }, - addMessage (state, message) { - state.messages.push(message) - state.messages = state.messages.slice(-19, 20) - }, - setMessages (state, messages) { - state.messages = messages.slice(-19, 20) - }, - setJoined (state, joined) { - state.joined = joined - } - }, - actions: { - initializeShout (store, socket) { - const channel = socket.channel('chat:public') - channel.joinPush.receive('ok', () => { - store.commit('setJoined', true) - }) - channel.onClose(() => { - store.commit('setJoined', false) - }) - channel.onError(() => { - store.commit('setJoined', false) - }) - channel.on('new_msg', (msg) => { - store.commit('addMessage', msg) - }) - channel.on('messages', ({ messages }) => { - store.commit('setMessages', messages) - }) - channel.join() - store.commit('setChannel', channel) - } - } -} - -export default shout diff --git a/src/modules/users.js b/src/modules/users.js index 12eb621f..02a9e361 100644 --- a/src/modules/users.js +++ b/src/modules/users.js @@ -523,7 +523,6 @@ const users = { store.dispatch('stopFetchingFollowRequests') store.commit('clearNotifications') store.commit('resetStatuses') - store.dispatch('resetChats') store.dispatch('setLastTimeline', 'public-timeline') store.dispatch('setLayoutWidth', windowWidth()) store.dispatch('setLayoutHeight', windowHeight()) @@ -555,9 +554,6 @@ const users = { if (user.token) { store.dispatch('setWsToken', user.token) - - // Initialize the shout socket. - store.dispatch('initializeSocket') } const startPolling = () => { @@ -566,9 +562,6 @@ const users = { // Start fetching notifications store.dispatch('startFetchingNotifications') - - // Start fetching chats - store.dispatch('startFetchingChats') } if (store.getters.mergedConfig.useStreamingApi) { @@ -577,7 +570,6 @@ const users = { store.dispatch('enableMastoSockets', true).catch((error) => { console.error('Failed initializing MastoAPI Streaming socket', error) }).then(() => { - store.dispatch('fetchChats', { latest: true }) setTimeout(() => store.dispatch('setNotificationsSilence', false), 10000) }) } else { diff --git a/src/services/api/api.service.js b/src/services/api/api.service.js index a98ea7f7..86fe2927 100644 --- a/src/services/api/api.service.js +++ b/src/services/api/api.service.js @@ -1,5 +1,5 @@ import { each, map, concat, last, get } from 'lodash' -import { parseStatus, parseUser, parseNotification, parseAttachment, parseChat, parseLinkHeaderPagination } from '../entity_normalizer/entity_normalizer.service.js' +import { parseStatus, parseUser, parseNotification, parseAttachment, parseLinkHeaderPagination } from '../entity_normalizer/entity_normalizer.service.js' import { RegistrationError, StatusCodeError } from '../errors/errors' /* eslint-env browser */ @@ -92,11 +92,6 @@ const MASTODON_ANNOUNCEMENTS_DISMISS_URL = id => `/api/v1/announcements/${id}/di const PLEROMA_EMOJI_REACTIONS_URL = id => `/api/v1/pleroma/statuses/${id}/reactions` const PLEROMA_EMOJI_REACT_URL = (id, emoji) => `/api/v1/pleroma/statuses/${id}/reactions/${emoji}` const PLEROMA_EMOJI_UNREACT_URL = (id, emoji) => `/api/v1/pleroma/statuses/${id}/reactions/${emoji}` -const PLEROMA_CHATS_URL = `/api/v1/pleroma/chats` -const PLEROMA_CHAT_URL = id => `/api/v1/pleroma/chats/by-account-id/${id}` -const PLEROMA_CHAT_MESSAGES_URL = id => `/api/v1/pleroma/chats/${id}/messages` -const PLEROMA_CHAT_READ_URL = id => `/api/v1/pleroma/chats/${id}/read` -const PLEROMA_DELETE_CHAT_MESSAGE_URL = (chatId, messageId) => `/api/v1/pleroma/chats/${chatId}/messages/${messageId}` const PLEROMA_BACKUP_URL = '/api/v1/pleroma/backups' const PLEROMA_ANNOUNCEMENTS_URL = '/api/v1/pleroma/admin/announcements' const PLEROMA_POST_ANNOUNCEMENT_URL = '/api/v1/pleroma/admin/announcements' @@ -1378,7 +1373,6 @@ const MASTODON_STREAMING_EVENTS = new Set([ ]) const PLEROMA_STREAMING_EVENTS = new Set([ - 'pleroma:chat_update' ]) // A thin wrapper around WebSocket API that allows adding a pre-processor to it @@ -1448,8 +1442,6 @@ export const handleMastoWS = (wsEvent) => { return { event, status: parseStatus(data) } } else if (event === 'notification') { return { event, notification: parseNotification(data) } - } else if (event === 'pleroma:chat_update') { - return { event, chatUpdate: parseChat(data) } } } else { console.warn('Unknown event', wsEvent) @@ -1466,82 +1458,6 @@ export const WSConnectionStatus = Object.freeze({ 'STARTING_INITIAL': 6 }) -const chats = ({ credentials }) => { - return fetch(PLEROMA_CHATS_URL, { headers: authHeaders(credentials) }) - .then((data) => data.json()) - .then((data) => { - return { chats: data.map(parseChat).filter(c => c) } - }) -} - -const getOrCreateChat = ({ accountId, credentials }) => { - return promisedRequest({ - url: PLEROMA_CHAT_URL(accountId), - method: 'POST', - credentials - }) -} - -const chatMessages = ({ id, credentials, maxId, sinceId, limit = 20 }) => { - let url = PLEROMA_CHAT_MESSAGES_URL(id) - const args = [ - maxId && `max_id=${maxId}`, - sinceId && `since_id=${sinceId}`, - limit && `limit=${limit}` - ].filter(_ => _).join('&') - - url = url + (args ? '?' + args : '') - - return promisedRequest({ - url, - method: 'GET', - credentials - }) -} - -const sendChatMessage = ({ id, content, mediaId = null, idempotencyKey, credentials }) => { - const payload = { - 'content': content - } - - if (mediaId) { - payload['media_id'] = mediaId - } - - const headers = {} - - if (idempotencyKey) { - headers['idempotency-key'] = idempotencyKey - } - - return promisedRequest({ - url: PLEROMA_CHAT_MESSAGES_URL(id), - method: 'POST', - payload: payload, - credentials, - headers - }) -} - -const readChat = ({ id, lastReadId, credentials }) => { - return promisedRequest({ - url: PLEROMA_CHAT_READ_URL(id), - method: 'POST', - payload: { - 'last_read_id': lastReadId - }, - credentials - }) -} - -const deleteChatMessage = ({ chatId, messageId, credentials }) => { - return promisedRequest({ - url: PLEROMA_DELETE_CHAT_MESSAGE_URL(chatId, messageId), - method: 'DELETE', - credentials - }) -} - const apiService = { verifyCredentials, fetchTimeline, @@ -1639,12 +1555,6 @@ const apiService = { fetchDomainMutes, muteDomain, unmuteDomain, - chats, - getOrCreateChat, - chatMessages, - sendChatMessage, - readChat, - deleteChatMessage, fetchAnnouncements, dismissAnnouncement, postAnnouncement, diff --git a/src/services/chat_service/chat_service.js b/src/services/chat_service/chat_service.js deleted file mode 100644 index 92ff689d..00000000 --- a/src/services/chat_service/chat_service.js +++ /dev/null @@ -1,226 +0,0 @@ -import _ from 'lodash' - -const empty = (chatId) => { - return { - idIndex: {}, - idempotencyKeyIndex: {}, - messages: [], - newMessageCount: 0, - lastSeenMessageId: '0', - chatId: chatId, - minId: undefined, - maxId: undefined - } -} - -const clear = (storage) => { - const failedMessageIds = [] - - for (const message of storage.messages) { - if (message.error) { - failedMessageIds.push(message.id) - } else { - delete storage.idIndex[message.id] - delete storage.idempotencyKeyIndex[message.idempotency_key] - } - } - - storage.messages = storage.messages.filter(m => failedMessageIds.includes(m.id)) - storage.newMessageCount = 0 - storage.lastSeenMessageId = '0' - storage.minId = undefined - storage.maxId = undefined -} - -const deleteMessage = (storage, messageId) => { - if (!storage) { return } - storage.messages = storage.messages.filter(m => m.id !== messageId) - delete storage.idIndex[messageId] - - if (storage.maxId === messageId) { - const lastMessage = _.maxBy(storage.messages, 'id') - storage.maxId = lastMessage.id - } - - if (storage.minId === messageId) { - const firstMessage = _.minBy(storage.messages, 'id') - storage.minId = firstMessage.id - } -} - -const cullOlderMessages = (storage) => { - const maxIndex = storage.messages.length - const minIndex = maxIndex - 50 - if (maxIndex <= 50) return - - storage.messages = _.sortBy(storage.messages, ['id']) - storage.minId = storage.messages[minIndex].id - for (const message of storage.messages) { - if (message.id < storage.minId) { - delete storage.idIndex[message.id] - delete storage.idempotencyKeyIndex[message.idempotency_key] - } - } - storage.messages = storage.messages.slice(minIndex, maxIndex) -} - -const handleMessageError = (storage, fakeId, isRetry) => { - if (!storage) { return } - const fakeMessage = storage.idIndex[fakeId] - if (fakeMessage) { - fakeMessage.error = true - fakeMessage.pending = false - if (!isRetry) { - // Ensure the failed message doesn't stay at the bottom of the list. - const lastPersistedMessage = _.orderBy(storage.messages, ['pending', 'id'], ['asc', 'desc'])[0] - if (lastPersistedMessage) { - const oldId = fakeMessage.id - fakeMessage.id = `${lastPersistedMessage.id}-${new Date().getTime()}` - storage.idIndex[fakeMessage.id] = fakeMessage - delete storage.idIndex[oldId] - } - } - } -} - -const add = (storage, { messages: newMessages, updateMaxId = true }) => { - if (!storage) { return } - for (let i = 0; i < newMessages.length; i++) { - const message = newMessages[i] - - // sanity check - if (message.chat_id !== storage.chatId) { return } - - if (message.fakeId) { - const fakeMessage = storage.idIndex[message.fakeId] - if (fakeMessage) { - // In case the same id exists (chat update before POST response) - // make sure to remove the older duplicate message. - if (storage.idIndex[message.id]) { - delete storage.idIndex[message.id] - storage.messages = storage.messages.filter(msg => msg.id !== message.id) - } - Object.assign(fakeMessage, message, { error: false }) - delete fakeMessage['fakeId'] - storage.idIndex[fakeMessage.id] = fakeMessage - delete storage.idIndex[message.fakeId] - - return - } - } - - if (!storage.minId || (!message.pending && message.id < storage.minId)) { - storage.minId = message.id - } - - if (!storage.maxId || message.id > storage.maxId) { - if (updateMaxId) { - storage.maxId = message.id - } - } - - if (!storage.idIndex[message.id] && !isConfirmation(storage, message)) { - if (storage.lastSeenMessageId < message.id) { - storage.newMessageCount++ - } - storage.idIndex[message.id] = message - storage.messages.push(storage.idIndex[message.id]) - storage.idempotencyKeyIndex[message.idempotency_key] = true - } - } -} - -const isConfirmation = (storage, message) => { - if (!message.idempotency_key) return - return storage.idempotencyKeyIndex[message.idempotency_key] -} - -const resetNewMessageCount = (storage) => { - if (!storage) { return } - storage.newMessageCount = 0 - storage.lastSeenMessageId = storage.maxId -} - -// Inserts date separators and marks the head and tail if it's the chain of messages made by the same user -const getView = (storage) => { - if (!storage) { return [] } - - const result = [] - const messages = _.orderBy(storage.messages, ['pending', 'id'], ['asc', 'asc']) - const firstMessage = messages[0] - let previousMessage = messages[messages.length - 1] - let currentMessageChainId - - if (firstMessage) { - const date = new Date(firstMessage.created_at) - date.setHours(0, 0, 0, 0) - result.push({ - type: 'date', - date, - id: date.getTime().toString() - }) - } - - let afterDate = false - - for (let i = 0; i < messages.length; i++) { - const message = messages[i] - const nextMessage = messages[i + 1] - - const date = new Date(message.created_at) - date.setHours(0, 0, 0, 0) - - // insert date separator and start a new message chain - if (previousMessage && previousMessage.date < date) { - result.push({ - type: 'date', - date, - id: date.getTime().toString() - }) - - previousMessage['isTail'] = true - currentMessageChainId = undefined - afterDate = true - } - - const object = { - type: 'message', - data: message, - date, - id: message.id, - messageChainId: currentMessageChainId - } - - // end a message chian - if ((nextMessage && nextMessage.account_id) !== message.account_id) { - object['isTail'] = true - currentMessageChainId = undefined - } - - // start a new message chain - if ((previousMessage && previousMessage.data && previousMessage.data.account_id) !== message.account_id || afterDate) { - currentMessageChainId = _.uniqueId() - object['isHead'] = true - object['messageChainId'] = currentMessageChainId - } - - result.push(object) - previousMessage = object - afterDate = false - } - - return result -} - -const ChatService = { - add, - empty, - getView, - deleteMessage, - cullOlderMessages, - resetNewMessageCount, - clear, - handleMessageError -} - -export default ChatService diff --git a/src/services/chat_utils/chat_utils.js b/src/services/chat_utils/chat_utils.js deleted file mode 100644 index de6e0625..00000000 --- a/src/services/chat_utils/chat_utils.js +++ /dev/null @@ -1,41 +0,0 @@ -import { showDesktopNotification } from '../desktop_notification_utils/desktop_notification_utils.js' - -export const maybeShowChatNotification = (store, chat) => { - if (!chat.lastMessage) return - if (store.rootState.chats.currentChatId === chat.id && !document.hidden) return - if (store.rootState.users.currentUser.id === chat.lastMessage.account_id) return - - const opts = { - tag: chat.lastMessage.id, - title: chat.account.name, - icon: chat.account.profile_image_url, - body: chat.lastMessage.content - } - - if (chat.lastMessage.attachment && chat.lastMessage.attachment.type === 'image') { - opts.image = chat.lastMessage.attachment.preview_url - } - - showDesktopNotification(store.rootState, opts) -} - -export const buildFakeMessage = ({ content, chatId, attachments, userId, idempotencyKey }) => { - const fakeMessage = { - content, - chat_id: chatId, - created_at: new Date(), - id: `${new Date().getTime()}`, - attachments: attachments, - account_id: userId, - idempotency_key: idempotencyKey, - emojis: [], - pending: true, - isNormalized: true - } - - if (attachments[0]) { - fakeMessage.attachment = attachments[0] - } - - return fakeMessage -} diff --git a/src/services/entity_normalizer/entity_normalizer.service.js b/src/services/entity_normalizer/entity_normalizer.service.js index e2ab5577..074bd0ad 100644 --- a/src/services/entity_normalizer/entity_normalizer.service.js +++ b/src/services/entity_normalizer/entity_normalizer.service.js @@ -94,7 +94,6 @@ export const parseUser = (data) => { output.background_image = data.pleroma.background_image output.favicon = data.pleroma.favicon - output.token = data.pleroma.chat_token if (relationship) { output.relationship = relationship @@ -200,7 +199,6 @@ export const parseUser = (data) => { : data.pleroma.deactivated // old backend output.notification_settings = data.pleroma.notification_settings - output.unread_chat_count = data.pleroma.unread_chat_count } output.tags = output.tags || [] @@ -403,7 +401,7 @@ export const parseNotification = (data) => { ? parseStatus(data.notice.favorited_status) : parsedNotice output.action = parsedNotice - output.from_profile = output.type === 'pleroma:chat_mention' ? parseUser(data.account) : parseUser(data.from_profile) + output.from_profile = parseUser(data.from_profile) } output.created_at = new Date(data.created_at) @@ -429,34 +427,3 @@ export const parseLinkHeaderPagination = (linkHeader, opts = {}) => { minId: flakeId ? minId : parseInt(minId, 10) } } - -export const parseChat = (chat) => { - const output = {} - output.id = chat.id - output.account = parseUser(chat.account) - output.unread = chat.unread - output.lastMessage = parseChatMessage(chat.last_message) - output.updated_at = new Date(chat.updated_at) - return output -} - -export const parseChatMessage = (message) => { - if (!message) { return } - if (message.isNormalized) { return message } - const output = message - output.id = message.id - output.created_at = new Date(message.created_at) - output.chat_id = message.chat_id - output.emojis = message.emojis - output.content = message.content - if (message.attachment) { - output.attachments = [parseAttachment(message.attachment)] - } else { - output.attachments = [] - } - output.pending = !!message.pending - output.error = false - output.idempotency_key = message.idempotency_key - output.isNormalized = true - return output -} diff --git a/src/services/style_setter/style_setter.js b/src/services/style_setter/style_setter.js index 543aa874..d5bf8749 100644 --- a/src/services/style_setter/style_setter.js +++ b/src/services/style_setter/style_setter.js @@ -106,8 +106,7 @@ export const generateRadii = (input) => { avatar: 5, avatarAlt: 50, tooltip: 2, - attachment: 5, - chatMessage: inputRadii.panel + attachment: 5 }) return { diff --git a/src/services/theme_data/pleromafe.js b/src/services/theme_data/pleromafe.js index c2983be7..29474512 100644 --- a/src/services/theme_data/pleromafe.js +++ b/src/services/theme_data/pleromafe.js @@ -23,9 +23,7 @@ export const LAYERS = { inputTopBar: 'topBar', alert: 'bg', alertPanel: 'panel', - poll: 'bg', - chatBg: 'underlay', - chatMessage: 'chatBg' + poll: 'bg' } /* By default opacity slots have 1 as default opacity @@ -707,58 +705,5 @@ export const SLOT_INHERITANCE = { layer: 'badge', variant: 'badgeNotification', textColor: 'bw' - }, - - chatBg: { - depends: ['bg'] - }, - - chatMessageIncomingBg: { - depends: ['chatBg'] - }, - - chatMessageIncomingText: { - depends: ['text'], - layer: 'chatMessage', - variant: 'chatMessageIncomingBg', - textColor: true - }, - - chatMessageIncomingLink: { - depends: ['link'], - layer: 'chatMessage', - variant: 'chatMessageIncomingBg', - textColor: 'preserve' - }, - - chatMessageIncomingBorder: { - depends: ['border'], - opacity: 'border', - color: (mod, border) => brightness(2 * mod, border).rgb - }, - - chatMessageOutgoingBg: { - depends: ['chatMessageIncomingBg'], - color: (mod, chatMessage) => brightness(5 * mod, chatMessage).rgb - }, - - chatMessageOutgoingText: { - depends: ['text'], - layer: 'chatMessage', - variant: 'chatMessageOutgoingBg', - textColor: true - }, - - chatMessageOutgoingLink: { - depends: ['link'], - layer: 'chatMessage', - variant: 'chatMessageOutgoingBg', - textColor: 'preserve' - }, - - chatMessageOutgoingBorder: { - depends: ['chatMessageOutgoingBg'], - opacity: 'border', - color: (mod, border) => brightness(2 * mod, border).rgb } } diff --git a/test/unit/specs/services/chat_service/chat_service.spec.js b/test/unit/specs/services/chat_service/chat_service.spec.js deleted file mode 100644 index fbbca436..00000000 --- a/test/unit/specs/services/chat_service/chat_service.spec.js +++ /dev/null @@ -1,108 +0,0 @@ -import chatService from '../../../../../src/services/chat_service/chat_service.js' - -const message1 = { - id: '9wLkdcmQXD21Oy8lEX', - idempotency_key: '1', - created_at: (new Date('2020-06-22T18:45:53.000Z')) -} - -const message2 = { - id: '9wLkdp6ihaOVdNj8Wu', - idempotency_key: '2', - account_id: '9vmRb29zLQReckr5ay', - created_at: (new Date('2020-06-22T18:45:56.000Z')) -} - -const message3 = { - id: '9wLke9zL4Dy4OZR2RM', - idempotency_key: '3', - account_id: '9vmRb29zLQReckr5ay', - created_at: (new Date('2020-07-22T18:45:59.000Z')) -} - -describe('chatService', () => { - describe('.add', () => { - it("Doesn't add duplicates", () => { - const chat = chatService.empty() - chatService.add(chat, { messages: [ message1 ] }) - chatService.add(chat, { messages: [ message1 ] }) - expect(chat.messages.length).to.eql(1) - - chatService.add(chat, { messages: [ message2 ] }) - expect(chat.messages.length).to.eql(2) - }) - - it('Updates minId and lastMessage and newMessageCount', () => { - const chat = chatService.empty() - - chatService.add(chat, { messages: [ message1 ] }) - expect(chat.maxId).to.eql(message1.id) - expect(chat.minId).to.eql(message1.id) - expect(chat.newMessageCount).to.eql(1) - - chatService.add(chat, { messages: [ message2 ] }) - expect(chat.maxId).to.eql(message2.id) - expect(chat.minId).to.eql(message1.id) - expect(chat.newMessageCount).to.eql(2) - - chatService.resetNewMessageCount(chat) - expect(chat.newMessageCount).to.eql(0) - expect(chat.lastSeenMessageId).to.eql(message2.id) - - // Add message with higher id - chatService.add(chat, { messages: [ message3 ] }) - expect(chat.newMessageCount).to.eql(1) - }) - }) - - describe('.delete', () => { - it('Updates minId and lastMessage', () => { - const chat = chatService.empty() - - chatService.add(chat, { messages: [ message1 ] }) - chatService.add(chat, { messages: [ message2 ] }) - chatService.add(chat, { messages: [ message3 ] }) - - expect(chat.maxId).to.eql(message3.id) - expect(chat.minId).to.eql(message1.id) - - chatService.deleteMessage(chat, message3.id) - expect(chat.maxId).to.eql(message2.id) - expect(chat.minId).to.eql(message1.id) - - chatService.deleteMessage(chat, message1.id) - expect(chat.maxId).to.eql(message2.id) - expect(chat.minId).to.eql(message2.id) - }) - }) - - describe('.getView', () => { - it('Inserts date separators', () => { - const chat = chatService.empty() - - chatService.add(chat, { messages: [ message1 ] }) - chatService.add(chat, { messages: [ message2 ] }) - chatService.add(chat, { messages: [ message3 ] }) - - const view = chatService.getView(chat) - expect(view.map(i => i.type)).to.eql(['date', 'message', 'message', 'date', 'message']) - }) - }) - - describe('.cullOlderMessages', () => { - it('keeps 50 newest messages and idIndex matches', () => { - const chat = chatService.empty() - - for (let i = 100; i > 0; i--) { - // Use decimal values with toFixed to hack together constant length predictable strings - chatService.add(chat, { messages: [{ ...message1, id: 'a' + (i / 1000).toFixed(3), idempotency_key: i }] }) - } - chatService.cullOlderMessages(chat) - expect(chat.messages.length).to.eql(50) - expect(chat.messages[0].id).to.eql('a0.051') - expect(chat.minId).to.eql('a0.051') - expect(chat.messages[49].id).to.eql('a0.100') - expect(Object.keys(chat.idIndex).length).to.eql(50) - }) - }) -})