release: v0.2.5

* sometimes  atg update does not include a plus symbol

.dockerignore

@@ -0,0 +1,2 @@
+.nyc*
+node_modules

Dockerfile

@@ -0,0 +1,12 @@
+FROM node:17-alpine
+
+ENV NODE_ENV production
+WORKDIR /app
+
+COPY package*.json ./
+RUN npm ci --only=production
+
+COPY . .
+
+EXPOSE 80
+CMD [ "node", "src/" ]

config/server.ini

@@ -1,4 +1,4 @@
 [server]
 host=0.0.0.0
-port=3030
+port=80
 endpoint=

config/telegram.ini

@@ -1,3 +1,2 @@
 [telegram]
-polling=true
 token=

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ussd-tg-proxy",
-  "version": "0.0.2",
+  "version": "0.2.5",
   "description": "ussd-tg-proxy",
   "main": "src/index.js",
   "repository": "https://git.grassecon.net/grassrootseconomics/ussd-tg-proxy.git",

src/bot.js

@@ -77,8 +77,11 @@ bot.on("msg:contact", async (ctx) => {
   log.debug(ctx.update, "msg:contact received");
   const contact = ctx.msg.contact;
 
-  if (ctx.msg.reply_to_message.from.is_bot && ctx.from.id === contact.user_id) {
-    if (contact.phone_number.slice(0, 4) !== "+254") {
+  if (ctx.from.id === contact.user_id) {
+    if (
+      contact.phone_number.slice(0, 4) !== "+254" ||
+      contact.phone_number.slice(0, 3) !== "254"
+    ) {
       return ctx.reply("Sarafu is only available in Kenya at the moment.");
     }
 
@@ -89,7 +92,6 @@ bot.on("msg:contact", async (ctx) => {
     );
   }
 
-  log.info(ctx.update.user, "contact spoof attempted");
   return ctx.reply("Could not verify sent contact.");
 });
 

src/index.js

@@ -6,7 +6,7 @@ const cache = require("./cache");
 const bot = require("./bot");
 const log = require("./log");
 
-if (config.get("TELEGRAM_POLLING")) {
+if (process.env.NODE_ENV !== "production") {
   bot.api.deleteWebhook().then(() => {
     log.info("starting bot in polling mode");
     bot.start();

src/request.js

@@ -8,6 +8,7 @@ async function proxy(sessionId, phone, input = "") {
     url: config.get("USSD_ENDPOINT"),
     method: "POST",
     parse: "string",
+    timeout: 3000,
     form: {
       sessionId: sessionId,
       phoneNumber: phone,

src/util.js

@@ -1,5 +1,5 @@
 // this regex extracts ussd reply options
-const regex = /\s(\d{1,2}).\s/g;
+const regex = /\s(\d{1,2})\.\s/g;
 
 // TODO: converts the text to a telegram keyboard
 function createKeyboard(input) {

tests/util.test.js

@@ -66,6 +66,4 @@ test("util", (t) => {
     t.same(output, expect);
     t.end();
   });
-
-  t.endAll();
 });