ES6 Stuff

This commit is contained in:
AlexKvazos
2015-05-19 20:05:53 -05:00
parent 8b0e87e986
commit 127e163f73
17 changed files with 45 additions and 46 deletions
+3 -3
View File
@@ -1,9 +1,9 @@
module.exports = (socket) => { export default (socket) => {
function onEnd() { let onEnd = () => {
socket.emit('bot:disconnect'); socket.emit('bot:disconnect');
delete socket.mcbot; delete socket.mcbot;
} };
socket.mcbot.on('end', onEnd); socket.mcbot.on('end', onEnd);
+3 -3
View File
@@ -1,6 +1,6 @@
module.exports = (socket) => { export default (socket) => {
function onError(error) { let onError = (error) => {
// this is okay because the connection was ended // this is okay because the connection was ended
if (error.toString() === 'Error: write after end') return; if (error.toString() === 'Error: write after end') return;
@@ -14,7 +14,7 @@ module.exports = (socket) => {
// delete the bot // delete the bot
delete socket.mcbot; delete socket.mcbot;
} };
socket.mcbot.on('error', onError); socket.mcbot.on('error', onError);
+3 -3
View File
@@ -1,8 +1,8 @@
import moment from 'moment'; import moment from 'moment';
module.exports = (socket) => { export default (socket) => {
function onLogin() { let onLogin = () => {
let timestamp = moment().format('MMM D h:mm:ss a'); let timestamp = moment().format('MMM D h:mm:ss a');
socket.emit('buffer:success', `Successfully logged in as ${socket.mcbot.username} with entity id ${socket.mcbot.entity.id}`); socket.emit('buffer:success', `Successfully logged in as ${socket.mcbot.username} with entity id ${socket.mcbot.entity.id}`);
@@ -12,7 +12,7 @@ module.exports = (socket) => {
username: socket.mcbot.username username: socket.mcbot.username
}); });
console.log(`${timestamp}: logged in > ${socket.connectionParams.hostname}:${socket.connectionParams.port} - Username: ${socket.mcbot.username}`); console.log(`${timestamp}: logged in > ${socket.connectionParams.hostname}:${socket.connectionParams.port} - Username: ${socket.mcbot.username}`);
} };
socket.mcbot.on('login', onLogin); socket.mcbot.on('login', onLogin);
+3 -3
View File
@@ -3,9 +3,9 @@ import parseExtra from '../../parsers/extra';
import {escapeHtml} from '../../utils'; import {escapeHtml} from '../../utils';
module.exports = (socket) => { export default (socket) => {
function onMessage(message) { let onMessage = (message) => {
// empty buffer // empty buffer
var buffer = ''; var buffer = '';
@@ -44,7 +44,7 @@ module.exports = (socket) => {
// send line back to the client // send line back to the client
socket.emit('bot:message', buffer); socket.emit('bot:message', buffer);
} };
socket.mcbot.on('message', onMessage); socket.mcbot.on('message', onMessage);
+3 -3
View File
@@ -1,10 +1,10 @@
module.exports = (socket) => { export default (socket) => {
function onSpawn() { let onSpawn = () => {
var pos = socket.mcbot.entity.position; var pos = socket.mcbot.entity.position;
socket.emit('buffer:info', `Spawned at X:${pos.x}, Y:${pos.y}, Z:${pos.z}`); socket.emit('buffer:info', `Spawned at X:${pos.x}, Y:${pos.y}, Z:${pos.z}`);
socket.emit('bot:players', socket.mcbot.players); socket.emit('bot:players', socket.mcbot.players);
} };
socket.mcbot.on('spawn', onSpawn); socket.mcbot.on('spawn', onSpawn);
+1 -1
View File
@@ -5,7 +5,7 @@ import message from './events/message';
import end from './events/end'; import end from './events/end';
// bind all listeners to the bot // bind all listeners to the bot
module.exports = (socket) => { export default (socket) => {
error(socket); error(socket);
login(socket); login(socket);
+3 -3
View File
@@ -18,9 +18,9 @@ dotenv.load();
// create express application, server and socketio instance // create express application, server and socketio instance
var app = express(); let app = express();
var server = createServer(app); let server = createServer(app);
var io = socketio(server); let io = socketio(server);
// setup socket.io-redis if connection variables are set // setup socket.io-redis if connection variables are set
+3 -3
View File
@@ -1,14 +1,14 @@
import {stringToCode} from '../utils'; import {stringToCode} from '../utils';
module.exports = (extra) => { export default (extra) => {
var string = ''; let string = '';
// for each piece of text // for each piece of text
extra.forEach((data) => { extra.forEach((data) => {
// get the text out of the element // get the text out of the element
var text; let text;
if (typeof data === 'string') { if (typeof data === 'string') {
text = data; text = data;
} else if (typeof data === 'object') { } else if (typeof data === 'object') {
+6 -6
View File
@@ -1,12 +1,12 @@
import {stringToCode} from '../utils'; import {stringToCode} from '../utils';
import parseExtra from '../parsers/extra'; import parseExtra from '../parsers/extra';
module.exports = (jsonMsg) => { export default (jsonMsg) => {
var username, msg, sender, broadcast, connected, max, usage, let username, msg, sender, broadcast, connected, max, usage,
current, pages, player, victim, killer, achievement; current, pages, player, victim, killer, achievement;
var color = stringToCode(jsonMsg.color); let color = stringToCode(jsonMsg.color);
switch (jsonMsg.translate) { switch (jsonMsg.translate) {
@@ -99,7 +99,7 @@ module.exports = (jsonMsg) => {
function parseAdmin(command) { function parseAdmin(command) {
var player, gamemode, p1, p2; let player, gamemode, p1, p2;
switch (command.translate) { switch (command.translate) {
@@ -136,7 +136,7 @@ function parseAdmin(command) {
function parseAchievement(achievementid) { function parseAchievement(achievementid) {
var achievements = { let achievements = {
'achievement.acquireIron': 'Acquire Hardware', 'achievement.acquireIron': 'Acquire Hardware',
'achievement.bakeCake': 'The Lie', 'achievement.bakeCake': 'The Lie',
'achievement.blazeRod': 'Into Fire', 'achievement.blazeRod': 'Into Fire',
@@ -181,7 +181,7 @@ function parseAchievement(achievementid) {
function parseCommandUsage(commandId) { function parseCommandUsage(commandId) {
var commands = { let commands = {
'commands.achievement.usage': '/achievement <give|take> <stat_name|*> [player]', 'commands.achievement.usage': '/achievement <give|take> <stat_name|*> [player]',
'commands.ban.usage': '/ban <name> [reason ...]', 'commands.ban.usage': '/ban <name> [reason ...]',
'commands.banip.usage': '/ban-ip <address|name> [reason ...]', 'commands.banip.usage': '/ban-ip <address|name> [reason ...]',
+3 -3
View File
@@ -1,10 +1,10 @@
module.exports = (socket) => { export default (socket) => {
function onChat(data) { let onChat = (data) => {
if (socket.mcbot && socket.mcbot.entity) { if (socket.mcbot && socket.mcbot.entity) {
socket.mcbot.chat(data.message); socket.mcbot.chat(data.message);
} }
} };
socket.on('chat', onChat); socket.on('chat', onChat);
+3 -3
View File
@@ -2,9 +2,9 @@ import mineflayer from 'mineflayer';
import moment from 'moment'; import moment from 'moment';
import events from '../../bot'; import events from '../../bot';
module.exports = (socket) => { export default (socket) => {
function onConnection(data) { let onConnection = (data) => {
let timestamp = moment().format('MMM D h:mm:ss a'); let timestamp = moment().format('MMM D h:mm:ss a');
@@ -39,7 +39,7 @@ module.exports = (socket) => {
// bind bot events // bind bot events
events(socket); events(socket);
} };
socket.on('server:connect', onConnection); socket.on('server:connect', onConnection);
+3 -3
View File
@@ -1,11 +1,11 @@
module.exports = (socket) => { export default (socket) => {
function onDisconnection() { let onDisconnection = () => {
if (socket.mcbot) { if (socket.mcbot) {
socket.mcbot.end(); socket.mcbot.end();
delete socket.mcbot; delete socket.mcbot;
} }
} };
socket.on('disconnect', onDisconnection); socket.on('disconnect', onDisconnection);
+3 -3
View File
@@ -1,10 +1,10 @@
module.exports = (socket) => { export default (socket) => {
function onPlayers() { let onPlayers = () => {
if (socket.mcbot && socket.mcbot.players) { if (socket.mcbot && socket.mcbot.players) {
socket.emit('bot:players', socket.mcbot.players); socket.emit('bot:players', socket.mcbot.players);
} }
} };
socket.on('players', onPlayers); socket.on('players', onPlayers);
+1 -1
View File
@@ -1,4 +1,4 @@
module.exports = (io) => { export default (io) => {
io.on('connection', (socket) => { io.on('connection', (socket) => {
+1 -1
View File
@@ -1,4 +1,4 @@
module.exports = (unsafe) => { export default (unsafe) => {
return unsafe return unsafe
.replace(/&/g, '&amp;') .replace(/&/g, '&amp;')
.replace(/</g, '&lt;') .replace(/</g, '&lt;')
+1 -2
View File
@@ -1,2 +1 @@
exports.escapeHtml = require('./escapeHtml'); export default require('requireindex')(__dirname);
exports.stringToCode = require('./stringToCode');
+2 -2
View File
@@ -1,6 +1,6 @@
module.exports = (string) => { export default (string) => {
var dictionary = { let dictionary = {
'black': 0, 'black': 0,
'dark_blue': 1, 'dark_blue': 1,
'dark_green': 2, 'dark_green': 2,