summaryrefslogtreecommitdiff
path: root/src/client
diff options
context:
space:
mode:
authortamaina <tamaina@hotmail.co.jp>2020-05-23 23:21:09 +0900
committerGitHub <noreply@github.com>2020-05-23 23:21:09 +0900
commitabc296cdcc73d0e039286a9107ea8b36f02ceae3 (patch)
tree239105c1d81c9a009cfe2481b8daa2d24d3fe70e /src/client
parentDrop support for Node v11, v13 (#6402) (diff)
downloadsharkey-abc296cdcc73d0e039286a9107ea8b36f02ceae3.tar.gz
sharkey-abc296cdcc73d0e039286a9107ea8b36f02ceae3.tar.bz2
sharkey-abc296cdcc73d0e039286a9107ea8b36f02ceae3.zip
refactor: use Object.fromEntries() instead of in-house implementation (#6401)
* refactor: use Object.fromEntries() instead of in-house implementation * Remove extra type assertions
Diffstat (limited to 'src/client')
-rw-r--r--src/client/config.ts3
-rw-r--r--src/client/scripts/compose-notification.ts3
-rw-r--r--src/client/scripts/set-i18n-contexts.ts3
3 files changed, 3 insertions, 6 deletions
diff --git a/src/client/config.ts b/src/client/config.ts
index f71647a05c..b9a4766188 100644
--- a/src/client/config.ts
+++ b/src/client/config.ts
@@ -1,5 +1,4 @@
import { clientDb, entries } from './db';
-import { fromEntries } from '../prelude/array';
declare const _LANGS_: string[];
declare const _VERSION_: string;
@@ -15,7 +14,7 @@ export const apiUrl = url + '/api';
export const wsUrl = url.replace('http://', 'ws://').replace('https://', 'wss://') + '/streaming';
export const lang = localStorage.getItem('lang');
export const langs = _LANGS_;
-export const getLocale = async () => fromEntries((await entries(clientDb.i18n)) as [string, string][]);
+export const getLocale = async () => Object.fromEntries((await entries(clientDb.i18n)) as [string, string][]);
export const version = _VERSION_;
export const env = _ENV_;
export const instanceName = siteName === 'Misskey' ? null : siteName;
diff --git a/src/client/scripts/compose-notification.ts b/src/client/scripts/compose-notification.ts
index 29eb515bfe..c3281955e4 100644
--- a/src/client/scripts/compose-notification.ts
+++ b/src/client/scripts/compose-notification.ts
@@ -1,13 +1,12 @@
import getNoteSummary from '../../misc/get-note-summary';
import getUserName from '../../misc/get-user-name';
import { clientDb, get, bulkGet } from '../db';
-import { fromEntries } from '../../prelude/array';
const getTranslation = (text: string): Promise<string> => get(text, clientDb.i18n);
export default async function(type, data): Promise<[string, NotificationOptions]> {
const contexts = ['deletedNote', 'invisibleNote', 'withNFiles', '_cw.poll'];
- const locale = fromEntries(await bulkGet(contexts, clientDb.i18n) as [string, string][]);
+ const locale = Object.fromEntries(await bulkGet(contexts, clientDb.i18n) as [string, string][]);
switch (type) {
case 'driveFileCreated': // TODO (Server Side)
diff --git a/src/client/scripts/set-i18n-contexts.ts b/src/client/scripts/set-i18n-contexts.ts
index 2eb76047f1..872153e0bd 100644
--- a/src/client/scripts/set-i18n-contexts.ts
+++ b/src/client/scripts/set-i18n-contexts.ts
@@ -1,7 +1,6 @@
import VueI18n from 'vue-i18n';
import { clientDb, clear, bulkSet } from '../db';
import { deepEntries, delimitEntry } from 'deep-entries';
-import { fromEntries } from '../../prelude/array';
export function setI18nContexts(lang: string, version: string, i18n: VueI18n, cleardb = false) {
return Promise.all([
@@ -13,6 +12,6 @@ export function setI18nContexts(lang: string, version: string, i18n: VueI18n, cl
const flatLocaleEntries = deepEntries(locale, delimitEntry) as [string, string][];
bulkSet(flatLocaleEntries, clientDb.i18n);
i18n.locale = lang;
- i18n.setLocaleMessage(lang, fromEntries(flatLocaleEntries));
+ i18n.setLocaleMessage(lang, Object.fromEntries(flatLocaleEntries));
});
}