Fixed nullable

bostrot · Sep 20, 2022 · 4464a81 · 4464a81
1 parent 7a79e58
commit 4464a81
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 16 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -4,6 +4,7 @@ WORKDIR /bot
 COPY ./src /bot/src
 COPY ./package.json /bot/package.json
 COPY ./package-lock.json /bot/package-lock.json
+COPY ./tsconfig.json /bot/tsconfig.json
 
 RUN apk update
 RUN apk add wget python3 build-base

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -1,8 +1,7 @@
 version: '3'
 services:
   supportbot:
-    #build: .
-    image: "bostrot/telegram-support-bot:4.0.0"
+    build: .
     restart: unless-stopped
     volumes:
       - ${PWD}/config:/bot/config

diff --git a/src/files.ts b/src/files.ts
@@ -63,7 +63,7 @@ function fileHandler(type: string, bot: TelegramAddon, ctx: Context) {
       );
     }
     // replying to non-ticket
-    if (userid === null || userid === undefined) {
+    if (userid == null) {
       return;
     }
   }
@@ -77,10 +77,12 @@ function fileHandler(type: string, bot: TelegramAddon, ctx: Context) {
     // }
     // if admin
     if (ctx.session.admin && userInfo === undefined) {
-      if (userid == null) {
+      // null check here
+      if (userid != null) {
+        msgId = userid[1];
+      } else {
         return;
       }
-      msgId = userid[1];
     }
     db.getOpen(
         msgId,

diff --git a/src/middleware.ts b/src/middleware.ts
@@ -4,17 +4,18 @@ import {Context} from './interfaces';
 
 // strict escape
 const strictEscape = function(str: string | any[]) {
-  let newStr = '';
-  const chars = ['[', ']', '(', ')', '_', '*', '~', '`'];
-  for (let i = 0; i < str.length; i++) {
-    // escape special characters
-    if (chars.includes(str[i])) {
-      newStr += '\\' + str[i];
-    } else {
-      newStr += str[i];
-    }
-  }
-  return newStr;
+  // let newStr = '';
+  // const chars = ['[', ']', '(', ')', '_', '*', '~', '`'];
+  // for (let i = 0; i < str.length; i++) {
+  //   // escape special characters
+  //   if (chars.includes(str[i])) {
+  //     newStr += '\\' + str[i];
+  //   } else {
+  //     newStr += str[i];
+  //   }
+  // }
+  // return newStr;
+  return str.toString();
 };
 
 // escape special characters

diff --git a/tsconfig.json b/tsconfig.json
@@ -7,6 +7,7 @@
     "sourceMap": true,
     "moduleResolution": "node",
     "esModuleInterop": true,
+    "strictNullChecks" : false,
   },
   "include": [
     "./src/**/**/*"