natty
/
misskey-awawa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

enhance(client): emojisはIndexedDBに保存する (#10121) 

* enhance(client): emojisはIndexedDBに保存する

* lastEmojisFetchedAt
This commit is contained in:
tamaina 2023-02-28 20:10:52 +09:00 committed by GitHub
parent 570f331477
commit c1e69e7a53
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
packages/frontend/src/custom-emojis.ts
View File

@ -3,9 +3,10 @@ import * as Misskey from 'misskey-js';
import { api, apiGet } from './os'; import { api, apiGet } from './os';
import { miLocalStorage } from './local-storage'; import { miLocalStorage } from './local-storage';
import { stream } from '@/stream'; import { stream } from '@/stream';
import { get, set } from '@/scripts/idb-proxy';
const storageCache = miLocalStorage.getItem('emojis'); const storageCache = await get('emojis');
export const customEmojis = shallowRef<Misskey.entities.CustomEmoji[]>(storageCache ? JSON.parse(storageCache) : []); export const customEmojis = shallowRef<Misskey.entities.CustomEmoji[]>(Array.isArray(storageCache) ? storageCache : []);
export const customEmojiCategories = computed<[ ...string[], null ]>(() => { export const customEmojiCategories = computed<[ ...string[], null ]>(() => {
const categories = new Set<string>(); const categories = new Set<string>();
for (const emoji of customEmojis.value) { for (const emoji of customEmojis.value) {
@ -18,31 +19,39 @@ export const customEmojiCategories = computed<[ ...string[], null ]>(() => {
stream.on('emojiAdded', emojiData => { stream.on('emojiAdded', emojiData => {
customEmojis.value = [emojiData.emoji, ...customEmojis.value]; customEmojis.value = [emojiData.emoji, ...customEmojis.value];
set('emojis', customEmojis.value);
}); });
stream.on('emojiUpdated', emojiData => { stream.on('emojiUpdated', emojiData => {
customEmojis.value = customEmojis.value.map(item => emojiData.emojis.find(search => search.name === item.name) as Misskey.entities.CustomEmoji ?? item); customEmojis.value = customEmojis.value.map(item => emojiData.emojis.find(search => search.name === item.name) as Misskey.entities.CustomEmoji ?? item);
set('emojis', customEmojis.value);
}); });
stream.on('emojiDeleted', emojiData => { stream.on('emojiDeleted', emojiData => {
customEmojis.value = customEmojis.value.filter(item => !emojiData.emojis.some(search => search.name === item.name)); customEmojis.value = customEmojis.value.filter(item => !emojiData.emojis.some(search => search.name === item.name));
set('emojis', customEmojis.value);
}); });
export async function fetchCustomEmojis(force = false) { export async function fetchCustomEmojis(force = false) {
const now = Date.now(); const now = Date.now();
const needsMigration = miLocalStorage.getItem('emojis') != null;
let res; let res;
if (force) { if (force || needsMigration) {
res = await api('emojis', {}); res = await api('emojis', {});
} else { } else {
const lastFetchedAt = miLocalStorage.getItem('lastEmojisFetchedAt'); const lastFetchedAt = await get('lastEmojisFetchedAt');
if (lastFetchedAt && (now - parseInt(lastFetchedAt)) < 1000 * 60 * 60) return; if (lastFetchedAt && (now - lastFetchedAt) < 1000 * 60 * 60) return;
res = await apiGet('emojis', {}); res = await apiGet('emojis', {});
} }
customEmojis.value = res.emojis; customEmojis.value = res.emojis;
miLocalStorage.setItem('emojis', JSON.stringify(res.emojis)); set('emojis', res.emojis);
miLocalStorage.setItem('lastEmojisFetchedAt', now.toString()); set('lastEmojisFetchedAt', now);
if (needsMigration) {
miLocalStorage.removeItem('emojis');
miLocalStorage.removeItem('lastEmojisFetchedAt');
}
} }
let cachedTags; let cachedTags;

6
packages/frontend/src/local-storage.ts
View File

@ -2,8 +2,6 @@ type Keys =
'v' | 'v' |
'lastVersion' | 'lastVersion' |
'instance' | 'instance' |
'emojis' | // TODO: indexed db
'lastEmojisFetchedAt' |
'account' | 'account' |
'accounts' | 'accounts' |
'latestDonationInfoShownAt' | 'latestDonationInfoShownAt' |
@ -28,7 +26,9 @@ type Keys =
`miux:${string}` | `miux:${string}` |
`ui:folder:${string}` | `ui:folder:${string}` |
`themes:${string}` | `themes:${string}` |
`aiscript:${string}`; `aiscript:${string}` |
'lastEmojisFetchedAt' | // DEPRECATED, stored in indexeddb (13.9.0~)
'emojis' // DEPRECATED, stored in indexeddb (13.9.0~);
export const miLocalStorage = { export const miLocalStorage = {
getItem: (key: Keys) => window.localStorage.getItem(key), getItem: (key: Keys) => window.localStorage.getItem(key),