sim1222/test1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

refactor: use Object.fromEntries() instead of in-house implementation (#6401)

Browse Source 
* refactor: use Object.fromEntries()
instead of in-house implementation

* Remove extra type assertions
This commit is contained in:
tamaina
2020-05-23 23:21:09 +09:00
committed by GitHub
parent 4df5ec82ce
commit abc296cdcc
6 changed files with 15 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/client/config.ts
View File

@ -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;

3
src/client/scripts/compose-notification.ts
View File

@ -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)

3
src/client/scripts/set-i18n-contexts.ts
View File

@ -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));
});
}