Merge branch 'more-fixes' into chat-refactor
This commit is contained in:
commit
01732a52ec
3 changed files with 7 additions and 4 deletions
|
|
@ -4,7 +4,7 @@ import { parseChat, parseChatMessage } from 'src/services/entity_normalizer/enti
|
||||||
|
|
||||||
const PLEROMA_CHATS_URL = '/api/v1/pleroma/chats'
|
const PLEROMA_CHATS_URL = '/api/v1/pleroma/chats'
|
||||||
const PLEROMA_CHAT_URL = (id) => `/api/v1/pleroma/chats/by-account-id/${id}`
|
const PLEROMA_CHAT_URL = (id) => `/api/v1/pleroma/chats/by-account-id/${id}`
|
||||||
const PLEROMA_CHAT_MESSAGES_URL = (id, { maxId, sinceId, limit }) =>
|
const PLEROMA_CHAT_MESSAGES_URL = (id, { maxId, sinceId, limit } = {}) =>
|
||||||
`/api/v1/pleroma/chats/${id}/messages${paramsString({ maxId, sinceId, limit })}`
|
`/api/v1/pleroma/chats/${id}/messages${paramsString({ maxId, sinceId, limit })}`
|
||||||
const PLEROMA_CHAT_READ_URL = (id) => `/api/v1/pleroma/chats/${id}/read`
|
const PLEROMA_CHAT_READ_URL = (id) => `/api/v1/pleroma/chats/${id}/read`
|
||||||
const PLEROMA_DELETE_CHAT_MESSAGE_URL = (chatId, messageId) =>
|
const PLEROMA_DELETE_CHAT_MESSAGE_URL = (chatId, messageId) =>
|
||||||
|
|
|
||||||
|
|
@ -17,7 +17,6 @@ export const paramsString = (params = {}) => {
|
||||||
}
|
}
|
||||||
})()
|
})()
|
||||||
|
|
||||||
if (entries.length === 0) return ''
|
|
||||||
|
|
||||||
const arrays = []
|
const arrays = []
|
||||||
const nonArrays = []
|
const nonArrays = []
|
||||||
|
|
@ -48,6 +47,8 @@ export const paramsString = (params = {}) => {
|
||||||
})
|
})
|
||||||
})
|
})
|
||||||
|
|
||||||
|
if (nonArrays.length + arrays.length === 0) return ''
|
||||||
|
|
||||||
return (
|
return (
|
||||||
'?' +
|
'?' +
|
||||||
[
|
[
|
||||||
|
|
|
||||||
|
|
@ -59,10 +59,12 @@ import { computed } from 'vue'
|
||||||
import ColorInput from 'src/components/color_input/color_input.vue'
|
import ColorInput from 'src/components/color_input/color_input.vue'
|
||||||
import ContrastRatio from 'src/components/contrast_ratio/contrast_ratio.vue'
|
import ContrastRatio from 'src/components/contrast_ratio/contrast_ratio.vue'
|
||||||
|
|
||||||
import { getContrastRatio, hex2rgb } from 'src/services/color_convert/color_convert.js'
|
|
||||||
|
|
||||||
import { useInterfaceStore } from 'src/stores/interface.js'
|
import { useInterfaceStore } from 'src/stores/interface.js'
|
||||||
|
|
||||||
|
import {
|
||||||
|
getContrastRatio,
|
||||||
|
hex2rgb,
|
||||||
|
} from 'src/services/color_convert/color_convert.js'
|
||||||
import {
|
import {
|
||||||
newExporter,
|
newExporter,
|
||||||
newImporter,
|
newImporter,
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue