Merge branch 'dev'

Release version 1.0.6
alirzaev · Jan 24, 2019 · 0e689a0 · 0e689a0
2 parents 02b464b + f374c53
commit 0e689a0
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/app/utils/beautify.js b/app/utils/beautify.js
@@ -20,8 +20,12 @@ module.exports = {
         .replace(/Лекция/im, 'Лек.')
         .replace(/Лабораторная работа/im, 'Лаб.')
         .replace(/Практическое занятие/im, 'Пр.')
-        .replace(/^([А-Яа-я]+-\d{4}-\d{2}-\d{2}, )/im, '')     // remove the group name from the lesson's description
-        .replace(/\s?([А-Яа-я]+-\d{4}-\d{2}-\d{2}, )/gim, '; ') // first occurrence replace to empty string, others to semicolon
+        .replace(/^([А-Яа-я]+-\d{4}-\d{2}-\d{2}, )/im, '\n   ')     // replace group name with 3 spaces
+        .replace(/\s?([А-Яа-я]+-\d{4}-\d{2}-\d{2}, )/gim, ';\n   ') // for indentation
+        .replace(/_/gim, '') // escape markdown characters
+        .replace(/\*/gim, '')
+        .replace(/\[/gim, '')
+        .replace(/`/gim, '')
     ),
 
     rings: (rings) => rings.map((rings, index) => `${index + 1}) ${rings.start}-${rings.end}`),

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "telegram-bot",
-  "version": "1.0.5",
+  "version": "1.0.6",
   "main": "server.js",
   "scripts": {
     "start": "node app/server.js",