fix jsr error,fmt

evex-dev · Nov 3, 2024 · d7b99ff · d7b99ff
1 parent 4daffa7
commit d7b99ff
Show file tree

Hide file tree

Showing 11 changed files with 109 additions and 95 deletions.
diff --git a/packages/linejs/client/clients/base-client.ts b/packages/linejs/client/clients/base-client.ts
@@ -597,15 +597,15 @@ export class BaseClient extends TypedEventEmitter<ClientEvents> {
 						const chat =
 							message.toType === LINETypes.MIDType._USER
 								? () => {
-									return this.getContact({ mid: sendIn });
-								}
+										return this.getContact({ mid: sendIn });
+									}
 								: undefined;
 
 						const group =
 							message.toType !== LINETypes.MIDType._USER
 								? async () => {
-									return (await this.getChats({ mids: [sendIn] })).chats[0];
-								}
+										return (await this.getChats({ mids: [sendIn] })).chats[0];
+									}
 								: (undefined as LooseType);
 
 						const getContact = () => {
@@ -1241,7 +1241,7 @@ export class BaseClient extends TypedEventEmitter<ClientEvents> {
 	/**
 	 * @description Will override.
 	 */
-	public decodeE2EEKeyV1(_data: LooseType, _secret: Buffer): LooseType { }
+	public decodeE2EEKeyV1(_data: LooseType, _secret: Buffer): LooseType {}
 
 	/**
 	 * @description Will override.

diff --git a/packages/linejs/client/clients/internal/liff-client.ts b/packages/linejs/client/clients/internal/liff-client.ts
@@ -218,9 +218,9 @@ export class LiffClient extends BaseClient {
 			const consentResponse =
 				"DOMParser" in window
 					? new (window as LooseType).DOMParser().parseFromString(
-						text,
-						"text/html",
-					)
+							text,
+							"text/html",
+						)
 					: new (await import("jsdom"))(text).dom.window.document;
 			const channelId =
 				consentResponse

diff --git a/packages/linejs/client/clients/internal/square-client.ts b/packages/linejs/client/clients/internal/square-client.ts
@@ -1308,9 +1308,9 @@ export class SquareClient extends LiffClient {
 			[
 				[11, 2, squareMemberMid],
 				[8, 3, reportType],
-				otherReason && [11, 4, otherReason] || null,
-				squareChatMid && [11, 5, squareChatMid] || null,
-				threadMid && [11, 6, threadMid] || null,
+				(otherReason && [11, 4, otherReason]) || null,
+				(squareChatMid && [11, 5, squareChatMid]) || null,
+				(threadMid && [11, 6, threadMid]) || null,
 			],
 			"reportSquareMessage",
 			this.SquareService_PROTOCOL_TYPE,
@@ -1332,7 +1332,7 @@ export class SquareClient extends LiffClient {
 			[
 				[11, 2, squareChatMid],
 				[11, 4, messageId],
-				[11, 5, squareThreadMid]
+				[11, 5, squareThreadMid],
 			],
 			"destroyMessage",
 			this.SquareService_PROTOCOL_TYPE,
@@ -1353,7 +1353,7 @@ export class SquareClient extends LiffClient {
 			[
 				[11, 2, squareChatMid],
 				[14, 4, [11, messageIds]],
-				[11, 5, squareThreadMid]
+				[11, 5, squareThreadMid],
 			],
 			"destroyMessage",
 			this.SquareService_PROTOCOL_TYPE,

diff --git a/packages/linejs/client/clients/internal/talk-client.ts b/packages/linejs/client/clients/internal/talk-client.ts
@@ -130,7 +130,7 @@ export class TalkClient extends ChannelClient {
 				[4, 3, location.latitude || 0],
 				[4, 4, location.longitude || 0],
 				[11, 6, location.categoryId || "PC0"],
-				[8, 7, location.provider as number || 2],
+				[8, 7, (location.provider as number) || 2],
 			];
 			message.push([12, 11, locationObj]);
 		}
@@ -208,7 +208,6 @@ export class TalkClient extends ChannelClient {
 		};
 		return this.direct_request(
 			[
-
 				[
 					12,
 					1,
@@ -346,7 +345,7 @@ export class TalkClient extends ChannelClient {
 			receivedOnly: false,
 			...options,
 		};
-		const id64 = (typeof id === "string" ? BigInt(id) : id)
+		const id64 = typeof id === "string" ? BigInt(id) : id;
 		return (
 			await this.direct_request(
 				[
@@ -800,20 +799,20 @@ export class TalkClient extends ChannelClient {
 						chatSet.picturePath ? [11, 7, chatSet.picturePath] : null,
 						chatSet.extra?.groupExtra
 							? [
-								12,
-								8,
-								[
+									12,
+									8,
 									[
-										12,
-										1,
 										[
-											[2, 2, chatSet.extra.groupExtra.preventedJoinByTicket],
-											[2, 6, chatSet.extra.groupExtra.addFriendDisabled],
-											[2, 7, chatSet.extra.groupExtra.ticketDisabled],
+											12,
+											1,
+											[
+												[2, 2, chatSet.extra.groupExtra.preventedJoinByTicket],
+												[2, 6, chatSet.extra.groupExtra.addFriendDisabled],
+												[2, 7, chatSet.extra.groupExtra.ticketDisabled],
+											],
 										],
 									],
-								],
-							]
+								]
 							: null,
 					],
 				],

diff --git a/packages/linejs/client/clients/timeline/index.ts b/packages/linejs/client/clients/timeline/index.ts
@@ -226,7 +226,7 @@ export class Timeline extends SettingsClient {
 			homeId,
 			sourceType,
 			likeLimit: "0",
-			commentLimit: "0"
+			commentLimit: "0",
 		};
 		if (postId) {
 			data.postId = postId;
@@ -235,21 +235,21 @@ export class Timeline extends SettingsClient {
 			data.updatedTime = updatedTime.toString();
 		}
 		const params = new URLSearchParams(data);
-		console.log(params.toString())
+		console.log(params.toString());
 		return this.customFetch(
 			`https://${this.endpoint}/${homeId[0] == "s" ? "sn" : "mh"}/api/v57/post/list.json?${params}`,
 			{ headers },
 		).then((r) => r.json());
 	}
 
 	public async sharePost(options: {
-		postId: string,
-		chatMid: string,
-		homeId: string,
+		postId: string;
+		chatMid: string;
+		homeId: string;
 	}): Promise<TimelineResponse> {
 		const { chatMid, postId, homeId } = {
-			...options
-		}
+			...options,
+		};
 		await this.initTimeline();
 		const headers = {
 			...this.timelineHeaders,
@@ -262,9 +262,10 @@ export class Timeline extends SettingsClient {
 				method: "POST",
 				headers,
 				body: JSON.stringify({
-					"postId": postId,
-					"receiveMids": [chatMid],
+					postId: postId,
+					receiveMids: [chatMid],
 				}),
-			}).then((r) => r.json());
+			},
+		).then((r) => r.json());
 	}
 }
diff --git a/packages/linejs/client/entities/device.ts b/packages/linejs/client/entities/device.ts
@@ -1,7 +1,7 @@
 export type Device =
 	| "DESKTOPWIN"
 	| "DESKTOPMAC"
-//	| "CHROMEOS"
+	//	| "CHROMEOS"
 	| "ANDROID"
 	| "IOS"
 	| "IOSIPAD"

diff --git a/packages/linejs/client/entities/talk-class.ts b/packages/linejs/client/entities/talk-class.ts
@@ -10,6 +10,7 @@ import type { LooseType } from "./common.ts";
 import type { Buffer } from "node:buffer";
 import { TypedEventEmitter } from "../libs/typed-event-emitter/index.ts";
 import { TalkMessage, Message } from "./message-class.ts";
+import type { TimelineResponse } from "./timeline.ts";
 
 type GroupEvents = {
 	message: (message: TalkMessage) => void;
@@ -71,7 +72,7 @@ export class Note {
 	constructor(
 		public mid: string,
 		private client: Client,
-	) { }
+	) {}
 
 	public createPost(options: {
 		text?: string;
@@ -90,37 +91,39 @@ export class Note {
 		mediaObjectIds?: string[];
 		mediaObjectTypes?: string[];
 		sourceType?: string;
-	}): Promise<LooseType> {
+	}): Promise<TimelineResponse> {
 		(options as LooseType).homeId = this.mid;
 		return this.client.createPost(options as LooseType);
 	}
 	public deletePost(options: {
 		postId: string;
-	}): Promise<LooseType> {
+	}): Promise<TimelineResponse> {
 		(options as LooseType).homeId = this.mid;
 		return this.client.deletePost(options as LooseType);
 	}
 
-	public listPost(options: {
-		homeId?: string;
-		postId?: string;
-		updatedTime?: number;
-		sourceType?: string;
-	} = {}): Promise<LooseType> {
+	public listPost(
+		options: {
+			homeId?: string;
+			postId?: string;
+			updatedTime?: number;
+			sourceType?: string;
+		} = {},
+	): Promise<TimelineResponse> {
 		(options as LooseType).homeId = this.mid;
 		return this.client.listPost(options as LooseType);
 	}
 
 	public getPost(options: {
 		postId: string;
-	}) {
+	}): Promise<TimelineResponse> {
 		(options as LooseType).homeId = this.mid;
 		return this.client.getPost(options as LooseType);
 	}
 	public sharePost(options: {
 		postId: string;
 		chatMid: string;
-	}) {
+	}): Promise<TimelineResponse> {
 		(options as LooseType).homeId = this.mid;
 		return this.client.sharePost(options as LooseType);
 	}
@@ -233,14 +236,14 @@ export class User extends TypedEventEmitter<UserEvents> {
 		options:
 			| string
 			| {
-				text?: string;
-				contentType?: number;
-				contentMetadata?: LooseType;
-				relatedMessageId?: string;
-				location?: LINETypes.Location;
-				chunk?: string[] | Buffer[];
-				e2ee?: boolean;
-			},
+					text?: string;
+					contentType?: number;
+					contentMetadata?: LooseType;
+					relatedMessageId?: string;
+					location?: LINETypes.Location;
+					chunk?: string[] | Buffer[];
+					e2ee?: boolean;
+			  },
 	): Promise<LINETypes.Message> {
 		if (typeof options === "string") {
 			return this.send({ text: options });
@@ -390,14 +393,14 @@ export class Group extends TypedEventEmitter<GroupEvents> {
 		options:
 			| string
 			| {
-				text?: string;
-				contentType?: number;
-				contentMetadata?: LooseType;
-				relatedMessageId?: string;
-				location?: LINETypes.Location;
-				chunk?: string[] | Buffer[];
-				e2ee?: boolean;
-			},
+					text?: string;
+					contentType?: number;
+					contentMetadata?: LooseType;
+					relatedMessageId?: string;
+					location?: LINETypes.Location;
+					chunk?: string[] | Buffer[];
+					e2ee?: boolean;
+			  },
 	): Promise<LINETypes.Message> {
 		if (typeof options === "string") {
 			return this.send({ text: options });

diff --git a/packages/linejs/client/entities/timeline.ts b/packages/linejs/client/entities/timeline.ts
@@ -1,6 +1,6 @@
 // deno-lint-ignore no-explicit-any
 export type TimelineResponse<T = any> = {
-    code: number,
-    message: string,
-    result: T,
-}
+	code: number;
+	message: string;
+	result: T;
+};
diff --git a/packages/linejs/client/libs/thrift/declares.ts b/packages/linejs/client/libs/thrift/declares.ts
@@ -43,33 +43,44 @@ export type NestedArray = Array<
 >;
 */
 export type TypedTValue =
-	[2, number, 0 | 1 | boolean | undefined] |
-	[3, number, number?] |
-	[4, number, number?] |
-	[6, number, number?] |
-	[8, number, number?] |
-	[10, number, number | bigint | undefined] |
-	[11, number, string | Buffer | undefined] |
-	[12, number, NestedArray?] |
-	[13, number, [number, Record<string | number, LooseType>]?] |
-	[14, number, [number, Array<LooseType>]?] |
-	[15, number, [number, Array<LooseType>]?]
+	| [2, number, 0 | 1 | boolean | undefined]
+	| [3, number, number?]
+	| [4, number, number?]
+	| [6, number, number?]
+	| [8, number, number?]
+	| [10, number, number | bigint | undefined]
+	| [11, number, string | Buffer | undefined]
+	| [12, number, NestedArray?]
+	| [13, number, [number, Record<string | number, LooseType>]?]
+	| [14, number, [number, Array<LooseType>]?]
+	| [15, number, [number, Array<LooseType>]?];
 
 export type NestedArray = Array<
-	null |
-	undefined |
-	[2, number, 0 | 1 | boolean | undefined] |
-	[3, number, number?] |
-	[4, number, number?] |
-	[6, number, number?] |
-	[8, number, number?] |
-	[10, number, number | bigint | undefined] |
-	[11, number, string | Buffer | undefined] |
-	[12, number, NestedArray?] |
-	[13, number, [number, number, Record<string | number, NestedArray> | Record<string | number, LooseType>]?] |
-	[14, number, [number, Array<NestedArray> | Array<LooseType>]?] |
-	[15, number, [number, Array<NestedArray> | Array<LooseType>]?]
->
+	| null
+	| undefined
+	| [2, number, 0 | 1 | boolean | undefined]
+	| [3, number, number?]
+	| [4, number, number?]
+	| [6, number, number?]
+	| [8, number, number?]
+	| [10, number, number | bigint | undefined]
+	| [11, number, string | Buffer | undefined]
+	| [12, number, NestedArray?]
+	| [
+			13,
+			number,
+			[
+				number,
+				number,
+				(
+					| Record<string | number, NestedArray>
+					| Record<string | number, LooseType>
+				),
+			]?,
+	  ]
+	| [14, number, [number, Array<NestedArray> | Array<LooseType>]?]
+	| [15, number, [number, Array<NestedArray> | Array<LooseType>]?]
+>;
 export interface ParsedThrift {
 	value: LooseType;
 	e: LooseType;

diff --git a/packages/linejs/client/libs/thrift/parser.ts b/packages/linejs/client/libs/thrift/parser.ts
@@ -33,7 +33,7 @@ const EPYT: Record<number, string> = {
 };
 
 function isStruct(obj: LooseType) {
-	return obj && Array.isArray(obj)
+	return obj && Array.isArray(obj);
 }
 
 export default class ThriftRenameParser {