diff options
author | RaindropsSys <contact@minteck.org> | 2023-07-11 23:29:27 +0200 |
---|---|---|
committer | RaindropsSys <contact@minteck.org> | 2023-07-11 23:29:27 +0200 |
commit | 6707568dd3ba87dcebddc57ed9b157bc1ef8cbc1 (patch) | |
tree | a6716dcc1595c290258930d941dd5dba41f2a264 | |
parent | 55af9b46a049ca5018be82155fde131589ae2e86 (diff) | |
download | signal.js-6707568dd3ba87dcebddc57ed9b157bc1ef8cbc1.tar.gz signal.js-6707568dd3ba87dcebddc57ed9b157bc1ef8cbc1.tar.bz2 signal.js-6707568dd3ba87dcebddc57ed9b157bc1ef8cbc1.zip |
Updated 8 files and added .idea/vcs.xml (automated)
-rw-r--r-- | .idea/vcs.xml | 6 | ||||
-rw-r--r-- | classes/CLIDispatcher.ts | 5 | ||||
-rw-r--r-- | classes/Group.ts | 24 | ||||
-rw-r--r-- | dist/classes/CLIDispatcher.d.ts | 2 | ||||
-rw-r--r-- | dist/classes/CLIDispatcher.js | 3 | ||||
-rw-r--r-- | dist/classes/CLIDispatcher.js.map | 2 | ||||
-rw-r--r-- | dist/classes/Group.d.ts | 2 | ||||
-rw-r--r-- | dist/classes/Group.js | 13 | ||||
-rw-r--r-- | dist/classes/Group.js.map | 2 |
9 files changed, 53 insertions, 6 deletions
diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..94a25f7 --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project version="4"> + <component name="VcsDirectoryMappings"> + <mapping directory="$PROJECT_DIR$" vcs="Git" /> + </component> +</project>
\ No newline at end of file diff --git a/classes/CLIDispatcher.ts b/classes/CLIDispatcher.ts index 4aecb76..4363423 100644 --- a/classes/CLIDispatcher.ts +++ b/classes/CLIDispatcher.ts @@ -3,7 +3,7 @@ import {randomUUID, UUID} from "crypto"; import {ICLIRequest} from "../types/ICLIRequest"; export class CLIDispatcher { - static dispatch(method: string, params: any, proc: ChildProcess): Promise<string> { + static dispatch(method: string, params: any, proc: ChildProcess): Promise<any> { return new Promise((res) => { let id: UUID = randomUUID(); let payload: ICLIRequest = { @@ -18,7 +18,8 @@ export class CLIDispatcher { let data = JSON.parse(raw.toString()); if (data.id === id) { - res(data.toString()); + console.log(data); + res(data); proc.stdout.removeListener("data", callback); } } diff --git a/classes/Group.ts b/classes/Group.ts index 7f1e958..2ae1867 100644 --- a/classes/Group.ts +++ b/classes/Group.ts @@ -1,5 +1,7 @@ import {Chat} from "./Chat"; import {Client} from "./Client"; +import {ChatMessageOptions} from "./ChatMessageOptions"; +import {CLIDispatcher} from "./CLIDispatcher"; export class Group extends Chat { public group: boolean = true; @@ -11,4 +13,26 @@ export class Group extends Chat { this.id = groupId; this.client = client; } + + async send(text: string, options?: ChatMessageOptions): Promise<void> { + let groupData = await CLIDispatcher.dispatch( + "listGroups", + { + group: [this.id], + recipient: [], + message: text + }, + this.client._process + ); + + await CLIDispatcher.dispatch( + "send", + { + groupId: this.id, + recipient: groupData['result'].filter(i => i.id === this.id)[0].members.map(i => i.number), + message: text + }, + this.client._process + ); + } }
\ No newline at end of file diff --git a/dist/classes/CLIDispatcher.d.ts b/dist/classes/CLIDispatcher.d.ts index 6058c7f..62cc284 100644 --- a/dist/classes/CLIDispatcher.d.ts +++ b/dist/classes/CLIDispatcher.d.ts @@ -1,5 +1,5 @@ /// <reference types="node" /> import { ChildProcess } from "child_process"; export declare class CLIDispatcher { - static dispatch(method: string, params: any, proc: ChildProcess): Promise<string>; + static dispatch(method: string, params: any, proc: ChildProcess): Promise<any>; } diff --git a/dist/classes/CLIDispatcher.js b/dist/classes/CLIDispatcher.js index f96ad96..4d39e2b 100644 --- a/dist/classes/CLIDispatcher.js +++ b/dist/classes/CLIDispatcher.js @@ -17,7 +17,8 @@ class CLIDispatcher { return; let data = JSON.parse(raw.toString()); if (data.id === id) { - res(data.toString()); + console.log(data); + res(data); proc.stdout.removeListener("data", callback); } }; diff --git a/dist/classes/CLIDispatcher.js.map b/dist/classes/CLIDispatcher.js.map index 5869d01..c72e4d7 100644 --- a/dist/classes/CLIDispatcher.js.map +++ b/dist/classes/CLIDispatcher.js.map @@ -1 +1 @@ -{"version":3,"file":"CLIDispatcher.js","sourceRoot":"","sources":["../../classes/CLIDispatcher.ts"],"names":[],"mappings":";;;AACA,mCAAwC;AAGxC,MAAa,aAAa;IACtB,MAAM,CAAC,QAAQ,CAAC,MAAc,EAAE,MAAW,EAAE,IAAkB;QAC3D,OAAO,IAAI,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;YACvB,IAAI,EAAE,GAAS,IAAA,mBAAU,GAAE,CAAC;YAC5B,IAAI,OAAO,GAAgB;gBACvB,OAAO,EAAE,KAAK;gBACd,MAAM;gBACN,MAAM;gBACN,EAAE;aACL,CAAA;YAED,IAAI,QAAQ,GAAkB,CAAC,GAAG,EAAQ,EAAE;gBACxC,IAAI,GAAG,CAAC,QAAQ,EAAE,CAAC,IAAI,EAAE,KAAK,EAAE;oBAAE,OAAO;gBACzC,IAAI,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,CAAC;gBAEtC,IAAI,IAAI,CAAC,EAAE,KAAK,EAAE,EAAE;oBAChB,GAAG,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC;oBACrB,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;iBAChD;YACL,CAAC,CAAA;YAED,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;YAC1C,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,GAAG,IAAI,CAAC,CAAC;QACrD,CAAC,CAAC,CAAC;IACP,CAAC;CACJ;AAzBD,sCAyBC"}
\ No newline at end of file +{"version":3,"file":"CLIDispatcher.js","sourceRoot":"","sources":["../../classes/CLIDispatcher.ts"],"names":[],"mappings":";;;AACA,mCAAwC;AAGxC,MAAa,aAAa;IACtB,MAAM,CAAC,QAAQ,CAAC,MAAc,EAAE,MAAW,EAAE,IAAkB;QAC3D,OAAO,IAAI,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;YACvB,IAAI,EAAE,GAAS,IAAA,mBAAU,GAAE,CAAC;YAC5B,IAAI,OAAO,GAAgB;gBACvB,OAAO,EAAE,KAAK;gBACd,MAAM;gBACN,MAAM;gBACN,EAAE;aACL,CAAA;YAED,IAAI,QAAQ,GAAkB,CAAC,GAAG,EAAQ,EAAE;gBACxC,IAAI,GAAG,CAAC,QAAQ,EAAE,CAAC,IAAI,EAAE,KAAK,EAAE;oBAAE,OAAO;gBACzC,IAAI,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,CAAC;gBAEtC,IAAI,IAAI,CAAC,EAAE,KAAK,EAAE,EAAE;oBAChB,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;oBAClB,GAAG,CAAC,IAAI,CAAC,CAAC;oBACV,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;iBAChD;YACL,CAAC,CAAA;YAED,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;YAC1C,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,GAAG,IAAI,CAAC,CAAC;QACrD,CAAC,CAAC,CAAC;IACP,CAAC;CACJ;AA1BD,sCA0BC"}
\ No newline at end of file diff --git a/dist/classes/Group.d.ts b/dist/classes/Group.d.ts index 4b03840..23110d5 100644 --- a/dist/classes/Group.d.ts +++ b/dist/classes/Group.d.ts @@ -1,8 +1,10 @@ import { Chat } from "./Chat"; import { Client } from "./Client"; +import { ChatMessageOptions } from "./ChatMessageOptions"; export declare class Group extends Chat { group: boolean; id: string; private client; constructor(groupId: string, client: Client); + send(text: string, options?: ChatMessageOptions): Promise<void>; } diff --git a/dist/classes/Group.js b/dist/classes/Group.js index d418106..aa0c95e 100644 --- a/dist/classes/Group.js +++ b/dist/classes/Group.js @@ -2,6 +2,7 @@ Object.defineProperty(exports, "__esModule", { value: true }); exports.Group = void 0; const Chat_1 = require("./Chat"); +const CLIDispatcher_1 = require("./CLIDispatcher"); class Group extends Chat_1.Chat { constructor(groupId, client) { super(); @@ -9,6 +10,18 @@ class Group extends Chat_1.Chat { this.id = groupId; this.client = client; } + async send(text, options) { + let groupData = await CLIDispatcher_1.CLIDispatcher.dispatch("listGroups", { + group: [this.id], + recipient: [], + message: text + }, this.client._process); + await CLIDispatcher_1.CLIDispatcher.dispatch("send", { + groupId: this.id, + recipient: groupData['result'].filter(i => i.id === this.id)[0].members.map(i => i.number), + message: text + }, this.client._process); + } } exports.Group = Group; //# sourceMappingURL=Group.js.map
\ No newline at end of file diff --git a/dist/classes/Group.js.map b/dist/classes/Group.js.map index df88a3b..3a0aef4 100644 --- a/dist/classes/Group.js.map +++ b/dist/classes/Group.js.map @@ -1 +1 @@ -{"version":3,"file":"Group.js","sourceRoot":"","sources":["../../classes/Group.ts"],"names":[],"mappings":";;;AAAA,iCAA4B;AAG5B,MAAa,KAAM,SAAQ,WAAI;IAK3B,YAAY,OAAe,EAAE,MAAc;QACvC,KAAK,EAAE,CAAC;QALL,UAAK,GAAY,IAAI,CAAC;QAMzB,IAAI,CAAC,EAAE,GAAG,OAAO,CAAC;QAClB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;IACzB,CAAC;CACJ;AAVD,sBAUC"}
\ No newline at end of file +{"version":3,"file":"Group.js","sourceRoot":"","sources":["../../classes/Group.ts"],"names":[],"mappings":";;;AAAA,iCAA4B;AAG5B,mDAA8C;AAE9C,MAAa,KAAM,SAAQ,WAAI;IAK3B,YAAY,OAAe,EAAE,MAAc;QACvC,KAAK,EAAE,CAAC;QALL,UAAK,GAAY,IAAI,CAAC;QAMzB,IAAI,CAAC,EAAE,GAAG,OAAO,CAAC;QAClB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;IACzB,CAAC;IAED,KAAK,CAAC,IAAI,CAAC,IAAY,EAAE,OAA4B;QACjD,IAAI,SAAS,GAAG,MAAM,6BAAa,CAAC,QAAQ,CACxC,YAAY,EACZ;YACI,KAAK,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC;YAChB,SAAS,EAAE,EAAE;YACb,OAAO,EAAE,IAAI;SAChB,EACD,IAAI,CAAC,MAAM,CAAC,QAAQ,CACvB,CAAC;QAEF,MAAM,6BAAa,CAAC,QAAQ,CACxB,MAAM,EACN;YACI,OAAO,EAAE,IAAI,CAAC,EAAE;YAChB,SAAS,EAAE,SAAS,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC;YAC1F,OAAO,EAAE,IAAI;SAChB,EACD,IAAI,CAAC,MAAM,CAAC,QAAQ,CACvB,CAAC;IACN,CAAC;CACJ;AAhCD,sBAgCC"}
\ No newline at end of file |