summaryrefslogtreecommitdiff
path: root/packages/frontend/src
diff options
context:
space:
mode:
Diffstat (limited to 'packages/frontend/src')
-rw-r--r--packages/frontend/src/components/MkSystemWebhookEditor.impl.ts2
-rw-r--r--packages/frontend/src/os.ts9
-rw-r--r--packages/frontend/src/plugin.ts11
-rw-r--r--packages/frontend/src/preferences/manager.ts2
-rw-r--r--packages/frontend/src/theme.ts2
-rw-r--r--packages/frontend/src/utility/admin-lookup.ts2
-rw-r--r--packages/frontend/src/utility/check-word-mute.ts2
-rw-r--r--packages/frontend/src/utility/drive.ts14
-rw-r--r--packages/frontend/src/utility/file-drop.ts22
-rw-r--r--packages/frontend/src/utility/get-drive-file-menu.ts2
-rw-r--r--packages/frontend/src/utility/get-note-menu.ts2
-rw-r--r--packages/frontend/src/utility/image-frame-renderer/ImageFrameRenderer.ts2
-rw-r--r--packages/frontend/src/utility/paginator.ts6
-rw-r--r--packages/frontend/src/utility/sound.ts2
-rw-r--r--packages/frontend/src/utility/timeline-date-separate.ts2
-rw-r--r--packages/frontend/src/utility/tour.ts2
16 files changed, 43 insertions, 41 deletions
diff --git a/packages/frontend/src/components/MkSystemWebhookEditor.impl.ts b/packages/frontend/src/components/MkSystemWebhookEditor.impl.ts
index 19e4eea733..f2ce55acc4 100644
--- a/packages/frontend/src/components/MkSystemWebhookEditor.impl.ts
+++ b/packages/frontend/src/components/MkSystemWebhookEditor.impl.ts
@@ -25,7 +25,7 @@ export type MkSystemWebhookResult = {
};
export async function showSystemWebhookEditorDialog(props: MkSystemWebhookEditorProps): Promise<MkSystemWebhookResult | null> {
- const { result } = await new Promise<{ result: MkSystemWebhookResult | null }>(async resolve => {
+ const { result } = await new Promise<{ result: MkSystemWebhookResult | null }>(resolve => {
const { dispose } = os.popup(
defineAsyncComponent(() => import('@/components/MkSystemWebhookEditor.vue')),
props,
diff --git a/packages/frontend/src/os.ts b/packages/frontend/src/os.ts
index 59ed3dc948..c1390e8274 100644
--- a/packages/frontend/src/os.ts
+++ b/packages/frontend/src/os.ts
@@ -780,7 +780,7 @@ export function chooseFileFromPc(
});
}
-export function launchUploader(
+export async function launchUploader(
files: File[],
options?: {
folderId?: string | null;
@@ -788,9 +788,10 @@ export function launchUploader(
features?: UploaderFeatures;
},
): Promise<Misskey.entities.DriveFile[]> {
- return new Promise(async (res, rej) => {
+ return new Promise((res, rej) => {
if (files.length === 0) return rej();
- const { dispose } = await popupAsyncWithDialog(import('@/components/MkUploaderDialog.vue').then(x => x.default), {
+ let dispose: () => void;
+ popupAsyncWithDialog(import('@/components/MkUploaderDialog.vue').then(x => x.default), {
files: markRaw(files),
folderId: options?.folderId,
multiple: options?.multiple,
@@ -801,7 +802,7 @@ export function launchUploader(
res(driveFiles);
},
closed: () => dispose(),
- });
+ }).then(d => dispose = d.dispose, rej);
});
}
diff --git a/packages/frontend/src/plugin.ts b/packages/frontend/src/plugin.ts
index f32c991828..d33e158ad9 100644
--- a/packages/frontend/src/plugin.ts
+++ b/packages/frontend/src/plugin.ts
@@ -49,7 +49,7 @@ async function getParser(): Promise<Parser> {
export function isSupportedAiScriptVersion(version: string): boolean {
try {
return (compareVersions(version, '0.12.0') >= 0);
- } catch (err) {
+ } catch (_) {
return false;
}
}
@@ -72,7 +72,7 @@ export async function parsePluginMeta(code: string): Promise<AiScriptPluginMeta>
try {
const parser = await getParser();
ast = parser.parse(code);
- } catch (err) {
+ } catch (_) {
throw new Error('Aiscript syntax error');
}
@@ -106,8 +106,9 @@ export async function authorizePlugin(plugin: Plugin) {
if (plugin.permissions == null || plugin.permissions.length === 0) return;
if (Object.hasOwn(store.s.pluginTokens, plugin.installId)) return;
- const token = await new Promise<string>(async (res, rej) => {
- const { dispose } = await os.popupAsyncWithDialog(import('@/components/MkTokenGenerateWindow.vue').then(x => x.default), {
+ const token = await new Promise<string>((res, rej) => {
+ let dispose: () => void;
+ os.popupAsyncWithDialog(import('@/components/MkTokenGenerateWindow.vue').then(x => x.default), {
title: i18n.ts.tokenRequested,
information: i18n.ts.pluginTokenRequestedDescription,
initialName: plugin.name,
@@ -123,7 +124,7 @@ export async function authorizePlugin(plugin: Plugin) {
res(token);
},
closed: () => dispose(),
- });
+ }).then(d => dispose = d.dispose, err => rej(err));
});
store.set('pluginTokens', {
diff --git a/packages/frontend/src/preferences/manager.ts b/packages/frontend/src/preferences/manager.ts
index 1a1ec2b345..58d8861cef 100644
--- a/packages/frontend/src/preferences/manager.ts
+++ b/packages/frontend/src/preferences/manager.ts
@@ -463,7 +463,7 @@ export class PreferencesManager extends EventEmitter<PreferencesManagerEvents> {
let mergedValue: ValueOf<K> | undefined = undefined; // null と区別したいため
try {
if (merge != null) mergedValue = merge(local, remote);
- } catch (err) {
+ } catch (_) {
// nop
}
const { canceled, result: choice } = await os.select({
diff --git a/packages/frontend/src/theme.ts b/packages/frontend/src/theme.ts
index e001bed8f3..a7012a7586 100644
--- a/packages/frontend/src/theme.ts
+++ b/packages/frontend/src/theme.ts
@@ -232,7 +232,7 @@ export function parseThemeCode(code: string): Theme {
try {
theme = JSON5.parse(code);
- } catch (err) {
+ } catch (_) {
throw new Error('Failed to parse theme json');
}
if (!validateTheme(theme)) {
diff --git a/packages/frontend/src/utility/admin-lookup.ts b/packages/frontend/src/utility/admin-lookup.ts
index 18eebaa8f8..f393fd4ae1 100644
--- a/packages/frontend/src/utility/admin-lookup.ts
+++ b/packages/frontend/src/utility/admin-lookup.ts
@@ -36,7 +36,7 @@ export async function lookupUser() {
notFound();
}
});
- idPromise.then(show).catch(err => {
+ idPromise.then(show).catch(_ => {
notFound();
});
}
diff --git a/packages/frontend/src/utility/check-word-mute.ts b/packages/frontend/src/utility/check-word-mute.ts
index 98fea1bced..eafc939c80 100644
--- a/packages/frontend/src/utility/check-word-mute.ts
+++ b/packages/frontend/src/utility/check-word-mute.ts
@@ -29,7 +29,7 @@ export function checkWordMute(note: Misskey.entities.Note, me: Misskey.entities.
try {
return new RegExp(regexp[1], regexp[2]).test(text);
- } catch (err) {
+ } catch (_) {
// This should never happen due to input sanitisation.
return false;
}
diff --git a/packages/frontend/src/utility/drive.ts b/packages/frontend/src/utility/drive.ts
index 64079d125a..4fe2042e78 100644
--- a/packages/frontend/src/utility/drive.ts
+++ b/packages/frontend/src/utility/drive.ts
@@ -180,8 +180,9 @@ export function chooseFileFromPcAndUpload(
export function chooseDriveFile(options: {
multiple?: boolean;
} = {}): Promise<Misskey.entities.DriveFile[]> {
- return new Promise(async resolve => {
- const { dispose } = await os.popupAsyncWithDialog(import('@/components/MkDriveFileSelectDialog.vue').then(x => x.default), {
+ return new Promise((resolve, rej) => {
+ let dispose: () => void;
+ os.popupAsyncWithDialog(import('@/components/MkDriveFileSelectDialog.vue').then(x => x.default), {
multiple: options.multiple ?? false,
}, {
done: files => {
@@ -190,7 +191,7 @@ export function chooseDriveFile(options: {
}
},
closed: () => dispose(),
- });
+ }).then((d) => dispose = d.dispose, rej);
});
}
@@ -301,14 +302,15 @@ export async function createCroppedImageDriveFileFromImageDriveFile(imageDriveFi
}
export async function selectDriveFolder(initialFolder: Misskey.entities.DriveFolder['id'] | null): Promise<(Misskey.entities.DriveFolder | null)[]> {
- return new Promise(async resolve => {
- const { dispose } = await os.popupAsyncWithDialog(import('@/components/MkDriveFolderSelectDialog.vue').then(x => x.default), {
+ return new Promise((resolve, reject) => {
+ let dispose: () => void;
+ os.popupAsyncWithDialog(import('@/components/MkDriveFolderSelectDialog.vue').then(x => x.default), {
initialFolder,
}, {
done: folders => {
resolve(folders);
},
closed: () => dispose(),
- });
+ }).then(d => dispose = d.dispose, reject);
});
}
diff --git a/packages/frontend/src/utility/file-drop.ts b/packages/frontend/src/utility/file-drop.ts
index 4259fe25e9..ffc024e8f3 100644
--- a/packages/frontend/src/utility/file-drop.ts
+++ b/packages/frontend/src/utility/file-drop.ts
@@ -75,20 +75,18 @@ export async function readDataTransferItems(itemList: DataTransferItemList): Pro
});
}
- function readDirectory(fileSystemDirectoryEntry: FileSystemDirectoryEntry): Promise<DroppedItem[]> {
- return new Promise(async (resolve) => {
- const allEntries = Array.of<FileSystemEntry>();
- const reader = fileSystemDirectoryEntry.createReader();
- while (true) {
- const entries = await new Promise<FileSystemEntry[]>((res, rej) => reader.readEntries(res, rej));
- if (entries.length === 0) {
- break;
- }
- allEntries.push(...entries);
+ async function readDirectory(fileSystemDirectoryEntry: FileSystemDirectoryEntry): Promise<DroppedItem[]> {
+ const allEntries = Array.of<FileSystemEntry>();
+ const reader = fileSystemDirectoryEntry.createReader();
+ while (true) {
+ const entries = await new Promise<FileSystemEntry[]>((res, rej) => reader.readEntries(res, rej));
+ if (entries.length === 0) {
+ break;
}
+ allEntries.push(...entries);
+ }
- resolve(await Promise.all(allEntries.map(readEntry)));
- });
+ return await Promise.all(allEntries.map(readEntry));
}
// 扱いにくいので配列に変換
diff --git a/packages/frontend/src/utility/get-drive-file-menu.ts b/packages/frontend/src/utility/get-drive-file-menu.ts
index 040cf8f976..53ca4389bf 100644
--- a/packages/frontend/src/utility/get-drive-file-menu.ts
+++ b/packages/frontend/src/utility/get-drive-file-menu.ts
@@ -89,7 +89,7 @@ async function deleteFile(file: Misskey.entities.DriveFile) {
}
export function getDriveFileMenu(file: Misskey.entities.DriveFile, folder?: Misskey.entities.DriveFolder | null): MenuItem[] {
- const isImage = file.type.startsWith('image/');
+ const _isImage = file.type.startsWith('image/');
const menuItems: MenuItem[] = [];
diff --git a/packages/frontend/src/utility/get-note-menu.ts b/packages/frontend/src/utility/get-note-menu.ts
index fc165ea898..78176970f1 100644
--- a/packages/frontend/src/utility/get-note-menu.ts
+++ b/packages/frontend/src/utility/get-note-menu.ts
@@ -262,7 +262,7 @@ export function getNoteMenu(props: {
os.apiWithDialog('clips/remove-note', { clipId: props.currentClip.id, noteId: appearNote.id });
}
- async function promote(): Promise<void> {
+ async function _promote(): Promise<void> {
const { canceled, result: days } = await os.inputNumber({
title: i18n.ts.numberOfDays,
});
diff --git a/packages/frontend/src/utility/image-frame-renderer/ImageFrameRenderer.ts b/packages/frontend/src/utility/image-frame-renderer/ImageFrameRenderer.ts
index 9e97728785..591a94b855 100644
--- a/packages/frontend/src/utility/image-frame-renderer/ImageFrameRenderer.ts
+++ b/packages/frontend/src/utility/image-frame-renderer/ImageFrameRenderer.ts
@@ -201,7 +201,7 @@ export class ImageFrameRenderer {
qrSize,
);
qrImageBitmap.close();
- } catch (err) {
+ } catch (_) {
// nop
}
}
diff --git a/packages/frontend/src/utility/paginator.ts b/packages/frontend/src/utility/paginator.ts
index 59ae1e431a..45054acfd0 100644
--- a/packages/frontend/src/utility/paginator.ts
+++ b/packages/frontend/src/utility/paginator.ts
@@ -213,7 +213,7 @@ export class Paginator<
} : {}),
};
- const apiRes = (await misskeyApi(this.endpoint, data).catch(err => {
+ const apiRes = (await misskeyApi(this.endpoint, data).catch(_ => {
this.error.value = true;
this.fetching.value = false;
return null;
@@ -273,7 +273,7 @@ export class Paginator<
}),
};
- const apiRes = (await misskeyApi<T[]>(this.endpoint, data).catch(err => {
+ const apiRes = (await misskeyApi<T[]>(this.endpoint, data).catch(_ => {
return null;
})) as T[] | null;
@@ -326,7 +326,7 @@ export class Paginator<
}),
};
- const apiRes = (await misskeyApi<T[]>(this.endpoint, data).catch(err => {
+ const apiRes = (await misskeyApi<T[]>(this.endpoint, data).catch(_ => {
return null;
})) as T[] | null;
diff --git a/packages/frontend/src/utility/sound.ts b/packages/frontend/src/utility/sound.ts
index 8e79841647..303244d126 100644
--- a/packages/frontend/src/utility/sound.ts
+++ b/packages/frontend/src/utility/sound.ts
@@ -111,7 +111,7 @@ export async function loadAudio(url: string, options?: { useCache?: boolean; })
try {
response = await window.fetch(url);
- } catch (err) {
+ } catch (_) {
return;
}
diff --git a/packages/frontend/src/utility/timeline-date-separate.ts b/packages/frontend/src/utility/timeline-date-separate.ts
index 33ddea048b..de71b8ce11 100644
--- a/packages/frontend/src/utility/timeline-date-separate.ts
+++ b/packages/frontend/src/utility/timeline-date-separate.ts
@@ -104,7 +104,7 @@ export function makeDateGroupedTimelineComputedRef<T extends { id: string; creat
for (let i = 0; i < items.value.length; i++) {
const item = items.value[i];
const date = new Date(item.createdAt);
- const nextDate = items.value[i + 1] ? new Date(items.value[i + 1].createdAt) : null;
+ const _nextDate = items.value[i + 1] ? new Date(items.value[i + 1].createdAt) : null;
if (tl.length === 0 || (
span === 'day' && tl[tl.length - 1].date.getTime() !== date.getTime()
diff --git a/packages/frontend/src/utility/tour.ts b/packages/frontend/src/utility/tour.ts
index c6bfa35a66..b14486e953 100644
--- a/packages/frontend/src/utility/tour.ts
+++ b/packages/frontend/src/utility/tour.ts
@@ -13,7 +13,7 @@ type TourStep = {
};
export function startTour(steps: TourStep[]) {
- return new Promise<void>(async (resolve) => {
+ return new Promise<void>((resolve) => {
const currentStepIndex = ref(0);
const titleRef = ref(steps[0].title);
const descriptionRef = ref(steps[0].description);
generated by cgit v1.2.3-freya (git 2.53.0.84.g453e7b744a) at 2026-04-25 17:29:58 +0000