Browse Source

Small improvements.

painor 3 years ago
parent
commit
9b85dc2b6f

+ 1 - 1
gramjs/Version.ts

@@ -1 +1 @@
-export const version = "1.8.10";
+export const version = "1.8.11";

+ 12 - 44
gramjs/client/TelegramClient.ts

@@ -800,21 +800,6 @@ export class TelegramClient extends TelegramBaseClient {
         return updateMethods.on(this, event);
         return updateMethods.on(this, event);
     }
     }
 
 
-    /** @hidden */
-    addEventHandler(
-        callback: { (event: NewMessageEvent): void },
-        event: NewMessage
-    ): void;
-    /** @hidden */
-    addEventHandler(
-        callback: { (event: AlbumEvent): void },
-        event: Album
-    ): void;
-    /** @hidden */
-    addEventHandler(
-        callback: { (event: any): void },
-        event?: EventBuilder
-    ): void;
 
 
     /**
     /**
      * Registers a new event handler callback.<br/>
      * Registers a new event handler callback.<br/>
@@ -837,6 +822,18 @@ export class TelegramClient extends TelegramBaseClient {
      * client.addEventHandler(handler, new NewMessage({}));
      * client.addEventHandler(handler, new NewMessage({}));
      ```
      ```
      */
      */
+    addEventHandler(
+        callback: { (event: NewMessageEvent): void },
+        event: NewMessage
+    ): void;
+    addEventHandler(
+        callback: { (event: AlbumEvent): void },
+        event: Album
+    ): void;
+    addEventHandler(
+        callback: { (event: any): void },
+        event?: EventBuilder
+    ): void;
     addEventHandler(callback: { (event: any): void }, event?: EventBuilder) {
     addEventHandler(callback: { (event: any): void }, event?: EventBuilder) {
         return updateMethods.addEventHandler(this, callback, event);
         return updateMethods.addEventHandler(this, callback, event);
     }
     }
@@ -1028,36 +1025,7 @@ export class TelegramClient extends TelegramBaseClient {
      */
      */
 
 
     getEntity(entity: EntityLike): Promise<Entity>;
     getEntity(entity: EntityLike): Promise<Entity>;
-    /**
-     * Turns the given entity into a valid Telegram {@link Api.User}, {@link Api.Chat} or {@link Api.Channel}.<br/>
-     * You can also pass a list or iterable of entities, and they will be efficiently fetched from the network.
-     * @param entity - If a username is given, the username will be resolved making an API call every time.<br/>
-     * Resolving usernames is an expensive operation and will start hitting flood waits around 50 usernames in a short period of time.<br/>
-     * <br/>
-     * Similar limits apply to invite links, and you should use their ID instead.<br/>
-     * Using phone numbers (from people in your contact list), exact names, integer IDs or Peer rely on a getInputEntity first,<br/>
-     * which in turn needs the entity to be in cache, unless a InputPeer was passed.<br/>
-     * <br/>
-     * If the entity can't be found, ValueError will be raised.
-     * @return
-     * {@link Api.Chat},{@link Api.Chat} or {@link Api.Channel} corresponding to the input entity. A list will be returned if more than one was given.
-     * @example
-     * ```ts
-     * const me = await client.getEntity("me");
-     * console.log("My name is",utils.getDisplayName(me));
-     *
-     * const chat = await client.getInputEntity("username");
-     * for await (const message of client.iterMessages(chat){
-     *     console.log("Message text is",message.text);
-     * }
-     *
-     * // Note that you could have used the username directly, but it's
-     * // good to use getInputEntity if you will reuse it a lot.
-     * ```
-     */
-
     getEntity(entity: EntityLike[]): Promise<Entity[]>;
     getEntity(entity: EntityLike[]): Promise<Entity[]>;
-
     getEntity(entity: any) {
     getEntity(entity: any) {
         return userMethods.getEntity(this, entity);
         return userMethods.getEntity(this, entity);
     }
     }

+ 4 - 4
gramjs/client/auth.ts

@@ -244,8 +244,8 @@ export async function signInUserWithQrCode(
         while (1) {
         while (1) {
             const result = await client.invoke(
             const result = await client.invoke(
                 new Api.auth.ExportLoginToken({
                 new Api.auth.ExportLoginToken({
-                    apiId: Number(process.env.TELEGRAM_T_API_ID),
-                    apiHash: process.env.TELEGRAM_T_API_HASH,
+                    apiId: Number(apiCredentials.apiId),
+                    apiHash: apiCredentials.apiHash,
                     exceptIds: [],
                     exceptIds: [],
                 })
                 })
             );
             );
@@ -285,8 +285,8 @@ export async function signInUserWithQrCode(
     try {
     try {
         const result2 = await client.invoke(
         const result2 = await client.invoke(
             new Api.auth.ExportLoginToken({
             new Api.auth.ExportLoginToken({
-                apiId: Number(process.env.TELEGRAM_T_API_ID),
-                apiHash: process.env.TELEGRAM_T_API_HASH,
+                apiId: Number(apiCredentials.apiId),
+                apiHash: apiCredentials.apiHash,
                 exceptIds: [],
                 exceptIds: [],
             })
             })
         );
         );

+ 1 - 0
gramjs/index.ts

@@ -4,6 +4,7 @@ import * as tl from "./tl";
 export { TelegramClient } from "./client/TelegramClient";
 export { TelegramClient } from "./client/TelegramClient";
 export { Connection } from "./network";
 export { Connection } from "./network";
 export { version } from "./Version";
 export { version } from "./Version";
+export { Logger } from "./extensions/Logger";
 import * as utils from "./Utils";
 import * as utils from "./Utils";
 import * as errors from "./errors";
 import * as errors from "./errors";
 import * as sessions from "./sessions";
 import * as sessions from "./sessions";

+ 0 - 2
gramjs/tl/custom/senderGetter.ts

@@ -42,8 +42,6 @@ export class SenderGetter {
     }
     }
 
 
     async getSender() {
     async getSender() {
-        console.log("sender is", this._inputSender);
-        console.log("getInputSender is", this._inputSender);
         if (
         if (
             this._client &&
             this._client &&
             (!this._sender ||
             (!this._sender ||

+ 2 - 2
package-lock.json

@@ -1,12 +1,12 @@
 {
 {
   "name": "telegram",
   "name": "telegram",
-  "version": "1.8.10",
+  "version": "1.8.11",
   "lockfileVersion": 2,
   "lockfileVersion": 2,
   "requires": true,
   "requires": true,
   "packages": {
   "packages": {
     "": {
     "": {
       "name": "telegram",
       "name": "telegram",
-      "version": "1.8.10",
+      "version": "1.8.11",
       "license": "MIT",
       "license": "MIT",
       "dependencies": {
       "dependencies": {
         "@cryptography/aes": "^0.1.1",
         "@cryptography/aes": "^0.1.1",

+ 7 - 1
package.json

@@ -1,6 +1,6 @@
 {
 {
   "name": "telegram",
   "name": "telegram",
-  "version": "1.8.10",
+  "version": "1.8.11",
   "description": "NodeJS/Browser MTProto API Telegram client library,",
   "description": "NodeJS/Browser MTProto API Telegram client library,",
   "main": "index.js",
   "main": "index.js",
   "types": "index.d.ts",
   "types": "index.d.ts",
@@ -18,6 +18,12 @@
   "bugs": {
   "bugs": {
     "url": "https://github.com/gram-js/gramjs/issues"
     "url": "https://github.com/gram-js/gramjs/issues"
   },
   },
+  "keywords": [
+    "telegram",
+    "mtproto",
+    "userbot",
+    "api"
+  ],
   "homepage": "https://github.com/gram-js/gramjs#readme",
   "homepage": "https://github.com/gram-js/gramjs#readme",
   "devDependencies": {
   "devDependencies": {
     "@babel/core": "^7.12.13",
     "@babel/core": "^7.12.13",