commit 1d04c82d6ee4009bb9872a3cbbcd8358c2dff155
parent a582299cd65a42592dea76d561c0314a23a65023
Author: Demonstrandum <moi@knutsen.co>
Date: Sun, 17 May 2020 22:37:55 +0100
Merge branch 'master' of github.com:Demonstrandum/Simp-O-Matic
Diffstat:
5 files changed, 31 insertions(+), 8 deletions(-)
diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
# The Simp'O'Matic
<p align="center">
- <img width="300" src="lib/resources/banners/banner-FFFFFF.png">
+ <img width="300" src="lib/resources/banners/logo-text-outlines.svg?sanitize=true">
</p>
## Help Out
diff --git a/lib/commands/whitelistchannels.ts b/lib/commands/whitelistchannels.ts
@@ -0,0 +1,6 @@
+// .whitelistchannels #channel1 #channel2
+// .whitelistchannels without any arguments turns off the function
+export default async (home_scope: HomeScope) => {
+ const { message, CONFIG } = home_scope;
+ CONFIG.whitelistchannels = [...message.mentions.channels.keys()];
+}+
\ No newline at end of file
diff --git a/lib/main.ts b/lib/main.ts
@@ -240,6 +240,9 @@ export class SimpOMatic {
if (message.content.startsWith('..')) return;
+ if(CONFIG.whitelistchannels.length > 0 && CONFIG.whitelistchannels.includes(message.channel.id))
+ return;
+
const last_command = this._COMMAND_HISTORY.last();
this._COMMAND_HISTORY.push(message);
if (this._COMMAND_HISTORY.length > CONFIG.commands.max_history) {
diff --git a/web/404.html b/web/404.html
@@ -5,7 +5,8 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>404 — Not Found!</title>
{{FAVICONS}}
- <link href="https://fonts.googleapis.com/css2?family=Balsamiq+Sans:wght@400;700&display=swap" rel="stylesheet">
+ <link href="https://fonts.googleapis.com/css2?family=Baloo+2:wght@800&display=swap" rel="stylesheet">
+ <link href="https://fonts.googleapis.com/css2?family=Exo+2:wght@100;300&display=swap" rel="stylesheet">
<style>
:root {
--grey: #666472;
@@ -17,7 +18,7 @@
}
body, html {
font-size: 16px;
- font-family: 'Balsamiq Sans', 'cursive';
+ font-family: "Baloo 2", cursive;
padding: 0;
margin: 0;
height: 100%;
@@ -52,7 +53,6 @@
}
.bar {
display: inline-block;
- vertical-align: text-top;
height: 1.1em;
width: 0.3em;
border-radius: 3px;
diff --git a/web/index.html b/web/index.html
@@ -5,7 +5,8 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>Simp'O'Matic — Discord Bot</title>
{{FAVICONS}}
- <link href="https://fonts.googleapis.com/css2?family=Balsamiq+Sans:wght@400;700&display=swap" rel="stylesheet">
+ <link href="https://fonts.googleapis.com/css2?family=Baloo+2:wght@800&display=swap" rel="stylesheet">
+ <link href="https://fonts.googleapis.com/css2?family=Exo+2:wght@100;300&display=swap" rel="stylesheet">
<style>
:root {
--grey: #666472;
@@ -17,7 +18,7 @@
}
body, html {
font-size: 16px;
- font-family: 'Balsamiq Sans', 'cursive';
+ font-family: "Baloo 2", cursive;
padding: 0;
margin: 0;
height: 100%;
@@ -70,7 +71,6 @@
}
.bar {
display: inline-block;
- vertical-align: text-top;
height: 1.1em;
width: 0.3em;
border-radius: 3px;
@@ -82,6 +82,19 @@
.pink {
color: var(--pink);
}
+ .simp {
+ font-family: "Baloo 2";
+ font-weight: 300
+ }
+ .matic, .o {
+ font-family: "Exo 2";
+ font-weight: 100;
+ position: relative;
+ top: -5px;
+ }
+ .o {
+ font-weight: 300
+ }
</style>
</head>
<body>
@@ -90,7 +103,7 @@
<div class="center">
<h1>
<div class="bar"></div>
- <span class="grey">Simp'O'Matic</span>
+ <span class="grey" style="position: relative; top: -3px"><span class="simp">simp</span><span class="o">'o'</span><span class="matic">matic</span></span>
<span class="pink">is Online</span>
<img
class="emoji"
