({
- 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 chatsModule = {
- 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 })
- commit('setChatListFetcher', {
- fetcher: () => promiseInterval(fetcher, 5000),
- })
- },
- stopFetchingChats({ commit }) {
- commit('setChatListFetcher', { fetcher: undefined })
- },
- fetchChats({ dispatch, rootState }) {
- return chats({
- credentials: useOAuthStore().token,
- }).then(({ chatList }) => {
- dispatch('addNewChats', { chats: chatList })
- return chats
- })
- },
- addNewChats(store, { chats }) {
- const { commit, dispatch, rootGetters } = store
- const newChatMessageSideEffects = (chat) => {
- maybeShowChatNotification(store, chat)
- }
- commit(
- 'addNewUsers',
- chats.map((k) => k.account).filter((k) => k),
- )
- commit('addNewChats', {
- dispatch,
- chats,
- rootGetters,
- newChatMessageSideEffects,
- })
- },
- updateChat({ commit }, { chat }) {
- commit('updateChat', { chat })
- },
-
- // Opened Chats
- startFetchingCurrentChat({ dispatch }, { fetcher }) {
- dispatch('setCurrentChatFetcher', { fetcher })
- },
- setCurrentChatFetcher({ commit }, { fetcher }) {
- commit('setCurrentChatFetcher', { fetcher })
- },
- addOpenedChat({ 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({ commit }) {
- 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) {
- readChat({
- id,
- lastReadId,
- credentials: useOAuthStore().token,
- })
- }
- },
- deleteChatMessage({ rootState, commit }, value) {
- deleteChatMessage({
- ...value,
- credentials: useOAuthStore().token,
- })
- commit('deleteChatMessage', { commit, ...value })
- },
- resetChats({ commit, dispatch }) {
- dispatch('clearCurrentChat')
- commit('resetChats', { commit })
- },
- clearOpenedChats({ commit }) {
- commit('clearOpenedChats', { commit })
- },
- handleMessageError({ commit }, value) {
- commit('handleMessageError', { commit, ...value })
- },
- cullOlderMessages({ commit }, chatId) {
- commit('cullOlderMessages', chatId)
- },
- },
- mutations: {
- setChatListFetcher(state, { 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, { 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, { chat: updatedChat }) {
- 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, { id }) {
- 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) {
- 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 chatsModule
diff --git a/src/modules/default_config_state.js b/src/modules/default_config_state.js
index d9a2ba247..9935e88ce 100644
--- a/src/modules/default_config_state.js
+++ b/src/modules/default_config_state.js
@@ -673,6 +673,11 @@ export const LOCAL_DEFAULT_CONFIG_DEFINITIONS = {
type: 'string',
default: null,
},
+ chatSubmitOnEnter: {
+ description: 'Post status on enter key in chats and chat view',
+ type: 'boolean',
+ default: false,
+ },
themeDebug: {
description:
'Debug mode that uses computed backgrounds instead of real ones to debug contrast functions',
diff --git a/src/modules/index.js b/src/modules/index.js
index e42260c06..c8f3dce39 100644
--- a/src/modules/index.js
+++ b/src/modules/index.js
@@ -1,5 +1,4 @@
import api from './api.js'
-import chats from './chats.js'
import drafts from './drafts.js'
import notifications from './notifications.js'
import profileConfig from './profileConfig.js'
@@ -13,5 +12,4 @@ export default {
api,
profileConfig,
drafts,
- chats,
}
diff --git a/src/modules/users.js b/src/modules/users.js
index 38eb6032c..8777f18da 100644
--- a/src/modules/users.js
+++ b/src/modules/users.js
@@ -21,6 +21,7 @@ import {
import { useAnnouncementsStore } from 'src/stores/announcements.js'
import { useBookmarkFoldersStore } from 'src/stores/bookmark_folders.js'
+import { useChatsStore } from 'src/stores/chats.js'
import { useEmojiStore } from 'src/stores/emoji.js'
import { useInstanceStore } from 'src/stores/instance.js'
import { useInstanceCapabilitiesStore } from 'src/stores/instance_capabilities.js'
@@ -726,7 +727,7 @@ const users = {
store.dispatch('stopFetchingFollowRequests')
store.commit('clearNotifications')
store.commit('resetStatuses')
- store.dispatch('resetChats')
+ useChatsStore().resetChats()
oauth.clearToken()
Cookies.remove('__Host-pleroma_key', { path: '/' })
useInterfaceStore().setLastTimeline('public-timeline')
diff --git a/src/services/chat_service/chat_service.js b/src/services/chat_service/chat_service.js
deleted file mode 100644
index eec267dde..000000000
--- a/src/services/chat_service/chat_service.js
+++ /dev/null
@@ -1,251 +0,0 @@
-import { maxBy, minBy, orderBy, sortBy, uniqueId } from 'lodash'
-
-const empty = (chatId) => {
- return {
- idIndex: {},
- idempotencyKeyIndex: {},
- messages: [],
- newMessageCount: 0,
- lastSeenMessageId: '0',
- 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
index 6d3181dd1..ccf91e85c 100644
--- a/src/services/chat_utils/chat_utils.js
+++ b/src/services/chat_utils/chat_utils.js
@@ -1,10 +1,8 @@
import { showDesktopNotification } from '../desktop_notification_utils/desktop_notification_utils.js'
-export const maybeShowChatNotification = (store, chat) => {
+export const maybeShowChatNotification = (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)
+ if (window.vuex.state.users.currentUser.id === chat.lastMessage.account_id)
return
const opts = {
@@ -21,7 +19,7 @@ export const maybeShowChatNotification = (store, chat) => {
opts.image = chat.lastMessage.attachment.preview_url
}
- showDesktopNotification(store.rootState, opts)
+ showDesktopNotification(window.vuex.state, opts)
}
export const buildFakeMessage = ({
diff --git a/src/services/notification_utils/notification_utils.js b/src/services/notification_utils/notification_utils.js
index 37e5e95ad..6cb3dbc19 100644
--- a/src/services/notification_utils/notification_utils.js
+++ b/src/services/notification_utils/notification_utils.js
@@ -191,6 +191,7 @@ export const prepareNotificationObject = (notification, i18n) => {
export const countExtraNotifications = (
store,
mergedConfig,
+ unreadChatsCount,
unreadAnnouncementCount,
) => {
const rootGetters = store.rootGetters || store.getters
@@ -200,9 +201,7 @@ export const countExtraNotifications = (
}
return [
- mergedConfig.showChatsInExtraNotifications
- ? rootGetters.unreadChatCount
- : 0,
+ mergedConfig.showChatsInExtraNotifications ? unreadChatsCount : 0,
mergedConfig.showAnnouncementsInExtraNotifications
? unreadAnnouncementCount
: 0,
diff --git a/src/services/poll/poll.service.js b/src/services/poll/poll.service.js
index b6b5f35e6..468fc6ff9 100644
--- a/src/services/poll/poll.service.js
+++ b/src/services/poll/poll.service.js
@@ -9,11 +9,11 @@ const pollFallbackValues = {
expiryUnit: 'minutes',
}
-const pollFallback = (object, attr) => {
+export const pollFallback = (object, attr) => {
return object[attr] !== undefined ? object[attr] : pollFallbackValues[attr]
}
-const pollFormToMasto = (poll) => {
+export const pollFormToMasto = (poll) => {
const expiresIn = DateUtils.unitToSeconds(
pollFallback(poll, 'expiryUnit'),
pollFallback(poll, 'expiryAmount'),
@@ -32,5 +32,3 @@ const pollFormToMasto = (poll) => {
expiresIn,
}
}
-
-export { pollFallback, pollFormToMasto }
diff --git a/src/stores/chats.js b/src/stores/chats.js
new file mode 100644
index 000000000..bc5b7f101
--- /dev/null
+++ b/src/stores/chats.js
@@ -0,0 +1,114 @@
+import { find, omitBy, orderBy, sumBy } from 'lodash'
+import { defineStore } from 'pinia'
+
+import { maybeShowChatNotification } from '../services/chat_utils/chat_utils.js'
+import { promiseInterval } from '../services/promise_interval/promise_interval.js'
+
+import { useOAuthStore } from 'src/stores/oauth.js'
+
+import { chats } from 'src/api/chats.js'
+
+const emptyChatList = () => ({
+ data: [],
+ idStore: {},
+})
+
+const defaultState = {
+ chatList: emptyChatList(),
+ chatListFetcher: null,
+}
+
+const getChatById = (state, id) => {
+ return find(state.chatList.data, { id })
+}
+
+export const useChatsStore = defineStore('chats', {
+ state: () => ({ ...defaultState }),
+ getters: {
+ sortedChatList(state) {
+ return orderBy(state.chatList.data, ['updated_at'], ['desc'])
+ },
+ unreadChatsCount(state) {
+ return sumBy(state.chatList.data, 'unread')
+ },
+ },
+ actions: {
+ startFetchingChats() {
+ const fetcher = () => this.fetchChats()
+ this.setChatListFetcher(() => promiseInterval(fetcher, 5000))
+ },
+ stopFetchingChats() {
+ this.setChatListFetcher(null)
+ },
+ async fetchChats() {
+ const { data } = await chats({
+ credentials: useOAuthStore().token,
+ })
+
+ this.addNewChats(data)
+ },
+ setChatListFetcher(fetcher) {
+ const prevFetcher = this.chatListFetcher
+ if (prevFetcher) {
+ prevFetcher.stop()
+ }
+ this.chatListFetcher = fetcher?.()
+ },
+ resetChats() {
+ this.chatList = emptyChatList()
+ this.setChatListFetcher(null)
+ },
+ addNewChats(chats) {
+ window.vuex.commit(
+ 'addNewUsers',
+ chats.map((k) => k.account).filter((k) => k),
+ )
+
+ chats.forEach((updatedChat) => {
+ const chat = getChatById(this, 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) {
+ maybeShowChatNotification(chat)
+ }
+ } else {
+ this.chatList.data.push(updatedChat)
+ this.chatList.idStore[updatedChat.id] = updatedChat
+ }
+ })
+ },
+ readChat(id) {
+ const chat = getChatById(this, id)
+ if (chat) {
+ chat.unread = 0
+ }
+ },
+ updateChat({ chat: updatedChat }) {
+ const chat = getChatById(this, updatedChat.id)
+ if (chat) {
+ chat.lastMessage = updatedChat.lastMessage
+ chat.unread = updatedChat.unread
+ chat.updated_at = updatedChat.updated_at
+ }
+ if (!chat) {
+ this.chatList.data.unshift(updatedChat)
+ }
+ this.chatList.idStore[updatedChat.id] = updatedChat
+ },
+ deleteChat(id) {
+ this.chats.data = this.chats.data.filter(
+ (conversation) => conversation.last_status.id !== id,
+ )
+ this.chats.idStore = omitBy(
+ this.chats.idStore,
+ (conversation) => conversation.last_status.id === id,
+ )
+ },
+ },
+})
diff --git a/src/stores/interface.js b/src/stores/interface.js
index 48d7cb061..275d6893d 100644
--- a/src/stores/interface.js
+++ b/src/stores/interface.js
@@ -188,7 +188,6 @@ export const useInterfaceStore = defineStore('interface', {
this.globalNotices = this.globalNotices.filter((n) => n !== notice)
},
setGlobalError({ error, instance, info }) {
- console.log(info)
switch (info) {
case 'https://vuejs.org/error-reference/#runtime-13': {
this.globalError = {
@@ -206,7 +205,6 @@ export const useInterfaceStore = defineStore('interface', {
break
}
}
- console.log(this.globalError)
},
clearGlobalError() {
this.globalError = null
diff --git a/test/fixtures/setup_test.js b/test/fixtures/setup_test.js
index 85a062cc7..1a04b9549 100644
--- a/test/fixtures/setup_test.js
+++ b/test/fixtures/setup_test.js
@@ -26,6 +26,7 @@ const getDefaultOpts = ({
global: {
plugins: [
applyAfterStore(makeMockStore(), afterStore),
+ createTestingPinia(),
VueVirtualScroller,
createRouter({
history: createMemoryHistory(),
@@ -41,7 +42,6 @@ const getDefaultOpts = ({
(Vue) => {
Vue.directive('body-scroll-lock', {})
},
- createTestingPinia(),
],
components: {
RichContent,
diff --git a/test/unit/specs/boot/routes.spec.js b/test/unit/specs/boot/routes.spec.js
index 6df0ab80d..98bb9a61d 100644
--- a/test/unit/specs/boot/routes.spec.js
+++ b/test/unit/specs/boot/routes.spec.js
@@ -37,8 +37,8 @@ describe('routes', () => {
const matchedComponents = router.currentRoute.value.matched
- expect(matchedComponents[0].components.default.name).to.eql(
- 'AsyncComponentWrapper',
+ expect(matchedComponents[0].components.default.__file).to.contain(
+ 'user_profile.vue',
)
})
@@ -47,8 +47,8 @@ describe('routes', () => {
const matchedComponents = router.currentRoute.value.matched
- expect(matchedComponents[0].components.default.name).to.eql(
- 'AsyncComponentWrapper',
+ expect(matchedComponents[0].components.default.__file).to.contain(
+ 'user_profile.vue',
)
})
@@ -56,9 +56,8 @@ describe('routes', () => {
await router.push('/lists')
const matchedComponents = router.currentRoute.value.matched
-
- expect(matchedComponents[0].components.default.name).to.eql(
- 'AsyncComponentWrapper',
+ expect(matchedComponents[0].components.default.__file).to.contain(
+ 'lists.vue',
)
})
@@ -67,8 +66,8 @@ describe('routes', () => {
const matchedComponents = router.currentRoute.value.matched
- expect(matchedComponents[0].components.default.name).to.eql(
- 'AsyncComponentWrapper',
+ expect(matchedComponents[0].components.default.__file).to.contain(
+ 'lists_timeline.vue',
)
})
@@ -77,8 +76,8 @@ describe('routes', () => {
const matchedComponents = router.currentRoute.value.matched
- expect(matchedComponents[0].components.default.name).to.eql(
- 'AsyncComponentWrapper',
+ expect(matchedComponents[0].components.default.__file).to.contain(
+ 'lists_edit.vue',
)
})
})
diff --git a/test/unit/specs/components/chat_message_list.spec.js b/test/unit/specs/components/chat_message_list.spec.js
new file mode 100644
index 000000000..126332b95
--- /dev/null
+++ b/test/unit/specs/components/chat_message_list.spec.js
@@ -0,0 +1,244 @@
+import { shallowMount } from '@vue/test-utils'
+
+import ChatMessageList from 'src/components/chat_message_list/chat_message_list.vue'
+
+describe('ChatMessageList', () => {
+ describe('computed.chatItems', () => {
+ it('Inserts date separators', () => {
+ const component = shallowMount(ChatMessageList, {
+ props: {
+ messages: [
+ {
+ id: '0',
+ account_id: 'Alice',
+ created_at: new Date('2020-06-22T20:00:00.000Z'),
+ },
+ {
+ id: '1',
+ account_id: 'Alice',
+ created_at: new Date('2020-06-22T20:01:00.000Z'),
+ },
+ {
+ id: '2',
+ account_id: 'Alice',
+ created_at: new Date('2020-06-23T20:00:00.000Z'),
+ },
+ ],
+ },
+ })
+
+ expect(component.vm.chatItems.map((i) => i.type)).to.eql([
+ 'message',
+ 'message',
+ 'date',
+ 'message',
+ ])
+ })
+
+ it('Inserts date header if needed', () => {
+ const component = shallowMount(ChatMessageList, {
+ props: {
+ headerDate: true,
+ messages: [
+ {
+ id: '0',
+ account_id: 'Alice',
+ created_at: new Date('2020-06-23T20:00:00.000Z'),
+ },
+ ],
+ },
+ })
+
+ expect(component.vm.chatItems.map((i) => i.type)).to.eql([
+ 'date',
+ 'message',
+ ])
+ })
+
+ it('Inserts time separators if messages were sent with considerable delay (5 minutes)', () => {
+ const component = shallowMount(ChatMessageList, {
+ props: {
+ messages: [
+ {
+ id: '0',
+ account_id: 'Alice',
+ created_at: new Date('2020-06-22T20:00:00.000Z'),
+ },
+ {
+ id: '1',
+ account_id: 'Alice',
+ created_at: new Date('2020-06-22T20:06:00.000Z'),
+ },
+ {
+ id: '2',
+ account_id: 'Alice',
+ created_at: new Date('2020-06-23T20:00:00.000Z'),
+ },
+ ],
+ },
+ })
+
+ expect(component.vm.chatItems.map((i) => i.type)).to.eql([
+ 'message',
+ 'date',
+ 'message',
+ 'date',
+ 'message',
+ ])
+ expect(component.vm.chatItems.map((i) => i.isTime)).to.eql([
+ undefined,
+ true,
+ undefined,
+ false,
+ undefined,
+ ])
+ })
+
+ it('Groups message chains by time and author', () => {
+ const component = shallowMount(ChatMessageList, {
+ props: {
+ messages: [
+ {
+ id: '0',
+ account_id: 'Alice',
+ created_at: new Date('2020-06-22T20:00:00.000Z'),
+ },
+ {
+ id: '1',
+ account_id: 'Alice',
+ created_at: new Date('2020-06-22T20:06:00.000Z'),
+ },
+ {
+ id: '2',
+ account_id: 'Alice',
+ created_at: new Date('2020-06-23T20:00:00.000Z'),
+ },
+ {
+ id: '3',
+ account_id: 'Bob',
+ created_at: new Date('2020-06-23T20:01:00.000Z'),
+ },
+ {
+ id: '4',
+ account_id: 'Bob',
+ created_at: new Date('2020-06-23T20:02:00.000Z'),
+ },
+ {
+ id: '5',
+ account_id: 'Bob',
+ created_at: new Date('2020-06-23T20:03:00.000Z'),
+ },
+ {
+ id: '6',
+ account_id: 'Eve',
+ created_at: new Date('2020-06-23T20:04:00.000Z'),
+ },
+ ],
+ },
+ })
+
+ // Type check
+ expect(component.vm.chatItems.map((i) => i.type)).to.eql([
+ 'message',
+ 'date',
+ 'message',
+ 'date',
+ 'message',
+ 'message',
+ 'message',
+ 'message',
+ 'message',
+ ])
+
+ // Chain head/Tail checks
+ expect(component.vm.chatItems.map((i) => [i.isHead, i.isTail])).to.eql([
+ [true, true],
+ [undefined, undefined],
+ [true, true],
+ [undefined, undefined],
+ [true, true],
+ [true, false],
+ [false, false],
+ [false, true],
+ [true, true],
+ ])
+
+ // Unique ID is randomly generated so we have to compare data against itself
+ // Two messages from Bob next to each other
+ expect(component.vm.chatItems[5].messageChainId).to.eql(
+ component.vm.chatItems[6].messageChainId,
+ )
+
+ // Message from Even right after Bob
+ expect(component.vm.chatItems[7].messageChainId).to.not.eql(
+ component.vm.chatItems[8].messageChainId,
+ )
+ })
+ })
+ describe('methods.getPreviousItem', () => {
+ describe('Finds correct previous meaningful (non-separator) message in the chatlist', () => {
+ let component
+
+ beforeEach(() => {
+ component = shallowMount(ChatMessageList, {
+ props: {
+ messages: [
+ {
+ id: '0',
+ account_id: 'Alice',
+ created_at: new Date('2020-06-22T20:00:00.000Z'),
+ },
+ {
+ // Separator
+ id: '1', // 2
+ account_id: 'Alice',
+ created_at: new Date('2020-06-22T20:06:00.000Z'),
+ },
+ {
+ // Separator
+ id: '2', // 4
+ account_id: 'Alice',
+ created_at: new Date('2020-06-23T20:00:00.000Z'),
+ },
+ {
+ id: '3', // 5
+ account_id: 'Bob',
+ created_at: new Date('2020-06-23T20:01:00.000Z'),
+ },
+ {
+ id: '4', // 6
+ account_id: 'Bob',
+ created_at: new Date('2020-06-23T20:02:00.000Z'),
+ },
+ {
+ id: '5', // 7
+ account_id: 'Bob',
+ created_at: new Date('2020-06-23T20:03:00.000Z'),
+ },
+ {
+ id: '6', // 8
+ account_id: 'Eve',
+ created_at: new Date('2020-06-23T20:04:00.000Z'),
+ },
+ ],
+ },
+ })
+ })
+
+ it('Directly next to each other', () => {
+ const correct = component.vm.chatItems[6]
+ expect(component.vm.getPreviousItem(7)).to.eql(correct)
+ })
+
+ it('Across separator', () => {
+ const correct = component.vm.chatItems[2]
+ expect(component.vm.getPreviousItem(4)).to.eql(correct)
+ })
+
+ it('Returns null if no previous item exist', () => {
+ const correct = null
+ expect(component.vm.getPreviousItem(0)).to.eql(correct)
+ })
+ })
+ })
+})
diff --git a/test/unit/specs/components/chat_view.spec.js b/test/unit/specs/components/chat_view.spec.js
new file mode 100644
index 000000000..c308e4fbc
--- /dev/null
+++ b/test/unit/specs/components/chat_view.spec.js
@@ -0,0 +1,137 @@
+import { createTestingPinia } from '@pinia/testing'
+import { shallowMount } from '@vue/test-utils'
+import { setActivePinia } from 'pinia'
+
+import ChatView from 'src/components/chat_view/chat_view.vue'
+
+const message1 = {
+ id: '1',
+ chat_id: 2,
+ idempotency_key: '1',
+ created_at: new Date('2020-06-22T18:45:53.000Z'),
+}
+
+const message2 = {
+ id: '2',
+ chat_id: 2,
+ idempotency_key: '2',
+ account_id: '9vmRb29zLQReckr5ay',
+ created_at: new Date('2020-06-22T18:45:56.000Z'),
+}
+
+const message3 = {
+ id: '3',
+ chat_id: 2,
+ idempotency_key: '3',
+ account_id: '9vmRb29zLQReckr5ay',
+ created_at: new Date('2020-07-22T18:45:59.000Z'),
+}
+
+const global = {
+ mocks: {
+ $store: {
+ state: {
+ api: {},
+ users: {},
+ statuses: {
+ allStatusesObject: {},
+ },
+ },
+ },
+ $route: {
+ params: {
+ recipient_id: 2,
+ },
+ },
+ $router: {
+ push: () => {
+ /* noop */
+ },
+ },
+ },
+ stubs: {
+ FAIcon: true,
+ },
+}
+
+describe('ChatView methods', () => {
+ let component
+ beforeEach(() => {
+ setActivePinia(createTestingPinia())
+ component = shallowMount(ChatView, { global, props: { testMode: true } })
+ component.vm.chat = { id: 2 }
+ })
+
+ describe('addMessages', () => {
+ it("Doesn't add duplicates", () => {
+ component.vm.addMessages({ messages: [message1] })
+ component.vm.addMessages({ messages: [message1] })
+ expect(component.vm.messages.length).to.eql(1)
+
+ component.vm.addMessages({ messages: [message2] })
+ expect(component.vm.messages.length).to.eql(2)
+ })
+
+ it('Updates minId and lastMessage and newMessageCount', async () => {
+ component.vm.addMessages({ messages: [message1] })
+ expect(component.vm.maxId).to.eql(message1.id)
+ expect(component.vm.minId).to.eql(message1.id)
+ expect(component.vm.newMessageCount).to.eql(1)
+
+ component.vm.addMessages({ messages: [message2] })
+ expect(component.vm.maxId).to.eql(message2.id)
+ expect(component.vm.minId).to.eql(message1.id)
+ expect(component.vm.newMessageCount).to.eql(2)
+
+ await component.vm.readChat()
+ expect(component.vm.newMessageCount).to.eql(0)
+ expect(component.vm.lastReadMessageId).to.eql(message2.id)
+
+ // Add message with higher id
+ component.vm.addMessages({ messages: [message3] })
+ expect(component.vm.newMessageCount).to.eql(1)
+ })
+ })
+
+ describe('deleteChatMessage', () => {
+ it('Updates minId and lastMessage', () => {
+ component.vm.addMessages({ messages: [message1] })
+ component.vm.addMessages({ messages: [message2] })
+ component.vm.addMessages({ messages: [message3] })
+
+ expect(component.vm.maxId).to.eql(message3.id)
+ expect(component.vm.minId).to.eql(message1.id)
+
+ component.vm.deleteChatMessage({ messageId: message3.id })
+ expect(component.vm.maxId).to.eql(message2.id)
+ expect(component.vm.minId).to.eql(message1.id)
+
+ component.vm.deleteChatMessage({ messageId: message1.id })
+ expect(component.vm.maxId).to.eql(message2.id)
+ expect(component.vm.minId).to.eql(message2.id)
+ })
+ })
+
+ describe('cullOlder', () => {
+ it('keeps 50 newest messages and messagesIndex matches', () => {
+ for (let i = 100; i > 0; i--) {
+ // Use decimal values with toFixed to hack together constant length predictable strings
+ component.vm.addMessages({
+ messages: [
+ {
+ ...message1,
+ id: 'a' + (i / 1000).toFixed(3),
+ idempotency_key: i,
+ },
+ ],
+ })
+ }
+ component.vm.cullOlder()
+ expect(component.vm.messages.length).to.eql(50)
+ expect(component.vm.messages[0].id).to.eql('a0.051')
+ expect(component.vm.minId).to.eql('a0.051')
+ expect(component.vm.messages[49].id).to.eql('a0.100')
+ expect(Object.keys(component.vm.messagesIndex).length).to.eql(50)
+ })
+ })
+})
diff --git a/test/unit/specs/components/post_status_form.spec.js b/test/unit/specs/components/post_status_form.spec.js
index 8f3d6d80f..03c0ec8b9 100644
--- a/test/unit/specs/components/post_status_form.spec.js
+++ b/test/unit/specs/components/post_status_form.spec.js
@@ -1,11 +1,11 @@
-import { createTestingPinia } from '@pinia/testing'
import { mount } from '@vue/test-utils'
-import { setActivePinia } from 'pinia'
+import { vi } from 'vitest'
import PostStatusForm from 'src/components/post_status_form/post_status_form.vue'
import { mountOpts } from '../../../fixtures/setup_test'
import { useInstanceCapabilitiesStore } from 'src/stores/instance_capabilities.js'
+import { useMergedConfigStore } from 'src/stores/merged_config.js'
const currentUser = {
id: 'current-user',
@@ -24,15 +24,16 @@ const repliedStatus = {
user: repliedUser,
}
-const replyMountOpts = () =>
+const repliedStatus2 = {
+ id: 'status-2',
+ visibility: 'private',
+ summary: 'subject',
+ user: repliedUser,
+}
+
+const replyMountOpts = (props) =>
mountOpts({
- props: {
- replyTo: repliedStatus.id,
- repliedUser,
- attentions: [],
- copyMessageScope: repliedStatus.visibility,
- disableDraft: true,
- },
+ props,
afterStore(store) {
store.state.users.currentUser = currentUser
store.state.statuses.allStatusesObject = {
@@ -43,19 +44,279 @@ const replyMountOpts = () =>
describe('PostStatusForm', () => {
beforeEach(() => {
- setActivePinia(createTestingPinia())
+ vi.useFakeTimers()
})
- it('initializes a reply form when quoteReply is unset', () => {
- useInstanceCapabilitiesStore().quotingAvailable = true
-
+ it('Clean empty initial state', () => {
const wrapper = mount(PostStatusForm, replyMountOpts())
- expect(wrapper.vm.newStatus.type).to.equal('reply')
- expect(wrapper.vm.newStatus.quote).to.eql({
- id: '',
- url: '',
- thread: false,
- })
+ expect(wrapper.vm.statusType).to.equal('new')
+ expect(wrapper.vm.newStatus.spoilerText).to.eql('')
+ expect(wrapper.vm.newStatus.mentions).to.eql('')
+ expect(wrapper.vm.newStatus.status).to.eql('')
})
+
+ it('Reset cleans form to pristine state equal to state form was when created', () => {
+ const wrapper = mount(PostStatusForm, replyMountOpts())
+
+ const initial = { ...wrapper.vm.newStatus }
+ wrapper.vm.clearStatus()
+
+ expect(wrapper.vm.newStatus).to.eql(initial)
+ })
+
+ it('Initializes a reply form', () => {
+ const wrapper = mount(
+ PostStatusForm,
+ replyMountOpts({
+ repliedStatus: repliedStatus,
+ }),
+ )
+
+ useInstanceCapabilitiesStore().quotingAvailable = true
+
+ expect(wrapper.vm.statusType).to.equal('reply')
+ expect(wrapper.vm.isReply).to.equal(true)
+ expect(wrapper.vm.refId).to.equal('status-1')
+ expect(wrapper.vm.quotable).to.equal(true)
+ expect(wrapper.vm.inReplyToStatusId).to.equal('status-1')
+ expect(wrapper.vm.newStatus.quote).to.eql(null)
+ expect(wrapper.vm.newStatus.poll).to.eql(null)
+ expect(wrapper.vm.newStatus.spoilerText).to.eql('')
+ expect(wrapper.vm.newStatus.mentions).to.eql('@replied')
+ expect(wrapper.vm.newStatus.status).to.eql('@replied ')
+ expect(wrapper.vm.newStatus.visibility).to.eql('public')
+ })
+
+ it('Copies scope and subject line, disables quoting for locked posts', () => {
+ const wrapper = mount(
+ PostStatusForm,
+ replyMountOpts({
+ repliedStatus: repliedStatus2,
+ }),
+ )
+
+ useInstanceCapabilitiesStore().quotingAvailable = true
+
+ expect(wrapper.vm.statusType).to.equal('reply')
+ expect(wrapper.vm.isReply).to.equal(true)
+ expect(wrapper.vm.quotable).to.equal(false)
+ expect(wrapper.vm.newStatus.quote).to.eql(null)
+ expect(wrapper.vm.newStatus.poll).to.eql(null)
+ expect(wrapper.vm.newStatus.spoilerText).to.eql('re: subject')
+ expect(wrapper.vm.newStatus.mentions).to.eql('@replied')
+ expect(wrapper.vm.newStatus.status).to.eql('@replied ')
+ expect(wrapper.vm.newStatus.visibility).to.eql('private')
+
+ expect(wrapper.vm.postingOptions.status).to.eql('@replied ')
+ expect(wrapper.vm.postingOptions.spoilerText).to.eql('re: subject')
+ expect(wrapper.vm.postingOptions.visibility).to.eql('private')
+ expect(wrapper.vm.postingOptions.sensitive).to.eql(false)
+ expect(wrapper.vm.postingOptions.media).to.eql([])
+ expect(wrapper.vm.postingOptions.inReplyToStatusId).to.eql('status-2')
+ expect(wrapper.vm.postingOptions.quoteId).to.eql(null)
+ expect(wrapper.vm.postingOptions.contentType).to.eql('text/plain')
+ expect(wrapper.vm.postingOptions.poll).to.eql(null)
+ })
+
+ it('Forces direct mode when replying to a DM, mastodon style subject handling', () => {
+ // We need to initialize pinia first which is happening here...
+ const options = replyMountOpts({
+ repliedStatus: { ...repliedStatus2, visibility: 'direct' },
+ })
+
+ // ...set our settings...
+ useMergedConfigStore().mergedConfig = {
+ ...useMergedConfigStore().mergedConfig,
+ subjectLineBehavior: 'masto',
+ }
+
+ // ...and only then mount our component
+ const wrapper = mount(PostStatusForm, options)
+
+ // Otherwise we get multiple instances of pinia that don't talk to each other
+
+ expect(wrapper.vm.statusType).to.equal('reply')
+ expect(wrapper.vm.isReply).to.equal(true)
+ expect(wrapper.vm.quotable).to.equal(false)
+ expect(wrapper.vm.newStatus.quote).to.eql(null)
+ expect(wrapper.vm.newStatus.poll).to.eql(null)
+ expect(wrapper.vm.newStatus.spoilerText).to.eql('subject')
+ expect(wrapper.vm.newStatus.mentions).to.eql('@replied')
+ expect(wrapper.vm.newStatus.status).to.eql('@replied ')
+ expect(wrapper.vm.newStatus.visibility).to.eql('direct')
+ })
+
+ it('Sets status to statusText without mentions if mentions line is enabled', () => {
+ const wrapper = mount(
+ PostStatusForm,
+ replyMountOpts({
+ repliedStatus: repliedStatus2,
+ statusText: 'testing',
+ mentionsLine: true,
+ }),
+ )
+
+ expect(wrapper.vm.statusType).to.equal('reply')
+ expect(wrapper.vm.isReply).to.equal(true)
+ expect(wrapper.vm.newStatus.mentions).to.eql('@replied')
+ expect(wrapper.vm.newStatus.status).to.eql('testing')
+ })
+
+ it('Sets mention when asked for it', () => {
+ const wrapper = mount(
+ PostStatusForm,
+ replyMountOpts({
+ profileMention: repliedUser,
+ }),
+ )
+
+ expect(wrapper.vm.statusType).to.equal('mention')
+ expect(wrapper.vm.isReply).to.equal(false)
+ expect(wrapper.vm.newStatus.mentions).to.eql('@replied')
+ expect(wrapper.vm.newStatus.status).to.eql('@replied ')
+ })
+
+ it('Initializes quote when reply/quote toggled to quote', () => {
+ const wrapper = mount(
+ PostStatusForm,
+ replyMountOpts({
+ repliedStatus: repliedStatus2,
+ }),
+ )
+
+ expect(wrapper.vm.statusType).to.equal('reply')
+ expect(wrapper.vm.isReply).to.equal(true)
+
+ wrapper.vm.quoteThreadToggled = true
+
+ expect(wrapper.vm.newStatus.quote).to.eql({ thread: true, id: 'status-2' })
+ })
+
+ it('Resets quote when reply/quote toggled to reply', () => {
+ const wrapper = mount(
+ PostStatusForm,
+ replyMountOpts({
+ repliedStatus: repliedStatus2,
+ }),
+ )
+
+ expect(wrapper.vm.statusType).to.equal('reply')
+ expect(wrapper.vm.isReply).to.equal(true)
+
+ wrapper.vm.quoteThreadToggled = true
+ wrapper.vm.quoteThreadToggled = false
+
+ expect(wrapper.vm.newStatus.quote).to.eql(null)
+ })
+
+ it('Initializes and reset quote when toggling quote attachment', () => {
+ const wrapper = mount(
+ PostStatusForm,
+ replyMountOpts({
+ repliedStatus: repliedStatus2,
+ }),
+ )
+
+ expect(wrapper.vm.statusType).to.equal('reply')
+ expect(wrapper.vm.isReply).to.equal(true)
+
+ wrapper.vm.toggleQuoteForm()
+ expect(wrapper.vm.newStatus.quote).to.eql({
+ thread: false,
+ id: null,
+ url: '',
+ })
+ wrapper.vm.toggleQuoteForm()
+ expect(wrapper.vm.newStatus.quote).to.eql(null)
+ })
+
+ it('Status editing', () => {
+ const wrapper = mount(
+ PostStatusForm,
+ replyMountOpts({
+ statusId: 'edited',
+ statusText: 'text',
+ statusSubject: 'heading',
+ statusIsSensitive: true,
+ statusPoll: {},
+ statusQuote: {},
+ statusFiles: [],
+ statusMediaDescriptions: {},
+ statusVisibility: 'unlisted',
+ statusContentType: 'text/markdown',
+ }),
+ )
+
+ expect(wrapper.vm.statusType).to.equal('edit')
+ expect(wrapper.vm.isReply).to.equal(false) // edits don't support changing reply-to so it's pretty much ignored
+ expect(wrapper.vm.isEdit).to.equal(true)
+ expect(wrapper.vm.newStatus.quote).to.eql({})
+ expect(wrapper.vm.newStatus.poll).to.eql({})
+ expect(wrapper.vm.newStatus.spoilerText).to.eql('heading')
+ expect(wrapper.vm.newStatus.mentions).to.eql('')
+ expect(wrapper.vm.newStatus.status).to.eql('text')
+ expect(wrapper.vm.newStatus.visibility).to.eql('unlisted')
+ expect(wrapper.vm.newStatus.contentType).to.eql('text/markdown')
+ expect(wrapper.vm.newStatus.nsfw).to.equal(true)
+ expect(wrapper.vm.newStatus.files).to.eql([])
+ })
+
+ it('Posting should reset idempotency key', async () => {
+ vi.setSystemTime(new Date(2027, 1, 1, 13))
+ const wrapper = mount(PostStatusForm, replyMountOpts())
+ const oldIdempotency = wrapper.vm.idempotencyKey
+
+ vi.setSystemTime(new Date(2028, 1, 1, 13))
+
+ wrapper.vm.newStatus.status = 'Testing'
+ await wrapper.vm.postStatus()
+
+ expect(wrapper.vm.idempotencyKey).to.not.eql(oldIdempotency)
+ })
+
+ // TODO Probably better to separate attachment upload/manipulation into its own component?
+ // we need to upload-on-submit for compression setting anyway
+ it('Attachments manipulations (moving, adding, removing)', () => {
+ const wrapper = mount(PostStatusForm, replyMountOpts())
+
+ const i1 = { id: '1', url: 'a' }
+ const i2 = { id: '2', url: 'b' }
+ const i3 = { id: '3', url: 'c' }
+ const i4 = { id: '4', url: 'd' }
+ const iX = { id: 'x', url: 'x' }
+
+ wrapper.vm.newStatus.files = [i3, i1, iX, i2]
+
+ wrapper.vm.removeMediaFile(iX)
+ expect(wrapper.vm.newStatus.files).to.eql([i3, i1, i2])
+
+ wrapper.vm.shiftUpMediaFile(i1)
+ expect(wrapper.vm.newStatus.files).to.eql([i1, i3, i2])
+
+ wrapper.vm.shiftUpMediaFile(i1) // should ignore
+ expect(wrapper.vm.newStatus.files).to.eql([i1, i3, i2])
+
+ wrapper.vm.shiftDnMediaFile(i3)
+ expect(wrapper.vm.newStatus.files).to.eql([i1, i2, i3])
+
+ wrapper.vm.shiftDnMediaFile(i3) // should ignore
+ expect(wrapper.vm.newStatus.files).to.eql([i1, i2, i3])
+
+ wrapper.vm.addMediaFile(i4)
+ expect(wrapper.vm.newStatus.files).to.eql([i1, i2, i3, i4])
+ })
+
+ it('Attachment descriptions', () => {
+ const wrapper = mount(PostStatusForm, replyMountOpts())
+
+ const i1 = { id: '1', url: 'a' }
+
+ wrapper.vm.addMediaFile(i1)
+ expect(wrapper.vm.newStatus.files).to.eql([i1])
+
+ wrapper.vm.editAttachment(i1, 'description')
+ expect(wrapper.vm.newStatus.mediaDescriptions['1']).to.eql('description')
+ })
+ // TODO: Drafts (needs vuex to pinia migration)
})
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 1cf5aa780..000000000
--- a/test/unit/specs/services/chat_service/chat_service.spec.js
+++ /dev/null
@@ -1,122 +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)
- })
- })
-})