summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRaindropsSys <contact@minteck.org>2023-05-07 13:51:26 +0200
committerRaindropsSys <contact@minteck.org>2023-05-07 13:51:26 +0200
commit2f160cbdf67f40c71ddafe62eb502fc443ab9e90 (patch)
tree02708bd64d8d7f5bbf512ac1c1b37fdbea1986b8
parent2e5b62c056e5aafcb6460b1c6e5b7dba6e8e0582 (diff)
downloadbutterscotch-2f160cbdf67f40c71ddafe62eb502fc443ab9e90.tar.gz
butterscotch-2f160cbdf67f40c71ddafe62eb502fc443ab9e90.tar.bz2
butterscotch-2f160cbdf67f40c71ddafe62eb502fc443ab9e90.zip
Updated 6 files, added 3 files and renamed .idea/matrix-bot.iml (automated)
-rw-r--r--.idea/butterscotch.iml (renamed from .idea/matrix-bot.iml)0
-rw-r--r--.idea/deployment.xml15
-rw-r--r--.idea/modules.xml2
-rw-r--r--.idea/vcs.xml6
-rw-r--r--Icon 0
-rw-r--r--commands/cute.js2
-rw-r--r--commands/nsfw.js2
-rw-r--r--discord.js2
-rw-r--r--matrix.js2
-rw-r--r--package.json3
10 files changed, 29 insertions, 5 deletions
diff --git a/.idea/matrix-bot.iml b/.idea/butterscotch.iml
index 24643cc..24643cc 100644
--- a/.idea/matrix-bot.iml
+++ b/.idea/butterscotch.iml
diff --git a/.idea/deployment.xml b/.idea/deployment.xml
new file mode 100644
index 0000000..15f74be
--- /dev/null
+++ b/.idea/deployment.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+ <component name="PublishConfigData" autoUpload="Always" serverName="zephyrheights" remoteFilesAllowedToDisappearOnAutoupload="false">
+ <serverData>
+ <paths name="zephyrheights">
+ <serverdata>
+ <mappings>
+ <mapping deploy="/pool/web/butterscotch" local="$PROJECT_DIR$" web="/" />
+ </mappings>
+ </serverdata>
+ </paths>
+ </serverData>
+ <option name="myAutoUpload" value="ALWAYS" />
+ </component>
+</project> \ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
index fe5af69..71ef8d6 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -2,7 +2,7 @@
<project version="4">
<component name="ProjectModuleManager">
<modules>
- <module fileurl="file://$PROJECT_DIR$/.idea/matrix-bot.iml" filepath="$PROJECT_DIR$/.idea/matrix-bot.iml" />
+ <module fileurl="file://$PROJECT_DIR$/.idea/butterscotch.iml" filepath="$PROJECT_DIR$/.idea/butterscotch.iml" />
</modules>
</component>
</project> \ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 0000000..35eb1dd
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+ <component name="VcsDirectoryMappings">
+ <mapping directory="" vcs="Git" />
+ </component>
+</project> \ No newline at end of file
diff --git a/Icon b/Icon
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/Icon
diff --git a/commands/cute.js b/commands/cute.js
index 03f24a8..a9390b4 100644
--- a/commands/cute.js
+++ b/commands/cute.js
@@ -1,6 +1,6 @@
const axios = require("axios");
module.exports = (parameter, wrapper) => {
- axios.get("https://derpibooru.org/api/v1/json/search/images/?q=" + (parameter.trim() !== "" ? encodeURIComponent(parameter.trim()) + ",%20" : "") + "cute,%20-bipedal,%20-human,%20-anthro,%20-face%20mask%20-text,%20-machine%20learning%20generated,%20-comic:pipp%27s%20ponyfans%20adventure,%20-content-aware%20scale,%20-pony%20creator,%20-youtube%20caption,%20-forced%20meme,%20-fluffy%20pony%20grimdark,%20-grimdark,%20-grotesque,%20-obligatory%20pony,%20-drama%20bait,%20-questionable,%20-not%20pony%20related,%20-text%20only,%20-deviantart%20stamp,%20-explicit,%20-exploitable%20meme,%20-nazi,%20-racial%20slur,%20-abuse,%20-suggestive,%20-1000%20hours%20in%20ms%20paint,%20-politics,%20-semi-grimdark,%20-seizure%20warning,%20-screencap,%20-edited%20screencap,%20-vulgar,%20-mockup,%20-fat,%20-sexy,%20-equestria%20girls,%20-big%20breasts,%20-large%20butt,%20-butt,%20-scootadash,%20-pregnant,%20-belly,%20-fetish,%20-drugs,%20-animated,%20-webm,%20-hoof%20knuckles,%20-your%20character%20here,%20-alcohol,%20-cigarette,%20-gmod,%20-them%27s%20fightin%27%20herds,%20-meme,%20-gameloft,%20-ponified,%20-ych%20result,%20-species%20swap,%20-semi-incest,%20-barely%20pony%20related,%20-pixel%20art,%20-spanish,%20-oc,%20-japan%20ponycon,%20-semi-anthro,%20-big%20belly,%20-impossibly%20large%20belly,%20-huge%20belly,%20-discord,%20-belly%20bed,%20-glory%20hole,%20-selfie,%20-g1,%20-g2,%20-g3,%20-implied%20anon&sf=random&per_page=1&filter_id=56027").then((res) => {
+ axios.get("https://derpibooru.org/api/v1/json/search/images/?q=" + (parameter.trim() !== "" ? encodeURIComponent(parameter.trim()) + ",%20" : "") + "cute,%20-bipedal,%20-human,%20-anthro,%20-face%20mask%20-text,%20-machine%20learning%20generated,%20-comic:pipp%27s%20ponyfans%20adventure,%20-content-aware%20scale,%20-pony%20creator,%20-youtube%20caption,%20-forced%20meme,%20-fluffy%20pony%20grimdark,%20-grimdark,%20-grotesque,%20-obligatory%20pony,%20-drama%20bait,%20-questionable,%20-not%20pony%20related,%20-text%20only,%20-deviantart%20stamp,%20-explicit,%20-exploitable%20meme,%20-nazi,%20-racial%20slur,%20-abuse,%20-suggestive,%20-1000%20hours%20in%20ms%20paint,%20-politics,%20-semi-grimdark,%20-seizure%20warning,%20-screencap,%20-edited%20screencap,%20-vulgar,%20-mockup,%20-fat,%20-sexy,%20-equestria%20girls,%20-big%20breasts,%20-large%20butt,%20-butt,%20-scootadash,%20-pregnant,%20-belly,%20-fetish,%20-drugs,%20-animated,%20-webm,%20-hoof%20knuckles,%20-your%20character%20here,%20-alcohol,%20-cigarette,%20-gmod,%20-them%27s%20fightin%27%20herds,%20-meme,%20-gameloft,%20-ponified,%20-ych%20result,%20-species%20swap,%20-semi-incest,%20-barely%20pony%20related,%20-pixel%20art,%20-spanish,%20-oc,%20-japan%20ponycon,%20-semi-anthro,%20-big%20belly,%20-impossibly%20large%20belly,%20-huge%20belly,%20-pokémon,%20-discord,%20-belly%20bed,%20-glory%20hole,%20-selfie,%20-g1,%20-g2,%20-g3,%20-implied%20anon&sf=random&per_page=1&filter_id=56027").then((res) => {
if (res.data['images'][0]) {
axios.get(res.data['images'][0]['view_url'], {
responseType: "arraybuffer"
diff --git a/commands/nsfw.js b/commands/nsfw.js
index a396036..9f814fc 100644
--- a/commands/nsfw.js
+++ b/commands/nsfw.js
@@ -21,7 +21,7 @@ module.exports = async (parameter, wrapper) => {
return;
}
- axios.get("https://derpibooru.org/api/v1/json/search/images/?q=" + (parameter.trim() !== "" ? encodeURIComponent(parameter.trim()) + ",%20" : "") + "explicit,-sketch%2C%20-original%20species%2C%20-traditional%20art%2C%20-transparent%20background%2C%20-opaline%2C%20-opaline%20arcana%2C%20-princess%20cadance%2C%20-jazz%20(g5)%2C%20-queen%20haven%2C%20-smolder%2C%20-machine%20learning%20generated%2C%20-content-aware%20scale%2C%20-pony%20creator%2C%20-youtube%20caption%2C%20-forced%20meme%2C%20-fluffy%20pony%20grimdark%2C%20-grimdark%2C%20-grotesque%2C%20-obligatory%20pony%2C%20-drama%20bait%2C%20-questionable%2C%20-not%20pony%20related%2C%20-text%20only%2C%20-deviantart%20stamp%2C%20-exploitable%20meme%2C%20-nazi%2C%20-racial%20slur%2C%20-abuse%2C%20-suggestive%2C%20-1000%20hours%20in%20ms%20paint%2C%20-politics%2C%20-semi-grimdark%2C%20-seizure%20warning%2C%20-screencap%2C%20-edited%20screencap%2C%20-vulgar%2C%20-mockup%2C%20-fat%2C%20-equestria%20girls%2C%20-big%20breasts%2C%20-large%20butt%2C%20-safe%2C%20-foalcon%2C%20-human%2C%20-anthro%2C%20-rainbow%20dash%2C%20-fluttershy%2C%20-zoom%20zephyrwing%2C%20-thunder%20(g5)%2C%20-posey%2C%20-babs%20seed%2C%20-sweetie%20belle%2C%20-scootaloo%2C%20-twilight%2C%20-twilight%20sparkle%2C%20-sweetie%20bot%2C%20-thunder%2C%20-zoom%2C%20-misty%2C%20-zipp%20storm%2C%20-pipp%20petals%2C%20-penis%2C%20-licking%20cock%2C%20-dickgirl%2C%20-dicks%20everywhere%2C%20-dickboop%2C%20-dick%20in%20a%20box%2C%20-fart%20on%20dick%2C%20-dick%2C%20-flattening%2C%20-cockblock%2C%20-male%2C%20-solo%20male%2C%20-masturbation%2C%20-masturbating%20in%20stomach%2C%20-stallion%2C%20-balls%2C%20-big%20balls%2C%20-close-up%2C%20-rope%2C%20-tied%20up%2C%20-ballgag%2C%20-diaper%2C%20-diaper%20fetish%2C%20-incest%2C%20-cyborg%2C%20-bondage%2C%20-apple%20bloom%2C%20-merch%20sexploitation%2C%20-fetish%2C%20-chastity%20belt%2C%20-deer%2C%20-zebra%2C%20-big%20crotchboobs%2C%20-cat%2C%20-3d%2C%20-sunny%20starscout%2C%20-izzy%20moonbow%2C%20-derpy%20hooves%2C%20-princess%20celestia%2C%20-trixie%2C%20-starlight%20glimmer%2C%20-pinkie%20pie%2C%20-applejack%2C%20-rarity%2C%20-them's%20fightin'%20herds%2C%20-your%20character%20here%2C%20-alcohol%2C%20-cigarette%2C%20-gmod%2C%20-meme%2C%20-gameloft%2C%20-ponified%2C%20-ych%20result%2C%20-species%20swap%2C%20-semi-incest%2C%20-barely%20pony%20related%2C%20-pixel%20art%2C%20-spanish%2C%20-japan%20ponycon%2C%20-chastity%20cage%2C%20-anal%20insertion%2C%20-semi-anthro%2C%20-big%20belly%2C%20-impossibly%20large%20belly%2C%20-huge%20belly%2C%20-belly%20bed%2C%20-glory%20hole%2C%20-selfie%2C%20-draconequus%2C%20-g1%2C%20-g2%2C%20-g3%2C%20-implied%20anon%2C%20-flurry%20heart%2C%20-silverstream%2C%20-ocellus%2C%20-yona%2C%20-gallus%2C%20-sandbar%2C%20-unikitty!%2C%20-satyr%2C%20-human%20on%20pony%20action%2C%20-latex%20pony&sf=random&per_page=1&filter_id=56027").then((res) => {
+ axios.get("https://derpibooru.org/api/v1/json/search/images/?q=" + (parameter.trim() !== "" ? encodeURIComponent(parameter.trim()) + ",%20" : "") + "explicit,-sketch%2C%20-original%20species%2C%20-traditional%20art%2C%20-transparent%20background%2C%20-opaline%2C%20-opaline%20arcana%2C%20-princess%20cadance%2C%20-jazz%20(g5)%2C%20-queen%20haven%2C%20-smolder%2C%20-machine%20learning%20generated%2C%20-content-aware%20scale%2C%20-pony%20creator%2C%20-youtube%20caption%2C%20-forced%20meme%2C%20-fluffy%20pony%20grimdark%2C%20-grimdark%2C%20-grotesque%2C%20-obligatory%20pony%2C%20-drama%20bait%2C%20-questionable%2C%20-not%20pony%20related%2C%20-text%20only%2C%20-deviantart%20stamp%2C%20-exploitable%20meme%2C%20-nazi%2C%20-racial%20slur%2C%20-abuse%2C%20-suggestive%2C%20-1000%20hours%20in%20ms%20paint%2C%20-politics%2C%20-semi-grimdark%2C%20-seizure%20warning%2C%20-screencap%2C%20-edited%20screencap%2C%20-vulgar%2C%20-mockup%2C%20-fat%2C%20-equestria%20girls%2C%20-big%20breasts%2C%20-large%20butt%2C%20-safe%2C%20-foalcon%2C%20-human%2C%20-anthro%2C%20-rainbow%20dash%2C%20-fluttershy%2C%20-zoom%20zephyrwing%2C%20-thunder%20(g5)%2C%20-posey%2C%20-babs%20seed%2C%20-sweetie%20belle%2C%20-scootaloo%2C%20-twilight%2C%20-twilight%20sparkle%2C%20-sweetie%20bot%2C%20-thunder%2C%20-zoom%2C%20-misty%2C%20-zipp%20storm%2C%20-pipp%20petals%2C%20-penis%2C%20-licking%20cock%2C%20-dickgirl%2C%20-dicks%20everywhere%2C%20-dickboop%2C%20-dick%20in%20a%20box%2C%20-fart%20on%20dick%2C%20-dick%2C%20-flattening%2C%20-cockblock%2C%20-male%2C%20-solo%20male%2C%20-masturbation%2C%20-masturbating%20in%20stomach%2C%20-stallion%2C%20-balls%2C%20-big%20balls%2C%20-close-up%2C%20-rope%2C%20-tied%20up%2C%20-ballgag%2C%20-diaper%2C%20-diaper%20fetish%2C%20-incest%2C%20-cyborg%2C%20-bondage%2C%20-apple%20bloom%2C%20-merch%20sexploitation%2C%20-fetish%2C%20-chastity%20belt%2C%20-deer%2C%20-zebra%2C%20-big%20crotchboobs%2C%20-cat%2C%20-3d%2C%20-sunny%20starscout%2C%20-izzy%20moonbow%2C%20-derpy%20hooves%2C%20-princess%20celestia%2C%20-trixie%2C%20-starlight%20glimmer%2C%20-pinkie%20pie%2C%20-applejack%2C%20-rarity%2C%20-them's%20fightin'%20herds%20-pokémon,%2C%20-your%20character%20here%2C%20-alcohol%2C%20-cigarette%2C%20-gmod%2C%20-meme%2C%20-gameloft%2C%20-ponified%2C%20-ych%20result%2C%20-species%20swap%2C%20-semi-incest%2C%20-barely%20pony%20related%2C%20-pixel%20art%2C%20-spanish%2C%20-japan%20ponycon%2C%20-chastity%20cage%2C%20-anal%20insertion%2C%20-semi-anthro%2C%20-big%20belly%2C%20-impossibly%20large%20belly%2C%20-huge%20belly%2C%20-belly%20bed%2C%20-glory%20hole%2C%20-selfie%2C%20-draconequus%2C%20-g1%2C%20-g2%2C%20-g3%2C%20-implied%20anon%2C%20-flurry%20heart%2C%20-silverstream%2C%20-ocellus%2C%20-yona%2C%20-gallus%2C%20-sandbar%2C%20-unikitty!%2C%20-satyr%2C%20-human%20on%20pony%20action%2C%20-latex%20pony&sf=random&per_page=1&filter_id=56027").then((res) => {
if (res.data['images'][0]) {
axios.get(res.data['images'][0]['view_url'], {
responseType: "arraybuffer"
diff --git a/discord.js b/discord.js
index 6477327..a66ae21 100644
--- a/discord.js
+++ b/discord.js
@@ -10,7 +10,7 @@ client.on('messageCreate', (msg) => {
let message = msg.content;
- if (message.startsWith(".") && !message.startsWith("..") && message.trim() !== ".") {
+ if (message.startsWith(".") && !message.startsWith("..") && message.trim() !== "." && message.trim() !== ".c.") {
let command;
try {
diff --git a/matrix.js b/matrix.js
index d024641..2318693 100644
--- a/matrix.js
+++ b/matrix.js
@@ -54,7 +54,7 @@ const client = sdk.createClient({
message = event.event.content.formatted_body.split("</mx-reply>")[1];
}
- if (message.startsWith(".") && !message.startsWith("..") && message.trim() !== ".") {
+ if (message.startsWith(".") && !message.startsWith("..") && message.trim() !== "." && message.trim() !== ".c.") {
let command;
try {
diff --git a/package.json b/package.json
index 1c238b9..ff31902 100644
--- a/package.json
+++ b/package.json
@@ -1,4 +1,7 @@
{
+ "scripts": {
+ "start": "nodemon index.js"
+ },
"dependencies": {
"axios": "^1.4.0",
"discord.js": "^14.10.2",