@adriangalilea/utils 2.28.0 → 2.29.0

package/dist/bot/groups.d.ts

@@ -25,12 +25,16 @@ export type ChatIdCtx = {
 };
 /** Minimum ctx shape `isGroupAdmin` reads. `bot` is the running gramio Bot — typed
  *  `unknown` so MenuCtx and every real ctx assign without a cast; its
- *  `api.getChatMember` is asserted at call time. */
+ *  `api.getChatAdministrators` is asserted at call time. `senderChat` is the
+ *  anonymous-admin identity on message ctxs (callback ctxs have none). */
 export type GroupAdminCtx = ChatIdCtx & {
     bot: unknown;
     from?: {
         id?: number;
     };
+    senderChat?: {
+        id?: number;
+    };
 };
 /** The ctx's chat id, whatever the event spelling. `undefined` only when the event has
  *  no chat at all (inline queries, some service events). */
@@ -40,10 +44,12 @@ export declare const isGroupChat: (ctx: ChatTypeCtx) => boolean;
 /** True for a 1:1 private chat. */
 export declare const isPrivateChat: (ctx: ChatTypeCtx) => boolean;
 /**
- * Whether a user is a creator/administrator of a group, per `getChatMember`. Chat and
- * user default to the ctx's own ({@link chatIdOf}, `ctx.from.id` — gramio's own
- * parameter-defaulting idiom); pass `chatId` / `userId` for cross-chat checks. Missing
- * ids (an actor-less service event) or an API rejection answer `false`.
+ * Whether a user is a creator/administrator of a group, per `getChatAdministrators`
+ * membership. Chat and user default to the ctx's own ({@link chatIdOf}, `ctx.from.id` —
+ * gramio's own parameter-defaulting idiom); pass `chatId` / `userId` for cross-chat
+ * checks. An anonymous admin's own message (`senderChat` = the chat itself) answers
+ * `true` without an API call — unless an explicit `userId` asks about someone else.
+ * Missing ids (an actor-less service event) or an API rejection answer `false`.
  */
 export declare function isGroupAdmin(ctx: GroupAdminCtx, opts?: {
     chatId?: number;

package/dist/bot/groups.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"groups.d.ts","sourceRoot":"","sources":["../../src/bot/groups.ts"],"names":[],"mappings":"AAgDA;8DAC8D;AAC9D,MAAM,MAAM,WAAW,GAAG;IACzB,IAAI,CAAC,EAAE;QAAE,IAAI,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IACzB,OAAO,CAAC,EAAE;QAAE,IAAI,CAAC,EAAE;YAAE,IAAI,CAAC,EAAE,MAAM,CAAA;SAAE,CAAA;KAAE,CAAC;CACvC,CAAC;AAEF;sCACsC;AACtC,MAAM,MAAM,SAAS,GAAG;IACvB,IAAI,CAAC,EAAE;QAAE,EAAE,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IACvB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE;QAAE,IAAI,CAAC,EAAE;YAAE,EAAE,CAAC,EAAE,MAAM,CAAA;SAAE,CAAA;KAAE,CAAC;CACrC,CAAC;AAEF;;oDAEoD;AACpD,MAAM,MAAM,aAAa,GAAG,SAAS,GAAG;IACvC,GAAG,EAAE,OAAO,CAAC;IACb,IAAI,CAAC,EAAE;QAAE,EAAE,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;CACvB,CAAC;AAcF;4DAC4D;AAC5D,eAAO,MAAM,QAAQ,GAAI,KAAK,SAAS,KAAG,MAAM,GAAG,SACC,CAAC;AAMrD,2CAA2C;AAC3C,eAAO,MAAM,WAAW,GAAI,KAAK,WAAW,KAAG,OAG9C,CAAC;AAEF,mCAAmC;AACnC,eAAO,MAAM,aAAa,GAAI,KAAK,WAAW,KAAG,OACnB,CAAC;AAE/B;;;;;GAKG;AACH,wBAAsB,YAAY,CACjC,GAAG,EAAE,aAAa,EAClB,IAAI,GAAE;IAAE,MAAM,CAAC,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,CAAA;CAAO,GAC7C,OAAO,CAAC,OAAO,CAAC,CAkBlB"}
+{"version":3,"file":"groups.d.ts","sourceRoot":"","sources":["../../src/bot/groups.ts"],"names":[],"mappings":"AAsDA;8DAC8D;AAC9D,MAAM,MAAM,WAAW,GAAG;IACzB,IAAI,CAAC,EAAE;QAAE,IAAI,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IACzB,OAAO,CAAC,EAAE;QAAE,IAAI,CAAC,EAAE;YAAE,IAAI,CAAC,EAAE,MAAM,CAAA;SAAE,CAAA;KAAE,CAAC;CACvC,CAAC;AAEF;sCACsC;AACtC,MAAM,MAAM,SAAS,GAAG;IACvB,IAAI,CAAC,EAAE;QAAE,EAAE,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IACvB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE;QAAE,IAAI,CAAC,EAAE;YAAE,EAAE,CAAC,EAAE,MAAM,CAAA;SAAE,CAAA;KAAE,CAAC;CACrC,CAAC;AAEF;;;0EAG0E;AAC1E,MAAM,MAAM,aAAa,GAAG,SAAS,GAAG;IACvC,GAAG,EAAE,OAAO,CAAC;IACb,IAAI,CAAC,EAAE;QAAE,EAAE,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IACvB,UAAU,CAAC,EAAE;QAAE,EAAE,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;CAC7B,CAAC;AAUF;4DAC4D;AAC5D,eAAO,MAAM,QAAQ,GAAI,KAAK,SAAS,KAAG,MAAM,GAAG,SACC,CAAC;AAMrD,2CAA2C;AAC3C,eAAO,MAAM,WAAW,GAAI,KAAK,WAAW,KAAG,OAG9C,CAAC;AAEF,mCAAmC;AACnC,eAAO,MAAM,aAAa,GAAI,KAAK,WAAW,KAAG,OACnB,CAAC;AAE/B;;;;;;;GAOG;AACH,wBAAsB,YAAY,CACjC,GAAG,EAAE,aAAa,EAClB,IAAI,GAAE;IAAE,MAAM,CAAC,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,CAAA;CAAO,GAC7C,OAAO,CAAC,OAAO,CAAC,CAmBlB"}

package/dist/bot/groups.js

@@ -3,9 +3,12 @@
  * check. Worker-safe (no env, no OS).
  *
  * Telegram's Bot API has no "is this user a group admin?" primitive and neither does
- * gramio: the raw material is `getChatMember` returning a member whose `status` may be
- * `"creator"` or `"administrator"`. Every bot with an admin-gated group setting re-rolls
- * that check; this module rolls it ONCE.
+ * gramio. The raw material is `getChatAdministrators` — NOT `getChatMember`: in a group
+ * whose member list is hidden, `getChatMember` on another user rejects with
+ * `CHAT_ADMIN_REQUIRED` for a non-admin bot, so a gate built on it denies EVERY real
+ * admin (creator included) while the admin list itself stays readable. Every bot with an
+ * admin-gated group setting re-rolls that check; this module rolls it ONCE, on the call
+ * that works everywhere the bot is present.
  *
  * ## The two ctx spellings (the trap this module absorbs)
  *
@@ -21,19 +24,22 @@
  * These take minimum structural ctx shapes (the `bot/ctx.ts` philosophy) that real
  * gramio contexts AND `bot/menu`'s `MenuCtx` satisfy by duck typing — a menu action
  * gates with `isGroupAdmin(ctx)`, no cast. `ctx.bot` stays `unknown` for exactly that
- * assignability (MenuCtx's own choice); a ctx whose bot has no `api.getChatMember`
- * PANICS — a miswire screams, it doesn't read as "not admin".
+ * assignability (MenuCtx's own choice); a ctx whose bot has no
+ * `api.getChatAdministrators` PANICS — a miswire screams, it doesn't read as "not
+ * admin".
  *
- * `isGroupAdmin` FAILS CLOSED on the API call itself: a `getChatMember` rejection (user
- * never seen in the chat, network, the bot removed mid-tap) answers `false`, never
- * throws — it is a permission gate, and a gate that throws breaks the surface it guards
- * (a menu tap's single answerCallbackQuery, a command reply). That rejection is the
- * messy real world; denial is the only honest answer to "I couldn't verify".
+ * `isGroupAdmin` FAILS CLOSED on the API call itself: a `getChatAdministrators`
+ * rejection (the bot removed mid-tap, network) answers `false`, never throws — it is a
+ * permission gate, and a gate that throws breaks the surface it guards (a menu tap's
+ * single answerCallbackQuery, a command reply). That rejection is the messy real world;
+ * denial is the only honest answer to "I couldn't verify".
  *
- * Anonymous-admin caveat: an admin posting anonymously wears the group's own identity
- * in `message.from` (the GroupAnonymousBot), so a MESSAGE from them fails this check.
- * Callback taps always carry the real user, so inline-button gates (the settings case)
- * are unaffected.
+ * Anonymous admins: a message posted "as the group" carries the chat itself in
+ * `sender_chat`, and Telegram offers that identity only to the chat's own admins — so
+ * `sender_chat.id === chat.id` IS the proof, no API call (a linked channel's auto-forward
+ * wears the CHANNEL's id, so the equality never false-positives). Callback taps always
+ * carry the real user, and anonymous admins appear in the admin list under their real
+ * user, so inline-button gates resolve them too.
  *
  * @example
  * // Gate a group-wide toggle: the bot's own admins always may, otherwise the
@@ -45,9 +51,6 @@
  * await isGroupAdmin(ctx, { chatId: -100123, userId: 42 })
  */
 import { assert } from "../offensive.js";
-// The two chat-member statuses that hold power over a group. Not exported: the
-// contract is the question `isGroupAdmin` answers, never status comparison.
-const GROUP_ADMIN_STATUSES = new Set(["creator", "administrator"]);
 /** The ctx's chat id, whatever the event spelling. `undefined` only when the event has
  *  no chat at all (inline queries, some service events). */
 export const chatIdOf = (ctx) => ctx.chat?.id ?? ctx.chatId ?? ctx.message?.chat?.id;
@@ -61,24 +64,27 @@ export const isGroupChat = (ctx) => {
 /** True for a 1:1 private chat. */
 export const isPrivateChat = (ctx) => chatTypeOf(ctx) === "private";
 /**
- * Whether a user is a creator/administrator of a group, per `getChatMember`. Chat and
- * user default to the ctx's own ({@link chatIdOf}, `ctx.from.id` — gramio's own
- * parameter-defaulting idiom); pass `chatId` / `userId` for cross-chat checks. Missing
- * ids (an actor-less service event) or an API rejection answer `false`.
+ * Whether a user is a creator/administrator of a group, per `getChatAdministrators`
+ * membership. Chat and user default to the ctx's own ({@link chatIdOf}, `ctx.from.id` —
+ * gramio's own parameter-defaulting idiom); pass `chatId` / `userId` for cross-chat
+ * checks. An anonymous admin's own message (`senderChat` = the chat itself) answers
+ * `true` without an API call — unless an explicit `userId` asks about someone else.
+ * Missing ids (an actor-less service event) or an API rejection answer `false`.
  */
 export async function isGroupAdmin(ctx, opts = {}) {
     const chatId = opts.chatId ?? chatIdOf(ctx);
+    if (chatId === undefined)
+        return false;
+    if (opts.userId === undefined && ctx.senderChat?.id === chatId)
+        return true;
     const userId = opts.userId ?? ctx.from?.id;
-    if (chatId === undefined || userId === undefined)
+    if (userId === undefined)
         return false;
     const bot = ctx.bot;
-    assert(typeof bot?.api?.getChatMember === "function", "isGroupAdmin: ctx.bot.api.getChatMember missing — not a gramio ctx?");
+    assert(typeof bot?.api?.getChatAdministrators === "function", "isGroupAdmin: ctx.bot.api.getChatAdministrators missing — not a gramio ctx?");
     try {
-        const member = await bot.api.getChatMember({
-            chat_id: chatId,
-            user_id: userId,
-        });
-        return GROUP_ADMIN_STATUSES.has(member.status ?? "");
+        const admins = await bot.api.getChatAdministrators({ chat_id: chatId });
+        return admins.some((m) => m.user?.id === userId);
     }
     catch {
         return false;

package/dist/bot/groups.js.map

@@ -1 +1 @@
-{"version":3,"file":"groups.js","sourceRoot":"","sources":["../../src/bot/groups.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6CG;AACH,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAiCzC,+EAA+E;AAC/E,4EAA4E;AAC5E,MAAM,oBAAoB,GAAG,IAAI,GAAG,CAAC,CAAC,SAAS,EAAE,eAAe,CAAC,CAAC,CAAC;AAEnE;4DAC4D;AAC5D,MAAM,CAAC,MAAM,QAAQ,GAAG,CAAC,GAAc,EAAsB,EAAE,CAC9D,GAAG,CAAC,IAAI,EAAE,EAAE,IAAI,GAAG,CAAC,MAAM,IAAI,GAAG,CAAC,OAAO,EAAE,IAAI,EAAE,EAAE,CAAC;AAErD,mEAAmE;AACnE,MAAM,UAAU,GAAG,CAAC,GAAgB,EAAsB,EAAE,CAC3D,GAAG,CAAC,IAAI,EAAE,IAAI,IAAI,GAAG,CAAC,OAAO,EAAE,IAAI,EAAE,IAAI,CAAC;AAE3C,2CAA2C;AAC3C,MAAM,CAAC,MAAM,WAAW,GAAG,CAAC,GAAgB,EAAW,EAAE;IACxD,MAAM,IAAI,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC;IAC7B,OAAO,IAAI,KAAK,OAAO,IAAI,IAAI,KAAK,YAAY,CAAC;AAClD,CAAC,CAAC;AAEF,mCAAmC;AACnC,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,GAAgB,EAAW,EAAE,CAC1D,UAAU,CAAC,GAAG,CAAC,KAAK,SAAS,CAAC;AAE/B;;;;;GAKG;AACH,MAAM,CAAC,KAAK,UAAU,YAAY,CACjC,GAAkB,EAClB,OAA6C,EAAE;IAE/C,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,IAAI,QAAQ,CAAC,GAAG,CAAC,CAAC;IAC5C,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,IAAI,GAAG,CAAC,IAAI,EAAE,EAAE,CAAC;IAC3C,IAAI,MAAM,KAAK,SAAS,IAAI,MAAM,KAAK,SAAS;QAAE,OAAO,KAAK,CAAC;IAC/D,MAAM,GAAG,GAAG,GAAG,CAAC,GAAsD,CAAC;IACvE,MAAM,CACL,OAAO,GAAG,EAAE,GAAG,EAAE,aAAa,KAAK,UAAU,EAC7C,qEAAqE,CACrE,CAAC;IACF,IAAI,CAAC;QACJ,MAAM,MAAM,GAAG,MAAM,GAAG,CAAC,GAAG,CAAC,aAAa,CAAC;YAC1C,OAAO,EAAE,MAAM;YACf,OAAO,EAAE,MAAM;SACf,CAAC,CAAC;QACH,OAAO,oBAAoB,CAAC,GAAG,CAAC,MAAM,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC;IACtD,CAAC;IAAC,MAAM,CAAC;QACR,OAAO,KAAK,CAAC;IACd,CAAC;AACF,CAAC"}
+{"version":3,"file":"groups.js","sourceRoot":"","sources":["../../src/bot/groups.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAmDG;AACH,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAmCzC;4DAC4D;AAC5D,MAAM,CAAC,MAAM,QAAQ,GAAG,CAAC,GAAc,EAAsB,EAAE,CAC9D,GAAG,CAAC,IAAI,EAAE,EAAE,IAAI,GAAG,CAAC,MAAM,IAAI,GAAG,CAAC,OAAO,EAAE,IAAI,EAAE,EAAE,CAAC;AAErD,mEAAmE;AACnE,MAAM,UAAU,GAAG,CAAC,GAAgB,EAAsB,EAAE,CAC3D,GAAG,CAAC,IAAI,EAAE,IAAI,IAAI,GAAG,CAAC,OAAO,EAAE,IAAI,EAAE,IAAI,CAAC;AAE3C,2CAA2C;AAC3C,MAAM,CAAC,MAAM,WAAW,GAAG,CAAC,GAAgB,EAAW,EAAE;IACxD,MAAM,IAAI,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC;IAC7B,OAAO,IAAI,KAAK,OAAO,IAAI,IAAI,KAAK,YAAY,CAAC;AAClD,CAAC,CAAC;AAEF,mCAAmC;AACnC,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,GAAgB,EAAW,EAAE,CAC1D,UAAU,CAAC,GAAG,CAAC,KAAK,SAAS,CAAC;AAE/B;;;;;;;GAOG;AACH,MAAM,CAAC,KAAK,UAAU,YAAY,CACjC,GAAkB,EAClB,OAA6C,EAAE;IAE/C,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,IAAI,QAAQ,CAAC,GAAG,CAAC,CAAC;IAC5C,IAAI,MAAM,KAAK,SAAS;QAAE,OAAO,KAAK,CAAC;IACvC,IAAI,IAAI,CAAC,MAAM,KAAK,SAAS,IAAI,GAAG,CAAC,UAAU,EAAE,EAAE,KAAK,MAAM;QAAE,OAAO,IAAI,CAAC;IAC5E,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,IAAI,GAAG,CAAC,IAAI,EAAE,EAAE,CAAC;IAC3C,IAAI,MAAM,KAAK,SAAS;QAAE,OAAO,KAAK,CAAC;IACvC,MAAM,GAAG,GAAG,GAAG,CAAC,GAEJ,CAAC;IACb,MAAM,CACL,OAAO,GAAG,EAAE,GAAG,EAAE,qBAAqB,KAAK,UAAU,EACrD,6EAA6E,CAC7E,CAAC;IACF,IAAI,CAAC;QACJ,MAAM,MAAM,GAAG,MAAM,GAAG,CAAC,GAAG,CAAC,qBAAqB,CAAC,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC,CAAC;QACxE,OAAO,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,EAAE,KAAK,MAAM,CAAC,CAAC;IAClD,CAAC;IAAC,MAAM,CAAC;QACR,OAAO,KAAK,CAAC;IACd,CAAC;AACF,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@adriangalilea/utils",
-	"version": "2.28.0",
+	"version": "2.29.0",
 	"description": "TypeScript utilities - logger, currency, formatter, GramIO bot plugins, and more",
 	"main": "./dist/index.js",
 	"types": "./dist/index.d.ts",