diff options
| author | 8cy <[email protected]> | 2020-05-05 15:17:58 -0700 |
|---|---|---|
| committer | 8cy <[email protected]> | 2020-05-05 15:17:58 -0700 |
| commit | 7a26c1a3727b7072835680687ebb38473e1a09cc (patch) | |
| tree | 1faf5a6cb771737570c04fc813fd5f266c95fe7c /src | |
| parent | add genservers (diff) | |
| download | dep-core-7a26c1a3727b7072835680687ebb38473e1a09cc.tar.xz dep-core-7a26c1a3727b7072835680687ebb38473e1a09cc.zip | |
add build scripts, remove dist
- remove some db errors, namely ones that are bs like no on doc type errors
- move ws to spike
- remove copy npm scripts i think
- remove .env and package
Diffstat (limited to 'src')
| -rw-r--r-- | src/app.ts | 4 | ||||
| -rw-r--r-- | src/bot.ts | 23 | ||||
| -rw-r--r-- | src/commands/zerotwo/darling.ts | 3 | ||||
| -rw-r--r-- | src/config.json | 2 | ||||
| -rw-r--r-- | src/ws/favicon.ico | bin | 19125 -> 0 bytes | |||
| -rw-r--r-- | src/ws/layouts/layout.hbs | 19 | ||||
| -rw-r--r-- | src/ws/public/css/main.css | 116 | ||||
| -rw-r--r-- | src/ws/views/error.hbs | 1 | ||||
| -rw-r--r-- | src/ws/views/index.hbs | 1 | ||||
| -rw-r--r-- | src/ws/ws.ts | 54 |
10 files changed, 22 insertions, 201 deletions
@@ -1,7 +1,7 @@ import { ShardingManager } from 'discord.js'; import config from './config.json'; -const manager = new ShardingManager('./dist/bot.js', { token: config['secret'] }); -//const manager = new ShardingManager('./bot.js', { token: config['secret'] }); +//const manager = new ShardingManager('./dist/bot.js', { token: config['secret'] }); +const manager = new ShardingManager('./bot.js', { token: config['secret'] }); manager.spawn(); console.log('\x1b[0m' + 'Connecting...'); @@ -3,10 +3,10 @@ import { CommandoClient } from 'discord.js-commando'; //import WS from './ws/ws'; import Welcome from './models/welcome.js'; import Goodbye from './models/goodbye.js'; -require('dotenv').config() -import mongo from 'mongoose'; -mongo.connect('mongodb://sin:[email protected]:47107/heroku_4qrjvmb9', { useNewUrlParser: true, useUnifiedTopology: true }) +import mongoose from 'mongoose'; +mongoose.connect('mongodb://sin:[email protected]:47107/heroku_4qrjvmb9', { useNewUrlParser: true, useUnifiedTopology: true }) import path from 'path'; +// @ts-ignore emoji-random doesnt have types import emoji from 'emoji-random'; require('./models/MusicGuild.js') @@ -43,7 +43,7 @@ client.registry }) .registerCommandsIn(path.join(__dirname, 'commands')); -client.once('ready', () => { +client.once('ready', async () => { //console.log(`Started bot: ${client.user.tag} (ID: ${client.user.id})\nCurrently running on ${client.guilds.cache.size} server(s).`); console.log('\x1b[0m' + 'Bot online!') console.log('\x1b[31m' + ` _ _ __ _ @@ -62,9 +62,16 @@ client.once('ready', () => { console.log('\x1b[0m' + 'Servers: ' + '\x1b[36m' + `${client.guilds.cache.size}` + '\x1b[0m') console.log() - client.user?.setActivity('uwu!help | v' + config['version'], { - type: 'WATCHING' - }); + // i would use a set interval in the main msg body but this is better for now because during maintenance you tend to refresh refresh a lot + if ((await client.users.fetch('705537104339402815')).presence.activities[0].name == 'maintenance') { + client.user?.setActivity('uwu!help | Maintenance', { + type: 'WATCHING' + }); + } else { + client.user?.setActivity('uwu!help | v' + config['version'], { + type: 'WATCHING' + }); + } }); client.on('error', console.error); @@ -86,6 +93,7 @@ client.on('guildMemberAdd', member => { } else if (!guild) { return } else if (guild) { + // @ts-ignore linting error shows that channelID doesnt exist when it does member.guild.channels.cache.get(guild.channelID)?.send(`<@${member.id}> has joined **${member.guild.name}** the server! ` + emoji.random()) } else { return @@ -99,6 +107,7 @@ client.on('guildMemberRemove', member => { } else if (!guild) { return } else if (guild) { + // @ts-ignore linting error shows that channelID doesnt exist when it does member.guild.channels.cache.get(guild.channelID)?.send(`<@${member.id}> has left **${member.guild.name}** the server! ` + emoji.random()) } else { return diff --git a/src/commands/zerotwo/darling.ts b/src/commands/zerotwo/darling.ts index bc0dc25..5a409c8 100644 --- a/src/commands/zerotwo/darling.ts +++ b/src/commands/zerotwo/darling.ts @@ -48,6 +48,7 @@ module.exports = class DarlingZeroTwo extends Command { if (error) { console.log(error) } else if (guild && darlingName == 'remove') { + // @ts-ignore linting error shows that channelID doesnt exist when it does if (msg.author.id == guild.userID) { await Darling.findOneAndDelete({ guildID: msg.guild.id }) msg.say('The current darling has been removed. ' + emoji.random()) @@ -57,6 +58,7 @@ module.exports = class DarlingZeroTwo extends Command { } else if (!guild && darlingName == 'remove') { msg.reply('There is no darling set in this server. ' + emoji.random()) } else if (guild && darlingName == 'set') { + // @ts-ignore linting error shows that channelID doesnt exist when it does msg.reply(`I already have a darling! It\'s <@${guild.userID}>! ` + emoji.random()) } else if (!guild && darlingName == 'set') { await darling.save() @@ -73,6 +75,7 @@ module.exports = class DarlingZeroTwo extends Command { } else if (!guild) { msg.reply('I haven\'t found my darling yet! To set one, do `uwu!darling set`. ' + emoji.random()) } else if (guild) { + // @ts-ignore linting error shows that channelID doesnt exist when it does msg.reply(`My darling is <@${guild.userID}>. ` + emoji.random()) } }) diff --git a/src/config.json b/src/config.json index 1997c4e..7d10d6e 100644 --- a/src/config.json +++ b/src/config.json @@ -1,7 +1,7 @@ { "secret":"Njk5NDczMjYzOTk4MjcxNDg5.XpU5oQ.btZuxVudhNllSQY6CxrXXtMJm9A", "yt-api-key":"AIzaSyCeG1lQAeInv4vjFv_eTL9IFAFNdQC9Nk8", - "version":"9.2.4", + "version":"9.3.0", "fortniteTrackerNetworkToken": "4cf21f95-5f1a-412a-b4a7-e5424adc314a", "maxMultipler": 100, "minMultipler": 1.01 diff --git a/src/ws/favicon.ico b/src/ws/favicon.ico Binary files differdeleted file mode 100644 index 7f426f3..0000000 --- a/src/ws/favicon.ico +++ /dev/null diff --git a/src/ws/layouts/layout.hbs b/src/ws/layouts/layout.hbs deleted file mode 100644 index 844e9da..0000000 --- a/src/ws/layouts/layout.hbs +++ /dev/null @@ -1,19 +0,0 @@ -<!DOCTYPE html> -<html lang="en"> - <head> - <meta charset="UTF-8"> - <meta name="viewport" content="width=device-width, initial-scale=1.0"> - <title>{{title}}</title> - <link rel="stylesheet" href="css/main.css"> - <link rel="shortcut icon" href="favicon.ico" type="image/x-icon"> - </head> - <body> - <div title="Status: Online"> - {{body}} - </div> - - <div class="footer"> - <p>Copyright © 2020 - <a href="https://cyne.cf">s1nical</a></p> - </div> - </body> -</html>
\ No newline at end of file diff --git a/src/ws/public/css/main.css b/src/ws/public/css/main.css deleted file mode 100644 index 993c46a..0000000 --- a/src/ws/public/css/main.css +++ /dev/null @@ -1,116 +0,0 @@ -@import url('https://fonts.googleapis.com/css?family=Fira+Mono:400'); - -body { - display: flex; - width: 100vw; - height: 100vh; - align-items: center; - justify-content: center; - margin: 0; - background: #131313; - color: #fff; - font-size: 96px; - font-family: 'Fira Mono', monospace; - letter-spacing: -7px; -} - -div { - animation: glitch 1s linear infinite; -} - -@keyframes glitch { - - 2%, - 64% { - transform: translate(2px, 0) skew(0deg); - } - - 4%, - 60% { - transform: translate(-2px, 0) skew(0deg); - } - - 62% { - transform: translate(0, 0) skew(5deg); - } -} - -div:before, -div:after { - content: attr(title); - position: absolute; - left: 0; -} - -div:before { - animation: glitchTop 1s linear infinite; - clip-path: polygon(0 0, 100% 0, 100% 33%, 0 33%); - -webkit-clip-path: polygon(0 0, 100% 0, 100% 33%, 0 33%); -} - -@keyframes glitchTop { - - 2%, - 64% { - transform: translate(2px, -2px); - } - - 4%, - 60% { - transform: translate(-2px, 2px); - } - - 62% { - transform: translate(13px, -1px) skew(-13deg); - } -} - -div:after { - animation: glitchBotom 1.5s linear infinite; - clip-path: polygon(0 67%, 100% 67%, 100% 100%, 0 100%); - -webkit-clip-path: polygon(0 67%, 100% 67%, 100% 100%, 0 100%); -} - -@keyframes glitchBotom { - - 2%, - 64% { - transform: translate(-2px, 0); - } - - 4%, - 60% { - transform: translate(-2px, 0); - } - - 62% { - transform: translate(-22px, 5px) skew(21deg); - } -} - -#green { - color: #05ffa1 -} - -a { - color: white; - text-decoration: none; - transition: 0.5s; -} - -a:hover { - color: rgb(223, 222, 222); - text-decoration: none; - transition: 0.5s; -} - -.footer { - position: fixed; - left: 0; - bottom: 0; - width: 100%; - color: white; - text-align: center; - font-size: 15px; - letter-spacing: -1px; -}
\ No newline at end of file diff --git a/src/ws/views/error.hbs b/src/ws/views/error.hbs deleted file mode 100644 index fe49573..0000000 --- a/src/ws/views/error.hbs +++ /dev/null @@ -1 +0,0 @@ -Error: {{errtype}}
\ No newline at end of file diff --git a/src/ws/views/index.hbs b/src/ws/views/index.hbs deleted file mode 100644 index 5253033..0000000 --- a/src/ws/views/index.hbs +++ /dev/null @@ -1 +0,0 @@ -Status: Online
\ No newline at end of file diff --git a/src/ws/ws.ts b/src/ws/ws.ts deleted file mode 100644 index 08f9581..0000000 --- a/src/ws/ws.ts +++ /dev/null @@ -1,54 +0,0 @@ -import express from 'express'; -import hbs from 'express-handlebars'; -import bodyParser from 'body-parser'; -import path from 'path'; - -class WebSocket { - constructor(token, port, client) { - this.token = token; - this.client = client; - - this.app = express() - this.app.engine('hbs', hbs({ - extname: 'hbs', - defaultLayout: 'layout', - layoutsDir: __dirname + '/layouts' - })) - this.app.set('views', path.join(__dirname, 'views')) - this.app.set('view engine', 'hbs') - this.app.use(express.static(path.join(__dirname, 'public'))) - this.app.use(bodyParser.urlencoded({ extended: false })) - this.app.use(bodyParser.json()) - - this.registerRoots() - - this.server = this.app.listen(port, () => { - console.log(`Websocket listening on port ${this.server.address().port}`) - }) - } - - checkToken(_token) { - return (_token == this.token) - } - - // http://localhost:port?token=123456 - registerRoots() { - this.app.get('/', (req, res) => { - var _token = req.query.token - // if (!this.checkToken(_token)) { - // res.render('error', { - // title: 's1nical - Error', - // errtype: 'INVALID TOKEN' - // }) - // return - // } - - res.render('index', { - title: 'Uwufier - Status', - token: _token - }) - }) - } -} - -module.exports = WebSocket
\ No newline at end of file |