Browse Source

add circle

add space

add message to process env

update files

fix var not being pushed
tags/2.0.0
Cian Butler 4 years ago
parent
commit
b57621b55f
9 changed files with 50 additions and 26 deletions
  1. +6
    -0
      app/bot.js
  2. +3
    -0
      circle.yml
  3. +17
    -21
      config/config.json
  4. +16
    -0
      docker-compose.yml
  5. +1
    -1
      package.json
  6. +1
    -1
      plugin_code/bookclub/config/config.json
  7. +1
    -1
      plugin_code/countdown/config/challenges.json
  8. +4
    -1
      plugin_code/popping/config/url.json
  9. +1
    -1
      plugin_code/uno/app/models/game.js

+ 6
- 0
app/bot.js View File

@@ -27,6 +27,12 @@ exports.init = function () {
config.clientOptions.port = process.env.PORT || config.clientOptions.port;
config.clientOptions.userName = process.env.USER || config.clientOptions.userName;

if (process.env.TARGET && process.env.MESSAGE) {
const target = process.env.TARGET;
const message = process.env.MESSAGE;
config.connectCommands.push({ target, message });
}

console.log(`Connecting to ${config.server} as ${config.nick}...`);
client = new irc.Client(config.server, config.nick, config.clientOptions);



+ 3
- 0
circle.yml View File

@@ -0,0 +1,3 @@
machine:
node:
version: 6.9.1

+ 17
- 21
config/config.json View File

@@ -1,20 +1,18 @@
{
"production": {
"server": "localhost",
"nick": "butlerxxx",
"nick": "butlerbot",

"connectCommands": [
{
"target": "nickserv",
"message": "identify"
}
],
"connectCommands": [{
"target": "nickserv",
"message": "identify"
}],

"clientOptions": {
"userName": "butlerx",
"port": "6697",
"floodProtection": true,
"floodProtectionDelay": 175
"userName": "butlerx",
"port": "6697",
"floodProtection": true,
"floodProtectionDelay": 175
}
},

@@ -22,18 +20,16 @@
"server": "localhost",
"nick": "butlerDev",

"connectCommands": [
{
"target": "",
"message": ""
}
],
"connectCommands": [{
"target": "",
"message": ""
}],

"clientOptions": {
"userName": "butlerx",
"port": "6697",
"floodProtection": true,
"floodProtectionDelay": 175
"userName": "butlerx",
"port": "6697",
"floodProtection": true,
"floodProtectionDelay": 175
}
}
}

+ 16
- 0
docker-compose.yml View File

@@ -0,0 +1,16 @@
version: "3"
services:
butlerbot:
image: 'butlerx/butlerbot:latest'
restart: 'always'
volumes:
- ./bookclub:/usr/src/app/plugin_code/bookclub/config
- ./pop:/usr/src/app/plugin_code/poping/config
environment:
SERVER: localhost
PORT: 6697
NICK: butlerbot
USER: butlerx
NODE_ENV: development
TARGET: Nickserv
MESSAGE: identify

+ 1
- 1
package.json View File

@@ -13,7 +13,7 @@
},
"scripts": {
"start": "node app",
"test": "echo \"Error: no test specified\" && exit 1",
"test": "npm run lint",
"lint": "eslint .",
"fix": "eslint . --fix"
},


+ 1
- 1
plugin_code/bookclub/config/config.json View File

@@ -13,7 +13,7 @@
"setTopic": true,
"topicBase": " || Welcome to Bookclub check out https://github.com/butlerx/butlerbot/wiki/bookclub for commands",
"awsId": "",
"awsSecret": "",
"awsSecret ": "",
"channels": ["#BookClub"],
"channelsToExclude": ["#Uno", "#CardsAgainstHumanity", "#Countdown", "bots"],
"channelsToJoin": ["#BookClub"]


+ 1
- 1
plugin_code/countdown/config/challenges.json View File

@@ -20,4 +20,4 @@
"number": 5,
"conundrum": 2
}
]
]

+ 4
- 1
plugin_code/popping/config/url.json View File

@@ -61,5 +61,8 @@
"http://www.someecards.com/videos/wtf/dr-pimple-popper-epidermoid-cyst-by-eye/",
"http://www.someecards.com/videos/wtf/dr-pimple-poppper-top-blackheads-whiteheads-2016/",
"http://www.someecards.com/life/health/pimple-popper-popping-blackheads-pore-strip-video/",
"http://www.someecards.com/videos/wtf/dr-pimple-popper-eyelid-milium/"
"http://www.someecards.com/videos/wtf/dr-pimple-popper-eyelid-milium/",
"http://www.someecards.com/life/health/dr-pimple-popper-medley-has-a-little-bit-of-something-for-everyone/",
"https://www.joe.ie/fitness-health/watch-cyst-popping-video-definitely-not-faint-hearted-581162",
"http://www.someecards.com/videos/wtf/dr-pimple-popper-onion-cyst/"
]

+ 1
- 1
plugin_code/uno/app/models/game.js View File

@@ -405,7 +405,7 @@ const Game = function (channel, client, config, cmdArgs) {

self.discard.addCard(pickedCard);

playString += `${player.nick} has played ${pickedCard.toString()}! ${player.nick} has ${player.hand.numCards()}left.`;
playString += `${player.nick} has played ${pickedCard.toString()}! ${player.nick} has ${player.hand.numCards()} left.`;

pickedCard.onPlay(self);



Loading…
Cancel
Save