From b0f4e94a1db3cfd78aa8cedc9ad755f862250688 Mon Sep 17 00:00:00 2001 From: Lukas Bachschwell Date: Thu, 10 Mar 2016 15:55:43 +0100 Subject: [PATCH 1/3] Update db.json --- db.json | 162 ++------------------------------------------------------ 1 file changed, 4 insertions(+), 158 deletions(-) diff --git a/db.json b/db.json index 150df10..56b9d56 100644 --- a/db.json +++ b/db.json @@ -2,171 +2,17 @@ "messages": [ { "numberString": "", - "number": "+43 681 2033 4015", + "number": "*", "time": "now", "message": "SMS MessageBoard", "color": 0 }, { - "numberString": "+CMT: \"002B0034003300360039003900310030003000380038003800380036\",\"\",\"16/03/09,19:19:25+04\"\r", - "number": "+4369910088886", + "numberString": "+CMT: \"*\",\"\",\"16/03/09,19:19:25+04\"\r", + "number": "*", "time": "19:19:25", "message": "Next", "color": 1 - }, - { - "numberString": "+CMT: \"002B0034003300360039003900310030003000380038003800380036\",\"\",\"16/03/09,19:19:43+04\"\r", - "number": "+4369910088886", - "time": "19:19:43", - "message": "Emoji support πŸ˜ƒπŸ‘πŸ™ˆπŸ™ŠπŸŽ‰πŸ™‰πŸ€‘πŸŽπŸ˜ΊπŸŽˆ", - "color": 2 - }, - { - "numberString": "+CMT: \"002B0034003300360039003900310030003000380038003800380036\",\"\",\"16/03/09,19:19:54+04\"\r", - "number": "+4369910088886", - "time": "19:19:54", - "message": "Multicolor", - "color": 3 - }, - { - "numberString": "+CMT: \"002B0034003300360039003900310030003000380038003800380036\",\"\",\"16/03/09,19:20:18+04\"\r", - "number": "+4369910088886", - "time": "19:20:18", - "message": "...and other tricks! πŸ˜‰", - "color": 4 - }, - { - "numberString": "+CMT: \"002B003400330036003600340035003300300035003900390036\",\"\",\"16/03/09,19:29:45+04\"\r", - "number": "+436645305996", - "time": "19:29:45", - "message": "Hi 😁", - "color": 0 - }, - { - "numberString": "+CMT: \"002B003400330036003600340035003300300035003900390036\",\"\",\"16/03/09,19:30:05+04\"\r", - "number": "+436645305996", - "time": "19:30:05", - "message": "Animations", - "color": 1 - }, - { - "numberString": "+CMT: \"002B003400330036003600340035003300300035003900390036\",\"\",\"16/03/09,19:32:09+04\"\r", - "number": "+436645305996", - "time": "19:32:09", - "message": "Hallo nici πŸ˜‡", - "color": 2 - }, - { - "numberString": "+CMT: \"002B0034003300360039003900310030003000380038003800380036\",\"\",\"16/03/09,19:36:27+04\"\r", - "number": "+4369910088886", - "time": "19:36:27", - "message": "Hallo Familie πŸ˜ŠπŸ™‰πŸŽ‰", - "color": 3 - }, - { - "numberString": "+CMT: \"002B003400330036003600340035003300300035003900390036\",\"\",\"16/03/09,19:37:44+04\"\r", - "number": "+436645305996", - "time": "19:37:44", - "message": "Emojis funktionieren jetzt auch 😍", - "color": 4 - }, - { - "numberString": "+CMT: \"002B0034003300360036003400370035003000350037003900370032\",\"\",\"16/03/09,20:35:42+04\"\r", - "number": "+4366475057972", - "time": "20:35:42", - "message": "Hey ", - "color": 0 - }, - { - "numberString": "+CMT: \"002B0034003300360039003900310030003000380038003800380036\",\"\",\"16/03/09,20:35:42+04\"\r", - "number": "+4369910088886", - "time": "20:35:42", - "message": "Hallo Timon", - "color": 1 - }, - { - "numberString": "+CMT: \"002B0034003300360039003900310030003000380038003800380036\",\"\",\"16/03/09,20:35:58+04\"\r", - "number": "+4369910088886", - "time": "20:35:58", - "message": "πŸ˜˜πŸ‘ŒπŸŽπŸ˜‰πŸ˜πŸ˜„πŸ‘Œ", - "color": 2 - }, - { - "numberString": "+CMT: \"002B0034003300360039003900310030003000380038003800380036\",\"\",\"16/03/09,22:36:42+04\"\r", - "number": "+4369910088886", - "time": "22:36:42", - "message": "Hahahahahah das is lustig", - "color": 3 - }, - { - "numberString": "+CMT: \"002B0034003300360039003900310030003000380038003800380036\",\"\",\"16/03/09,22:36:53+04\"\r", - "number": "+4369910088886", - "time": "22:36:53", - "message": "Ich πŸ˜πŸ‘", - "color": 4 - }, - { - "numberString": "+CMT: \"002B0034003300360039003900310030003000380038003800380036\",\"\",\"16/03/09,22:37:08+04\"\r", - "number": "+4369910088886", - "time": "22:37:08", - "message": "Haha fritsch", - "color": 0 - }, - { - "numberString": "+CMT: \"002B0034003300360039003900310030003000380038003800380036\",\"\",\"16/03/09,22:51:08+04\"\r", - "number": "+4369910088886", - "time": "22:51:08", - "message": "πŸ˜›ahhhhhhh rage!!!!", - "color": 1 - }, - { - "numberString": "+CMT: \"002B0034003300360039003900310030003000380038003800380036\",\"\",\"16/03/09,22:51:19+04\"\r", - "number": "+4369910088886", - "time": "22:51:19", - "message": "Djdndjdcjdosndhf", - "color": 2 - }, - { - "numberString": "+CMT: \"002B0034003300360039003900310030003000380038003800380036\",\"\",\"16/03/09,22:51:33+04\"\r", - "number": "+4369910088886", - "time": "22:51:33", - "message": "Node.js for the win", - "color": 3 - }, - { - "numberString": "+CMT: \"002B0034003300360039003900310030003000380038003800380036\",\"\",\"16/03/09,22:51:53+04\"\r", - "number": "+4369910088886", - "time": "22:51:53", - "message": "Bootstrap ruelz πŸ˜›πŸ™ˆπŸŽ‰", - "color": 4 - }, - { - "numberString": "+CMT: \"002B0034003300360039003900310030003000380038003800380036\",\"\",\"16/03/09,22:57:20+04\"\r", - "number": "+4369910088886", - "time": "22:57:20", - "message": "I ❀️ Socket.io", - "color": 0 - }, - { - "numberString": "+CMT: \"002B0034003300360039003900310030003000380038003800380036\",\"\",\"16/03/10,09:19:15+04\"\r", - "number": "+4369910088886", - "time": "09:19:15", - "message": "Test", - "color": 1 - }, - { - "numberString": "+CMT: \"002B0034003300360039003900310030003000380038003800380036\",\"\",\"16/03/10,09:19:42+04\"\r", - "number": "+4369910088886", - "time": "09:19:42", - "message": "Test g", - "color": 2 - }, - { - "numberString": "+CMT: \"002B0034003300360039003900310030003000380038003800380036\",\"\",\"16/03/10,09:25:17+04\"\r", - "number": "+4369910088886", - "time": "09:25:17", - "message": "More", - "color": 3 } ] -} \ No newline at end of file +} From 7accd22dc833e49a963ab3e655a3a12b5a24f409 Mon Sep 17 00:00:00 2001 From: Lukas Bachschwell Date: Thu, 10 Mar 2016 15:57:03 +0100 Subject: [PATCH 2/3] Update server.js --- server.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/server.js b/server.js index ae0651b..8ba8d74 100644 --- a/server.js +++ b/server.js @@ -34,7 +34,8 @@ function startServer(route,handle,debug) { db('messages').size(); //call this once to establish the db if there is nothing in the json file - if(db('messages').size() == 0)db('messages').push({ numberString: "",number: "+43 681 2033 4015", time: "now", message: "SMS MessageBoard",color: 0 }); + var mynumber = config('mainConfig').chain().find({ param: 'mynumber' }).value()['value']; + if(db('messages').size() == 0)db('messages').push({ numberString: "",number: mynumber, time: "now", message: "SMS MessageBoard",color: 0 }); // on request event function onRequest(request, response) { From 6b85a923778fdc5be4490d936ef1abc8df9f20f5 Mon Sep 17 00:00:00 2001 From: Lukas Bachschwell Date: Tue, 15 Mar 2016 11:24:24 +0100 Subject: [PATCH 3/3] Delete db.json --- db.json | 18 ------------------ 1 file changed, 18 deletions(-) delete mode 100644 db.json diff --git a/db.json b/db.json deleted file mode 100644 index 56b9d56..0000000 --- a/db.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "messages": [ - { - "numberString": "", - "number": "*", - "time": "now", - "message": "SMS MessageBoard", - "color": 0 - }, - { - "numberString": "+CMT: \"*\",\"\",\"16/03/09,19:19:25+04\"\r", - "number": "*", - "time": "19:19:25", - "message": "Next", - "color": 1 - } - ] -}