Browse Source

fix: replace substr with substring

Sv443 1 month ago
parent
commit
9d359667bb
7 changed files with 10 additions and 10 deletions
  1. 1 1
      docs/raw/index.js
  2. 2 2
      src/httpServer.js
  3. 1 1
      src/languages.js
  4. 1 1
      src/parseURL.js
  5. 1 1
      tools/add-joke.js
  6. 2 2
      tools/submissions.js
  7. 2 2
      tools/validate-ids.js

+ 1 - 1
docs/raw/index.js

@@ -18,7 +18,7 @@ var submission = {};
 
 
 if(settings.baseURL.endsWith("/"))
 if(settings.baseURL.endsWith("/"))
 {
 {
-    settings.baseURL = settings.baseURL.substr(0, (settings.baseURL.length - 1));
+    settings.baseURL = settings.baseURL.substring(0, (settings.baseURL.length - 1));
 }
 }
 
 
 var tryItOk = false;
 var tryItOk = false;

+ 2 - 2
src/httpServer.js

@@ -121,7 +121,7 @@ const init = () => {
                     analytics({
                     analytics({
                         type: "Error",
                         type: "Error",
                         data: {
                         data: {
-                            errorMessage: `Error while setting up the HTTP response to "${ip.substr(8)}...": ${err}`,
+                            errorMessage: `Error while setting up the HTTP response to "${ip.substring(8)}...": ${err}`,
                             ipAddress: ip,
                             ipAddress: ip,
                             urlParameters: parsedURL.queryParams,
                             urlParameters: parsedURL.queryParams,
                             urlPath: parsedURL.pathArray
                             urlPath: parsedURL.pathArray
@@ -386,7 +386,7 @@ const init = () => {
                                     "message": `Restarting ${settings.info.name}`,
                                     "message": `Restarting ${settings.info.name}`,
                                     "timestamp": new Date().getTime()
                                     "timestamp": new Date().getTime()
                                 }, lang));
                                 }, lang));
-                                console.log(`\n\n[${logger.getTimestamp(" | ")}]  ${jsl.colors.fg.red}IP ${jsl.colors.fg.yellow}${ip.substr(0, 8)}[...]${jsl.colors.fg.red} sent a restart command\n\n\n${jsl.colors.rst}`);
+                                console.log(`\n\n[${logger.getTimestamp(" | ")}]  ${jsl.colors.fg.red}IP ${jsl.colors.fg.yellow}${ip.substring(0, 8)}[...]${jsl.colors.fg.red} sent a restart command\n\n\n${jsl.colors.rst}`);
                                 process.exit(2); // if the process is exited with status 2, the package node-wrap will restart the process
                                 process.exit(2); // if the process is exited with status 2, the package node-wrap will restart the process
                             }
                             }
                             else return respondWithErrorPage(res, 400, tr(lang, "invalidSubmissionOrWrongEndpoint", (parsedURL.pathArray != null ? parsedURL.pathArray[0] : "/")));
                             else return respondWithErrorPage(res, 400, tr(lang, "invalidSubmissionOrWrongEndpoint", (parsedURL.pathArray != null ? parsedURL.pathArray[0] : "/")));

+ 1 - 1
src/languages.js

@@ -130,7 +130,7 @@ function jokeLangs()
         if(f == settings.jokes.jokesTemplateFile)
         if(f == settings.jokes.jokesTemplateFile)
             return;
             return;
 
 
-        let langCode = f.split("-")[1].substr(0, 2);
+        let langCode = f.split("-")[1].substring(0, 2);
 
 
         retLangs.push({
         retLangs.push({
             code: langCode,
             code: langCode,

+ 1 - 1
src/parseURL.js

@@ -42,7 +42,7 @@ function parseURL(url)
         let rawQstr = (parsed.query == "" ? null : parsed.query);
         let rawQstr = (parsed.query == "" ? null : parsed.query);
 
 
         if(rawQstr && rawQstr.startsWith("?"))
         if(rawQstr && rawQstr.startsWith("?"))
-            rawQstr = rawQstr.substr(1);
+            rawQstr = rawQstr.substring(1);
 
 
         if(!jsl.isEmpty(rawQstr) && rawQstr.includes("&"))
         if(!jsl.isEmpty(rawQstr) && rawQstr.includes("&"))
             qstrArr = rawQstr.split("&");
             qstrArr = rawQstr.split("&");

+ 1 - 1
tools/add-joke.js

@@ -157,7 +157,7 @@ function promptJoke(currentJoke)
                 const truncateLength = 64;
                 const truncateLength = 64;
                 
                 
                 if(typeof curProp === "string" && curProp.length > truncateLength)
                 if(typeof curProp === "string" && curProp.length > truncateLength)
-                    curProp = `${curProp.substr(0, truncateLength)}…`;
+                    curProp = `${curProp.substring(0, truncateLength)}…`;
 
 
                 const boolDeco = typeof curProp === "boolean" ? (curProp === true ? ` ${col.green}✔ ` : ` ${col.red}✘ `) : "";
                 const boolDeco = typeof curProp === "boolean" ? (curProp === true ? ` ${col.green}✔ ` : ` ${col.red}✘ `) : "";
 
 

+ 2 - 2
tools/submissions.js

@@ -727,9 +727,9 @@ function getSubmissions(lang)
 function parseFileName(fileName)
 function parseFileName(fileName)
 {
 {
     if(fileName.startsWith("submission_"))
     if(fileName.startsWith("submission_"))
-        fileName = fileName.substr(11);
+        fileName = fileName.substring(11);
     if(fileName.endsWith(".json"))
     if(fileName.endsWith(".json"))
-        fileName = fileName.substr(0, fileName.length - 5);
+        fileName = fileName.substring(0, fileName.length - 5);
 
 
     // eff8e7ca_0_1634205492859
     // eff8e7ca_0_1634205492859
 
 

+ 2 - 2
tools/validate-ids.js

@@ -30,7 +30,7 @@ try
         if(fName.startsWith("template"))
         if(fName.startsWith("template"))
             return;
             return;
 
 
-        let langCode = fName.split("-")[1].substr(0, 2);
+        let langCode = fName.split("-")[1].substring(0, 2);
 
 
         let filePath = resolve(join(settings.jokes.jokesFolderPath, fName));
         let filePath = resolve(join(settings.jokes.jokesFolderPath, fName));
 
 
@@ -62,7 +62,7 @@ try
                     jokeContent = `${errjoke.joke.setup.replace(/\n/gm, "\\n")} -/- ${errjoke.joke.delivery.replace(/\n/gm, "\\n")}`;
                     jokeContent = `${errjoke.joke.setup.replace(/\n/gm, "\\n")} -/- ${errjoke.joke.delivery.replace(/\n/gm, "\\n")}`;
 
 
                 if(jokeContent.length > 40)
                 if(jokeContent.length > 40)
-                    jokeContent = `${jokeContent.substr(0, 40)}...`;
+                    jokeContent = `${jokeContent.substring(0, 40)}...`;
 
 
                 console.log(`#${errjoke.joke.id} | ${langCode} | ${errjoke.joke.category} | ${jokeContent}    ${col.red}(Expected ID #${errjoke.idx} - joke instead has #${errjoke.joke.id})${col.rst}`);
                 console.log(`#${errjoke.joke.id} | ${langCode} | ${errjoke.joke.category} | ${jokeContent}    ${col.red}(Expected ID #${errjoke.idx} - joke instead has #${errjoke.joke.id})${col.rst}`);
                 notOk++;
                 notOk++;