Merge pull request #19 from epfl-dojo/feature/functionsFiles

Feature/functions files
epfl-dojo · Dec 17, 2019 · b0ddbb5 · b0ddbb5
2 parents d98fee1 + d61c975
commit b0ddbb5
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 32 deletions.
diff --git a/ancien index.js b/ancien index.js
diff --git a/dataHandle.js b/dataHandle.js
@@ -1,15 +1,13 @@
 const fs = require('fs')
-const usersDataFile = 'users_data.json'
+const usersDataFile = './users_data.json'
 module.exports = {
   createUserList: async function (msg, usersObj) {
-    console.log(usersObj)
     if(!usersObj[msg.chat.id][msg.from.id]) {
       usersObj[msg.chat.id][msg.from.id] = {
         'wallet' : 0,
         'username' : msg.from.username,
         'firstname' : msg.from.first_name
       }
-        console.debug(usersObj)
         fs.writeFile(usersDataFile, JSON.stringify(usersObj, null, 2), 'utf8', function (err) {
           if (err) {
             return console.log(err)
@@ -18,47 +16,42 @@ module.exports = {
       }
       return usersObj
     },
-  createChatList: async function (msg, usersObj) {
+  createChatList: function (msg, usersObj) {
     if (!usersObj[msg.chat.id]) {
-      usersObj = {
-        [msg.chat.id]: {
-        }
-      }
-      fs.writeFile(usersDataFile, JSON.stringify(usersObj, null, 2), 'utf8', function (err) {
+      usersObj[msg.chat.id] = {}
+      fs.writeFileSync(usersDataFile, JSON.stringify(usersObj, null, 2), 'utf8', function (err) {
         if (err) {
           return console.log(err)
         }
       })
     }
-    console.log(usersObj)
     return usersObj
   },
-  doesFileExists: function () {
-    console.log('Does', usersDataFile, 'exists ?')
-    try {
-      if (fs.existsSync(usersDataFile)) {
-        console.log(' → yes')
-        return true
-      } else {
-        console.log(' → no')
-        return false
-      }
-    } catch(err) {
-      console.error(err)
-    }
-  },
+    doesFileExists: function (filePath){
+     try {
+       if (fs.existsSync(filePath)) {
+         return true
+       } else {
+         return false
+       }
+     } catch(err) {
+       console.error(err)
+     }
+   },
   readUsersData: function () {
-    return fs.readFileSync(usersDataFile, 'utf8')
+    let tmp = fs.readFileSync(usersDataFile, 'utf8')
+    // Let transform the string to an object, see https://stackoverflow.com/questions/45015/safely-turning-a-json-string-into-an-object
+    return JSON.parse(tmp)
   },
   createUsersDataFile: function () {
     fs.appendFileSync(usersDataFile, '{}', 'utf8')
     console.log(usersDataFile, 'should exist now...')
   },
   initializeUsers: function () {
-    if (!module.exports.doesFileExists()) {
+    if (!module.exports.doesFileExists(usersDataFile)) {
       console.log("File doesn't exist!")
       module.exports.createUsersDataFile()
     }
     return module.exports.readUsersData()
-  }
+  },
 }
diff --git a/index.js b/index.js
@@ -4,11 +4,9 @@ const bot = new TeleBot(Secrets.BOT_TOKEN)
 const dh = require('./dataHandle')
 
 var users = dh.initializeUsers()
-
-bot.on('text', (msg) => {
-  msg.reply.text(msg.text)
-  dh.createChatList(msg, users)
-  dh.createUserList(msg, users)
+bot.on('text', async (msg) => {
+  users = await dh.createChatList(msg, users)
+  users = await dh.createUserList(msg, users)
 })
 
 var commands = {
@@ -38,4 +36,9 @@ bot.on([`/${commands.list[1].name}`], (msg) => {
   msg.reply.text(helpmsg)
 });
 
+// bot.on(/^\/send(.+)$/, (msg, props) => {
+//   const value = props.match[1].trim()
+//   console.log(value)
+// })
+
 bot.start()