Some cleanup and corrections.
Jokes and news should work again
This commit is contained in:
parent
02256dede6
commit
7bc1455e37
|
@ -338,7 +338,7 @@ command(
|
||||||
|
|
||||||
command(
|
command(
|
||||||
['!in'],
|
['!in'],
|
||||||
'!in <channel> <message>',
|
'Post a message in a specific channel: !in <channel> <message>',
|
||||||
async ({ args, event }) => {
|
async ({ args, event }) => {
|
||||||
const channel = idFromWord(args[0])
|
const channel = idFromWord(args[0])
|
||||||
const text = event.text.substring(event.text.indexOf('>') + 1)
|
const text = event.text.substring(event.text.indexOf('>') + 1)
|
||||||
|
|
|
@ -1,10 +1,9 @@
|
||||||
const fs = require('fs')
|
const fs = require('fs')
|
||||||
//const jokes = require('../jokes')
|
|
||||||
const achievements = require('./achievements')
|
const achievements = require('./achievements')
|
||||||
const buyableItems = require('./buyableItems')
|
const buyableItems = require('./buyableItems')
|
||||||
const { quackStore, getChaos } = require('./quackstore')
|
const { quackStore, getChaos } = require('./quackstore')
|
||||||
const slack = require("../../slack");
|
|
||||||
|
|
||||||
|
let jokes
|
||||||
let slackUsers
|
let slackUsers
|
||||||
const setSlackUsers = users => {
|
const setSlackUsers = users => {
|
||||||
slackUsers = users
|
slackUsers = users
|
||||||
|
@ -424,7 +423,7 @@ const shufflePercent = (str, percentOdds) => {
|
||||||
}
|
}
|
||||||
|
|
||||||
const definitelyShuffle = (str, percentOdds) => {
|
const definitelyShuffle = (str, percentOdds) => {
|
||||||
if (!str) {
|
if (!str || str.length === 1) {
|
||||||
return str
|
return str
|
||||||
}
|
}
|
||||||
if (!percentOdds) {
|
if (!percentOdds) {
|
||||||
|
@ -617,5 +616,6 @@ module.exports = {
|
||||||
updateAll,
|
updateAll,
|
||||||
setSlackAppClientChatUpdate: update => slackAppClientChatUpdate = update,
|
setSlackAppClientChatUpdate: update => slackAppClientChatUpdate = update,
|
||||||
setUpgrades,
|
setUpgrades,
|
||||||
setSlackUsers
|
setSlackUsers,
|
||||||
|
setJokes: _jokes => jokes = _jokes
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,4 +1,5 @@
|
||||||
const slack = require('../slack')
|
const slack = require('../slack')
|
||||||
|
const { setJokes } = require('../games/hvacoins/utils')
|
||||||
|
|
||||||
// TODO: Move jokes/news into their own files, and let hvacker edit them when !addjoke or !addnews are used
|
// TODO: Move jokes/news into their own files, and let hvacker edit them when !addjoke or !addnews are used
|
||||||
const jokes = [
|
const jokes = [
|
||||||
|
@ -106,3 +107,5 @@ module.exports = {
|
||||||
tellJoke,
|
tellJoke,
|
||||||
newsAlert
|
newsAlert
|
||||||
}
|
}
|
||||||
|
|
||||||
|
setJokes(module.exports)
|
|
@ -72,7 +72,7 @@ const buildSayPrepend = ({ say, prepend }) => async msg => {
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
process.once('SIGINT', code => {
|
process.once('SIGINT', () => {
|
||||||
saveGame('SIGINT', true)
|
saveGame('SIGINT', true)
|
||||||
process.exit()
|
process.exit()
|
||||||
})
|
})
|
||||||
|
|
Loading…
Reference in New Issue