Merge branch 'kdysy1130-socket' into 'master'

ejs hotfix



See merge request !7

-const tmi = require('tmi.js');
-const papago = require('./openAPIs/papago_api')
-const ttlserver = require('../socket_server')
-
-// Define configuration options
-var opts = {
-  identity: {
-    username: process.env.BOT_USERNAME,
-    password: process.env.OAUTH_TOKEN
-  },
-  channels: [
-    'bachelorchuckchuck'
-  ]
-};
-
-// Create a client with our options
-const client = new tmi.client(opts);
-
-// Register our event handlers (defined below)
-client.on('message', onMessageHandler);
-client.on('connected', onConnectedHandler);
-
-// Connect to Twitch:
-client.connect();
-
-// Called every time a message comes in
-function onMessageHandler (target, context, msg, self) {
-  if (self) { return; } // Ignore messages from the bot
-  
-  client.say(target, `/color `+changecolor());
-  papago.detectchat(msg, client, target);
-
-  if(msg == '척척학사'){
-    client.say(target, `안녕하세요 척척학사의 방송입니다.`);
-  }
-  
-}
-
-exports.addChannel = (channel) =>{
-    opts.channels.append(channel);
-}
-
-// Called every time the bot connects to Twitch chat
-function onConnectedHandler (addr, port) {
-  console.log(`* Connected to ${addr}:${port}`);
-}
+// const tmi = require('tmi.js');
+// const papago = require('./openAPIs/papago_api')
+// const ttlserver = require('../socket_server')
+
+// // Define configuration options
+// var opts = {
+//   identity: {
+//     username: process.env.BOT_USERNAME,
+//     password: process.env.OAUTH_TOKEN
+//   },
+//   channels: [
+//     'bachelorchuckchuck'
+//   ]
+// };
+
+// // Create a client with our options
+// const client = new tmi.client(opts);
+
+// // Register our event handlers (defined below)
+// client.on('message', onMessageHandler);
+// client.on('connected', onConnectedHandler);
+
+// // Connect to Twitch:
+// client.connect();
+
+// // Called every time a message comes in
+// function onMessageHandler (target, context, msg, self) {
+//   if (self) { return; } // Ignore messages from the bot
+  
+//   client.say(target, `/color `+changecolor());
+//   papago.detectchat(msg, client, target);
+
+//   if(msg == '척척학사'){
+//     client.say(target, `안녕하세요 척척학사의 방송입니다.`);
+//   }
+  
+// }
+
+// exports.addChannel = (channel) =>{
+//     opts.channels.append(channel);
+// }
+
+// // Called every time the bot connects to Twitch chat
+// function onConnectedHandler (addr, port) {
+//   console.log(`* Connected to ${addr}:${port}`);
+// }

@@ -3,7 +3,8 @@ const config = require('./config/config')
 const app = require('express')();
 const app = require('express')();
 const http = require('http').Server(app);
 const http = require('http').Server(app);
 const io = require('socket.io')(http);
 const io = require('socket.io')(http);
-const papago = require('./openAPIs/papago_api')
+const papago = require('./openAPIs/papago_api');
+
 // const tmi = require('tmi.js');
 // const tmi = require('tmi.js');
 // // Define configuration options
 // // Define configuration options
 // var opts = {
 // var opts = {
@@ -19,12 +20,13 @@ const papago = require('./openAPIs/papago_api')
 // const client = new tmi.client(opts); //twitch chatbot client
 // const client = new tmi.client(opts); //twitch chatbot client
 
 
 app.set('view engine', 'ejs');
 app.set('view engine', 'ejs');
-app.set('views', './testviews');
+app.set('views', './server/testviews');
 
 
 let room = ['streamer1', 'streamer2'];
 let room = ['streamer1', 'streamer2'];
 // client.opts.channels;
 // client.opts.channels;
 let a = 0;
 let a = 0;
 
 
+
 app.get('/', (req, res) => {
 app.get('/', (req, res) => {
     res.render('chat');
     res.render('chat');
 });
 });