db_control_red

김민욱
Commit d86c3536223f46b67fe87b3ec435b23a98563da8 d86c3536 1 parent 4e08a028
Showing 2 changed files with 60 additions and 69 deletions
Routers/route.js
db_control_red.js
--- a/Routers/route.js
View file @d86c353
+++ b/Routers/route.js
View file @d86c353
@@ -80,10 +80,8 @@ bot.on('message', (data) => {
 // Responding to Data
 function handleMessage(message, current_channel){
     console.log(message);
-    var test = -1;
 //Handles message response depending on the user message
     if(message.includes(' tell me') || message.includes(' Tell me')){
-        test =1;
         if(message.includes(' knock')){
             knockknockJoke(current_channel);
         }
@@ -101,14 +99,17 @@ function handleMessage(message, current_channel){
         else if(message.includes(' reddit')){
             redditJoke(current_channel);
         }
+        else if(message.includes(' funny story')){
+            Funnystory(current_channel);
+        }
         else if(message.includes(' me')){
-            comment = "Please use @joker --help to know what I can do!:smiliey::smiliey::smiliey:\n You can write type of joke[knock-knock, general, programming]";
+            comment = "Please use @joker --help to know what I can do!:smiliey::smiliey::smiliey:\n You can write type of joke[knock-knock, general, programming, funny story, reddit]";
             bot.postMessageToChannel(current_channel, "Tell you what??? :no_mouth:", emoji.emojis('no_mouth'));
             bot.postMessageToChannel(current_channel, comment, emoji.emojis('flushed'));
         }  
     }
     else if(message.includes(' help')){
-       comment = "If you want to start @joker then write [tell me] and write type of joke [knock-knock, general, programming]:smiley:!!";
+       comment = "If you want to start @joker then write [tell me] and write type of joke [knock-knock, general, programming, funny story, reddit]:smiley:!!!";
        bot.postMessageToChannel(current_channel, comment, emoji.emojis('smiliey'));
     }
     else if(message.includes(' what jokes')){
@@ -120,7 +121,7 @@ function handleMessage(message, current_channel){
     //{
     //    MakeJoke(message);
     //}
-    /*else if (test = 0){
+    /*else{
          comment = "Sorry I'm not smart enough to understand this.....\nPlease use @joker help to know what I can do!";
          bot.postMessageToChannel(current_channel, comment, emoji.emojis('flushed'));    
     }*/
@@ -254,33 +255,62 @@ programmingJoke= (user_channel)=>{
         })
     };
-    //Function for giving out random joke after filtering only reddit jokes
+
-    redditJoke= (user_channel)=>{
+
-        MongoClient.connect(url, function (err, client){
+//Function for giving out random joke after filtering only reddit jokes
-            if (err) throw err; 
+Funnystory= (user_channel)=>{
-            var db = client.db('redditjoke');
+    MongoClient.connect(url, function (err, client){
+        if (err) throw err; 
+        var db = client.db('FunnyStoryapi');
+    
-            json_max = 70;
+        random = getRandomInt(200);
-            random = getRandomInt(json_max);
+        result = db.collection('FunnyStory').findOne({id: random});   
-            result = db.collection('reddit').findOne({id: random});   
+        user = result;
-            user = result;
+        //if the random picked api type is not general execute the function from the start to get another format for general type
-            //if the random picked api type is not general execute the function from the start to get another format for general type
+        user.then(function(total){
-            user.then(function(total){
+            category = total.category
-                 title = total.title;
+             bot.postMessageToChannel(user_channel, category, emoji.emojis('smiliey'));
-                 bot.postMessageToChannel(user_channel, title, emoji.emojis('smiliey'));
+             console.log("이야기 카테고리")
-                 console.log("문답형 JOKE")
         return total;
-            })
+        })
-            .then((all)=>{
+        .then((all)=>{
-                joke = all.body;
+            story = all.body;
-         bot.postMessageToChannel(user_channel, `${joke}:stuck_out_tongue_winking_eye::laughing:`, emoji.emojis('laughing'))
+             bot.postMessageToChannel(user_channel, `${story}:stuck_out_tongue_winking_eye::laughing:`, emoji.emojis('laughing'))
-                console.log("정답은~~");
+            console.log("이야기 시작!");
-                return joke;
+            
-            })
+        })
-            client.close();
+        client.close();
-            })
+        })
-        };
+    };
-         
+        
+
+//Function for giving out random joke after filtering only reddit jokes
+redditJoke= (user_channel)=>{
+    MongoClient.connect(url, function (err, client){
+        if (err) throw err; 
+        var db = client.db('redditjoke');
+    
+        json_max = 70;
+        random = getRandomInt(json_max);
+        result = db.collection('reddit').findOne({id: random});   
+        user = result;
+        //if the random picked api type is not general execute the function from the start to get another format for general type
+        user.then(function(total){
+             title = total.title;
+             bot.postMessageToChannel(user_channel, title, emoji.emojis('smiliey'));
+             console.log("문답형 JOKE")
+    return total;
+        })
+        .then((all)=>{
+            joke = all.body;
+     bot.postMessageToChannel(user_channel, `${joke}:stuck_out_tongue_winking_eye::laughing:`, emoji.emojis('laughing'))
+            console.log("정답은~~");
+            
+        })
+        client.close();
+        })
+    };        
 //Function for giving out random joke after filtering only knock-knock type jokes
 knockknockJoke= (user_channel)=>{
     MongoClient.connect(url, function (err, client){
--- a/db_control_red.js
View file @d86c353
+++ b/db_control_red.js
View file @d86c353
@@ -43,42 +43,3 @@ MongoClient.connect(url,{ useNewUrlParser: true }).then((client) => {
 })
 .catch((err) => console.log(err));
-
-
-
-
-
-
-
-
-
-
-
-
-// //will encapsulate all that database operations
-// const assert = require('assert');
-
-// exports.insertDocument = (db, document, collection, callback) =>{
-//     const coll = db.collection(collection);
-//     return coll.insert(document);
-// };
-
-// exports.findDocuments = (db, collection, input,callback)=>{
-//     const coll = db.collection(collection);
-//     return coll.find({"type": input}).toArray();
-// }
-
-// exports.removeDocuments = (db, document , collection, callback)=>{
-//     const coll = db.collection(collection);
-//     return coll.deleteone(document);
-// }
-
-// exports.updateDocuments = (db, document , update ,collection, callback)=>{
-//     const coll = db.collection(collection);
-//     return coll.updateOne(document, {$set: update}, null);
-// }
-
-// exports.getdata = (db, document, collection, input, callback =>{
-//     result = findDocuments(db,collection);
-//     return result;
-// })
\ No newline at end of file