백승욱 / movie-reco-chatbot

Go to a project
Toggle navigation Toggle navigation pinning
백승욱
f51eff90 2 parents 4ec62bbf 540e801e

Resolve merge conflict

Inline Side-by-side
Showing 1 changed file with 9 additions and 2 deletions
...@@ -28,7 +28,11 @@ const user_id = config.USER_ID; ...@@ -28,7 +28,11 @@ const user_id = config.USER_ID;
28 28
29 29
30 // SHOW MENU 30 // SHOW MENU
31 +<<<<<<< HEAD
31 function ShowMenu(replyToken) { 32 function ShowMenu(replyToken) {
33 +=======
34 +function ShowMenu(replyeToken) {
35 +>>>>>>> 540e801ecd8d88e2733b5a89c69473c69ed530f3
32 request.post({ 36 request.post({
33 url: LINE_URL + '/reply', 37 url: LINE_URL + '/reply',
34 headers: { 38 headers: {
...@@ -48,8 +52,6 @@ function ShowMenu(replyToken) { ...@@ -48,8 +52,6 @@ function ShowMenu(replyToken) {
48 }); 52 });
49 } 53 }
50 54
51 -ShowMenu();
52 -
53 55
54 // RECEIVE MESSAGE 56 // RECEIVE MESSAGE
55 app.post('/hook', function (req, res) { 57 app.post('/hook', function (req, res) {
...@@ -71,7 +73,11 @@ function Response(replyToken, message) { ...@@ -71,7 +73,11 @@ function Response(replyToken, message) {
71 MovieInfo.MovieInfo(replyToken, message); 73 MovieInfo.MovieInfo(replyToken, message);
72 } 74 }
73 else if (message == '0' || message == '0번') { 75 else if (message == '0' || message == '0번') {
76 +<<<<<<< HEAD
74 ShowMenu(replyToken); 77 ShowMenu(replyToken);
78 +=======
79 + ShowMenu(replyeToken);
80 +>>>>>>> 540e801ecd8d88e2733b5a89c69473c69ed530f3
75 } 81 }
76 else if (message == '1' || message == '1번') { 82 else if (message == '1' || message == '1번') {
77 BoxOffice.ShowYesterdayRank(replyToken); 83 BoxOffice.ShowYesterdayRank(replyToken);
...@@ -94,6 +100,7 @@ function Response(replyToken, message) { ...@@ -94,6 +100,7 @@ function Response(replyToken, message) {
94 } 100 }
95 else { 101 else {
96 Exception.SayIDontKnow(replyToken); 102 Exception.SayIDontKnow(replyToken);
103 + ShowMenu(replyeToken);
97 } 104 }
98 } 105 }
99 106
......