From d7b99ff4469533a020e660c0d4c26547ac74aec0 Mon Sep 17 00:00:00 2001 From: piloking <141794311+piloking@users.noreply.github.com> Date: Sun, 3 Nov 2024 23:46:19 +0900 Subject: [PATCH] fix jsr error,fmt --- packages/linejs/client/clients/base-client.ts | 10 +-- .../client/clients/internal/liff-client.ts | 6 +- .../client/clients/internal/square-client.ts | 10 +-- .../client/clients/internal/talk-client.ts | 25 ++++---- .../linejs/client/clients/timeline/index.ts | 21 ++++--- packages/linejs/client/entities/device.ts | 2 +- packages/linejs/client/entities/talk-class.ts | 57 +++++++++-------- packages/linejs/client/entities/timeline.ts | 8 +-- .../linejs/client/libs/thrift/declares.ts | 61 +++++++++++-------- packages/linejs/client/libs/thrift/parser.ts | 2 +- packages/linejs/client/libs/thrift/write.ts | 2 +- 11 files changed, 109 insertions(+), 95 deletions(-) diff --git a/packages/linejs/client/clients/base-client.ts b/packages/linejs/client/clients/base-client.ts index 50c39c2..799692d 100644 --- 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 { 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 { /** * @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 index 2e420f2..b419216 100644 --- 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 index f361a36..7df0b2d 100644 --- 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 index 994dcff..f4bca5d 100644 --- 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 index c993cf2..08493e1 100644 --- 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,7 +235,7 @@ 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 }, @@ -243,13 +243,13 @@ export class Timeline extends SettingsClient { } public async sharePost(options: { - postId: string, - chatMid: string, - homeId: string, + postId: string; + chatMid: string; + homeId: string; }): Promise { 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 index 4eaafb9..d4f6242 100644 --- 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 index 70b620f..85ecd31 100644 --- 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 { + }): Promise { (options as LooseType).homeId = this.mid; return this.client.createPost(options as LooseType); } public deletePost(options: { postId: string; - }): Promise { + }): Promise { (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 { + public listPost( + options: { + homeId?: string; + postId?: string; + updatedTime?: number; + sourceType?: string; + } = {}, + ): Promise { (options as LooseType).homeId = this.mid; return this.client.listPost(options as LooseType); } public getPost(options: { postId: string; - }) { + }): Promise { (options as LooseType).homeId = this.mid; return this.client.getPost(options as LooseType); } public sharePost(options: { postId: string; chatMid: string; - }) { + }): Promise { (options as LooseType).homeId = this.mid; return this.client.sharePost(options as LooseType); } @@ -233,14 +236,14 @@ export class User extends TypedEventEmitter { 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 { if (typeof options === "string") { return this.send({ text: options }); @@ -390,14 +393,14 @@ export class Group extends TypedEventEmitter { 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 { 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 index 056a814..5f256dd 100644 --- 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 = { - code: number, - message: string, - result: T, -} \ No newline at end of file + code: number; + message: string; + result: T; +}; diff --git a/packages/linejs/client/libs/thrift/declares.ts b/packages/linejs/client/libs/thrift/declares.ts index 982cd98..deab04a 100644 --- 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]?] | - [14, number, [number, Array]?] | - [15, number, [number, Array]?] + | [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]?] + | [14, number, [number, Array]?] + | [15, number, [number, Array]?]; 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 | Record]?] | - [14, number, [number, Array | Array]?] | - [15, number, [number, Array | 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 + | Record + ), + ]?, + ] + | [14, number, [number, Array | Array]?] + | [15, number, [number, Array | Array]?] +>; 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 index fe11aab..6f233fa 100644 --- a/packages/linejs/client/libs/thrift/parser.ts +++ b/packages/linejs/client/libs/thrift/parser.ts @@ -33,7 +33,7 @@ const EPYT: Record = { }; function isStruct(obj: LooseType) { - return obj && Array.isArray(obj) + return obj && Array.isArray(obj); } export default class ThriftRenameParser { diff --git a/packages/linejs/client/libs/thrift/write.ts b/packages/linejs/client/libs/thrift/write.ts index 01f0110..555f2ae 100644 --- a/packages/linejs/client/libs/thrift/write.ts +++ b/packages/linejs/client/libs/thrift/write.ts @@ -92,7 +92,7 @@ function writeValue( case Thrift.Type.I64: if (typeof val === "bigint") { - val = new Int64(val.toString(16)) + val = new Int64(val.toString(16)); } output.writeFieldBegin("", Thrift.Type.I64, fid); output.writeI64(val);