lint fixes

misskey-dev · Sep 9, 2024 · 21e23c0 · 21e23c0
1 parent 2ea0b57
commit 21e23c0
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 10 deletions.
diff --git a/packages/frontend-shared/eslint.config.js b/packages/frontend-shared/eslint.config.js
@@ -5,6 +5,7 @@ import pluginVue from 'eslint-plugin-vue';
 import pluginMisskey from '@misskey-dev/eslint-plugin';
 import sharedConfig from '../shared/eslint.config.js';
 
+// eslint-disable-next-line import/no-default-export
 export default [
 	...sharedConfig,
 	{

diff --git a/packages/frontend-shared/js/embed-page.ts b/packages/frontend-shared/js/embed-page.ts
@@ -80,7 +80,7 @@ export function parseEmbedParams(searchParams: URLSearchParams | string): Parsed
 	}
 
 	function convertColorMode(value: string | null): 'light' | 'dark' | undefined {
-		if (value != null && [ 'light', 'dark' ].includes(value)) {
+		if (value != null && ['light', 'dark'].includes(value)) {
 			return value as 'light' | 'dark';
 		}
 		return undefined;

diff --git a/packages/frontend-shared/js/i18n.ts b/packages/frontend-shared/js/i18n.ts
@@ -4,6 +4,7 @@
  */
 import type { ILocale, ParameterizedString } from '../../../locales/index.js';
 
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
 type TODO = any;
 
 type FlattenKeys<T extends ILocale, TPrediction> = keyof {

diff --git a/packages/frontend-shared/js/media-proxy.ts b/packages/frontend-shared/js/media-proxy.ts
@@ -3,8 +3,8 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-import { query } from './url.js';
 import * as Misskey from 'misskey-js';
+import { query } from './url.js';
 
 export class MediaProxy {
 	private serverMetadata: Misskey.entities.MetaDetailed;
@@ -17,17 +17,18 @@ export class MediaProxy {
 
 	public getProxiedImageUrl(imageUrl: string, type?: 'preview' | 'emoji' | 'avatar', mustOrigin = false, noFallback = false): string {
 		const localProxy = `${this.url}/proxy`;
+		let _imageUrl = imageUrl;
 
 		if (imageUrl.startsWith(this.serverMetadata.mediaProxy + '/') || imageUrl.startsWith('/proxy/') || imageUrl.startsWith(localProxy + '/')) {
 			// もう既にproxyっぽそうだったらurlを取り出す
-			imageUrl = (new URL(imageUrl)).searchParams.get('url') ?? imageUrl;
+			_imageUrl = (new URL(imageUrl)).searchParams.get('url') ?? imageUrl;
 		}
 
 		return `${mustOrigin ? localProxy : this.serverMetadata.mediaProxy}/${
 			type === 'preview' ? 'preview.webp'
 			: 'image.webp'
 		}?${query({
-			url: imageUrl,
+			url: _imageUrl,
 			...(!noFallback ? { 'fallback': '1' } : {}),
 			...(type ? { [type]: '1' } : {}),
 			...(mustOrigin ? { origin: '1' } : {}),

diff --git a/packages/frontend-shared/js/url.ts b/packages/frontend-shared/js/url.ts
@@ -8,18 +8,18 @@
  * 2. プロパティがundefinedの時はクエリを付けない
  * （new URLSearchParams(obj)ではそこまで丁寧なことをしてくれない）
  */
-export function query(obj: Record<string, any>): string {
+export function query(obj: Record<string, string | number | boolean>): string {
 	const params = Object.entries(obj)
-		.filter(([, v]) => Array.isArray(v) ? v.length : v !== undefined)
-		.reduce((a, [k, v]) => (a[k] = v, a), {} as Record<string, any>);
+		.filter(([, v]) => Array.isArray(v) ? v.length : v !== undefined) // eslint-disable-line @typescript-eslint/no-unnecessary-condition
+		.reduce<Record<string, string | number | boolean>>((a, [k, v]) => (a[k] = v, a), {});
 
 	return Object.entries(params)
 		.map((p) => `${p[0]}=${encodeURIComponent(p[1])}`)
 		.join('&');
 }
 
-export function appendQuery(url: string, query: string): string {
-	return `${url}${/\?/.test(url) ? url.endsWith('?') ? '' : '&' : '?'}${query}`;
+export function appendQuery(url: string, queryString: string): string {
+	return `${url}${/\?/.test(url) ? url.endsWith('?') ? '' : '&' : '?'}${queryString}`;
 }
 
 export function extractDomain(url: string) {

diff --git a/packages/frontend-shared/js/use-document-visibility.ts b/packages/frontend-shared/js/use-document-visibility.ts
@@ -3,7 +3,8 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-import { onMounted, onUnmounted, ref, Ref } from 'vue';
+import { onMounted, onUnmounted, ref } from 'vue';
+import type { Ref } from 'vue';
 
 export function useDocumentVisibility(): Ref<DocumentVisibilityState> {
 	const visibility = ref(document.visibilityState);