summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author8cy <[email protected]>2020-07-24 07:37:15 -0700
committer8cy <[email protected]>2020-07-24 07:37:15 -0700
commit0966fe54ea4298fe7e62b680d26620bc85ccf081 (patch)
tree61265f6d0880c6f2ab5edd9cd8bf8009558678b5
parentbig stuffs here (diff)
downloaddep-core-0966fe54ea4298fe7e62b680d26620bc85ccf081.tar.xz
dep-core-0966fe54ea4298fe7e62b680d26620bc85ccf081.zip
clean: clean up some messy shit
Diffstat
-rw-r--r--client/public/favicon.icobin3150 -> 5558 bytes
-rw-r--r--client/public/index.html4
-rw-r--r--client/public/manifest.json4
-rw-r--r--client/src/styles/bootstrap-mod.css37
-rw-r--r--client/src/styles/styles.css40
-rw-r--r--server/src/commands/mod/Slowmode.ts8
-rw-r--r--server/src/commands/server/Server.ts2
-rw-r--r--server/src/listeners/client/ReadyListener.ts24
-rw-r--r--server/src/listeners/client/message.ts36
9 files changed, 81 insertions, 74 deletions
diff --git a/client/public/favicon.ico b/client/public/favicon.ico
index bcd5dfd..ce8608e 100644
--- a/client/public/favicon.ico
+++ b/client/public/favicon.ico
Binary files differ
diff --git a/client/public/index.html b/client/public/index.html
index 51da5d4..80fe570 100644
--- a/client/public/index.html
+++ b/client/public/index.html
@@ -7,7 +7,7 @@
<meta name="theme-color" content="#000000" />
<meta
name="description"
- content="Web site created using create-react-app"
+ content="The Discord bot, Aki's, dashboard!"
/>
<link rel="apple-touch-icon" href="%PUBLIC_URL%/logo192.png" />
<!--
@@ -24,7 +24,7 @@
work correctly both with client-side routing and a non-root public URL.
Learn how to configure a non-root public URL by running `npm run build`.
-->
- <title>Aki Dashboard</title>
+ <title>Aki's Dashboard</title>
</head>
<body>
<noscript>You need to enable JavaScript to run this app.</noscript>
diff --git a/client/public/manifest.json b/client/public/manifest.json
index c963f8a..903b137 100644
--- a/client/public/manifest.json
+++ b/client/public/manifest.json
@@ -1,6 +1,6 @@
{
- "short_name": "Aki Dashboard",
- "name": "Create React App Sample",
+ "short_name": "Aki's Dashboard",
+ "name": "The Discord bot, Aki's, dashboard!",
"icons": [
{
"src": "favicon.ico",
diff --git a/client/src/styles/bootstrap-mod.css b/client/src/styles/bootstrap-mod.css
new file mode 100644
index 0000000..4a4ecd9
--- /dev/null
+++ b/client/src/styles/bootstrap-mod.css
@@ -0,0 +1,37 @@
+/* .dark-navbar {
+ background-color: #1f1f1f !important;
+}
+
+.nav-link {
+ color: #d3d3d3 !important;
+}
+
+.dark-card {
+ background-color: #1d1d1d !important;
+}
+
+.card-title {
+ color: #e1e1e1 !important;
+}
+
+.badge-primary {
+ background-color: #bb86fc !important;
+ border-color: #bb86fc !important;
+}
+
+.btn-primary {
+ background-color: #bb86fc !important;
+ border-color: #bb86fc !important;
+}
+
+.card-img-top {
+ border-radius: 50%;
+}
+
+.navbar-toggler-icon {
+ color: #e1e1e1 !important;
+}
+
+.dropdown-menu {
+ background-color: #1f1f1f !important;
+} */ \ No newline at end of file
diff --git a/client/src/styles/styles.css b/client/src/styles/styles.css
index 92ad20f..4cdfe4c 100644
--- a/client/src/styles/styles.css
+++ b/client/src/styles/styles.css
@@ -10,45 +10,9 @@
.user-icon-image {
border-radius: 50%;
}
-/*
-.dark-navbar {
- background-color: #1f1f1f !important;
-}
+/*
html, body {
background-color: #121212 !important;
}
-
-.nav-link {
- color: #d3d3d3 !important;
-}
-
-.dark-card {
- background-color: #1d1d1d !important;
-}
-
-.card-title {
- color: #e1e1e1 !important;
-}
-
-.badge-primary {
- background-color: #bb86fc !important;
- border-color: #bb86fc !important;
-}
-
-.btn-primary {
- background-color: #bb86fc !important;
- border-color: #bb86fc !important;
-}
-*/
-.card-img-top {
- border-radius: 50%;
-}
-/*
-.navbar-toggler-icon {
- color: #e1e1e1 !important;
-}
-
-.dropdown-menu {
- background-color: #1f1f1f !important;
-}*/ \ No newline at end of file
+*/ \ No newline at end of file
diff --git a/server/src/commands/mod/Slowmode.ts b/server/src/commands/mod/Slowmode.ts
index 3aec2bd..b352007 100644
--- a/server/src/commands/mod/Slowmode.ts
+++ b/server/src/commands/mod/Slowmode.ts
@@ -42,21 +42,21 @@ export default class SlowmodeMod extends Command {
try {
if (amount > 120) {
amount = 120;
- msg.channel.send('Due to Discord API limitations, slow mode can only be a max of **120** seconds or less! Your specified amount has been rounded down to **120** seconds. (This message will automatically be deleted in 3 seconds.)')
- .then(m => m.delete({ timeout: 3000 }));
+ msg.channel.send('Due to Discord API limitations, slow mode can only be a max of **120** seconds or less! Your specified amount has been rounded down to **120** seconds. (This message will automatically be deleted in 10 seconds.)')
+ .then(m => m.delete({ timeout: 10000 }));
}
(msg.channel as TextChannel).setRateLimitPerUser(amount);
if (realtime) {
let time = 60000 * realtime;
- msg.channel.send(`Slowmode has now been set to ${amount} seconds and will end in ${realtime} minutes!`);
+ msg.channel.send(`Slowmode has now been set to **${amount}** seconds and will end in **${realtime}** minutes!`);
setTimeout(() => {
(msg.channel as TextChannel).setRateLimitPerUser(0);
return msg.channel.send('Slowmode has now been disabled!');
}, time);
} else {
if (amount == 0) return msg.channel.send('Slowmode has now been disabled!');
- return msg.channel.send(`Slowmode has now been set to ${amount} seconds!`);
+ return msg.channel.send(`Slowmode has now been set to **${amount}** seconds!`);
}
} catch (err) {
console.error(err);
diff --git a/server/src/commands/server/Server.ts b/server/src/commands/server/Server.ts
index 7caf899..20e023b 100644
--- a/server/src/commands/server/Server.ts
+++ b/server/src/commands/server/Server.ts
@@ -24,7 +24,7 @@ export default class ServerServer extends Command {
const embed = this.client.util.embed()
.setAuthor(`${msg.guild.name} - ${msg.guild.id}`, `${msg.guild.iconURL()}`, `https://discordapp.com/channels/${msg.guild.id}/${msg.guild.id}`)
- .setDescription(`Heres's all the information on \`${msg.guild.name}\``)
+ .setDescription(`Here's all the information on \`${msg.guild.name}\``)
.setThumbnail(`${msg.guild.iconURL()}`)
.addField('Owner', `\`${msg.guild.owner.user.tag}\``)
.addField(`Members [${msg.guild.memberCount}]`, `${online} members are online.`, true)
diff --git a/server/src/listeners/client/ReadyListener.ts b/server/src/listeners/client/ReadyListener.ts
index 706e223..0260248 100644
--- a/server/src/listeners/client/ReadyListener.ts
+++ b/server/src/listeners/client/ReadyListener.ts
@@ -21,9 +21,23 @@ export default class ReadyListener extends Listener {
public exec(): void {
console.log(`${this.client.user.tag} is now online and ready!`);
- /* const activities: ReactionStatus[] = [
+ const activities: ReactionStatus[] = [
{
- text: 'uwu$help',
+ text: 'uwu!help',
+ type: 'WATCHING'
+ },
+ {
+ text: `${this.client.channels.cache.size.toLocaleString('en-US')} Channels`,
+ type: 'WATCHING'
+ },
+ {
+ text: `${this.client.guilds.cache
+ .reduce((prev, val) => prev + val.memberCount, 0)
+ .toLocaleString('en-US')} Members`,
+ type: 'WATCHING'
+ },
+ {
+ text: 'kyzer.co',
type: 'WATCHING'
}
]
@@ -35,12 +49,12 @@ export default class ReadyListener extends Listener {
this.client.user!.setActivity(status.value.text, { type: status.value.type });
}, 300000);
- setInterval(() => this._clearPresences(), 9e5); */
+ setInterval(() => this._clearPresences(), 9e5);
new API(this.client).start();
}
- /* private _clearPresences(): void {
+ private _clearPresences(): void {
const i = this.client.guilds.cache.reduce((acc: number, g: Guild): number => {
acc += g.presences.cache.size;
g.presences.cache.clear();
@@ -55,5 +69,5 @@ export default class ReadyListener extends Listener {
yield arr[i];
i = (i + 1) % arr.length;
}
- } */
+ }
} \ No newline at end of file
diff --git a/server/src/listeners/client/message.ts b/server/src/listeners/client/message.ts
index bcad42c..071c310 100644
--- a/server/src/listeners/client/message.ts
+++ b/server/src/listeners/client/message.ts
@@ -13,35 +13,27 @@ export default class MessageListener extends Listener {
public exec(msg: Message): void {
if (msg.mentions.everyone) msg.react('👀');
-
- const waterVariations = [
- 'water',
- 'wader',
- 'wahter',
- 'wahder',
- 'wata',
- 'wateer'
- ];
-
+
if (msg.guild.id === emmaServer) {
- if (waterVariations.includes(msg.content.toLowerCase())) {
+ if (msg.content.toLowerCase().includes('water')
+ && msg.content.toLowerCase().includes('wader')
+ && msg.content.toLowerCase().includes('wahter')
+ && msg.content.toLowerCase().includes('wahder')
+ && msg.content.toLowerCase().includes('wata')
+ && msg.content.toLowerCase().includes('wateer')) {
msg.react('733894420700594187');
msg.react('732062891162992720');
}
}
- const uglyVariations = [
- 'ugly',
- 'ugy',
- 'ugyy',
- 'uggy',
- 'ugee',
- 'uggly',
- 'uglee'
- ];
-
if (msg.guild.id === emmaServer) {
- if (uglyVariations.includes(msg.content.toLowerCase())) {
+ if (msg.content.toLowerCase().includes('ugly')
+ && msg.content.toLowerCase().includes('ugy')
+ && msg.content.toLowerCase().includes('ugyy')
+ && msg.content.toLowerCase().includes('uggy')
+ && msg.content.toLowerCase().includes('ugee')
+ && msg.content.toLowerCase().includes('uggly')
+ && msg.content.toLowerCase().includes('uglee')) {
msg.react('733301856054280253');
}
}
generated by cgit v1.2.3 (git 2.25.1) at 2026-03-11 05:12:02 +0000