From 5cda71737127d51517c06debb73af902119381fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?John=20Molakvo=C3=A6=20=28skjnldsv=29?= Date: Thu, 9 Apr 2020 11:59:47 +0200 Subject: Migrate to eslint-config-nextcloud MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: John Molakvoæ (skjnldsv) --- src/store/actions.js | 120 ++++++++++++++++++++++----------------------- src/store/constants.js | 2 +- src/store/getters.js | 6 +-- src/store/index.js | 2 +- src/store/mutations.js | 36 +++++++------- src/store/normalization.js | 2 +- 6 files changed, 84 insertions(+), 84 deletions(-) (limited to 'src/store') diff --git a/src/store/actions.js b/src/store/actions.js index 08dc4272b..90503061e 100644 --- a/src/store/actions.js +++ b/src/store/actions.js @@ -40,7 +40,7 @@ import { where, } from 'ramda' -import {savePreference} from '../service/PreferenceService' +import { savePreference } from '../service/PreferenceService' import { create as createAccount, deleteAccount, @@ -50,7 +50,7 @@ import { update as updateAccount, updateSignature, } from '../service/AccountService' -import {create as createFolder, fetchAll as fetchAllFolders, markFolderRead} from '../service/FolderService' +import { create as createFolder, fetchAll as fetchAllFolders, markFolderRead } from '../service/FolderService' import { deleteMessage, fetchEnvelope, @@ -59,16 +59,16 @@ import { setEnvelopeFlag, syncEnvelopes, } from '../service/MessageService' -import {createAlias, deleteAlias} from '../service/AliasService' +import { createAlias, deleteAlias } from '../service/AliasService' import logger from '../logger' -import {normalizedEnvelopeListId} from './normalization' -import {showNewMessagesNotification} from '../service/NotificationService' -import {parseUuid} from '../util/EnvelopeUidParser' -import {matchError} from '../errors/match' +import { normalizedEnvelopeListId } from './normalization' +import { showNewMessagesNotification } from '../service/NotificationService' +import { parseUuid } from '../util/EnvelopeUidParser' +import { matchError } from '../errors/match' import SyncIncompleteError from '../errors/SyncIncompleteError' import MailboxLockedError from '../errors/MailboxLockedError' -import {wait} from '../util/wait' -import {UNIFIED_ACCOUNT_ID, UNIFIED_INBOX_ID} from './constants' +import { wait } from '../util/wait' +import { UNIFIED_ACCOUNT_ID, UNIFIED_INBOX_ID } from './constants' const PAGE_SIZE = 20 @@ -87,27 +87,27 @@ const findIndividualFolders = curry((getFolders, specialRole) => const combineEnvelopeLists = pipe(flatten, orderBy(prop('dateInt'), 'desc')) export default { - savePreference({commit, getters}, {key, value}) { - return savePreference(key, value).then(({value}) => { + savePreference({ commit, getters }, { key, value }) { + return savePreference(key, value).then(({ value }) => { commit('savePreference', { key, value, }) }) }, - fetchAccounts({commit, getters}) { + fetchAccounts({ commit, getters }) { return fetchAllAccounts().then((accounts) => { accounts.forEach((account) => commit('addAccount', account)) return getters.accounts }) }, - fetchAccount({commit}, id) { + fetchAccount({ commit }, id) { return fetchAccount(id).then((account) => { commit('addAccount', account) return account }) }, - createAccount({commit}, config) { + createAccount({ commit }, config) { return createAccount(config).then((account) => { logger.debug(`account ${account.id} created, fetching folders …`, account) return fetchAllFolders(account.id) @@ -119,42 +119,42 @@ export default { .then(() => account) }) }, - updateAccount({commit}, config) { + updateAccount({ commit }, config) { return updateAccount(config).then((account) => { console.debug('account updated', account) commit('editAccount', account) return account }) }, - patchAccount({commit}, {account, data}) { + patchAccount({ commit }, { account, data }) { return patchAccount(account, data).then((account) => { console.debug('account patched', account, data) - commit('patchAccount', {account, data}) + commit('patchAccount', { account, data }) return account }) }, - updateAccountSignature({commit}, {account, signature}) { + updateAccountSignature({ commit }, { account, signature }) { return updateSignature(account, signature).then(() => { console.debug('account signature updated') - const updated = Object.assign({}, account, {signature}) + const updated = Object.assign({}, account, { signature }) commit('editAccount', updated) return account }) }, - deleteAccount({commit}, account) { + deleteAccount({ commit }, account) { return deleteAccount(account.id).catch((err) => { console.error('could not delete account', err) throw err }) }, - createFolder({commit}, {account, name}) { + createFolder({ commit }, { account, name }) { return createFolder(account.id, name).then((folder) => { - console.debug(`folder ${name} created for account ${account.id}`, {folder}) - commit('addFolder', {account, folder}) + console.debug(`folder ${name} created for account ${account.id}`, { folder }) + commit('addFolder', { account, folder }) commit('expandAccount', account.id) }) }, - moveAccount({commit, getters}, {account, up}) { + moveAccount({ commit, getters }, { account, up }) { const accounts = getters.accounts const index = accounts.indexOf(account) if (up) { @@ -171,12 +171,12 @@ export default { if (account.id === 0) { return } - commit('saveAccountsOrder', {account, order: idx}) - return patchAccount(account, {order: idx}) + commit('saveAccountsOrder', { account, order: idx }) + return patchAccount(account, { order: idx }) }) ) }, - markFolderRead({getters, dispatch}, {accountId, folderId}) { + markFolderRead({ getters, dispatch }, { accountId, folderId }) { const folder = getters.getFolder(accountId, folderId) if (folder.isUnified) { @@ -194,13 +194,13 @@ export default { return markFolderRead(accountId, folderId).then( dispatch('syncEnvelopes', { - accountId: accountId, - folderId: folderId, + accountId, + folderId, }) ) }, - fetchEnvelope({commit, getters}, uuid) { - const {accountId, folderId, uid} = parseUuid(uuid) + fetchEnvelope({ commit, getters }, uuid) { + const { accountId, folderId, uid } = parseUuid(uuid) const cached = getters.getEnvelope(accountId, folderId, uid) if (cached) { @@ -222,7 +222,7 @@ export default { return getters.getEnvelope(accountId, folderId, uid) }) }, - fetchEnvelopes({state, commit, getters, dispatch}, {accountId, folderId, query}) { + fetchEnvelopes({ state, commit, getters, dispatch }, { accountId, folderId, query }) { const folder = getters.getFolder(accountId, folderId) if (folder.isUnified) { @@ -275,7 +275,7 @@ export default { ) )(accountId, folderId, query, undefined, PAGE_SIZE) }, - fetchNextEnvelopePage({commit, getters, dispatch}, {accountId, folderId, query, rec = true}) { + fetchNextEnvelopePage({ commit, getters, dispatch }, { accountId, folderId, query, rec = true }) { const folder = getters.getFolder(accountId, folderId) if (folder.isUnified) { @@ -378,7 +378,7 @@ export default { return envelopes }) }, - syncEnvelopes({commit, getters, dispatch}, {accountId, folderId, query, init = false}) { + syncEnvelopes({ commit, getters, dispatch }, { accountId, folderId, query, init = false }) { const folder = getters.getFolder(accountId, folderId) if (folder.isUnified) { @@ -462,11 +462,11 @@ export default { return matchError(error, { [SyncIncompleteError.getName()]() { console.warn('(initial) sync is incomplete, retriggering') - return dispatch('syncEnvelopes', {accountId, folderId, query, init}) + return dispatch('syncEnvelopes', { accountId, folderId, query, init }) }, [MailboxLockedError.getName()](error) { - logger.info('Sync failed because the mailbox is locked, retriggering', {error}) - return wait(1500).then(() => dispatch('syncEnvelopes', {accountId, folderId, query, init})) + logger.info('Sync failed because the mailbox is locked, retriggering', { error }) + return wait(1500).then(() => dispatch('syncEnvelopes', { accountId, folderId, query, init })) }, default(error) { console.error('Could not sync envelopes: ' + error.message, error) @@ -474,13 +474,13 @@ export default { }) }) }, - async syncInboxes({getters, dispatch}) { + async syncInboxes({ getters, dispatch }) { const results = await Promise.all( getters.accounts .filter((a) => !a.isUnified) .map((account) => { return Promise.all( - getters.getFolders(account.id).map(async (folder) => { + getters.getFolders(account.id).map(async(folder) => { if (folder.specialRole !== 'inbox') { return } @@ -510,7 +510,7 @@ export default { // Make sure the priority inbox is updated as well logger.info('updating priority inbox') for (const query of ['is:important not:starred', 'is:starred not:important', 'not:starred not:important']) { - logger.info("sync'ing priority inbox section", {query}) + logger.info("sync'ing priority inbox section", { query }) const folder = getters.getFolder(UNIFIED_ACCOUNT_ID, UNIFIED_INBOX_ID) const list = folder.envelopeLists[normalizedEnvelopeListId(query)] if (list === undefined) { @@ -531,7 +531,7 @@ export default { showNewMessagesNotification(newMessages) } }, - toggleEnvelopeFlagged({commit, getters}, envelope) { + toggleEnvelopeFlagged({ commit, getters }, envelope) { // Change immediately and switch back on error const oldState = envelope.flags.flagged commit('flagEnvelope', { @@ -551,7 +551,7 @@ export default { }) }) }, - toggleEnvelopeImportant({commit, getters}, envelope) { + toggleEnvelopeImportant({ commit, getters }, envelope) { // Change immediately and switch back on error const oldState = envelope.flags.important commit('flagEnvelope', { @@ -571,7 +571,7 @@ export default { }) }) }, - toggleEnvelopeSeen({commit, getters}, envelope) { + toggleEnvelopeSeen({ commit, getters }, envelope) { // Change immediately and switch back on error const oldState = envelope.flags.seen commit('flagEnvelope', { @@ -591,7 +591,7 @@ export default { }) }) }, - toggleEnvelopeJunk({commit, getters}, envelope) { + toggleEnvelopeJunk({ commit, getters }, envelope) { // Change immediately and switch back on error const oldState = envelope.flags.junk commit('flagEnvelope', { @@ -611,7 +611,7 @@ export default { }) }) }, - markEnvelopeFavoriteOrUnfavorite({commit, getters}, {envelope, favFlag}) { + markEnvelopeFavoriteOrUnfavorite({ commit, getters }, { envelope, favFlag }) { // Change immediately and switch back on error const oldState = envelope.flags.flagged commit('flagEnvelope', { @@ -631,7 +631,7 @@ export default { }) }) }, - markEnvelopeSeenOrUnseen({commit, getters}, {envelope, seenFlag}) { + markEnvelopeSeenOrUnseen({ commit, getters }, { envelope, seenFlag }) { // Change immediately and switch back on error const oldState = envelope.flags.unseen commit('flagEnvelope', { @@ -651,8 +651,8 @@ export default { }) }) }, - fetchMessage({commit}, uuid) { - const {accountId, folderId, uid} = parseUuid(uuid) + fetchMessage({ commit }, uuid) { + const { accountId, folderId, uid } = parseUuid(uuid) return fetchMessage(accountId, folderId, uid).then((message) => { // Only commit if not undefined (not found) if (message) { @@ -666,43 +666,43 @@ export default { return message }) }, - replaceDraft({getters, commit}, {draft, uid, data}) { + replaceDraft({ getters, commit }, { draft, uid, data }) { commit('updateDraft', { draft, data, newUid: uid, }) }, - deleteMessage({getters, commit}, {accountId, folderId, uid}) { - commit('removeEnvelope', {accountId, folderId, uid}) + deleteMessage({ getters, commit }, { accountId, folderId, uid }) { + commit('removeEnvelope', { accountId, folderId, uid }) return deleteMessage(accountId, folderId, uid) .then(() => { const folder = getters.getFolder(accountId, folderId) if (!folder) { - logger.error('could not find folder', {accountId, folderId}) + logger.error('could not find folder', { accountId, folderId }) return } - commit('removeMessage', {accountId, folder, uid}) - console.log('message removed') + commit('removeMessage', { accountId, folder, uid }) + console.debug('message removed') }) .catch((err) => { console.error('could not delete message', err) const envelope = getters.getEnvelope(accountId, folderId, uid) if (envelope) { - commit('addEnvelope', {accountId, folderId, envelope}) + commit('addEnvelope', { accountId, folderId, envelope }) } else { - logger.error('could not find envelope', {accountId, folderId, uid}) + logger.error('could not find envelope', { accountId, folderId, uid }) } throw err }) }, - async createAlias({commit}, {account, aliasToAdd}) { + async createAlias({ commit }, { account, aliasToAdd }) { const alias = await createAlias(account, aliasToAdd) - commit('createAlias', {account, alias}) + commit('createAlias', { account, alias }) }, - async deleteAlias({commit}, {account, aliasToDelete}) { + async deleteAlias({ commit }, { account, aliasToDelete }) { await deleteAlias(account, aliasToDelete) - commit('deleteAlias', {account, alias: aliasToDelete}) + commit('deleteAlias', { account, alias: aliasToDelete }) }, } diff --git a/src/store/constants.js b/src/store/constants.js index a779b75cc..ca08968b1 100644 --- a/src/store/constants.js +++ b/src/store/constants.js @@ -18,7 +18,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -import {normalizedFolderId} from './normalization' +import { normalizedFolderId } from './normalization' export const UNIFIED_ACCOUNT_ID = 0 export const UNIFIED_INBOX_ID = btoa('inbox') diff --git a/src/store/getters.js b/src/store/getters.js index f61436a58..b6e6e29de 100644 --- a/src/store/getters.js +++ b/src/store/getters.js @@ -19,10 +19,10 @@ * along with this program. If not, see . */ -import {defaultTo, head} from 'ramda' +import { defaultTo, head } from 'ramda' -import {UNIFIED_ACCOUNT_ID} from './constants' -import {normalizedEnvelopeListId, normalizedFolderId, normalizedMessageId} from './normalization' +import { UNIFIED_ACCOUNT_ID } from './constants' +import { normalizedEnvelopeListId, normalizedFolderId, normalizedMessageId } from './normalization' export const getters = { getPreference: (state) => (key, def) => { diff --git a/src/store/index.js b/src/store/index.js index 62125cdad..df0915e25 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -30,7 +30,7 @@ import { PRIORITY_INBOX_UID, } from './constants' import actions from './actions' -import {getters} from './getters' +import { getters } from './getters' import mutations from './mutations' Vue.use(Vuex) diff --git a/src/store/mutations.js b/src/store/mutations.js index 68f1a7376..37176badb 100644 --- a/src/store/mutations.js +++ b/src/store/mutations.js @@ -23,11 +23,11 @@ import orderBy from 'lodash/fp/orderBy' import sortedUniqBy from 'lodash/fp/sortedUniqBy' import Vue from 'vue' -import {buildMailboxHierarchy} from '../imap/MailboxHierarchy' -import {havePrefix} from '../imap/MailboxPrefix' -import {normalizedFolderId, normalizedMessageId, normalizedEnvelopeListId} from './normalization' -import {sortMailboxes} from '../imap/MailboxSorter' -import {UNIFIED_ACCOUNT_ID} from './constants' +import { buildMailboxHierarchy } from '../imap/MailboxHierarchy' +import { havePrefix } from '../imap/MailboxPrefix' +import { normalizedFolderId, normalizedMessageId, normalizedEnvelopeListId } from './normalization' +import { sortMailboxes } from '../imap/MailboxSorter' +import { UNIFIED_ACCOUNT_ID } from './constants' const addFolderToState = (state, account) => (folder) => { const id = normalizedFolderId(account.id, folder.id) @@ -43,7 +43,7 @@ const sortAccounts = (accounts) => { } export default { - savePreference(state, {key, value}) { + savePreference(state, { key, value }) { Vue.set(state.preferences, key, value) }, addAccount(state, account) { @@ -70,10 +70,10 @@ export default { editAccount(state, account) { Vue.set(state.accounts, account.id, Object.assign({}, state.accounts[account.id], account)) }, - patchAccount(state, {account, data}) { + patchAccount(state, { account, data }) { Vue.set(state.accounts, account.id, Object.assign({}, state.accounts[account.id], data)) }, - saveAccountsOrder(state, {account, order}) { + saveAccountsOrder(state, { account, order }) { Vue.set(account, 'order', order) Vue.set( state, @@ -87,7 +87,7 @@ export default { expandAccount(state, accountId) { state.accounts[accountId].collapsed = false }, - addFolder(state, {account, folder}) { + addFolder(state, { account, folder }) { // Flatten the existing ones before updating the hierarchy const existing = account.folders.map((id) => state.folders[id]) existing.forEach((folder) => { @@ -110,7 +110,7 @@ export default { account.folders.push(id) }) }, - addEnvelope(state, {accountId, folderId, query, envelope}) { + addEnvelope(state, { accountId, folderId, query, envelope }) { const folder = state.folders[normalizedFolderId(accountId, folderId)] Vue.set(state.envelopes, envelope.uuid, envelope) const listId = normalizedEnvelopeListId(query) @@ -133,17 +133,17 @@ export default { ) }) }, - updateEnvelope(state, {envelope}) { + updateEnvelope(state, { envelope }) { const existing = state.envelopes[envelope.uid] if (!existing) { return } Vue.set(existing, 'flags', envelope.flags) }, - flagEnvelope(state, {envelope, flag, value}) { + flagEnvelope(state, { envelope, flag, value }) { envelope.flags[flag] = value }, - removeEnvelope(state, {accountId, folderId, uid}) { + removeEnvelope(state, { accountId, folderId, uid }) { const folder = state.folders[normalizedFolderId(accountId, folderId)] for (const listId in folder.envelopeLists) { if (!Object.hasOwnProperty.call(folder.envelopeLists, listId)) { @@ -184,14 +184,14 @@ export default { } }) }, - addMessage(state, {accountId, folderId, message}) { + addMessage(state, { accountId, folderId, message }) { const uuid = normalizedMessageId(accountId, folderId, message.uid) message.accountId = accountId message.folderId = folderId message.uuid = uuid Vue.set(state.messages, uuid, message) }, - updateDraft(state, {draft, data, newUid}) { + updateDraft(state, { draft, data, newUid }) { // Update draft's UID const oldUid = draft.uid const uid = normalizedMessageId(draft.accountId, draft.folderId, newUid) @@ -217,13 +217,13 @@ export default { Vue.set(state.envelopes, uid, draft) Vue.set(state.messages, uid, draft) }, - removeMessage(state, {accountId, folderId, uid}) { + removeMessage(state, { accountId, folderId, uid }) { Vue.delete(state.messages, normalizedMessageId(accountId, folderId, uid)) }, - createAlias(state, {account, alias}) { + createAlias(state, { account, alias }) { account.aliases.push(alias) }, - deleteAlias(state, {account, alias}) { + deleteAlias(state, { account, alias }) { account.aliases.splice(account.aliases.indexOf(alias), 1) }, } diff --git a/src/store/normalization.js b/src/store/normalization.js index c4b162a74..1da1a671c 100644 --- a/src/store/normalization.js +++ b/src/store/normalization.js @@ -19,7 +19,7 @@ * along with this program. If not, see . */ -import {curry, defaultTo} from 'ramda' +import { curry, defaultTo } from 'ramda' export const normalizedFolderId = curry((accountId, folderId) => { return `${accountId}-${folderId}` -- cgit v1.2.3