{
} else {
conversation = filter(conversation, (status) => status.type !== 'retweet')
}
- return conversation.filter((_) => _).sort(sortById)
+ return conversation.filter(Boolean).sort(sortById)
}
const conversation = {
@@ -239,9 +239,9 @@ const conversation = {
depth,
},
walk(forest, forest[id], depth + 1, processed),
- ].reduce((a, b) => a.concat(b), [])
+ ].flat()
})
- .reduce((a, b) => a.concat(b), [])
+ .flat()
const linearized = walk(
threads.forest,
@@ -305,11 +305,10 @@ const conversation = {
topLevel() {
const topLevel = this.conversation.reduce(
(tl, cur) =>
- tl.filter(
- (k) =>
- this.getReplies(cur.id)
- .map((v) => v.id)
- .indexOf(k.id) === -1,
+ tl.filter((k) =>
+ this.getReplies(cur.id)
+ .map((v) => v.id)
+ .includes(k.id),
),
this.conversation,
)
diff --git a/src/components/emoji_input/emoji_input.js b/src/components/emoji_input/emoji_input.js
index 0cce2494d..d8cc7a919 100644
--- a/src/components/emoji_input/emoji_input.js
+++ b/src/components/emoji_input/emoji_input.js
@@ -188,8 +188,8 @@ const EmojiInput = {
}
return {
- names: names.filter((k) => k),
- keywords: keywords.filter((k) => k),
+ names: names.filter(Boolean),
+ keywords: keywords.filter(Boolean),
}
}
},
diff --git a/src/components/emoji_picker/emoji_picker.js b/src/components/emoji_picker/emoji_picker.js
index 6889fb8b0..a0e30bf6d 100644
--- a/src/components/emoji_picker/emoji_picker.js
+++ b/src/components/emoji_picker/emoji_picker.js
@@ -57,7 +57,7 @@ const maybeLocalizedKeywords = (emoji, languages, nameLocalizer) => {
languages.forEach((lang) => {
const keywords = emoji.annotations[lang]?.keywords || []
const name = emoji.annotations[lang]?.name
- res.push(...keywords.concat([name]).filter((k) => k))
+ res.push(...keywords.concat([name]).filter(Boolean))
})
}
return res
@@ -408,7 +408,7 @@ const EmojiPicker = {
isFirstRow: index === 0,
})),
)
- .reduce((a, c) => a.concat(c), [])
+ .flat()
},
languages() {
return ensureFinalFallback(
diff --git a/src/components/font_control/font_control.js b/src/components/font_control/font_control.js
index 697d83ee2..af4d62358 100644
--- a/src/components/font_control/font_control.js
+++ b/src/components/font_control/font_control.js
@@ -35,7 +35,7 @@ export default {
'sans-serif',
'monospace',
...(this.options || []),
- ].filter((_) => _),
+ ].filter(Boolean),
}
},
methods: {
diff --git a/src/components/font_control/font_control.vue b/src/components/font_control/font_control.vue
index 99bdb8603..5a54e8368 100644
--- a/src/components/font_control/font_control.vue
+++ b/src/components/font_control/font_control.vue
@@ -2,7 +2,7 @@
this.findUser(userId))
- .filter((user) => user)
+ .filter(Boolean)
},
searchUsers() {
return this.searchUserIds
.map((userId) => this.findUser(userId))
- .filter((user) => user)
+ .filter(Boolean)
},
...mapState({
currentUser: (state) => state.users.currentUser,
diff --git a/src/components/opacity_input/opacity_input.vue b/src/components/opacity_input/opacity_input.vue
index e6b736fa3..e6bdd6b8d 100644
--- a/src/components/opacity_input/opacity_input.vue
+++ b/src/components/opacity_input/opacity_input.vue
@@ -11,7 +11,7 @@
{{ label || $t('settings.style.themes3.editor.opacity') }}
{
@@ -139,7 +139,7 @@ const EmojiTab = {
return this.refreshPackList()
} else {
this.displayError(resp.error)
- return Promise.reject(resp)
+ throw new Error(resp)
}
})
.then(() => {
@@ -239,7 +239,7 @@ const EmojiTab = {
return this.refreshPackList()
} else {
this.displayError(resp.error)
- return Promise.reject(resp)
+ throw new Error(resp)
}
})
.then(() => {
@@ -259,7 +259,7 @@ const EmojiTab = {
return this.refreshPackList()
} else {
this.displayError(resp.error)
- return Promise.reject(resp)
+ throw new Error(resp)
}
})
.then(() => {
@@ -280,7 +280,7 @@ const EmojiTab = {
return this.refreshPackList()
} else {
this.displayError(resp.error)
- return Promise.reject(resp)
+ throw new Error(resp)
}
})
.then(() => {
diff --git a/src/components/settings_modal/helpers/emoji_editing_popover.vue b/src/components/settings_modal/helpers/emoji_editing_popover.vue
index d3db657d3..0cd04f053 100644
--- a/src/components/settings_modal/helpers/emoji_editing_popover.vue
+++ b/src/components/settings_modal/helpers/emoji_editing_popover.vue
@@ -262,7 +262,7 @@ export default {
.then((resp) => {
if (resp.error !== undefined) {
this.$emit('displayError', resp.error)
- return Promise.reject(resp.error)
+ throw new Error(resp.error)
}
return resp.json()
diff --git a/src/components/settings_modal/helpers/number_setting.js b/src/components/settings_modal/helpers/number_setting.js
index d0b23c919..8f8861c25 100644
--- a/src/components/settings_modal/helpers/number_setting.js
+++ b/src/components/settings_modal/helpers/number_setting.js
@@ -28,12 +28,12 @@ export default {
methods: {
...Setting.methods,
getValue(e) {
- if (!this.truncate === 1) {
+ if (this.truncate === 1) {
return Number.parseInt(e.target.value)
} else if (this.truncate > 1) {
return Math.trunc(e.target.value / this.truncate) * this.truncate
}
- return parseFloat(e.target.value)
+ return Number.parseFloat(e.target.value)
},
},
}
diff --git a/src/components/settings_modal/helpers/unit_setting.js b/src/components/settings_modal/helpers/unit_setting.js
index 99f4ac38e..3be6b7a10 100644
--- a/src/components/settings_modal/helpers/unit_setting.js
+++ b/src/components/settings_modal/helpers/unit_setting.js
@@ -67,7 +67,10 @@ export default {
return this.$t(['settings', 'units', this.unitSet, value].join('.'))
},
updateValue(e) {
- this.configSink(this.path, parseFloat(e.target.value) + this.stateUnit)
+ this.configSink(
+ this.path,
+ Number.parseFloat(e.target.value) + this.stateUnit,
+ )
},
updateUnit(e) {
let value = this.stateValue
diff --git a/src/components/settings_modal/tabs/appearance_tab.js b/src/components/settings_modal/tabs/appearance_tab.js
index d93758f9a..647c90c47 100644
--- a/src/components/settings_modal/tabs/appearance_tab.js
+++ b/src/components/settings_modal/tabs/appearance_tab.js
@@ -236,7 +236,7 @@ const AppearanceTab = {
},
stylePalettes() {
const ruleset = useInterfaceStore().styleDataUsed || []
- if (!ruleset?.length === 0) return
+ if (ruleset.length === 0) return
const meta = ruleset.find((x) => x.component === '@meta')
const result = ruleset
.filter((x) => x.component.startsWith('@palette'))
@@ -277,7 +277,7 @@ const AppearanceTab = {
return !window.IntersectionObserver
},
instanceWallpaper() {
- useInstanceStore().instanceIdentity.background
+ return useInstanceStore().instanceIdentity.background
},
instanceWallpaperUsed() {
return (
diff --git a/src/components/settings_modal/tabs/clutter_tab.js b/src/components/settings_modal/tabs/clutter_tab.js
index 85749ab3f..87269eb99 100644
--- a/src/components/settings_modal/tabs/clutter_tab.js
+++ b/src/components/settings_modal/tabs/clutter_tab.js
@@ -1,5 +1,4 @@
-import { mapActions, mapState } from 'pinia'
-import { v4 as uuidv4 } from 'uuid'
+import { mapState } from 'pinia'
import Checkbox from 'src/components/checkbox/checkbox.vue'
import Select from 'src/components/select/select.vue'
@@ -12,7 +11,6 @@ import UnitSetting from '../helpers/unit_setting.vue'
import { useInstanceStore } from 'src/stores/instance.js'
import { useInstanceCapabilitiesStore } from 'src/stores/instance_capabilities.js'
-import { useSyncConfigStore } from 'src/stores/sync_config.js'
const ClutterTab = {
components: {
@@ -33,120 +31,6 @@ const ClutterTab = {
store.instanceIdentity.showInstanceSpecificPanel &&
store.instanceIdentity.instanceSpecificPanelContent,
}),
- ...mapState(useSyncConfigStore, {
- muteFilters: (store) =>
- Object.entries(store.prefsStorage.simple.muteFilters),
- muteFiltersObject: (store) => store.prefsStorage.simple.muteFilters,
- }),
- },
- methods: {
- ...mapActions(useSyncConfigStore, [
- 'setSimplePrefAndSave',
- 'unsetSimplePrefAndSave',
- 'pushSyncConfig',
- ]),
- getDatetimeLocal(timestamp) {
- const date = new Date(timestamp)
- const fmt = new Intl.NumberFormat('en-US', { minimumIntegerDigits: 2 })
- const datetime = [
- date.getFullYear(),
- '-',
- fmt.format(date.getMonth() + 1),
- '-',
- fmt.format(date.getDate()),
- 'T',
- fmt.format(date.getHours()),
- ':',
- fmt.format(date.getMinutes()),
- ].join('')
- return datetime
- },
- checkRegexValid(id) {
- const filter = this.muteFiltersObject[id]
- if (filter.type !== 'regexp') return true
- if (filter.type !== 'user_regexp') return true
- const { value } = filter
- let valid = true
- try {
- new RegExp(value)
- } catch {
- valid = false
- console.error('Invalid RegExp: ' + value)
- }
- return valid
- },
- createFilter(
- filter = {
- type: 'word',
- value: '',
- name: 'New Filter',
- enabled: true,
- expires: null,
- hide: false,
- },
- ) {
- const newId = uuidv4()
-
- filter.order = this.muteFilters.length + 2
- this.muteFiltersDraftObject[newId] = filter
- this.setSimplePrefAndSave({ path: 'muteFilters.' + newId, value: filter })
- this.pushSyncConfig()
- },
- exportFilter(id) {
- this.exportedFilter = { ...this.muteFiltersDraftObject[id] }
- delete this.exportedFilter.order
- this.filterExporter.exportData()
- },
- importFilter() {
- this.filterImporter.importData()
- },
- copyFilter(id) {
- const filter = { ...this.muteFiltersDraftObject[id] }
- const newId = uuidv4()
-
- this.muteFiltersDraftObject[newId] = filter
- this.setSimplePrefAndSave({ path: 'muteFilters.' + newId, value: filter })
- this.pushSyncConfig()
- },
- deleteFilter(id) {
- delete this.muteFiltersDraftObject[id]
- this.unsetSimplePrefAndSave({ path: 'muteFilters.' + id, value: null })
- this.pushSyncConfig()
- },
- purgeExpiredFilters() {
- this.muteFiltersExpired.forEach(([id]) => {
- delete this.muteFiltersDraftObject[id]
- this.unsetSimplePrefAndSave({ path: 'muteFilters.' + id, value: null })
- })
- this.pushSyncConfig()
- },
- updateFilter(id, field, value) {
- const filter = { ...this.muteFiltersDraftObject[id] }
- if (field === 'expires-never') {
- if (!value) {
- const offset = 1000 * 60 * 60 * 24 * 14 // 2 weeks
- const date = Date.now() + offset
- filter.expires = date
- } else {
- filter.expires = null
- }
- } else if (field === 'expires') {
- const parsed = Date.parse(value)
- filter.expires = parsed.valueOf()
- } else {
- filter[field] = value
- }
- this.muteFiltersDraftObject[id] = filter
- this.muteFiltersDraftDirty[id] = true
- },
- saveFilter(id) {
- this.setSimplePrefAndSave({
- path: 'muteFilters.' + id,
- value: this.muteFiltersDraftObject[id],
- })
- this.pushSyncConfig()
- this.muteFiltersDraftDirty[id] = false
- },
},
// Updating nested properties
watch: {
diff --git a/src/components/settings_modal/tabs/filtering_tab.js b/src/components/settings_modal/tabs/filtering_tab.js
index e0d0f6879..3a9cad6d2 100644
--- a/src/components/settings_modal/tabs/filtering_tab.js
+++ b/src/components/settings_modal/tabs/filtering_tab.js
@@ -190,21 +190,24 @@ const FilteringTab = {
}
return valid
},
- createFilter(
- filter = {
+ createFilter(filter) {
+ const newId = uuidv4()
+ const newFilter = {
type: 'word',
value: '',
name: 'New Filter',
enabled: true,
expires: null,
hide: false,
- },
- ) {
- const newId = uuidv4()
+ ...filter,
+ }
- filter.order = this.muteFilters.length + 2
- this.muteFiltersDraftObject[newId] = filter
- this.setSimplePrefAndSave({ path: 'muteFilters.' + newId, value: filter })
+ newFilter.order = this.muteFilters.length + 2
+ this.muteFiltersDraftObject[newId] = newFilter
+ this.setSimplePrefAndSave({
+ path: 'muteFilters.' + newId,
+ value: newFilter,
+ })
},
exportFilter(id) {
this.exportedFilter = { ...this.muteFiltersDraftObject[id] }
diff --git a/src/components/settings_modal/tabs/old_theme_tab/old_theme_tab.js b/src/components/settings_modal/tabs/old_theme_tab/old_theme_tab.js
index 40df1b98e..90ddc5ee0 100644
--- a/src/components/settings_modal/tabs/old_theme_tab/old_theme_tab.js
+++ b/src/components/settings_modal/tabs/old_theme_tab/old_theme_tab.js
@@ -611,7 +611,7 @@ export default {
*/
normalizeLocalState(theme, version = 0, source, forceSource = false) {
let input
- if (typeof source !== 'undefined') {
+ if (source !== undefined) {
if (forceSource || source?.themeEngineVersion === CURRENT_VERSION) {
input = source
version = source.themeEngineVersion
diff --git a/src/components/settings_modal/tabs/old_theme_tab/old_theme_tab.vue b/src/components/settings_modal/tabs/old_theme_tab/old_theme_tab.vue
index 751e113a0..9724162ca 100644
--- a/src/components/settings_modal/tabs/old_theme_tab/old_theme_tab.vue
+++ b/src/components/settings_modal/tabs/old_theme_tab/old_theme_tab.vue
@@ -181,14 +181,14 @@
name="accentColor"
:fallback="previewTheme.colors?.link"
:label="$t('settings.accent')"
- :show-optional-checkbox="typeof linkColorLocal !== 'undefined'"
+ :show-optional-checkbox="linkColorLocal !== undefined"
/>
diff --git a/src/components/status/status.js b/src/components/status/status.js
index 3e10a24e1..a33d29525 100644
--- a/src/components/status/status.js
+++ b/src/components/status/status.js
@@ -262,7 +262,7 @@ const Status = {
this.muteFilterHits.length > 0 ? 'filtered' : null,
this.muteBotStatuses && this.botStatus ? 'bot' : null,
this.muteSensitiveStatuses && this.sensitiveStatus ? 'nsfw' : null,
- ].filter((_) => _)
+ ].filter(Boolean)
},
muteLocalized() {
if (this.muteReasons.length === 0) return null
diff --git a/src/i18n/compare b/src/i18n/compare
index 94e5aab55..7afe9355c 100755
--- a/src/i18n/compare
+++ b/src/i18n/compare
@@ -1,7 +1,7 @@
#!/usr/bin/env node
const arg = process.argv[2]
-if (typeof arg === 'undefined') {
+if (arg === undefined) {
console.info('This is a very simple and tiny tool that checks en.json with any other language and')
console.info('outputs all the things present in english but missing in foreign language.')
console.info('')
diff --git a/src/i18n/messages.js b/src/i18n/messages.js
index 76d6b5386..db80f7ac3 100644
--- a/src/i18n/messages.js
+++ b/src/i18n/messages.js
@@ -20,7 +20,7 @@ const languageFileMap = import.meta.glob(['./*.json', '!./en.json'])
const loadLanguageFile = (code) => {
const jsonName = langCodeToJsonName(code)
- if (jsonName === 'en') return Promise.resolve({ default: enMessages })
+ if (jsonName === 'en') return { default: enMessages }
return languageFileMap[`./${jsonName}.json`]()
}
diff --git a/src/lib/persisted_state.js b/src/lib/persisted_state.js
index aef1cc8dc..5fcf259aa 100644
--- a/src/lib/persisted_state.js
+++ b/src/lib/persisted_state.js
@@ -74,7 +74,7 @@ export default function createPersistedState({
if (saveImmedeatelyActions.includes(mutation.type)) {
setState(key, reducer(cloneDeep(state), paths), storage).then(
(success) => {
- if (typeof success !== 'undefined') {
+ if (success !== undefined) {
if (
mutation.type === 'setOption' ||
mutation.type === 'setCurrentUser'
@@ -198,7 +198,7 @@ export const piniaPersistPlugin =
const setState = (state) => {
if (!loadedGuard.loaded) {
console.info('waiting for old state to be loaded...')
- return Promise.reject()
+ throw new Error('Waiting')
} else {
return storage.setItem(key, state)
}
diff --git a/src/modules/api.js b/src/modules/api.js
index 92b849a2b..d2c578c9c 100644
--- a/src/modules/api.js
+++ b/src/modules/api.js
@@ -325,7 +325,7 @@ const api = {
const token = state.wsToken
if (
useInstanceCapabilitiesStore().shoutAvailable &&
- typeof token !== 'undefined' &&
+ token !== undefined &&
state.socket === null
) {
const socket = new Socket('/socket', { params: { token } })
diff --git a/src/modules/statuses.js b/src/modules/statuses.js
index e3878e85c..ef68a5237 100644
--- a/src/modules/statuses.js
+++ b/src/modules/statuses.js
@@ -49,8 +49,8 @@ const emptyTl = (userId = 0) => ({
visibleStatuses: [],
visibleStatusesObject: {},
newStatusCount: 0,
- maxId: 0,
- minId: 0,
+ maxId: '0',
+ minId: '0',
minVisibleId: 0,
loading: false,
followers: [],
@@ -64,7 +64,7 @@ export const defaultState = () => ({
scrobblesNextFetch: {},
allStatusesObject: {},
conversationsObject: {},
- maxId: 0,
+ maxId: '0',
favorites: new Set(),
timelines: {
mentions: emptyTl(),
@@ -525,7 +525,7 @@ export const mutations = {
},
addRepeats(state, { id, rebloggedByUsers, currentUser }) {
const newStatus = state.allStatusesObject[id]
- newStatus.rebloggedBy = rebloggedByUsers.filter((_) => _)
+ newStatus.rebloggedBy = rebloggedByUsers.filter(Boolean)
// repeats stats can be incorrect based on polling condition, let's update them using the most recent data
newStatus.repeat_num = newStatus.rebloggedBy.length
newStatus.repeated = !!newStatus.rebloggedBy.find(
@@ -534,7 +534,7 @@ export const mutations = {
},
addFavs(state, { id, favoritedByUsers, currentUser }) {
const newStatus = state.allStatusesObject[id]
- newStatus.favoritedBy = favoritedByUsers.filter((_) => _)
+ newStatus.favoritedBy = favoritedByUsers.filter(Boolean)
// favorites stats can be incorrect based on polling condition, let's update them using the most recent data
newStatus.fave_num = newStatus.favoritedBy.length
newStatus.favorited = !!newStatus.favoritedBy.find(
@@ -879,7 +879,7 @@ const statuses = {
store.commit('addNewUsers', data.accounts)
store.commit(
'addNewUsers',
- data.statuses.map((s) => s.user).filter((u) => u),
+ data.statuses.map((s) => s.user).filter(Boolean),
)
store.commit('addNewStatuses', {
statuses: data.statuses,
diff --git a/src/modules/users.js b/src/modules/users.js
index b58566859..c4af0fb36 100644
--- a/src/modules/users.js
+++ b/src/modules/users.js
@@ -76,10 +76,10 @@ const mergeArrayLength = (oldValue, newValue) => {
const getNotificationPermission = () => {
const Notification = window.Notification
- if (!Notification) return Promise.resolve(null)
+ if (!Notification) return null
if (Notification.permission === 'default')
return Notification.requestPermission()
- return Promise.resolve(Notification.permission)
+ return Notification.permission
}
const blockUser = (store, args) => {
@@ -269,7 +269,7 @@ export const mutations = {
state.currentUser.blockIds = blockIds
},
addBlockId(state, blockId) {
- if (state.currentUser.blockIds.indexOf(blockId) === -1) {
+ if (state.currentUser.blockIds.includes(blockId)) {
state.currentUser.blockIds.push(blockId)
}
},
@@ -283,7 +283,7 @@ export const mutations = {
state.currentUser.muteIdsMaxId = muteIdsMaxId
},
addMuteId(state, muteId) {
- if (state.currentUser.muteIds.indexOf(muteId) === -1) {
+ if (state.currentUser.muteIds.includes(muteId)) {
state.currentUser.muteIds.push(muteId)
}
},
@@ -291,7 +291,7 @@ export const mutations = {
state.currentUser.domainMutes = domainMutes
},
addDomainMute(state, domain) {
- if (state.currentUser.domainMutes.indexOf(domain) === -1) {
+ if (state.currentUser.domainMutes.includes(domain)) {
state.currentUser.domainMutes.push(domain)
}
},
@@ -388,7 +388,7 @@ const users = {
if (!user) {
return store.dispatch('fetchUser', id)
} else {
- return Promise.resolve(user)
+ return user
}
},
updateUserAdminData(store, { userAdminData }) {
@@ -635,7 +635,7 @@ const users = {
},
addNewNotifications(store, { notifications }) {
const users = map(notifications, 'from_profile')
- const targetUsers = map(notifications, 'target').filter((_) => _)
+ const targetUsers = map(notifications, 'target').filter(Boolean)
const notificationIds = notifications.map((_) => _.id)
store.commit('addNewUsers', users)
store.commit('addNewUsers', targetUsers)
diff --git a/src/services/color_convert/color_convert.js b/src/services/color_convert/color_convert.js
index dded73da3..925969531 100644
--- a/src/services/color_convert/color_convert.js
+++ b/src/services/color_convert/color_convert.js
@@ -11,7 +11,7 @@ import { contrastRatio, convert, invertLightness } from 'chromatism'
* @param {Number} [b] - Blue component
*/
export const rgb2hex = (r, g, b) => {
- if (r === null || typeof r === 'undefined') {
+ if (r === null || r === undefined) {
return undefined
}
// TODO: clean up this mess
@@ -130,7 +130,7 @@ export const arithmeticBlend = (origin, value, operator) => {
* @returns {Object} sRGB of resulting color
*/
export const alphaBlend = (fg, fga, bg) => {
- if (fga === 1 || typeof fga === 'undefined') {
+ if (fga === 1 || fga === undefined) {
return fg
}
@@ -210,16 +210,16 @@ export const rgba2css = function (rgba) {
}
if (rgba !== null) {
- if (rgba.r !== undefined && !isNaN(rgba.r)) {
+ if (rgba.r !== undefined && !Number.isNaN(rgba.r)) {
base.r = rgba.r
}
- if (rgba.g !== undefined && !isNaN(rgba.g)) {
+ if (rgba.g !== undefined && !Number.isNaN(rgba.g)) {
base.g = rgba.g
}
- if (rgba.b !== undefined && !isNaN(rgba.b)) {
+ if (rgba.b !== undefined && !Number.isNaN(rgba.b)) {
base.b = rgba.b
}
- if (rgba.a !== undefined && !isNaN(rgba.a)) {
+ if (rgba.a !== undefined && !Number.isNaN(rgba.a)) {
base.a = rgba.a
}
} else {
diff --git a/src/services/file_type/file_type.service.js b/src/services/file_type/file_type.service.js
index 02f659eec..b6179cd81 100644
--- a/src/services/file_type/file_type.service.js
+++ b/src/services/file_type/file_type.service.js
@@ -43,7 +43,7 @@ export const fileTypeExt = (url) => {
}
export const fileMatchesSomeType = (types, file) =>
- types.some((type) => fileType(file.mimetype) === type)
+ types.includes(fileType(file.mimetype))
const fileTypeService = {
fileType,
diff --git a/src/services/notification_utils/notification_utils.js b/src/services/notification_utils/notification_utils.js
index 46b81cc66..9e443bf8b 100644
--- a/src/services/notification_utils/notification_utils.js
+++ b/src/services/notification_utils/notification_utils.js
@@ -25,7 +25,7 @@ const visibleTypes = (notificationVisibility) => {
notificationVisibility.emojiReactions && 'pleroma:emoji_reaction',
notificationVisibility.reports && 'pleroma:report',
notificationVisibility.polls && 'poll',
- ].filter((_) => _)
+ ].filter(Boolean)
}
const statusNotifications = new Set([
@@ -95,9 +95,7 @@ export const filteredNotificationsFromStore = (
types,
) => {
// map is just to clone the array since sort mutates it and it causes some issues
- const sortedNotifications = notificationsFromStore(store)
- .map((_) => _)
- .sort(sortById)
+ const sortedNotifications = notificationsFromStore(store).sort(sortById)
// TODO implement sorting elsewhere and make it optional
return sortedNotifications.filter((notification) =>
(types || visibleTypes(notificationVisibility)).includes(notification.type),
diff --git a/src/services/ruffle_service/ruffle_service.js b/src/services/ruffle_service/ruffle_service.js
index c029330aa..298f32df3 100644
--- a/src/services/ruffle_service/ruffle_service.js
+++ b/src/services/ruffle_service/ruffle_service.js
@@ -25,13 +25,13 @@ const createRuffleService = () => {
script.src = '/static/ruffle/ruffle.js'
script.type = 'text/javascript'
script.onerror = (e) => {
- reject(e)
+ reject(new Error('Ruffle script errorred', e))
}
script.onabort = (e) => {
- reject(e)
+ reject(new Error('Ruffle script aborted', e))
}
script.oncancel = (e) => {
- reject(e)
+ reject(new Error('Ruffle script cancelled', e))
}
script.onload = () => {
ruffleInstance = window.RufflePlayer
diff --git a/src/services/status_parser/status_parser.js b/src/services/status_parser/status_parser.js
index a011fe265..fc498f540 100644
--- a/src/services/status_parser/status_parser.js
+++ b/src/services/status_parser/status_parser.js
@@ -88,5 +88,5 @@ export const muteFilterHits = (muteFilters, status) => {
}
}
})
- .filter((_) => _)
+ .filter(Boolean)
}
diff --git a/src/services/style_setter/style_setter.js b/src/services/style_setter/style_setter.js
index 4eed080c1..318978264 100644
--- a/src/services/style_setter/style_setter.js
+++ b/src/services/style_setter/style_setter.js
@@ -316,7 +316,7 @@ export const getResourcesIndex = async (url, parser = (x) => x) => {
const resourceTransform = (resources) => {
return Object.entries(resources).map(([k, v]) => {
if (typeof v === 'object') {
- return [k, () => Promise.resolve(v)]
+ return [k, () => v]
} else if (typeof v === 'string') {
return [
k,
@@ -359,11 +359,9 @@ export const getResourcesIndex = async (url, parser = (x) => x) => {
const total = [...custom, ...builtin]
if (total.length === 0) {
- return Promise.reject(
- new Error(
- `Resource at ${url} and ${customUrl} completely unavailable. Panicking`,
- ),
+ throw new Error(
+ `Resource at ${url} and ${customUrl} completely unavailable. Panicking`,
)
}
- return Promise.resolve(Object.fromEntries(total))
+ return Object.fromEntries(total)
}
diff --git a/src/services/sw/sw.js b/src/services/sw/sw.js
index 2b7dabd41..ef8200a4d 100644
--- a/src/services/sw/sw.js
+++ b/src/services/sw/sw.js
@@ -3,7 +3,7 @@ function urlBase64ToUint8Array(base64String) {
const padding = '='.repeat((4 - (base64String.length % 4)) % 4)
const base64 = (base64String + padding)
.replaceAll('-', '+')
- .replace(/_/g, '/')
+ .replaceAll('_', '/')
const rawData = window.atob(base64)
return Uint8Array.from([...rawData].map((char) => char.codePointAt(0)))
@@ -28,10 +28,8 @@ function getOrCreateServiceWorker() {
}
function subscribePush(registration, isEnabled, vapidPublicKey) {
- if (!isEnabled)
- return Promise.reject(new Error('Web Push is disabled in config'))
- if (!vapidPublicKey)
- return Promise.reject(new Error('VAPID public key is not found'))
+ if (!isEnabled) throw new Error('Web Push is disabled in config')
+ if (!vapidPublicKey) throw new Error('VAPID public key is not found')
const subscribeOptions = {
userVisibleOnly: false,
@@ -40,10 +38,10 @@ function subscribePush(registration, isEnabled, vapidPublicKey) {
return registration.pushManager.subscribe(subscribeOptions)
}
-function unsubscribePush(registration) {
+async function unsubscribePush(registration) {
return registration.pushManager.getSubscription().then((subscription) => {
if (subscription === null) {
- return Promise.resolve('No subscription')
+ return 'No subscription'
}
return subscription.unsubscribe()
})
diff --git a/src/services/theme_data/css_utils.js b/src/services/theme_data/css_utils.js
index 990db652c..b728f68d2 100644
--- a/src/services/theme_data/css_utils.js
+++ b/src/services/theme_data/css_utils.js
@@ -165,7 +165,7 @@ export const getCssRules = (rules, debug) =>
header,
directives,
rule.component === 'Text' &&
- rule.state.indexOf('faint') < 0 &&
+ !rule.state.includes('faint') &&
rule.directives.textNoCssColor !== 'yes'
? ' color: var(--text);'
: '',
diff --git a/src/services/theme_data/iss_utils.js b/src/services/theme_data/iss_utils.js
index 67579a118..d42da3780 100644
--- a/src/services/theme_data/iss_utils.js
+++ b/src/services/theme_data/iss_utils.js
@@ -24,7 +24,7 @@ export const getAllPossibleCombinations = (array) => {
const nonSelf = array.filter((x) => !selfSet.has(x))
return nonSelf.map((x) => [...self, x])
})
- const flatCombos = newCombos.reduce((acc, x) => [...acc, ...x], [])
+ const flatCombos = newCombos.flat()
const uniqueComboStrings = new Set()
const uniqueCombos = flatCombos.map(sortBy).filter((x) => {
if (uniqueComboStrings.has(x.join())) {
@@ -36,7 +36,7 @@ export const getAllPossibleCombinations = (array) => {
})
combos.push(uniqueCombos)
}
- return combos.reduce((acc, x) => [...acc, ...x], [])
+ return combos.flat()
}
/**
diff --git a/src/services/theme_data/theme2_to_theme3.js b/src/services/theme_data/theme2_to_theme3.js
index 5bab4818c..8c3ac6ad2 100644
--- a/src/services/theme_data/theme2_to_theme3.js
+++ b/src/services/theme_data/theme2_to_theme3.js
@@ -191,14 +191,16 @@ export const convertTheme2To3 = (data) => {
newRules.push(rule)
if (rule.component === 'Button') {
- newRules.push({ ...rule, component: 'ScrollbarElement' })
- newRules.push({ ...rule, component: 'Tab' })
- newRules.push({
- ...rule,
- component: 'Tab',
- state: ['active'],
- directives: { opacity: 0 },
- })
+ newRules.push(
+ { ...rule, component: 'ScrollbarElement' },
+ { ...rule, component: 'Tab' },
+ {
+ ...rule,
+ component: 'Tab',
+ state: ['active'],
+ directives: { opacity: 0 },
+ },
+ )
}
if (rule.component === 'Panel') {
newRules.push({ ...rule, component: 'Post' })
@@ -250,8 +252,10 @@ export const convertTheme2To3 = (data) => {
}
newRules.push(rule)
if (rule.component === 'Button') {
- newRules.push({ ...rule, component: 'ScrollbarElement' })
- newRules.push({ ...rule, component: 'Tab' })
+ newRules.push(
+ { ...rule, component: 'ScrollbarElement' },
+ { ...rule, component: 'Tab' },
+ )
}
})
return newRules
@@ -349,16 +353,20 @@ export const convertTheme2To3 = (data) => {
newRules.push({ ...rule, parent: { component: 'Notification' } })
}
if (key === 'buttonPressed') {
- newRules.push({ ...rule, state: ['toggled'] })
- newRules.push({ ...rule, state: ['toggled', 'focus'] })
- newRules.push({ ...rule, state: ['pressed', 'focus'] })
- newRules.push({ ...rule, state: ['toggled', 'focus', 'hover'] })
- newRules.push({ ...rule, state: ['pressed', 'focus', 'hover'] })
+ newRules.push(
+ { ...rule, state: ['toggled'] },
+ { ...rule, state: ['toggled', 'focus'] },
+ { ...rule, state: ['pressed', 'focus'] },
+ { ...rule, state: ['toggled', 'focus', 'hover'] },
+ { ...rule, state: ['pressed', 'focus', 'hover'] },
+ )
}
if (rule.component === 'Button') {
- newRules.push({ ...rule, component: 'ScrollbarElement' })
- newRules.push({ ...rule, component: 'Tab' })
+ newRules.push(
+ { ...rule, component: 'ScrollbarElement' },
+ { ...rule, component: 'Tab' },
+ )
}
})
return newRules
@@ -512,15 +520,17 @@ export const convertTheme2To3 = (data) => {
{ ...newRule, component: 'Tab' },
{ ...newRule, component: 'ScrollbarElement' },
]
- if (newRule.state?.indexOf('toggled') >= 0) {
- rules.push({ ...newRule, state: [...newRule.state, 'focused'] })
- rules.push({ ...newRule, state: [...newRule.state, 'hover'] })
- rules.push({
- ...newRule,
- state: [...newRule.state, 'hover', 'focused'],
- })
+ if (newRule.state?.includes('toggled')) {
+ rules.push(
+ { ...newRule, state: [...newRule.state, 'focused'] },
+ { ...newRule, state: [...newRule.state, 'hover'] },
+ {
+ ...newRule,
+ state: [...newRule.state, 'hover', 'focused'],
+ },
+ )
}
- if (newRule.state?.indexOf('hover') >= 0) {
+ if (newRule.state?.includes('hover')) {
rules.push({ ...newRule, state: [...newRule.state, 'focused'] })
}
return rules
@@ -559,9 +569,9 @@ export const convertTheme2To3 = (data) => {
const flatExtRules = extendedRules
.filter(Boolean)
- .reduce((acc, x) => [...acc, ...x], [])
+ .flat()
.filter(Boolean)
- .reduce((acc, x) => [...acc, ...x], [])
+ .flat()
return [
generateRoot(),
diff --git a/src/services/theme_data/theme_data_3.service.js b/src/services/theme_data/theme_data_3.service.js
index 626d7daeb..694e41e12 100644
--- a/src/services/theme_data/theme_data_3.service.js
+++ b/src/services/theme_data/theme_data_3.service.js
@@ -262,7 +262,7 @@ export const init = ({
...r,
})),
)
- .reduce((acc, arr) => [...acc, ...arr], []),
+ .flat(),
...inputRuleset,
].map((rule) => {
normalizeCombination(rule)
@@ -690,11 +690,11 @@ export const init = ({
.map((combination) => ['normal', ...combination])
.filter((combo) => {
// Optimization: filter out some hard-coded combinations that don't make sense
- if (combo.indexOf('disabled') >= 0) {
+ if (combo.includes('disabled')) {
return !(
- combo.indexOf('hover') >= 0 ||
- combo.indexOf('focused') >= 0 ||
- combo.indexOf('pressed') >= 0
+ combo.includes('hover') ||
+ combo.includes('focused') ||
+ combo.includes('pressed')
)
}
return true
@@ -705,13 +705,13 @@ export const init = ({
.map((variant) => {
return stateCombinations.map((state) => ({ variant, state }))
})
- .reduce((acc, x) => [...acc, ...x], [])
+ .flat()
stateVariantCombination.forEach((combination) => {
combination.component = component.name
combination.lazy = component.lazy || parent?.lazy
combination.parent = parent
- if (!liteMode && combination.state.indexOf('hover') >= 0) {
+ if (!liteMode && combination.state.includes('hover')) {
combination.lazy = true
}
diff --git a/src/services/user_highlighter/user_highlighter.js b/src/services/user_highlighter/user_highlighter.js
index e3f94ea1a..abd0d9633 100644
--- a/src/services/user_highlighter/user_highlighter.js
+++ b/src/services/user_highlighter/user_highlighter.js
@@ -47,7 +47,7 @@ const highlightStyle = (prefs) => {
const highlightClass = (user) => {
return (
- 'USER____' + user.screen_name?.replaceAll('.', '_').replace(/@/g, '_AT_')
+ 'USER____' + user.screen_name?.replaceAll('.', '_').replaceAll('@', '_AT_')
)
}
diff --git a/src/stores/chats.js b/src/stores/chats.js
index 7908da9c8..5ade0c126 100644
--- a/src/stores/chats.js
+++ b/src/stores/chats.js
@@ -61,7 +61,7 @@ export const useChatsStore = defineStore('chats', {
addNewChats(chats) {
window.vuex.commit(
'addNewUsers',
- chats.map((k) => k.account).filter((k) => k),
+ chats.map((k) => k.account).filter(Boolean),
)
chats.forEach((updatedChat) => {
diff --git a/src/stores/emoji.js b/src/stores/emoji.js
index 2d77954f1..8135a483e 100644
--- a/src/stores/emoji.js
+++ b/src/stores/emoji.js
@@ -120,23 +120,19 @@ export const useEmojiStore = defineStore('emoji', {
}, {})
},
standardEmojiList(state) {
- return (
- SORTED_EMOJI_GROUP_IDS.map((groupId) =>
- (this.emoji[groupId] || []).map((k) =>
- injectAnnotations(k, this.unicodeEmojiAnnotations),
- ),
- ).reduce((a, b) => a.concat(b), []) ?? []
- )
+ return SORTED_EMOJI_GROUP_IDS.map((groupId) =>
+ (this.emoji[groupId] || []).map((k) =>
+ injectAnnotations(k, this.unicodeEmojiAnnotations),
+ ),
+ ).flat()
},
standardEmojiGroupList(state) {
- return (
- SORTED_EMOJI_GROUP_IDS.map((groupId) => ({
- id: groupId,
- emojis: (this.emoji[groupId] || []).map((k) =>
- injectAnnotations(k, this.unicodeEmojiAnnotations),
- ),
- })) ?? []
- )
+ return SORTED_EMOJI_GROUP_IDS.map((groupId) => ({
+ id: groupId,
+ emojis: (this.emoji[groupId] || []).map((k) =>
+ injectAnnotations(k, this.unicodeEmojiAnnotations),
+ ),
+ }))
},
},
actions: {
diff --git a/src/stores/interface.js b/src/stores/interface.js
index edc879614..7be72a8d2 100644
--- a/src/stores/interface.js
+++ b/src/stores/interface.js
@@ -294,7 +294,7 @@ export const useInterfaceStore = defineStore('interface', {
path: 'palettesIndex',
value: { _error: e },
})
- return Promise.resolve({})
+ return {}
}
},
setPalette(value) {
@@ -332,7 +332,7 @@ export const useInterfaceStore = defineStore('interface', {
path: 'simple.stylesIndex',
value: { _error: e },
})
- return Promise.resolve({})
+ return {}
}
},
setStyle(value) {
@@ -375,7 +375,7 @@ export const useInterfaceStore = defineStore('interface', {
path: 'themesIndex',
value: { _error: e },
})
- return Promise.resolve({})
+ return {}
}
},
setTheme(value) {
diff --git a/src/stores/sync_config.js b/src/stores/sync_config.js
index 3b71478c1..9464ffb68 100644
--- a/src/stores/sync_config.js
+++ b/src/stores/sync_config.js
@@ -104,7 +104,7 @@ const _verifyPrefs = (state) => {
// Simple
Object.entries(defaultState.prefsStorage.simple).forEach(([k, v]) => {
- if (typeof v === 'undefined') return
+ if (v === undefined) return
if (typeof v === 'number' || typeof v === 'boolean') return
if (typeof v === 'object') return
console.warn(
@@ -836,7 +836,7 @@ export const useSyncConfigStore = defineStore('sync_config', {
: [path, finalValue]
})
newState.prefsStorage.simple = Object.fromEntries(
- newEntries.filter((_) => _),
+ newEntries.filter(Boolean),
)
return newState
},
diff --git a/src/stores/user_highlight.js b/src/stores/user_highlight.js
index 0db37703d..3cd3bfe7d 100644
--- a/src/stores/user_highlight.js
+++ b/src/stores/user_highlight.js
@@ -43,7 +43,7 @@ const _verifyHighlights = (state) => {
// Simple
Object.entries(defaultState.highlight).forEach(([k, v]) => {
- if (typeof v === 'undefined') return
+ if (v === undefined) return
if (typeof v === 'object') return
console.warn(`User highlight ${k} is invalid type ${typeof v}, unsetting`)
delete state.highlight[k]
diff --git a/test/e2e/runner.js b/test/e2e/runner.js
index 33fcc322c..06cae7813 100644
--- a/test/e2e/runner.js
+++ b/test/e2e/runner.js
@@ -10,10 +10,10 @@ const server = require('../../build/dev-server.js')
// For more information on Nightwatch's config file, see
// http://nightwatchjs.org/guide#settings-file
let opts = process.argv.slice(2)
-if (opts.indexOf('--config') === -1) {
+if (!opts.includes('--config')) {
opts = opts.concat(['--config', 'test/e2e/nightwatch.conf.js'])
}
-if (opts.indexOf('--env') === -1) {
+if (!opts.includes('--env')) {
opts = opts.concat(['--env', 'chrome'])
}
diff --git a/test/unit/specs/components/chat_view.spec.js b/test/unit/specs/components/chat_view.spec.js
index c308e4fbc..d03809e38 100644
--- a/test/unit/specs/components/chat_view.spec.js
+++ b/test/unit/specs/components/chat_view.spec.js
@@ -66,10 +66,10 @@ describe('ChatView methods', () => {
it("Doesn't add duplicates", () => {
component.vm.addMessages({ messages: [message1] })
component.vm.addMessages({ messages: [message1] })
- expect(component.vm.messages.length).to.eql(1)
+ expect(component.vm.messages).to.have.length(1)
component.vm.addMessages({ messages: [message2] })
- expect(component.vm.messages.length).to.eql(2)
+ expect(component.vm.messages).to.have.length(2)
})
it('Updates minId and lastMessage and newMessageCount', async () => {
@@ -127,11 +127,11 @@ describe('ChatView methods', () => {
})
}
component.vm.cullOlder()
- expect(component.vm.messages.length).to.eql(50)
+ expect(component.vm.messages).to.have.length(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)
+ expect(Object.keys(component.vm.messagesIndex)).to.have.length(50)
})
})
})
diff --git a/test/unit/specs/components/post_status_form.spec.js b/test/unit/specs/components/post_status_form.spec.js
index 03c0ec8b9..f89102504 100644
--- a/test/unit/specs/components/post_status_form.spec.js
+++ b/test/unit/specs/components/post_status_form.spec.js
@@ -80,8 +80,8 @@ describe('PostStatusForm', () => {
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.quote).to.be.null
+ expect(wrapper.vm.newStatus.poll).to.be.null
expect(wrapper.vm.newStatus.spoilerText).to.eql('')
expect(wrapper.vm.newStatus.mentions).to.eql('@replied')
expect(wrapper.vm.newStatus.status).to.eql('@replied ')
@@ -101,8 +101,8 @@ describe('PostStatusForm', () => {
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.quote).to.be.null
+ expect(wrapper.vm.newStatus.poll).to.be.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 ')
@@ -114,9 +114,9 @@ describe('PostStatusForm', () => {
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.quoteId).to.be.null
expect(wrapper.vm.postingOptions.contentType).to.eql('text/plain')
- expect(wrapper.vm.postingOptions.poll).to.eql(null)
+ expect(wrapper.vm.postingOptions.poll).to.be.null
})
it('Forces direct mode when replying to a DM, mastodon style subject handling', () => {
@@ -139,8 +139,8 @@ describe('PostStatusForm', () => {
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.quote).to.be.null
+ expect(wrapper.vm.newStatus.poll).to.be.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 ')
@@ -207,7 +207,7 @@ describe('PostStatusForm', () => {
wrapper.vm.quoteThreadToggled = true
wrapper.vm.quoteThreadToggled = false
- expect(wrapper.vm.newStatus.quote).to.eql(null)
+ expect(wrapper.vm.newStatus.quote).to.be.null
})
it('Initializes and reset quote when toggling quote attachment', () => {
@@ -228,7 +228,7 @@ describe('PostStatusForm', () => {
url: '',
})
wrapper.vm.toggleQuoteForm()
- expect(wrapper.vm.newStatus.quote).to.eql(null)
+ expect(wrapper.vm.newStatus.quote).to.be.null
})
it('Status editing', () => {
diff --git a/test/unit/specs/lib/persisted_state.spec.js b/test/unit/specs/lib/persisted_state.spec.js
index de7d92bd8..c37d0f99f 100644
--- a/test/unit/specs/lib/persisted_state.spec.js
+++ b/test/unit/specs/lib/persisted_state.spec.js
@@ -187,7 +187,7 @@ describe('piniaPersistPlugin', () => {
const test = useTestStore()
test.$patch({ a: 3 })
- expect(await mockStorage.getItem('pinia-local-test')).to.eql(undefined)
+ expect(await mockStorage.getItem('pinia-local-test')).to.be.undefined
// NOTE: it should not even have tried to save, because the subscribe function
// is called only after loading the initial state.
expect(mockStorage.setItem).not.toHaveBeenCalled()
diff --git a/test/unit/specs/modules/statuses.spec.js b/test/unit/specs/modules/statuses.spec.js
index cd43496a9..04bd07ffe 100644
--- a/test/unit/specs/modules/statuses.spec.js
+++ b/test/unit/specs/modules/statuses.spec.js
@@ -278,7 +278,7 @@ describe('Statuses module', () => {
timeline: 'public',
})
- expect(state.timelines.public.visibleStatuses.length).to.eql(1)
+ expect(state.timelines.public.visibleStatuses).to.have.length(1)
expect(state.timelines.public.visibleStatuses[0].fave_num).to.eql(1)
expect(state.timelines.public.maxId).to.eq(favorite.id)
@@ -289,7 +289,7 @@ describe('Statuses module', () => {
timeline: 'public',
})
- expect(state.timelines.public.visibleStatuses.length).to.eql(1)
+ expect(state.timelines.public.visibleStatuses).to.have.length(1)
expect(state.timelines.public.visibleStatuses[0].fave_num).to.eql(1)
expect(state.timelines.public.maxId).to.eq(favorite.id)
@@ -314,7 +314,7 @@ describe('Statuses module', () => {
user,
})
- expect(state.timelines.public.visibleStatuses.length).to.eql(1)
+ expect(state.timelines.public.visibleStatuses).to.have.length(1)
expect(state.timelines.public.visibleStatuses[0].fave_num).to.eql(1)
expect(state.timelines.public.visibleStatuses[0].favorited).to.eql(true)
})
@@ -406,7 +406,7 @@ describe('Statuses module', () => {
emoji: '😂',
currentUser: { id: 'me' },
})
- expect(state.allStatusesObject['1'].emoji_reactions.length).to.eql(0)
+ expect(state.allStatusesObject['1'].emoji_reactions).to.have.length(0)
})
})
@@ -428,7 +428,7 @@ describe('Statuses module', () => {
state.timelines.public.minId = '5'
mutations.showNewStatuses(state, { timeline: 'public' })
- expect(state.timelines.public.visibleStatuses.length).to.eql(2)
+ expect(state.timelines.public.visibleStatuses).to.have.length(2)
expect(state.timelines.public.minVisibleId).to.equal('10')
expect(state.timelines.public.minId).to.equal('10')
})
diff --git a/test/unit/specs/modules/users.spec.js b/test/unit/specs/modules/users.spec.js
index c07f817d8..1b33f8c4e 100644
--- a/test/unit/specs/modules/users.spec.js
+++ b/test/unit/specs/modules/users.spec.js
@@ -68,7 +68,7 @@ describe('The users module', () => {
},
}
const name = 'Guy'
- expect(getters.findUser(state)(name)).to.eql(undefined)
+ expect(getters.findUser(state)(name)).to.be.undefined
})
it('returns user with matching id', () => {
@@ -114,7 +114,7 @@ describe('The users module', () => {
},
}
const id = '1'
- expect(getters.findUserByName(state)(id)).to.eql(undefined)
+ expect(getters.findUserByName(state)(id)).to.be.undefined
})
})
})
diff --git a/test/unit/specs/services/entity_normalizer/entity_normalizer.spec.js b/test/unit/specs/services/entity_normalizer/entity_normalizer.spec.js
index da3f88636..c68c832a0 100644
--- a/test/unit/specs/services/entity_normalizer/entity_normalizer.spec.js
+++ b/test/unit/specs/services/entity_normalizer/entity_normalizer.spec.js
@@ -101,7 +101,7 @@ describe('API Entities normalizer', () => {
describe('Mastoapi preprocessing and converting', () => {
it("doesn't blow up", () => {
const parsed = mastoapidata.map(parseStatus)
- expect(parsed.length).to.eq(mastoapidata.length)
+ expect(parsed).to.have.length(mastoapidata.length)
})
it('processes repeats correctly', () => {
diff --git a/test/unit/specs/stores/sync_config.spec.js b/test/unit/specs/stores/sync_config.spec.js
index a045aa18a..d2e6d42d3 100644
--- a/test/unit/specs/stores/sync_config.spec.js
+++ b/test/unit/specs/stores/sync_config.spec.js
@@ -125,7 +125,7 @@ describe('The SyncConfig store', () => {
},
})
- expect(store.prefsStorage._journal.length).to.eql(500)
+ expect(store.prefsStorage._journal).to.have.length(500)
})
it('should reset local timestamp to remote if contents are the same', async () => {
@@ -173,7 +173,7 @@ describe('The SyncConfig store', () => {
}
store.setPreference({ path: 'simple.palette', value: '1' })
expect(store.prefsStorage.simple.palette).to.eql('1')
- expect(store.prefsStorage._journal.length).to.eql(1)
+ expect(store.prefsStorage._journal).to.have.length(1)
expect(store.prefsStorage._journal[0]).to.eql({
path: 'simple.palette',
operation: 'set',
@@ -199,7 +199,7 @@ describe('The SyncConfig store', () => {
store.updateCache({ username: 'test' })
expect(store.prefsStorage.simple.palette).to.eql(2)
expect(store.prefsStorage.collections.palette).to.eql([])
- expect(store.prefsStorage._journal.length).to.eql(2)
+ expect(store.prefsStorage._journal).to.have.length(2)
expect(store.prefsStorage._journal[0]).to.eql({
path: 'simple.palette',
operation: 'set',
@@ -229,7 +229,7 @@ describe('The SyncConfig store', () => {
store.updateCache({ username: 'test' })
expect(store.prefsStorage.simple.palette).to.eql(1)
expect(store.prefsStorage.collections.palette).to.eql([2])
- expect(store.prefsStorage._journal.length).to.eql(2)
+ expect(store.prefsStorage._journal).to.have.length(2)
})
// TODO We need a proper test for object-based stores
@@ -245,7 +245,7 @@ describe('The SyncConfig store', () => {
expect(store.prefsStorage.simple.fontInput).to.not.have.property(
'family',
)
- expect(store.prefsStorage._journal.length).to.eql(1)
+ expect(store.prefsStorage._journal).to.have.length(1)
})
it('should not allow unsetting depth <= 2', () => {
diff --git a/test/unit/specs/stores/user_highlight.spec.js b/test/unit/specs/stores/user_highlight.spec.js
index f80143b6e..e97f8f382 100644
--- a/test/unit/specs/stores/user_highlight.spec.js
+++ b/test/unit/specs/stores/user_highlight.spec.js
@@ -55,7 +55,7 @@ describe('The UserHighlight store', () => {
user: 'highlight@testing',
type: 'test',
})
- expect(store.highlight._journal.length).to.eql(1)
+ expect(store.highlight._journal).to.have.length(1)
expect(store.highlight._journal[0]).to.eql({
user: 'highlight@testing',
operation: 'set',
@@ -74,7 +74,7 @@ describe('The UserHighlight store', () => {
user: 'highlight@testing.xyz',
type: 'test',
})
- expect(store.highlight._journal.length).to.eql(1)
+ expect(store.highlight._journal).to.have.length(1)
expect(store.highlight._journal[0]).to.eql({
user: 'highlight@testing.xyz',
operation: 'set',
@@ -98,7 +98,7 @@ describe('The UserHighlight store', () => {
user: 'a@test.xyz',
type: 'foo',
})
- expect(store.highlight._journal.length).to.eql(1)
+ expect(store.highlight._journal).to.have.length(1)
})
})
})