sendnrw/misskey
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' of misskey-dev into merge-upstream

Browse Source
This commit is contained in:
まっちゃとーにゅ
2024-01-10 03:10:45 +09:00
parent 83a2b947f0 7e52ea4818
commit abe95d9b67
376 changed files with 5293 additions and 2636 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5,7 +5,7 @@
import { shallowRef, computed, markRaw, watch } from 'vue';
import * as Misskey from 'misskey-js';
import { api, apiGet } from '@/os.js';
import { misskeyApi, misskeyApiGet } from '@/scripts/misskey-api.js';
import { useStream } from '@/stream.js';
import { get, set, exist } from '@/scripts/idb-proxy.js';
@@ -52,12 +52,12 @@ export async function fetchCustomEmojis(force = false) {
let res;
if (force) {
res = await api('emojis', {});
res = await misskeyApi('emojis', {});
} else {
const emojiCacheExist = await exist('emojis');
const lastFetchedAt = await get('lastEmojisFetchedAt');
if (lastFetchedAt && (now - lastFetchedAt) < 1000 * 60 * 60 && emojiCacheExist) return;
res = await apiGet('emojis', {});
res = await misskeyApiGet('emojis', {});
}
customEmojis.value = res.emojis;