Username changes

ddinan · Jul 30, 2022 · f0618ab · f0618ab
1 parent 561f30b
commit f0618ab
Show file tree

Hide file tree

Showing 8 changed files with 134 additions and 123 deletions.
diff --git a/commands/color.js b/commands/color.js
@@ -15,7 +15,7 @@ exports.run = async (client, message, args, level) => {
  .setColor(hex)
  .setDescription(`${lang.RandomHex} \`#${hex}\``)
  .setTitle("#" + hex)
- .setImage(`https://derekdinan.github.io/ClassiCube-Stuff/hex-to-img/?hex=${color}`)
+ .setImage(`https://ddinan.github.io/ClassiCube-Stuff/hex-to-img/?hex=${color}`)
  .setFooter(`${lang.RespondingTo} ${message.author.tag}`, message.author.avatarURL())
  .setTimestamp()
 

diff --git a/events/ready.js b/events/ready.js
@@ -87,7 +87,7 @@ module.exports = async (client) => {
  client.logger.log(`Running on Node ${process.version.replace(" ", "")}`, "ready");
  client.logger.log(`Running Discord.js v${require("discord.js").version.replace(" ", "")}`, "ready");
 
- client.logger.log("Running Tsuyo v1.2 | https://github.com/derekdinan/Tsuyo");
+ client.logger.log("Running Tsuyo v1.2 | https://github.com/ddinan/Tsuyo");
  client.startuptime = new Date().getTime() - client.starttime;
  client.logger.log("It took " + client.startuptime + "ms to start Tsuyo.");*/
 

diff --git a/package.json b/package.json
@@ -1,85 +1,80 @@
 {
- "name": "Tsuyo",
- "version": "1.0.0",
- "description": "A multipurpose bot to handle all your needs.",
- "main": "bot.js",
- "scripts": {
- "start": "node bot.js",
- "node": "node bot.js",
- "forever": "forever start bot.js",
- "pm2": "pm2 start bot.js",
- "pnpm": "pnpm server start",
- "yarn": "yarn run bot.js",
- "nodemon": "nodemon -L .",
- "snyk-protect": "snyk protect",
- "prepare": "npm run snyk-protect",
- "test": "jest"
- },
- "engines": {
- "node": "12.x"
- },
- "repository": "github:derekdinan/Tsuyo",
- "author": "Venk#2020",
- "license": "MIT",
- "dependencies": {
- "@top-gg/sdk": "^3.1.2",
- "axios": "^0.21.1",
- "better-sqlite-pool": "^0.3.1",
- "better-sqlite3": "^7.4.3",
- "body-parser": "^1.19.0",
- "canvacord": "^5.2.3",
- "chalk": "^4.1.2",
- "colors": "^1.4.0",
- "connect-mongo": "^4.4.1",
- "cookie-parser": "^1.4.5",
- "discord-anti-spam": "^2.5.8",
- "discord-buttons": "^4.0.0",
- "discord-menu-buttons": "^1.4.7",
-<<<<<<< Updated upstream
- "discord.js": "^13.1.0",
- "dotenv": "^16.0.0",
-=======
- "discord.js": "^13.6.0",
- "dotenv": "^10.0.0",
->>>>>>> Stashed changes
- "ejs": "^3.1.6",
- "enmap": "^5.8.7",
- "express": "^4.16.4",
- "express-session": "^1.17.2",
- "form-data": "^4.0.0",
- "humanize-duration": "^3.27.0",
- "ip": "^1.1.5",
- "js-beautify": "^1.14.0",
- "mathjs": "^9.4.3",
- "moment": "^2.29.1",
- "moment-duration-format": "^2.2.2",
- "ms": "^2.1.3",
- "node-fetch": "^2.6.0",
- "node-html-parser": "^4.1.5",
- "numeral": "^2.0.6",
- "one-liner-joke": "^1.2.2",
- "pm2": "^5.1.2",
- "random": "^3.0.6",
- "random-puppy": "^1.1.0",
- "reaction-role": "^4.1.1",
- "reconlx": "^2.2.0",
- "redis": "^3.1.2",
- "request": "^2.88.2",
- "rhyme": "^0.0.3",
- "snyk": "^1.858.0",
- "superagent": "^6.1.0",
- "top.gg": "^2.3.1",
- "zaq": "^2.1.5",
- "zxcvbn": "^4.4.2"
- },
- "devDependencies": {
- "eslint": "^7.32.0",
- "forever": "^3.0.4",
- "nodemon": "^2.0.13"
- },
- "bugs": {
- "url": "https://github.com/derekdinan/Tsuyo/issues"
- },
- "homepage": "http:https://tsuyo.xyz",
- "snyk": true
-}
+ "name": "Tsuyo",
+ "version": "1.0.0",
+ "description": "A multipurpose bot to handle all your needs.",
+ "main": "bot.js",
+ "scripts": {
+ "start": "node bot.js",
+ "node": "node bot.js",
+ "forever": "forever start bot.js",
+ "pm2": "pm2 start bot.js",
+ "pnpm": "pnpm server start",
+ "yarn": "yarn run bot.js",
+ "nodemon": "nodemon -L .",
+ "snyk-protect": "snyk protect",
+ "prepare": "npm run snyk-protect",
+ "test": "jest"
+ },
+ "engines": {
+ "node": "12.x"
+ },
+ "repository": "github:ddinan/Tsuyo",
+ "author": "Venk#2020",
+ "license": "MIT",
+ "dependencies": {
+ "@top-gg/sdk": "^3.1.2",
+ "axios": "^0.21.1",
+ "better-sqlite-pool": "^0.3.1",
+ "better-sqlite3": "^7.4.3",
+ "body-parser": "^1.19.0",
+ "canvacord": "^5.2.3",
+ "chalk": "^4.1.2",
+ "colors": "^1.4.0",
+ "connect-mongo": "^4.4.1",
+ "cookie-parser": "^1.4.5",
+ "discord-anti-spam": "^2.5.8",
+ "discord-buttons": "^4.0.0",
+ "discord-menu-buttons": "^1.4.7",
+ "discord.js": "^13.6.0",
+ "dotenv": "^16.0.0",
+ "ejs": "^3.1.6",
+ "enmap": "^5.8.7",
+ "express": "^4.16.4",
+ "express-session": "^1.17.2",
+ "form-data": "^4.0.0",
+ "humanize-duration": "^3.27.0",
+ "ip": "^1.1.5",
+ "js-beautify": "^1.14.0",
+ "mathjs": "^9.4.3",
+ "moment": "^2.29.1",
+ "moment-duration-format": "^2.2.2",
+ "ms": "^2.1.3",
+ "node-fetch": "^2.6.0",
+ "node-html-parser": "^4.1.5",
+ "numeral": "^2.0.6",
+ "one-liner-joke": "^1.2.2",
+ "pm2": "^5.1.2",
+ "random": "^3.0.6",
+ "random-puppy": "^1.1.0",
+ "reaction-role": "^4.1.1",
+ "reconlx": "^2.2.0",
+ "redis": "^3.1.2",
+ "request": "^2.88.2",
+ "rhyme": "^0.0.3",
+ "snyk": "^1.858.0",
+ "superagent": "^6.1.0",
+ "top.gg": "^2.3.1",
+ "zaq": "^2.1.5",
+ "zxcvbn": "^4.4.2"
+ },
+ "devDependencies": {
+ "eslint": "^7.32.0",
+ "forever": "^3.0.4",
+ "nodemon": "^2.0.13"
+ },
+ "bugs": {
+ "url": "https://github.com/ddinan/Tsuyo/issues"
+ },
+ "homepage": "http:https://tsuyo.xyz",
+ "snyk": true
+}
diff --git a/routes/me.js b/routes/me.js
@@ -1,4 +1,5 @@
 const router = require('express').Router()
+const client = require('../bot.js')
 
 router.get('/', (req, res) => {
  if (!req.session.user) {
@@ -7,7 +8,8 @@ router.get('/', (req, res) => {
  }
  res.render('me', {
  pageTitle: 'Home - Tsuyo',
- user: req.session.user || null
+ user: req.session.user || null,
+ djsclient: client
  })
 })
 

diff --git a/routes/server.js b/routes/server.js
@@ -33,8 +33,7 @@ router.post('/config', async (req, res) => {
  if (!req.session.guilds) return res.redirect('/')
  if (!client.guilds.cache.has(req.query.id)) return res.redirect('/')
  if (!client.guilds.cache.get(req.query.id).members.cache.has(req.session.user.id)) return res.redirect('/')
-
- if (!client.guilds.cache.get(req.query.id).members.cache.get(req.session.user.id).permissions.has('MANAGE_SERVER')) return console.log("nope")
+ if (!client.guilds.cache.get(req.query.id).members.cache.get(req.session.user.id).permissions.has('MANAGE_SERVER')) return res.redirect('/')
 
  client.settings.set(req.query.id, req.body)
  res.render('server/config', {

diff --git a/views/me.ejs b/views/me.ejs
@@ -21,6 +21,7 @@
 
  <div class="info">
  <h1 style="padding-top: 50px; text-align: left">Info</h1>
+
  <table style="width:100%">
  <tr>
  <td>
@@ -29,7 +30,15 @@
  </tr>
  <tr>
  <td>
- <h2>Balance <span class="data">$21980321</span></h2>
+ <% djsclient.money.ensure(`${user.id}`, {
+ member: user.id,
+ money: 0
+ })
+
+ const money = djsclient.money.get(user.id, 'money')
+ %>
+
+ <h2>Balance <span class="data">$<% money %></span></h2>
  </td>
  </tr>
  </table>

diff --git a/views/partials/navbar.ejs b/views/partials/navbar.ejs
@@ -5,7 +5,7 @@
  <link rel="stylesheet" href="navbar.css" type="text/css">
  <div class="left"><a href="/" style="color:#995BBD; font-weight:450;">Tsuyo</a>
  <a href="http:https://tsuyo.xyz/about">About</a>
- <a target="_blank" href="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/derekdinan/Tsuyo">GitHub</a>
+ <a target="_blank" href="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/ddinan/Tsuyo">GitHub</a>
  <a target="_blank" href="https://discord.gg/3hbeQgY">Support Server</a>
  </div>
 

diff --git a/views/servers.ejs b/views/servers.ejs
@@ -10,40 +10,46 @@
  <div class="page-content">
  <div class="servers">
  <h1 class="title">Servers you can manage: </h1>
- <% djsclient.guilds.cache.forEach((guild) => {
- const member = guild.members.cache.find(p => p.id === user.id)
- if (!member) return
- if (!member.permissions.has('ADMINISTRATOR')) return
- if (!djsclient.guilds.cache.has(guild.id)) { %>
- <a id="invite-btn" target="_blank" href="https://discordapp.com/oauth2/authorize?client_id=492871769485475840&scope=bot&permissions=1506142455&guild_id=<%= guild.id %>">Invite to server
- </a>
+ <% console.log(user.username + " user " + user.id)
+ 
+ let guildMember = djsclient.users.fetch(user.id)
+ guildMember.then(function(member) {
+ console.log(member.username + " member " + member.id)
+ member.guilds.forEach((guild) => {
+ const guildMember = guild.members.cache.get(member.id)
+ if (!guildMember.user.permissions.has('ADMINISTRATOR')) return
 
- <% if (guild.icon) { %>
- <div class="toolelem">
- <div class="text"><span class="tooltext"><%= guild.name %></span></div>
- <img style="border-radius: 50px;" width="100" height="100" src="https://cdn.discordapp.com/icons/<%= guild.id %>/<%= guild.icon %>.png?size=256">
- </div>
- <% } else { %>
- <div class="toolelem">
- <div class="text"><span class="tooltext"><%= guild.name %></span></div>
- <img style="border-radius: 50px;" width="100" height="100" src="https://discordapp.com/assets/6debd47ed13483642cf09e832ed0bc1b.png">
- </div>
- <% }
- } else { %>
- <a id="manage-btn" href="./guild/config?id=<%= guild.id %>">Manage server</a>
- <% if (guild.icon) { %>
- <div class="toolelem">
- <div class="text"><span class="tooltext"><%= guild.name %></span></div>
- <img style="border-radius: 50px;" width="100" height="100" src="https://cdn.discordapp.com/icons/<%= guild.id %>/<%= guild.icon %>.png?size=256">
- </div>
- <% } else { %>
- <div class="toolelem">
- <div class="text"><span class="tooltext"><%= guild.name %></span></div>
- <img style="border-radius: 50px;" width="100" height="100" src="https://discordapp.com/assets/6debd47ed13483642cf09e832ed0bc1b.png">
- </div>
+ if (!djsclient.guilds.cache.has(guild.id)) { %>
+ <a id="invite-btn" target="_blank" href="https://discordapp.com/oauth2/authorize?client_id=492871769485475840&scope=bot&permissions=1506142455&guild_id=<%= guild.id %>">Invite to server
+ </a>
+
+ <% if (guild.icon) { %>
+ <div class="toolelem">
+ <div class="text"><span class="tooltext"><%= guild.name %></span></div>
+ <img style="border-radius: 50px;" width="100" height="100" src="https://cdn.discordapp.com/icons/<%= guild.id %>/<%= guild.icon %>.png?size=256">
+ </div>
+ <% } else { %>
+ <div class="toolelem">
+ <div class="text"><span class="tooltext"><%= guild.name %></span></div>
+ <img style="border-radius: 50px;" width="100" height="100" src="https://discordapp.com/assets/6debd47ed13483642cf09e832ed0bc1b.png">
+ </div>
+ <% }
+ } else { %>
+ <a id="manage-btn" href="./guild/config?id=<%= guild.id %>">Manage server</a>
+ <% if (guild.icon) { %>
+ <div class="toolelem">
+ <div class="text"><span class="tooltext"><%= guild.name %></span></div>
+ <img style="border-radius: 50px;" width="100" height="100" src="https://cdn.discordapp.com/icons/<%= guild.id %>/<%= guild.icon %>.png?size=256">
+ </div>
+ <% } else { %>
+ <div class="toolelem">
+ <div class="text"><span class="tooltext"><%= guild.name %></span></div>
+ <img style="border-radius: 50px;" width="100" height="100" src="https://discordapp.com/assets/6debd47ed13483642cf09e832ed0bc1b.png">
+ </div>
+ <% } %>
  <% } %>
- <% } %>
- <% }) %>
+ <% }) %>
+ <% }); %>
  </div>
  </div>
 </body>