npm - easyoref - Versions diffs - 2.0.0 → 2.0.1 - Mend

easyoref 2.0.0 → 2.0.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (21) hide show

package/dist/bot.js +10 -0
package/dist/bot.js.map +1 -1
package/dist/handlers/admin.d.ts.map +1 -1
package/dist/handlers/admin.js +70 -16
package/dist/handlers/admin.js.map +1 -1
package/dist/handlers/qa.d.ts.map +1 -1
package/dist/handlers/qa.js +20 -11
package/dist/handlers/qa.js.map +1 -1
package/dist/handlers/settings.d.ts +3 -0
package/dist/handlers/settings.d.ts.map +1 -0
package/dist/handlers/settings.js +110 -0
package/dist/handlers/settings.js.map +1 -0
package/dist/handlers/shelter.d.ts +1 -1
package/dist/handlers/shelter.d.ts.map +1 -1
package/dist/handlers/shelter.js +30 -8
package/dist/handlers/shelter.js.map +1 -1
package/dist/handlers/start.d.ts +12 -11
package/dist/handlers/start.d.ts.map +1 -1
package/dist/handlers/start.js +156 -35
package/dist/handlers/start.js.map +1 -1
package/package.json +1 -1

package/dist/bot.js CHANGED Viewed

@@ -22,6 +22,7 @@ import { initGifState, pickGif } from "./gif-state.js";
 import { registerAdminHandler } from "./handlers/admin.js";
 import { registerInlineHandler } from "./handlers/inline.js";
 import { registerQaHandler } from "./handlers/qa.js";
+import { registerSettingsHandler } from "./handlers/settings.js";
 import { registerShelterHandler } from "./handlers/shelter.js";
 import { initDefaultAreas, registerStartHandler } from "./handlers/start.js";
 // ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
@@ -660,10 +661,19 @@ async function main() {
     if (bot) {
         initDefaultAreas();
         registerStartHandler(bot);
+        registerSettingsHandler(bot);
         registerAdminHandler(bot);
         registerShelterHandler(bot);
         registerQaHandler(bot);
         registerInlineHandler(bot);
+        // Set bot menu commands (per-language)
+        const commands = [
+            { command: "start", description: "Register / restart" },
+            { command: "settings", description: "Settings" },
+        ];
+        bot.api.setMyCommands(commands).catch((err) => {
+            logger.warn("Failed to set bot commands", { error: String(err) });
+        });
         bot.start({ drop_pending_updates: true }).catch((err) => {
             logger.error("Bot polling failed", { error: String(err) });
         });

package/dist/bot.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"bot.js","sourceRoot":"","sources":["../src/bot.ts"],"names":[],"mappings":"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"}
1	+ {"version":3,"file":"bot.js","sourceRoot":"","sources":["../src/bot.ts"],"names":[],"mappings":"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"}

package/dist/handlers/admin.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"admin.d.ts","sourceRoot":"","sources":["../../src/handlers/admin.ts"],"names":[],"mappings":"~~AAEA~~,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,QAAQ,CAAC;~~AAMlC~~,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,GAAG,GAAG,IAAI,~~CAgEnD~~"}
1	+ {"version":3,"file":"admin.d.ts","sourceRoot":"","sources":["../../src/handlers/admin.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,QAAQ,CAAC;AAmDlC,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,GAAG,GAAG,IAAI,CAsFnD"}

package/dist/handlers/admin.js CHANGED Viewed

@@ -1,56 +1,110 @@
-import { config, getAllUsers, setUserTier } from "@easyoref/shared";
+import { config, getAllUsers, getBotStrings, getUser, setUserTier, } from "@easyoref/shared";
 import * as logger from "@easyoref/shared/logger";
 function isAdmin(chatId) {
     return config.adminChatIds.includes(Number(chatId));
 }
+function getAdminLang(chatId) {
+    // Admin lang: we don't async lookup here, default to "ru"
+    return "ru";
+}
+/**
+ * Resolve a grant/revoke target to a chatId string.
+ * Accepts: numeric ID, @username, t.me/username URL.
+ */
+async function resolveTarget(bot, input) {
+    const trimmed = input.trim();
+    // Numeric chat ID
+    if (/^-?\d+$/.test(trimmed)) {
+        return { chatId: trimmed, display: trimmed };
+    }
+    // Extract username from @mention or t.me/ link
+    let username;
+    if (trimmed.startsWith("@")) {
+        username = trimmed;
+    }
+    else {
+        const match = trimmed.match(/(?:https?:\/\/)?t(?:elegram)?\.me\/([a-zA-Z_]\w{3,})/);
+        if (match) {
+            username = `@${match[1]}`;
+        }
+    }
+    if (!username) {
+        return { error: "Invalid target. Use chat ID, @username, or t.me/link." };
+    }
+    try {
+        const chat = await bot.api.getChat(username);
+        return { chatId: String(chat.id), display: `${username} (${chat.id})` };
+    }
+    catch {
+        return { error: `Could not resolve ${username}. Bot must have interacted with this user/group.` };
+    }
+}
 export function registerAdminHandler(bot) {
-    // /grant <chatId> — upgrade user to Pro
+    // /grant <target> — upgrade user to Pro
     bot.command("grant", async (ctx) => {
         const adminId = String(ctx.chat.id);
         if (!isAdmin(adminId)) {
-            await ctx.reply("Unauthorized.");
+            const user = await getUser(adminId);
+            const lang = (user?.language ?? "ru");
+            await ctx.reply(getBotStrings(lang).adminUnauthorized);
             return;
         }
+        const s = getBotStrings(getAdminLang(adminId));
         const args = ctx.match?.trim();
         if (!args) {
-            await ctx.reply("Usage: /grant <chatId>");
+            await ctx.reply(s.adminGrantUsage);
             return;
         }
-        const success = await setUserTier(args, "pro");
+        const resolved = await resolveTarget(bot, args);
+        if ("error" in resolved) {
+            await ctx.reply(resolved.error);
+            return;
+        }
+        const success = await setUserTier(resolved.chatId, "pro");
         if (success) {
-            await ctx.reply(`✅ User ${args} upgraded to Pro.`);
-            logger.info("Admin: granted pro", { adminId, targetId: args });
+            await ctx.reply(s.adminGranted.replace("{target}", resolved.display));
+            logger.info("Admin: granted pro", { adminId, target: resolved.display });
         }
         else {
-            await ctx.reply(`User ${args} not found.`);
+            await ctx.reply(s.adminUserNotFound.replace("{target}", resolved.display));
         }
     });
-    // /revoke <chatId> — downgrade user to Free
+    // /revoke <target> — downgrade user to Free
     bot.command("revoke", async (ctx) => {
         const adminId = String(ctx.chat.id);
         if (!isAdmin(adminId)) {
-            await ctx.reply("Unauthorized.");
+            const user = await getUser(adminId);
+            const lang = (user?.language ?? "ru");
+            await ctx.reply(getBotStrings(lang).adminUnauthorized);
             return;
         }
+        const s = getBotStrings(getAdminLang(adminId));
         const args = ctx.match?.trim();
         if (!args) {
-            await ctx.reply("Usage: /revoke <chatId>");
+            await ctx.reply("Usage: /revoke <chatId or @username or t.me/link>");
+            return;
+        }
+        const resolved = await resolveTarget(bot, args);
+        if ("error" in resolved) {
+            await ctx.reply(resolved.error);
             return;
         }
-        const success = await setUserTier(args, "free");
+        const success = await setUserTier(resolved.chatId, "free");
         if (success) {
-            await ctx.reply(`✅ User ${args} downgraded to Free.`);
-            logger.info("Admin: revoked pro", { adminId, targetId: args });
+            await ctx.reply(s.adminRevoked.replace("{target}", resolved.display));
+            logger.info("Admin: revoked pro", { adminId, target: resolved.display });
         }
         else {
-            await ctx.reply(`User ${args} not found.`);
+            await ctx.reply(s.adminUserNotFound.replace("{target}", resolved.display));
         }
     });
     // /users — list all registered users
     bot.command("users", async (ctx) => {
         const adminId = String(ctx.chat.id);
         if (!isAdmin(adminId)) {
-            await ctx.reply("Unauthorized.");
+            const user = await getUser(adminId);
+            const lang = (user?.language ?? "ru");
+            await ctx.reply(getBotStrings(lang).adminUnauthorized);
             return;
         }
         const allUsers = await getAllUsers();

package/dist/handlers/admin.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"admin.js","sourceRoot":"","sources":["../../src/handlers/admin.ts"],"names":[],"mappings":"AAAA,OAAO,~~EAAE~~,MAAM,~~EAAE~~,WAAW,~~EAAE~~,WAAW,~~EAAE~~,MAAM,kBAAkB,CAAC;~~AACpE~~,OAAO,KAAK,MAAM,MAAM,yBAAyB,CAAC;AAGlD,SAAS,OAAO,CAAC,MAAc;IAC7B,OAAO,MAAM,CAAC,YAAY,CAAC,QAAQ,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC;AACtD,CAAC;AAED,MAAM,UAAU,oBAAoB,CAAC,GAAQ;IAC3C,wCAAwC;IACxC,GAAG,CAAC,OAAO,CAAC,OAAO,EAAE,KAAK,EAAE,GAAG,EAAE,EAAE;QACjC,MAAM,OAAO,GAAG,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QACpC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC;YACtB,MAAM,GAAG,CAAC,KAAK,CAAC,~~eAAe~~,CAAC,CAAC;~~YACjC~~,OAAO;QACT,CAAC;QACD,MAAM,IAAI,GAAG,GAAG,CAAC,KAAK,EAAE,IAAI,EAAE,CAAC;QAC/B,IAAI,CAAC,IAAI,EAAE,CAAC;YACV,MAAM,GAAG,CAAC,KAAK,CAAC,~~wBAAwB~~,CAAC,CAAC;~~YAC1C~~,OAAO;QACT,CAAC;QACD,MAAM,OAAO,GAAG,MAAM,WAAW,CAAC,~~IAAI~~,EAAE,KAAK,CAAC,CAAC;~~QAC/C~~,IAAI,OAAO,EAAE,CAAC;YACZ,MAAM,GAAG,CAAC,KAAK,CAAC,UAAU,~~IAAI~~,~~mBAAmB~~,CAAC,CAAC;~~YACnD~~,MAAM,CAAC,IAAI,CAAC,oBAAoB,EAAE,EAAE,OAAO,EAAE,~~QAAQ~~,EAAE,~~IAAI~~,EAAE,CAAC,CAAC;~~QACjE~~,CAAC;aAAM,CAAC;YACN,MAAM,GAAG,CAAC,KAAK,CAAC,QAAQ,~~IAAI~~,~~aAAa~~,CAAC,CAAC;~~QAC7C~~,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,4CAA4C;IAC5C,GAAG,CAAC,OAAO,CAAC,QAAQ,EAAE,KAAK,EAAE,GAAG,EAAE,EAAE;QAClC,MAAM,OAAO,GAAG,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QACpC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC;YACtB,MAAM,GAAG,CAAC,KAAK,CAAC,~~eAAe~~,CAAC,CAAC;~~YACjC~~,OAAO;QACT,CAAC;QACD,MAAM,IAAI,GAAG,GAAG,CAAC,KAAK,EAAE,IAAI,EAAE,CAAC;QAC/B,IAAI,CAAC,IAAI,EAAE,CAAC;YACV,MAAM,GAAG,CAAC,KAAK,CAAC,~~yBAAyB~~,CAAC,CAAC;~~YAC3C~~,OAAO;QACT,CAAC;QACD,MAAM,OAAO,GAAG,MAAM,WAAW,CAAC,~~IAAI~~,EAAE,MAAM,CAAC,CAAC;~~QAChD~~,IAAI,OAAO,EAAE,CAAC;YACZ,MAAM,GAAG,CAAC,KAAK,CAAC,UAAU,~~IAAI~~,~~sBAAsB~~,CAAC,CAAC;~~YACtD~~,MAAM,CAAC,IAAI,CAAC,oBAAoB,EAAE,EAAE,OAAO,EAAE,~~QAAQ~~,EAAE,~~IAAI~~,EAAE,CAAC,CAAC;~~QACjE~~,CAAC;aAAM,CAAC;YACN,MAAM,GAAG,CAAC,KAAK,CAAC,QAAQ,~~IAAI~~,~~aAAa~~,CAAC,CAAC;~~QAC7C~~,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,qCAAqC;IACrC,GAAG,CAAC,OAAO,CAAC,OAAO,EAAE,KAAK,EAAE,GAAG,EAAE,EAAE;QACjC,MAAM,OAAO,GAAG,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QACpC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC;YACtB,MAAM,GAAG,CAAC,KAAK,CAAC,~~eAAe~~,CAAC,CAAC;~~YACjC~~,OAAO;QACT,CAAC;QACD,MAAM,QAAQ,GAAG,MAAM,WAAW,EAAE,CAAC;QACrC,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC1B,MAAM,GAAG,CAAC,KAAK,CAAC,sBAAsB,CAAC,CAAC;YACxC,OAAO;QACT,CAAC;QACD,MAAM,KAAK,GAAG,QAAQ,CAAC,GAAG,CACxB,CAAC,CAAC,EAAE,EAAE,CACJ,WAAW,CAAC,CAAC,MAAM,aAAa,CAAC,CAAC,IAAI,MAAM,CAAC,CAAC,QAAQ,MAAM,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CACnF,CAAC;QACF,MAAM,GAAG,CAAC,KAAK,CACb,wBAAwB,QAAQ,CAAC,MAAM,aAAa,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,EACtE,EAAE,UAAU,EAAE,MAAM,EAAE,CACvB,CAAC;IACJ,CAAC,CAAC,CAAC;AACL,CAAC"}
1	+ {"version":3,"file":"admin.js","sourceRoot":"","sources":["../../src/handlers/admin.ts"],"names":[],"mappings":"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"}

package/dist/handlers/qa.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"qa.d.ts","sourceRoot":"","sources":["../../src/handlers/qa.ts"],"names":[],"mappings":"~~AAGA~~,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,QAAQ,CAAC;AAElC,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,GAAG,GAAG,IAAI,~~CAmChD~~"}
1	+ {"version":3,"file":"qa.d.ts","sourceRoot":"","sources":["../../src/handlers/qa.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,QAAQ,CAAC;AAElC,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,GAAG,GAAG,IAAI,CA6ChD"}

package/dist/handlers/qa.js CHANGED Viewed

@@ -1,11 +1,28 @@
 import { runQa } from "@easyoref/agent";
-import { config, getRedis, getUser } from "@easyoref/shared";
+import { config, getBotStrings, getRedis, getUser, } from "@easyoref/shared";
 import * as logger from "@easyoref/shared/logger";
 export function registerQaHandler(bot) {
     bot.on("message:text", async (ctx) => {
         if (ctx.chat.type !== "private")
             return;
         const chatId = String(ctx.chat.id);
+        // Skip /commands — let grammY command handlers handle them
+        if (ctx.message.text.startsWith("/"))
+            return;
+        // Skip reply keyboard button presses (shelter/settings buttons)
+        const btnTexts = ["ru", "en", "he", "ar"].flatMap((l) => {
+            const s = getBotStrings(l);
+            return [s.btnShelter, s.btnSettings, s.skipLocationBtn];
+        });
+        if (btnTexts.includes(ctx.message.text))
+            return;
+        const user = await getUser(chatId);
+        const lang = (user?.language ?? "ru");
+        const bs = getBotStrings(lang);
+        if (!user) {
+            await ctx.reply(bs.qaNotRegistered);
+            return;
+        }
         // Rate limit: qaRateLimitPerMin per user (Redis INCR + EXPIRE)
         const redis = getRedis();
         const rateLimitKey = `qa:rate:${chatId}`;
@@ -13,15 +30,7 @@ export function registerQaHandler(bot) {
         if (count === 1)
             await redis.expire(rateLimitKey, 60);
         if (count > config.agent.qaRateLimitPerMin) {
-            await ctx.reply("Too many questions. Please wait a minute.");
-            return;
-        }
-        // Skip /commands — let grammY command handlers handle them
-        if (ctx.message.text.startsWith("/"))
-            return;
-        const user = await getUser(chatId);
-        if (!user) {
-            await ctx.reply("Please use /start to register first.");
+            await ctx.reply(bs.qaRateLimit);
             return;
         }
         await ctx.replyWithChatAction("typing");
@@ -31,7 +40,7 @@ export function registerQaHandler(bot) {
         }
         catch (err) {
             logger.error("Q&A failed", { error: String(err), chatId });
-            await ctx.reply("I couldn't process your question. Please try again.");
+            await ctx.reply(bs.qaError);
         }
     });
 }

package/dist/handlers/qa.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"qa.js","sourceRoot":"","sources":["../../src/handlers/qa.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AACxC,OAAO,~~EAAE~~,MAAM,~~EAAE~~,QAAQ,~~EAAE~~,OAAO,~~EAAE~~,MAAM,kBAAkB,CAAC;~~AAC7D~~,OAAO,KAAK,MAAM,MAAM,yBAAyB,CAAC;AAGlD,MAAM,UAAU,iBAAiB,CAAC,GAAQ;IACxC,GAAG,CAAC,EAAE,CAAC,cAAc,EAAE,KAAK,EAAE,GAAG,EAAE,EAAE;QACnC,IAAI,GAAG,CAAC,IAAI,CAAC,IAAI,KAAK,SAAS;YAAE,OAAO;QAExC,MAAM,MAAM,GAAG,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAEnC~~,+DAA+D~~;~~QAC/D~~,~~MAAM~~,~~KAAK,~~GAAG,~~QAAQ~~,~~EAAE~~,CAAC;~~QACzB~~,MAAM,~~YAAY~~,GAAG,~~WAAW~~,~~MAAM~~,EAAE,CAAC;~~QACzC~~,MAAM,~~KAAK~~,GAAG,~~MAAM~~,~~KAAK~~,CAAC,~~IAAI~~,CAAC,~~YAAY~~,CAAC,CAAC;~~QAC7C~~,IAAI,~~KAAK~~,~~KAAK~~,CAAC;YAAE,MAAM,~~KAAK~~,CAAC,MAAM,CAAC,~~YAAY~~,~~EAAE~~,~~EAAE~~,CAAC,CAAC;~~QACtD~~,~~IAAI~~,~~KAAK~~,GAAG,~~MAAM~~,CAAC,~~KAAK~~,CAAC,~~iBAAiB~~,EAAE,CAAC;~~YAC3C~~,MAAM,GAAG,CAAC,KAAK,CAAC,~~2CAA2C~~,CAAC,CAAC;~~YAC7D~~,OAAO;QACT,CAAC;QAED,~~2DAA2D~~;~~QAC3D~~,~~IAAI~~,GAAG,CAAC,~~OAAO~~,CAAC,IAAI,CAAC,~~UAAU~~,CAAC,~~GAAG,~~CAAC;~~YAAE~~,~~OAAO;QAE7C~~,~~MAAM~~,~~IAAI~~,~~GAAG~~,MAAM,~~OAAO~~,CAAC,MAAM,CAAC,CAAC;~~QACnC~~,IAAI,CAAC,~~IAAI~~,EAAE,CAAC;~~YACV~~,MAAM,GAAG,CAAC,KAAK,CAAC,~~sCAAsC~~,CAAC,CAAC;~~YACxD~~,OAAO;QACT,CAAC;QAED,MAAM,GAAG,CAAC,mBAAmB,CAAC,QAAQ,CAAC,CAAC;QAExC,IAAI,CAAC;YACH,MAAM,MAAM,GAAG,MAAM,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;YACrD,MAAM,GAAG,CAAC,KAAK,CAAC,MAAM,EAAE,EAAE,UAAU,EAAE,MAAM,EAAE,CAAC,CAAC;QAClD,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,MAAM,CAAC,KAAK,CAAC,YAAY,EAAE,EAAE,KAAK,EAAE,MAAM,CAAC,GAAG,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC;YAC3D,MAAM,GAAG,CAAC,KAAK,CAAC,~~qDAAqD~~,CAAC,CAAC;~~QACzE~~,CAAC;IACH,CAAC,CAAC,CAAC;AACL,CAAC"}
1	+ {"version":3,"file":"qa.js","sourceRoot":"","sources":["../../src/handlers/qa.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AACxC,OAAO,EACL,MAAM,EACN,aAAa,EACb,QAAQ,EACR,OAAO,GAER,MAAM,kBAAkB,CAAC;AAC1B,OAAO,KAAK,MAAM,MAAM,yBAAyB,CAAC;AAGlD,MAAM,UAAU,iBAAiB,CAAC,GAAQ;IACxC,GAAG,CAAC,EAAE,CAAC,cAAc,EAAE,KAAK,EAAE,GAAG,EAAE,EAAE;QACnC,IAAI,GAAG,CAAC,IAAI,CAAC,IAAI,KAAK,SAAS;YAAE,OAAO;QAExC,MAAM,MAAM,GAAG,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAEnC,2DAA2D;QAC3D,IAAI,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC;YAAE,OAAO;QAE7C,gEAAgE;QAChE,MAAM,QAAQ,GAAG,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;YACtD,MAAM,CAAC,GAAG,aAAa,CAAC,CAAa,CAAC,CAAC;YACvC,OAAO,CAAC,CAAC,CAAC,UAAU,EAAE,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC,eAAe,CAAC,CAAC;QAC1D,CAAC,CAAC,CAAC;QACH,IAAI,QAAQ,CAAC,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC;YAAE,OAAO;QAEhD,MAAM,IAAI,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,CAAC;QACnC,MAAM,IAAI,GAAG,CAAC,IAAI,EAAE,QAAQ,IAAI,IAAI,CAAa,CAAC;QAClD,MAAM,EAAE,GAAG,aAAa,CAAC,IAAI,CAAC,CAAC;QAE/B,IAAI,CAAC,IAAI,EAAE,CAAC;YACV,MAAM,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,eAAe,CAAC,CAAC;YACpC,OAAO;QACT,CAAC;QAED,+DAA+D;QAC/D,MAAM,KAAK,GAAG,QAAQ,EAAE,CAAC;QACzB,MAAM,YAAY,GAAG,WAAW,MAAM,EAAE,CAAC;QACzC,MAAM,KAAK,GAAG,MAAM,KAAK,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QAC7C,IAAI,KAAK,KAAK,CAAC;YAAE,MAAM,KAAK,CAAC,MAAM,CAAC,YAAY,EAAE,EAAE,CAAC,CAAC;QACtD,IAAI,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC,iBAAiB,EAAE,CAAC;YAC3C,MAAM,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,WAAW,CAAC,CAAC;YAChC,OAAO;QACT,CAAC;QAED,MAAM,GAAG,CAAC,mBAAmB,CAAC,QAAQ,CAAC,CAAC;QAExC,IAAI,CAAC;YACH,MAAM,MAAM,GAAG,MAAM,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;YACrD,MAAM,GAAG,CAAC,KAAK,CAAC,MAAM,EAAE,EAAE,UAAU,EAAE,MAAM,EAAE,CAAC,CAAC;QAClD,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,MAAM,CAAC,KAAK,CAAC,YAAY,EAAE,EAAE,KAAK,EAAE,MAAM,CAAC,GAAG,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC;YAC3D,MAAM,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,OAAO,CAAC,CAAC;QAC9B,CAAC;IACH,CAAC,CAAC,CAAC;AACL,CAAC"}

package/dist/handlers/settings.d.ts ADDED Viewed

@@ -0,0 +1,3 @@
+import { type Bot } from "grammy";
+export declare function registerSettingsHandler(bot: Bot): void;
+//# sourceMappingURL=settings.d.ts.map

package/dist/handlers/settings.d.ts.map ADDED Viewed

	@@ -0,0 +1 @@
1	+ {"version":3,"file":"settings.d.ts","sourceRoot":"","sources":["../../src/handlers/settings.ts"],"names":[],"mappings":"AASA,OAAO,EAA4B,KAAK,GAAG,EAAE,MAAM,QAAQ,CAAC;AAmB5D,wBAAgB,uBAAuB,CAAC,GAAG,EAAE,GAAG,GAAG,IAAI,CAuGtD"}

package/dist/handlers/settings.js ADDED Viewed

@@ -0,0 +1,110 @@
+import { getBotStrings, getUser, isValidLanguage, saveUser, translateAreas, } from "@easyoref/shared";
+import * as logger from "@easyoref/shared/logger";
+import { InlineKeyboard, Keyboard } from "grammy";
+import { mainMenuKeyboard, setAwaitingLocation } from "./start.js";
+const settingsKeyboard = (lang) => {
+    const s = getBotStrings(lang);
+    return new InlineKeyboard()
+        .text(s.settingsLanguage, "settings:lang")
+        .text(s.settingsLocation, "settings:location")
+        .row()
+        .text(s.settingsInfo, "settings:info");
+};
+const langKeyboard = new InlineKeyboard()
+    .text("🇷🇺 Русский", "setlang:ru")
+    .text("🇬🇧 English", "setlang:en")
+    .row()
+    .text("🇮🇱 עברית", "setlang:he")
+    .text("🇸🇦 العربية", "setlang:ar");
+export function registerSettingsHandler(bot) {
+    // ── /settings command ───────────────────────────────
+    bot.command("settings", async (ctx) => {
+        const chatId = String(ctx.chat.id);
+        const user = await getUser(chatId);
+        if (!user) {
+            await ctx.reply(getBotStrings("ru").qaNotRegistered);
+            return;
+        }
+        const lang = user.language;
+        const s = getBotStrings(lang);
+        await ctx.reply(s.settingsTitle, { reply_markup: settingsKeyboard(lang) });
+    });
+    // ── Settings button from reply keyboard ─────────────
+    bot.hears([
+        getBotStrings("ru").btnSettings,
+        getBotStrings("en").btnSettings,
+        getBotStrings("he").btnSettings,
+        getBotStrings("ar").btnSettings,
+    ], async (ctx) => {
+        const chatId = String(ctx.chat.id);
+        const user = await getUser(chatId);
+        if (!user)
+            return;
+        const lang = user.language;
+        const s = getBotStrings(lang);
+        await ctx.reply(s.settingsTitle, {
+            reply_markup: settingsKeyboard(lang),
+        });
+    });
+    // ── Language sub-flow ───────────────────────────────
+    bot.callbackQuery("settings:lang", async (ctx) => {
+        await ctx.answerCallbackQuery();
+        const chatId = String(ctx.from.id);
+        const user = await getUser(chatId);
+        const lang = (user?.language ?? "ru");
+        const s = getBotStrings(lang);
+        await ctx.editMessageText(s.askLanguage, { reply_markup: langKeyboard });
+    });
+    bot.callbackQuery(/^setlang:/, async (ctx) => {
+        const lang = ctx.callbackQuery.data.slice(8);
+        if (!isValidLanguage(lang)) {
+            await ctx.answerCallbackQuery("Invalid language");
+            return;
+        }
+        await ctx.answerCallbackQuery();
+        const chatId = String(ctx.from.id);
+        const user = await getUser(chatId);
+        if (!user)
+            return;
+        await saveUser({ ...user, language: lang, lastActiveAt: Date.now() });
+        const s = getBotStrings(lang);
+        await ctx.editMessageReplyMarkup({ reply_markup: undefined }).catch(() => { });
+        await ctx.reply(s.languageSaved, {
+            reply_markup: mainMenuKeyboard(lang),
+        });
+        logger.info("Language changed via settings", { chatId, lang });
+    });
+    // ── Location sub-flow ──────────────────────────────
+    bot.callbackQuery("settings:location", async (ctx) => {
+        await ctx.answerCallbackQuery();
+        const chatId = String(ctx.from.id);
+        const user = await getUser(chatId);
+        const lang = (user?.language ?? "ru");
+        const s = getBotStrings(lang);
+        const locationKb = new Keyboard()
+            .requestLocation(s.shareLocationBtn)
+            .resized()
+            .oneTime();
+        await ctx.editMessageReplyMarkup({ reply_markup: undefined }).catch(() => { });
+        setAwaitingLocation(chatId);
+        await ctx.reply(s.askLocation, { reply_markup: locationKb });
+    });
+    // ── Info sub-flow ──────────────────────────────────
+    bot.callbackQuery("settings:info", async (ctx) => {
+        await ctx.answerCallbackQuery();
+        const chatId = String(ctx.from.id);
+        const user = await getUser(chatId);
+        if (!user)
+            return;
+        const lang = user.language;
+        const s = getBotStrings(lang);
+        const translatedAreas = translateAreas(user.areas.join(", "), lang);
+        const text = s.infoDisplay
+            .replace("{chatId}", user.chatId)
+            .replace("{lang}", lang)
+            .replace("{tier}", user.tier)
+            .replace("{areas}", translatedAreas);
+        await ctx.editMessageText(text, { parse_mode: "HTML" });
+    });
+}
+//# sourceMappingURL=settings.js.map

package/dist/handlers/settings.js.map ADDED Viewed

@@ -0,0 +1 @@

+ {"version":3,"file":"settings.js","sourceRoot":"","sources":["../../src/handlers/settings.ts"],"names":[],"mappings":"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"}

package/dist/handlers/shelter.d.ts CHANGED Viewed

@@ -2,6 +2,6 @@
  * Shelter search handler — responds to location messages with nearest bomb shelters.
  * Safety-critical feature: available to ALL tiers (free + pro).
  */
-import type { Bot } from "grammy";
+import { type Bot } from "grammy";
 export declare function registerShelterHandler(bot: Bot): void;
 //# sourceMappingURL=shelter.d.ts.map

package/dist/handlers/shelter.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"shelter.d.ts","sourceRoot":"","sources":["../../src/handlers/shelter.ts"],"names":[],"mappings":"AAAA;;;GAGG;~~AAIH~~,OAAO,KAAK,~~EAAE,~~GAAG,EAAE,MAAM,QAAQ,CAAC;~~AAiBlC~~,wBAAgB,sBAAsB,CAAC,GAAG,EAAE,GAAG,GAAG,IAAI,~~CA2BrD~~"}
1	+ {"version":3,"file":"shelter.d.ts","sourceRoot":"","sources":["../../src/handlers/shelter.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAUH,OAAO,EAAY,KAAK,GAAG,EAAE,MAAM,QAAQ,CAAC;AAiB5C,wBAAgB,sBAAsB,CAAC,GAAG,EAAE,GAAG,GAAG,IAAI,CAmDrD"}

package/dist/handlers/shelter.js CHANGED Viewed

@@ -2,9 +2,10 @@
  * Shelter search handler — responds to location messages with nearest bomb shelters.
  * Safety-critical feature: available to ALL tiers (free + pro).
  */
-import { fetchNearestShelters } from "@easyoref/shared";
+import { fetchNearestShelters, getBotStrings, getUser, } from "@easyoref/shared";
 import * as logger from "@easyoref/shared/logger";
-function formatShelterList(nearest) {
+import { Keyboard } from "grammy";
+function formatShelterList(title, nearest) {
     const lines = nearest.map((s, i) => {
         const dist = s.distanceKm < 1
             ? `${Math.round(s.distanceKm * 1000)}m`
@@ -13,23 +14,44 @@ function formatShelterList(nearest) {
             `   📍 ${dist} (~${s.walkingMinutes} min walk)\n` +
             `   <a href="${s.googleMapsUrl}">Open in Maps</a>`);
     });
-    return `🏚 <b>Nearest shelters:</b>\n\n${lines.join("\n\n")}`;
+    return `${title}\n\n${lines.join("\n\n")}`;
 }
 export function registerShelterHandler(bot) {
+    // Reply keyboard "Shelter" button handler
+    bot.hears([
+        getBotStrings("ru").btnShelter,
+        getBotStrings("en").btnShelter,
+        getBotStrings("he").btnShelter,
+        getBotStrings("ar").btnShelter,
+    ], async (ctx) => {
+        const chatId = String(ctx.chat.id);
+        const user = await getUser(chatId);
+        const lang = (user?.language ?? "ru");
+        const s = getBotStrings(lang);
+        const locationKb = new Keyboard()
+            .requestLocation(s.shareLocationBtn)
+            .resized()
+            .oneTime();
+        await ctx.reply(s.askLocation, { reply_markup: locationKb });
+    });
+    // Note: location messages are handled in start.ts (onboarding + area detection)
+    // This handler runs AFTER start.ts location handler via next()
     bot.on("message:location", async (ctx) => {
         const { latitude, longitude } = ctx.message.location;
         const chatId = String(ctx.chat.id);
+        const user = await getUser(chatId);
+        const lang = (user?.language ?? "en");
+        const bs = getBotStrings(lang);
         logger.info("Shelter search requested", { chatId, latitude, longitude });
-        // Send typing indicator while fetching
         await ctx.replyWithChatAction("find_location").catch(() => { });
         const nearest = await fetchNearestShelters(latitude, longitude);
         if (nearest.length === 0) {
-            await ctx.reply("No shelters found nearby in OpenStreetMap data.\n\n" +
-                "Try the official Pikud HaOref shelter finder:\n" +
-                "https://www.oref.org.il/NAShelters/", { link_preview_options: { is_disabled: true } });
+            await ctx.reply(bs.shelterNone, {
+                link_preview_options: { is_disabled: true },
+            });
             return;
         }
-        await ctx.reply(formatShelterList(nearest), {
+        await ctx.reply(formatShelterList(bs.shelterTitle, nearest), {
             parse_mode: "HTML",
             link_preview_options: { is_disabled: true },
         });

package/dist/handlers/shelter.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"shelter.js","sourceRoot":"","sources":["../../src/handlers/shelter.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,~~EAAE~~,oBAAoB,~~EAAoB~~,MAAM,kBAAkB,CAAC;~~AAC1E~~,OAAO,KAAK,MAAM,MAAM,yBAAyB,CAAC;~~AAGlD~~,SAAS,iBAAiB,CAAC,OAAsB;~~IAC/C~~,MAAM,KAAK,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;QACjC,MAAM,IAAI,GACR,CAAC,CAAC,UAAU,GAAG,CAAC;YACd,CAAC,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,UAAU,GAAG,IAAI,CAAC,GAAG;YACvC,CAAC,CAAC,GAAG,CAAC,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC;QACrC,OAAO,CACL,GAAG,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,IAAI,OAAO,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,IAAI;YACnE,SAAS,IAAI,MAAM,CAAC,CAAC,cAAc,cAAc;YACjD,eAAe,CAAC,CAAC,aAAa,oBAAoB,CACnD,CAAC;IACJ,CAAC,CAAC,CAAC;IACH,OAAO,~~kCAAkC~~,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC;~~AAChE~~,CAAC;AAED,MAAM,UAAU,sBAAsB,CAAC,GAAQ;IAC7C,GAAG,CAAC,EAAE,CAAC,kBAAkB,EAAE,KAAK,EAAE,GAAG,EAAE,EAAE;QACvC,MAAM,EAAE,QAAQ,EAAE,SAAS,EAAE,GAAG,GAAG,CAAC,OAAO,CAAC,QAAQ,CAAC;QACrD,MAAM,MAAM,GAAG,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;~~QAEnC~~,MAAM,CAAC,IAAI,CAAC,0BAA0B,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,SAAS,EAAE,CAAC,CAAC;QAEzE,~~uCAAuC;QACvC,~~MAAM,GAAG,CAAC,mBAAmB,CAAC,eAAe,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC;QAE/D,MAAM,OAAO,GAAG,MAAM,oBAAoB,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC;QAEhE,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACzB,MAAM,GAAG,CAAC,KAAK,~~CACb~~,~~qDAAqD;gBACnD~~,~~iDAAiD;gBACjD~~,~~qCAAqC~~,~~EACvC,~~EAAE,oBAAoB,EAAE,EAAE,WAAW,EAAE,IAAI,EAAE,~~EAAE~~,~~CAChD,~~CAAC;~~YACF~~,OAAO;QACT,CAAC;QAED,MAAM,GAAG,CAAC,KAAK,CAAC,iBAAiB,CAAC,OAAO,CAAC,EAAE;~~YAC1C~~,UAAU,EAAE,MAAM;YAClB,oBAAoB,EAAE,EAAE,WAAW,EAAE,IAAI,EAAE;SAC5C,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC"}
1	+ {"version":3,"file":"shelter.js","sourceRoot":"","sources":["../../src/handlers/shelter.ts"],"names":[],"mappings":"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"}

package/dist/handlers/start.d.ts CHANGED Viewed

@@ -1,17 +1,18 @@
-import type { Bot } from "grammy";
+import { type Language } from "@easyoref/shared";
+import { Keyboard, type Bot } from "grammy";
 export declare function initDefaultAreas(): void;
+/** Persistent reply keyboard shown after registration */
+export declare function mainMenuKeyboard(lang: Language): Keyboard;
+/** Mark a chatId as awaiting location (used by settings handler too) */
+export declare function setAwaitingLocation(chatId: string): void;
 /**
- * /start [lang] — register or update user.
- * In private chat: registers the user with their chat ID.
- * In group chat: registers the group chat ID.
+ * Interactive /start onboarding:
+ *   1. Show welcome + language inline keyboard
+ *   2. User picks language → ask for location (reply keyboard with 📍)
+ *   3. User sends location → detect area via polygon → save → confirm
+ *   4. Or user skips → use default area → save → confirm
  *
- * Areas default to config.city_ids (resolved Hebrew names).
- * Language defaults to "ru" or optional argument.
- *
- * Examples:
- *   /start       → register with default language (ru)
- *   /start en    → register with English
- *   /start he    → register with Hebrew
+ * In groups: /start [lang] — simple registration (no interactive flow).
  */
 export declare function registerStartHandler(bot: Bot): void;
 //# sourceMappingURL=start.d.ts.map

package/dist/handlers/start.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"start.d.ts","sourceRoot":"","sources":["../../src/handlers/start.ts"],"names":[],"mappings":"~~AASA~~,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,QAAQ,CAAC;~~AAKlC~~,wBAAgB,gBAAgB,IAAI,IAAI,CAIvC;~~AAED;;;;;;;;;;;;GAYG~~;AACH,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,GAAG,GAAG,IAAI,~~CA8CnD~~"}
1	+ {"version":3,"file":"start.d.ts","sourceRoot":"","sources":["../../src/handlers/start.ts"],"names":[],"mappings":"AAAA,OAAO,EASL,KAAK,QAAQ,EAEd,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EAAkB,QAAQ,EAAE,KAAK,GAAG,EAAE,MAAM,QAAQ,CAAC;AAK5D,wBAAgB,gBAAgB,IAAI,IAAI,CAIvC;AAQD,yDAAyD;AACzD,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,QAAQ,GAAG,QAAQ,CAOzD;AAKD,wEAAwE;AACxE,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAExD;AASD;;;;;;;;GAQG;AACH,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,GAAG,GAAG,IAAI,CAsKnD"}

package/dist/handlers/start.js CHANGED Viewed

@@ -1,5 +1,6 @@
-import { config, getUser, isValidLanguage, resolveCityIds, saveUser, } from "@easyoref/shared";
+import { config, findAreaByLocation, getBotStrings, getUser, isValidLanguage, resolveCityIds, saveUser, translateAreas, } from "@easyoref/shared";
 import * as logger from "@easyoref/shared/logger";
+import { InlineKeyboard, Keyboard } from "grammy";
 /** Default areas from config city_ids (resolved at startup via initTranslations) */
 let defaultAreas = [];
 export function initDefaultAreas() {
@@ -7,55 +8,175 @@ export function initDefaultAreas() {
         defaultAreas = resolveCityIds(config.cityIds);
     }
 }
+function getDefaultAreas() {
+    return defaultAreas.length > 0
+        ? defaultAreas
+        : ["תל אביב - דרום העיר ויפו"];
+}
+/** Persistent reply keyboard shown after registration */
+export function mainMenuKeyboard(lang) {
+    const s = getBotStrings(lang);
+    return new Keyboard()
+        .text(s.btnShelter)
+        .text(s.btnSettings)
+        .resized()
+        .persistent();
+}
+/** Track users who are currently in the "send location for area" flow */
+const awaitingLocation = new Set();
+/** Mark a chatId as awaiting location (used by settings handler too) */
+export function setAwaitingLocation(chatId) {
+    awaitingLocation.add(chatId);
+}
+const langKeyboard = new InlineKeyboard()
+    .text("🇷🇺 Русский", "lang:ru")
+    .text("🇬🇧 English", "lang:en")
+    .row()
+    .text("🇮🇱 עברית", "lang:he")
+    .text("🇸🇦 العربية", "lang:ar");
 /**
- * /start [lang] — register or update user.
- * In private chat: registers the user with their chat ID.
- * In group chat: registers the group chat ID.
+ * Interactive /start onboarding:
+ *   1. Show welcome + language inline keyboard
+ *   2. User picks language → ask for location (reply keyboard with 📍)
+ *   3. User sends location → detect area via polygon → save → confirm
+ *   4. Or user skips → use default area → save → confirm
  *
- * Areas default to config.city_ids (resolved Hebrew names).
- * Language defaults to "ru" or optional argument.
- *
- * Examples:
- *   /start       → register with default language (ru)
- *   /start en    → register with English
- *   /start he    → register with Hebrew
+ * In groups: /start [lang] — simple registration (no interactive flow).
  */
 export function registerStartHandler(bot) {
+    // ── /start command ──────────────────────────────────
     bot.command("start", async (ctx) => {
         const chatId = String(ctx.chat.id);
-        const args = ctx.match?.trim();
-        // Parse optional language argument
-        let lang = "ru";
-        if (args && isValidLanguage(args)) {
-            lang = args;
-        }
-        // Resolve areas: use defaults from config city_ids
-        const areas = defaultAreas.length > 0 ? defaultAreas : ["תל אביב - דרום העיר ויפו"];
+        // Groups: simple registration with optional lang arg
+        if (ctx.chat.type !== "private") {
+            const args = ctx.match?.trim();
+            let lang = "ru";
+            if (args && isValidLanguage(args))
+                lang = args;
+            const areas = getDefaultAreas();
+            const existing = await getUser(chatId);
+            const user = {
+                chatId,
+                language: lang,
+                areas,
+                tier: existing?.tier ?? "free",
+                registeredAt: existing?.registeredAt ?? Date.now(),
+                lastActiveAt: Date.now(),
+            };
+            await saveUser(user);
+            const s = getBotStrings(lang);
+            const translatedAreas = translateAreas(areas.join(", "), lang);
+            await ctx.reply(s.registered
+                .replace("{lang}", lang)
+                .replace("{areas}", translatedAreas), { parse_mode: "HTML" });
+            logger.info("Group registered via /start", { chatId, lang });
+            return;
+        }
+        // Private: interactive flow — show language picker
+        await ctx.reply(getBotStrings("ru").welcome, {
+            reply_markup: langKeyboard,
+        });
+    });
+    // ── Language selection callback ─────────────────────
+    bot.callbackQuery(/^lang:/, async (ctx) => {
+        const lang = ctx.callbackQuery.data.slice(5);
+        if (!isValidLanguage(lang)) {
+            await ctx.answerCallbackQuery("Invalid language");
+            return;
+        }
+        const chatId = String(ctx.from.id);
+        await ctx.answerCallbackQuery();
+        // Save language choice temporarily — full save after location
         const existing = await getUser(chatId);
+        const s = getBotStrings(lang);
         if (existing) {
-            // Update language if changed, refresh lastActiveAt
-            const updated = {
-                ...existing,
+            // Returning user changing language via /start
+            await saveUser({ ...existing, language: lang, lastActiveAt: Date.now() });
+        }
+        // Remove inline keyboard from welcome message
+        await ctx.editMessageReplyMarkup({ reply_markup: undefined }).catch(() => { });
+        // Ask for location
+        const locationKb = new Keyboard()
+            .requestLocation(s.shareLocationBtn)
+            .row()
+            .text(s.skipLocationBtn)
+            .resized()
+            .oneTime();
+        await ctx.reply(s.askLocation, { reply_markup: locationKb });
+        // Mark user as awaiting location for area detection
+        awaitingLocation.add(chatId);
+        // Store pending language in a lightweight way (callback data prefix)
+        // We'll read it back from the user record or fallback to what we just set
+        if (!existing) {
+            // Pre-create user with default areas, will update on location
+            const user = {
+                chatId,
                 language: lang,
+                areas: getDefaultAreas(),
+                tier: "free",
+                registeredAt: Date.now(),
                 lastActiveAt: Date.now(),
             };
-            await saveUser(updated);
-            await ctx.reply(`✅ Updated! Language: ${lang}, Areas: ${areas.join(", ")}`);
-            logger.info("User updated via /start", { chatId, lang });
+            await saveUser(user);
+        }
+    });
+    // ── Location received (onboarding or settings) ─────
+    bot.on("message:location", async (ctx, next) => {
+        const chatId = String(ctx.chat.id);
+        // Only handle if user is in "awaiting location for area" flow
+        if (!awaitingLocation.has(chatId)) {
+            await next();
+            return;
+        }
+        awaitingLocation.delete(chatId);
+        const user = await getUser(chatId);
+        if (!user) {
+            await next();
             return;
         }
-        // New registration
-        const user = {
+        const { latitude, longitude } = ctx.message.location;
+        const detectedArea = findAreaByLocation(latitude, longitude);
+        const lang = user.language;
+        const s = getBotStrings(lang);
+        let areas;
+        if (detectedArea) {
+            areas = [detectedArea];
+            const translatedArea = translateAreas(detectedArea, lang);
+            await ctx.reply(s.areaDetected.replace("{area}", translatedArea));
+        }
+        else {
+            areas = getDefaultAreas();
+            await ctx.reply(s.areaNotDetected);
+        }
+        await saveUser({ ...user, areas, lastActiveAt: Date.now() });
+        const translatedAreas = translateAreas(areas.join(", "), lang);
+        await ctx.reply(s.registered.replace("{lang}", lang).replace("{areas}", translatedAreas), { parse_mode: "HTML", reply_markup: mainMenuKeyboard(lang) });
+        logger.info("User area updated via location", {
             chatId,
-            language: lang,
             areas,
-            tier: "free",
-            registeredAt: Date.now(),
-            lastActiveAt: Date.now(),
-        };
-        await saveUser(user);
-        await ctx.reply(`✅ Registered! Language: ${lang}, Areas: ${areas.join(", ")}\n\nYou will receive alerts for these areas.`);
-        logger.info("User registered via /start", { chatId, lang, areas });
+            detected: !!detectedArea,
+        });
+    });
+    // ── "Skip" button handler ──────────────────────────
+    bot.hears([
+        getBotStrings("ru").skipLocationBtn,
+        getBotStrings("en").skipLocationBtn,
+        getBotStrings("he").skipLocationBtn,
+        getBotStrings("ar").skipLocationBtn,
+    ], async (ctx) => {
+        const chatId = String(ctx.chat.id);
+        const user = await getUser(chatId);
+        if (!user)
+            return;
+        const lang = user.language;
+        const s = getBotStrings(lang);
+        const areas = getDefaultAreas();
+        await saveUser({ ...user, areas, lastActiveAt: Date.now() });
+        const translatedAreas = translateAreas(areas.join(", "), lang);
+        await ctx.reply(s.registered
+            .replace("{lang}", lang)
+            .replace("{areas}", translatedAreas), { parse_mode: "HTML", reply_markup: mainMenuKeyboard(lang) });
+        logger.info("User skipped location, using defaults", { chatId, areas });
     });
 }
 //# sourceMappingURL=start.js.map

package/dist/handlers/start.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"start.js","sourceRoot":"","sources":["../../src/handlers/start.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,MAAM,EACN,OAAO,EACP,eAAe,EACf,cAAc,EACd,QAAQ,~~GAET~~,MAAM,kBAAkB,CAAC;AAC1B,OAAO,KAAK,MAAM,MAAM,yBAAyB,CAAC;~~AAGlD~~,oFAAoF;AACpF,IAAI,YAAY,GAAa,EAAE,CAAC;AAEhC,MAAM,UAAU,gBAAgB;IAC9B,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC9B,YAAY,GAAG,cAAc,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IAChD,CAAC;AACH,CAAC;AAED~~;;;;;;;;;;;;GAYG~~;AACH,MAAM,UAAU,oBAAoB,CAAC,GAAQ;IAC3C,GAAG,CAAC,OAAO,CAAC,OAAO,EAAE,KAAK,EAAE,GAAG,EAAE,EAAE;QACjC,MAAM,MAAM,GAAG,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;~~QACnC~~,MAAM,IAAI,GAAG,GAAG,CAAC,KAAK,EAAE,IAAI,EAAE,CAAC;~~QAE~~/B,~~mCAAmC~~;~~QACnC~~,IAAI,IAAI,GAAG,IAAI,CAAC;~~QAChB~~,IAAI,IAAI,IAAI,~~eAAe~~,CAAC,IAAI,CAAC,EAAE,CAAC;~~YAClC~~,IAAI,GAAG,IAAI,CAAC;~~QACd~~,CAAC;QAED,mDAAmD;QACnD,MAAM,KAAK,~~GACT~~,YAAY,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,~~YAAY~~,CAAC,CAAC,CAAC,CAAC,~~0BAA0B~~,CAAC,CAAC;~~QAExE~~,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,CAAC;QACvC,IAAI,QAAQ,EAAE,CAAC;YACb,~~mDAAmD~~;~~YACnD~~,MAAM,OAAO,~~GAAe~~;~~gBAC1B~~,GAAG,QAAQ;~~gBACX~~,QAAQ,EAAE,IAAI;gBACd,YAAY,EAAE,IAAI,CAAC,GAAG,EAAE;aACzB,CAAC;YACF,MAAM,QAAQ,CAAC,~~OAAO~~,CAAC,CAAC;~~YACxB~~,~~MAAM~~,GAAG,CAAC,KAAK,~~CACb~~,~~wBAAwB~~,IAAI,~~YAAY~~,~~KAAK~~,CAAC,~~IAAI~~,CAAC,IAAI,CAAC,EAAE,~~CAC3D~~,CAAC;~~YACF~~,~~MAAM~~,CAAC,~~IAAI~~,CAAC,~~yBAAyB~~,~~EAAE~~,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC;~~YACzD~~,OAAO;QACT,CAAC;QAED,~~mBAAmB~~;~~QACnB~~,MAAM,IAAI,~~GAAe~~;YACvB,MAAM;YACN,QAAQ,EAAE,IAAI;~~YACd~~,KAAK;~~YACL~~,IAAI,EAAE,MAAM~~;YACZ~~,YAAY,EAAE,IAAI,CAAC,~~GAAG~~,EAAE;~~YACxB~~,~~YAAY~~,EAAE,IAAI,CAAC,GAAG,EAAE;~~SACzB~~,CAAC;~~QACF~~,MAAM,~~QAAQ~~,CAAC,IAAI,CAAC,CAAC;~~QACrB~~,MAAM,GAAG,CAAC,KAAK,~~CACb~~,~~2BAA2B~~,IAAI,YAAY,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,~~8CAA8C~~,~~CAC1G~~,CAAC;~~QACF~~,MAAM,CAAC,IAAI,CAAC,~~4BAA4B~~,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC;~~IACrE~~,CAAC,~~CAAC~~,CAAC;~~AACL~~,CAAC"}
1	+ {"version":3,"file":"start.js","sourceRoot":"","sources":["../../src/handlers/start.ts"],"names":[],"mappings":"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"}

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "easyoref",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "description": "Real-time Israeli civil defense alerts → Telegram, filtered by your location",
   "type": "module",
   "bin": {