lint
This commit is contained in:
parent
eb1807351c
commit
c05381e6aa
26 changed files with 81 additions and 54 deletions
|
|
@ -175,14 +175,16 @@ const setSettings = async ({ apiConfig, staticConfig, store }) => {
|
|||
if (source === 'name') return
|
||||
if (INSTANCE_IDENTIY_EXTERNAL.has(source)) return
|
||||
useInstanceStore().set({
|
||||
value: config[source] ?? INSTANCE_IDENTITY_DEFAULT_DEFINITIONS[source].default,
|
||||
value:
|
||||
config[source] ?? INSTANCE_IDENTITY_DEFAULT_DEFINITIONS[source].default,
|
||||
path: `instanceIdentity.${source}`,
|
||||
})
|
||||
})
|
||||
|
||||
Object.keys(INSTANCE_DEFAULT_CONFIG_DEFINITIONS).forEach((source) =>
|
||||
useInstanceStore().set({
|
||||
value: config[source] ?? INSTANCE_DEFAULT_CONFIG_DEFINITIONS[source].default,
|
||||
value:
|
||||
config[source] ?? INSTANCE_DEFAULT_CONFIG_DEFINITIONS[source].default,
|
||||
path: `prefsStorage.${source}`,
|
||||
}),
|
||||
)
|
||||
|
|
|
|||
|
|
@ -27,7 +27,11 @@ const About = {
|
|||
frontendVersionLink() {
|
||||
return pleromaFeCommitUrl + this.frontendVersion
|
||||
},
|
||||
...mapState(useInstanceStore, ['backendVersion', 'backendRepository', 'frontendVersion']),
|
||||
...mapState(useInstanceStore, [
|
||||
'backendVersion',
|
||||
'backendRepository',
|
||||
'frontendVersion',
|
||||
]),
|
||||
showInstanceSpecificPanel() {
|
||||
return (
|
||||
useInstanceStore().instanceIdentity.showInstanceSpecificPanel &&
|
||||
|
|
|
|||
|
|
@ -7,7 +7,9 @@
|
|||
<features-panel v-if="showFeaturesPanel" />
|
||||
<div class="panel panel-default">
|
||||
<div class="panel-heading">
|
||||
<div class="title">{{ $t('settings.version.title') }}</div>
|
||||
<div class="title">
|
||||
{{ $t('settings.version.title') }}
|
||||
</div>
|
||||
</div>
|
||||
<div class="panel-body">
|
||||
<dl>
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@ const BasicUserCard = {
|
|||
allowNonSquareEmoji() {
|
||||
return useMergedConfigStore().mergedConfig.nonSquareEmoji
|
||||
},
|
||||
}
|
||||
},
|
||||
}
|
||||
|
||||
export default BasicUserCard
|
||||
|
|
|
|||
|
|
@ -3,6 +3,8 @@ import { defineAsyncComponent } from 'vue'
|
|||
import RichContent from 'src/components/rich_content/rich_content.jsx'
|
||||
import UserAvatar from '../user_avatar/user_avatar.vue'
|
||||
|
||||
import { useMergedConfigStore } from 'src/stores/merged_config.js'
|
||||
|
||||
export default {
|
||||
name: 'ChatTitle',
|
||||
components: {
|
||||
|
|
|
|||
|
|
@ -88,6 +88,7 @@ export default {
|
|||
label: {
|
||||
required: false,
|
||||
type: String,
|
||||
default: '',
|
||||
},
|
||||
// use unstyled, uh, style
|
||||
unstyled: {
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
import ConfirmModal from 'src/components/confirm_modal/confirm_modal.vue'
|
||||
import Draft from 'src/components/draft/draft.vue'
|
||||
import List from 'src/components/list/list.vue'
|
||||
import ConfirmModal from 'src/components/confirm_modal/confirm_modal.vue'
|
||||
|
||||
const Drafts = {
|
||||
components: {
|
||||
|
|
@ -10,7 +10,7 @@ const Drafts = {
|
|||
},
|
||||
data() {
|
||||
return {
|
||||
showingConfirmDialog: false
|
||||
showingConfirmDialog: false,
|
||||
}
|
||||
},
|
||||
computed: {
|
||||
|
|
@ -23,12 +23,14 @@ const Drafts = {
|
|||
this.showingConfirmDialog = true
|
||||
},
|
||||
doAbandonAll() {
|
||||
this.$store.dispatch('abandonAllDrafts').then(() => this.hideConfirmDialog())
|
||||
this.$store
|
||||
.dispatch('abandonAllDrafts')
|
||||
.then(() => this.hideConfirmDialog())
|
||||
},
|
||||
hideConfirmDialog() {
|
||||
this.showingConfirmDialog = false
|
||||
},
|
||||
}
|
||||
},
|
||||
}
|
||||
|
||||
export default Drafts
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
<div
|
||||
ref="root"
|
||||
class="input emoji-input"
|
||||
:class="{ '-with-picker': !hideEmojiButton, '-textarea': this.input?.tagName === 'TEXTAREA' }"
|
||||
:class="{ '-with-picker': !hideEmojiButton, '-textarea': input?.tagName === 'TEXTAREA' }"
|
||||
>
|
||||
<slot
|
||||
:id="'textbox-' + randomSeed"
|
||||
|
|
|
|||
|
|
@ -47,7 +47,7 @@ const Gallery = {
|
|||
: attachments
|
||||
.reduce(
|
||||
(acc, attachment, i) => {
|
||||
const peek = attachments[i+1]
|
||||
const peek = attachments[i + 1]
|
||||
const nextEnd = peek == null
|
||||
const nextWide = !nextEnd && !displayTypes.has(peek?.type)
|
||||
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
import { get } from 'lodash'
|
||||
import { mapState } from 'pinia'
|
||||
|
||||
import { useInstanceStore } from 'src/stores/instance.js'
|
||||
|
||||
/**
|
||||
|
|
@ -21,16 +22,11 @@ const MRFTransparencyPanel = {
|
|||
computed: {
|
||||
...mapState(useInstanceStore, {
|
||||
federationPolicy: (state) => state.federationPolicy,
|
||||
mrfPolicies: (state) =>
|
||||
get(state, 'federationPolicy.mrf_policies', []),
|
||||
mrfPolicies: (state) => get(state, 'federationPolicy.mrf_policies', []),
|
||||
quarantineInstances: (state) =>
|
||||
toInstanceReasonObject(
|
||||
get(state, 'federationPolicy.quarantined_instances', []),
|
||||
get(
|
||||
state,
|
||||
'federationPolicy.quarantined_instances_info',
|
||||
[],
|
||||
),
|
||||
get(state, 'federationPolicy.quarantined_instances_info', []),
|
||||
'quarantined_instances',
|
||||
),
|
||||
acceptInstances: (state) =>
|
||||
|
|
|
|||
|
|
@ -378,13 +378,10 @@ const PostStatusForm = {
|
|||
this.newStatus.hasQuote = value
|
||||
this.newStatus.quote.thread = value
|
||||
this.newStatus.quote.id = value ? this.replyTo : ''
|
||||
}
|
||||
},
|
||||
},
|
||||
defaultQuotable() {
|
||||
if (
|
||||
!this.quotingAvailable ||
|
||||
!this.isReply
|
||||
) {
|
||||
if (!this.quotingAvailable || !this.isReply) {
|
||||
return false
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -264,10 +264,10 @@
|
|||
/>
|
||||
<QuoteForm
|
||||
v-if="quotingAvailable"
|
||||
:id="newStatus.quote.id"
|
||||
ref="quoteForm"
|
||||
:visible="quoteFormVisible"
|
||||
:url="newStatus.quote.url"
|
||||
:id="newStatus.quote.id"
|
||||
@update:url="url => newStatus.quote.url = url"
|
||||
@update:id="id => newStatus.quote.id = id"
|
||||
/>
|
||||
|
|
|
|||
|
|
@ -328,7 +328,13 @@ export default {
|
|||
// slots updated -> rerender -> emit -> update up the tree -> rerender -> ...
|
||||
// at least until vue3?
|
||||
const result = (
|
||||
<span class={['RichContent', this.faint ? '-faint' : '', this.allowNonSquareEmoji ? '-allow-non-square-emoji' : '']}>
|
||||
<span
|
||||
class={[
|
||||
'RichContent',
|
||||
this.faint ? '-faint' : '',
|
||||
this.allowNonSquareEmoji ? '-allow-non-square-emoji' : '',
|
||||
]}
|
||||
>
|
||||
{this.collapse
|
||||
? pass2.map((x) => {
|
||||
if (!Array.isArray(x)) return x.replace(/\n/g, ' ')
|
||||
|
|
|
|||
|
|
@ -9,13 +9,13 @@
|
|||
class="setting-label"
|
||||
:class="{ 'faint': shouldBeDisabled }"
|
||||
>
|
||||
<ModifiedIndicator
|
||||
:changed="isChanged"
|
||||
:onclick="reset"
|
||||
/>
|
||||
<LocalSettingIndicator :is-local="isLocalSetting" />
|
||||
{{ ' ' }}
|
||||
<DraftButtons v-if="!hideDraftButtons" />
|
||||
<ModifiedIndicator
|
||||
:changed="isChanged"
|
||||
:onclick="reset"
|
||||
/>
|
||||
<LocalSettingIndicator :is-local="isLocalSetting" />
|
||||
{{ ' ' }}
|
||||
<DraftButtons v-if="!hideDraftButtons" />
|
||||
<template v-if="backendDescriptionLabel">
|
||||
{{ backendDescriptionLabel + ' ' }}
|
||||
</template>
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
import { mapState } from 'pinia'
|
||||
|
||||
import BooleanSetting from '../helpers/boolean_setting.vue'
|
||||
import SharedComputedObject from '../helpers/shared_computed_object.js'
|
||||
|
||||
|
|
@ -17,7 +18,11 @@ const VersionTab = {
|
|||
frontendVersionLink() {
|
||||
return pleromaFeCommitUrl + this.frontendVersion
|
||||
},
|
||||
...mapState(useInstanceStore, ['backendVersion', 'backendRepository', 'frontendVersion']),
|
||||
...mapState(useInstanceStore, [
|
||||
'backendVersion',
|
||||
'backendRepository',
|
||||
'frontendVersion',
|
||||
]),
|
||||
...SharedComputedObject(),
|
||||
},
|
||||
methods: {
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
<span
|
||||
class="quick-action-buttons"
|
||||
:class="{ '-pin': showPin }"
|
||||
>
|
||||
>
|
||||
<span
|
||||
v-for="button in quickButtons"
|
||||
:key="button.name"
|
||||
|
|
|
|||
|
|
@ -68,7 +68,7 @@ const KNOWN_TAGS = new Set([
|
|||
'mrf_tag:force-unlisted',
|
||||
'mrf_tag:sandbox',
|
||||
'mrf_tag:disable-remote-subscription',
|
||||
'mrf_tag:disable-any-subscription'
|
||||
'mrf_tag:disable-any-subscription',
|
||||
])
|
||||
|
||||
export default {
|
||||
|
|
@ -119,7 +119,7 @@ export default {
|
|||
required: false,
|
||||
type: Boolean,
|
||||
default: false,
|
||||
}
|
||||
},
|
||||
},
|
||||
components: {
|
||||
DialogModal,
|
||||
|
|
|
|||
|
|
@ -218,6 +218,7 @@
|
|||
</span>
|
||||
<span
|
||||
v-for="tag in user.tags"
|
||||
:key="tag"
|
||||
class="alert warning user-role"
|
||||
>
|
||||
{{ isKnownTag ? $t('user_card.tags.' + tag) : tag }}
|
||||
|
|
|
|||
|
|
@ -3,11 +3,11 @@ import { defineAsyncComponent } from 'vue'
|
|||
import RichContent from 'src/components/rich_content/rich_content.jsx'
|
||||
import UnicodeDomainIndicator from '../unicode_domain_indicator/unicode_domain_indicator.vue'
|
||||
|
||||
import { useMergedConfigStore } from 'src/stores/merged_config.js'
|
||||
|
||||
import { library } from '@fortawesome/fontawesome-svg-core'
|
||||
import { faCircleNotch } from '@fortawesome/free-solid-svg-icons'
|
||||
|
||||
import { useMergedConfigStore } from 'src/stores/merged_config.js'
|
||||
|
||||
library.add(faCircleNotch)
|
||||
|
||||
const UserListPopover = {
|
||||
|
|
|
|||
|
|
@ -10,9 +10,9 @@ import List from '../list/list.vue'
|
|||
import Timeline from '../timeline/timeline.vue'
|
||||
import UserCard from '../user_card/user_card.vue'
|
||||
|
||||
import { useMergedConfigStore } from 'src/stores/merged_config.js'
|
||||
import { useInstanceStore } from 'src/stores/instance.js'
|
||||
import { useInstanceCapabilitiesStore } from 'src/stores/instance_capabilities.js'
|
||||
import { useMergedConfigStore } from 'src/stores/merged_config.js'
|
||||
|
||||
import { library } from '@fortawesome/fontawesome-svg-core'
|
||||
import { faCircleNotch } from '@fortawesome/free-solid-svg-icons'
|
||||
|
|
|
|||
|
|
@ -44,7 +44,7 @@ const saveDraftToStorage = async (draft) => {
|
|||
|
||||
const deleteDraftFromStorage = async (ids) => {
|
||||
const currentData = await getStorageData()
|
||||
ids.forEach(id => {
|
||||
ids.forEach((id) => {
|
||||
delete currentData[id]
|
||||
})
|
||||
await storage.setItem(storageKey, currentData)
|
||||
|
|
|
|||
|
|
@ -81,7 +81,10 @@ export const maybeShowNotification = (
|
|||
|
||||
if (notification.seen) return
|
||||
if (!visibleTypes(notificationVisibility).includes(notification.type)) return
|
||||
if (notification.type === 'mention' && isMutedNotification(muteFilters, notification))
|
||||
if (
|
||||
notification.type === 'mention' &&
|
||||
isMutedNotification(muteFilters, notification)
|
||||
)
|
||||
return
|
||||
|
||||
const notificationObject = prepareNotificationObject(
|
||||
|
|
|
|||
|
|
@ -10,7 +10,15 @@ export const muteFilterHits = (muteFilters, status) => {
|
|||
return muteFilters
|
||||
.toSorted((a, b) => b.order - a.order)
|
||||
.map((filter) => {
|
||||
const { hide, expires, name, value, type, enabled, caseSensitive = false } = filter
|
||||
const {
|
||||
hide,
|
||||
expires,
|
||||
name,
|
||||
value,
|
||||
type,
|
||||
enabled,
|
||||
caseSensitive = false,
|
||||
} = filter
|
||||
if (!enabled) return false
|
||||
if (value === '') return false
|
||||
if (expires !== null && expires < Date.now()) return false
|
||||
|
|
@ -18,9 +26,7 @@ export const muteFilterHits = (muteFilters, status) => {
|
|||
case 'word': {
|
||||
let match = false
|
||||
if (caseSensitive) {
|
||||
match =
|
||||
statusText.includes(value) ||
|
||||
statusSummary.includes(value)
|
||||
match = statusText.includes(value) || statusSummary.includes(value)
|
||||
} else {
|
||||
const lowercaseValue = value.toLowerCase()
|
||||
match =
|
||||
|
|
@ -56,7 +62,9 @@ export const muteFilterHits = (muteFilters, status) => {
|
|||
match =
|
||||
poster.toLowerCase().includes(lowercaseValue) ||
|
||||
replyToUser.toLowerCase().includes(lowercaseValue) ||
|
||||
mentions.some((mention) => mention.toLowerCase().includes(lowercaseValue))
|
||||
mentions.some((mention) =>
|
||||
mention.toLowerCase().includes(lowercaseValue),
|
||||
)
|
||||
}
|
||||
if (match) {
|
||||
return { hide, name }
|
||||
|
|
|
|||
|
|
@ -499,10 +499,7 @@ export const init = ({
|
|||
}),
|
||||
)
|
||||
const lastVariantRule = variantRules[variantRules.length - 1]
|
||||
const lastVariantSelector = ruleToSelector(
|
||||
lastVariantRule,
|
||||
true,
|
||||
)
|
||||
const lastVariantSelector = ruleToSelector(lastVariantRule, true)
|
||||
|
||||
if (lastVariantRule && lastVariantSelector !== selector) {
|
||||
inheritRule = lastVariantRule
|
||||
|
|
|
|||
|
|
@ -14,8 +14,8 @@ import {
|
|||
uniqWith,
|
||||
unset,
|
||||
} from 'lodash'
|
||||
import { v4 as uuidv4 } from 'uuid'
|
||||
import { defineStore } from 'pinia'
|
||||
import { v4 as uuidv4 } from 'uuid'
|
||||
import { toRaw } from 'vue'
|
||||
|
||||
import { CURRENT_UPDATE_COUNTER } from 'src/components/update_notification/update_notification.js'
|
||||
|
|
@ -684,8 +684,6 @@ export const useSyncConfigStore = defineStore('sync_config', {
|
|||
`Already migrated Values: ${[...migratedEntries].join() || '[none]'}`,
|
||||
)
|
||||
|
||||
const { configMigration } = useSyncConfigStore().flagStorage
|
||||
|
||||
Object.entries(oldDefaultConfigSync).forEach(([key, value]) => {
|
||||
const oldValue = config[key]
|
||||
const defaultValue = value
|
||||
|
|
|
|||
|
|
@ -292,7 +292,10 @@ export const useUserHighlightStore = defineStore('user_highlight', {
|
|||
)
|
||||
}
|
||||
})
|
||||
storage.setItem('vuex-lz', { ...vuexState, config: { ...config, highlight } })
|
||||
storage.setItem('vuex-lz', {
|
||||
...vuexState,
|
||||
config: { ...config, highlight },
|
||||
})
|
||||
|
||||
if (recent === null) {
|
||||
console.debug(
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue