소스 검색

Search for remote URLs before local ones.

painor 3 년 전
부모
커밋
42edc34e88
6개의 변경된 파일21개의 추가작업 그리고 13개의 파일을 삭제
  1. 1 1
      gramjs/Version.ts
  2. 12 6
      gramjs/client/uploads.ts
  3. 2 2
      gramjs/tl/custom/forward.ts
  4. 2 0
      gramjs/tl/custom/senderGetter.ts
  5. 2 2
      package-lock.json
  6. 2 2
      package.json

+ 1 - 1
gramjs/Version.ts

@@ -1 +1 @@
-export const version = "1.8.8";
+export const version = "1.8.9";

+ 12 - 6
gramjs/client/uploads.ts

@@ -233,6 +233,7 @@ interface FileToMediaInterface {
     asImage?: boolean;
     workers?: number;
 }
+
 /** @hidden */
 async function _fileToMedia(
     client: TelegramClient,
@@ -259,6 +260,7 @@ async function _fileToMedia(
         return { fileHandle: undefined, media: undefined, image: undefined };
     }
     const isImage = utils.isImage(file);
+    console.log("as image?", isImage);
     if (asImage == undefined) {
         asImage = isImage && !forceDocument;
     }
@@ -296,6 +298,15 @@ async function _fileToMedia(
 
     if (file instanceof Api.InputFile || file instanceof Api.InputFileBig) {
         fileHandle = file;
+    } else if (
+        typeof file == "string" &&
+        (file.startsWith("https://") || file.startsWith("http://"))
+    ) {
+        if (asImage) {
+            media = new Api.InputMediaPhotoExternal({ url: file });
+        } else {
+            media = new Api.InputMediaPhotoExternal({ url: file });
+        }
     } else if (!(typeof file == "string") || (await fs.lstat(file)).isFile()) {
         if (typeof file == "string") {
             createdFile = new CustomFile(
@@ -327,12 +338,6 @@ async function _fileToMedia(
             onProgress: progressCallback,
             workers: workers,
         });
-    } else if (file.startsWith("https://") || file.startsWith("http://")) {
-        if (asImage) {
-            media = new Api.InputMediaPhotoExternal({ url: file });
-        } else {
-            media = new Api.InputMediaPhotoExternal({ url: file });
-        }
     } else {
         throw new Error(`"Not a valid path nor a url ${file}`);
     }
@@ -410,6 +415,7 @@ async function _fileToMedia(
         image: asImage,
     };
 }
+
 /** @hidden */
 export async function sendFile(
     client: TelegramClient,

+ 2 - 2
gramjs/tl/custom/forward.ts

@@ -8,7 +8,7 @@ import { _getEntityPair, getPeerId } from "../../Utils";
 import { inspect } from "util";
 import { Mixin } from "ts-mixer";
 
-export class Forward extends Mixin(SenderGetter, ChatGetter){
+export class Forward extends Mixin(SenderGetter, ChatGetter) {
     private originalFwd: Api.MessageFwdHeader;
     [inspect.custom]() {
         return betterConsoleLog(this);
@@ -21,7 +21,7 @@ export class Forward extends Mixin(SenderGetter, ChatGetter){
     ) {
         super({});
         // contains info for the original header sent by telegram.
-       this.originalFwd = original;
+        this.originalFwd = original;
 
         let senderId = undefined;
         let sender = undefined;

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

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

+ 2 - 2
package-lock.json

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

+ 2 - 2
package.json

@@ -1,7 +1,7 @@
 {
   "name": "telegram",
-  "version": "1.8.8",
-  "description": "NodeJS MTProto API Telegram client library,",
+  "version": "1.8.9",
+  "description": "NodeJS/Browser MTProto API Telegram client library,",
   "main": "index.js",
   "types": "index.d.ts",
   "scripts": {