refactor(client/getMe) return type based on args (#661)

gram-js · Apr 12, 2024 · 4690d50 · 4690d50
1 parent f8710df
commit 4690d50
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/gramjs/client/TelegramClient.ts b/gramjs/client/TelegramClient.ts
@@ -1226,6 +1226,8 @@ export class TelegramClient extends TelegramBaseClient {
      * console.log("My username is",me.username);
      * ```
      */
+    getMe(inputPeer: true): Promise<Api.InputPeerUser>;
+    getMe(inputPeer?: false): Promise<Api.User>;
     getMe(inputPeer = false) {
         return userMethods.getMe(this, inputPeer);
     }

diff --git a/gramjs/client/users.ts b/gramjs/client/users.ts
@@ -122,12 +122,12 @@ export async function invoke<R extends Api.AnyRequest>(
 }
 
 /** @hidden */
-export async function getMe(
-    client: TelegramClient,
-    inputPeer = false
-): Promise<Api.InputPeerUser | Api.User> {
+export async function getMe<
+    T extends boolean,
+    R = T extends true ? Api.InputPeerUser : Api.User
+>(client: TelegramClient, inputPeer: T): Promise<R> {
     if (inputPeer && client._selfInputPeer) {
-        return client._selfInputPeer;
+        return client._selfInputPeer as R;
     }
     const me = (
         await client.invoke(
@@ -142,7 +142,7 @@ export async function getMe(
             false
         ) as Api.InputPeerUser;
     }
-    return inputPeer ? client._selfInputPeer : me;
+    return inputPeer ? (client._selfInputPeer as R) : (me as R);
 }
 
 /** @hidden */

diff --git a/gramjs/tl/custom/messageButton.ts b/gramjs/tl/custom/messageButton.ts
@@ -153,7 +153,7 @@ export class MessageButton {
                 );
             }
             if (sharePhone == true || typeof sharePhone == "string") {
-                const me = (await this._client.getMe()) as Api.User;
+                const me = await this._client.getMe();
                 sharePhone = new Api.InputMediaContact({
                     phoneNumber:
                         (sharePhone == true ? me.phone : sharePhone) || "",