mirror of
https://github.com/janderedev/automod.git
synced 2024-09-29 04:01:05 +00:00
Compare commits
No commits in common. "3a1e7015030a2ac6f7024709854761d518401a81" and "51fb5dc25e2c96f8f8a96f2baa07687d17b31239" have entirely different histories.
3a1e701503
...
51fb5dc25e
8
.github/workflows/docker.yml
vendored
8
.github/workflows/docker.yml
vendored
|
@ -20,7 +20,7 @@ jobs:
|
||||||
uses: docker/metadata-action@v4
|
uses: docker/metadata-action@v4
|
||||||
with:
|
with:
|
||||||
# list of Docker images to use as base name for tags
|
# list of Docker images to use as base name for tags
|
||||||
images: ghcr.io/sussycatgirl/automod-api
|
images: ghcr.io/janderedev/automod-api
|
||||||
# generate Docker tags based on branch and short commit SHA
|
# generate Docker tags based on branch and short commit SHA
|
||||||
tags: |
|
tags: |
|
||||||
type=ref,event=branch
|
type=ref,event=branch
|
||||||
|
@ -60,7 +60,7 @@ jobs:
|
||||||
uses: docker/metadata-action@v4
|
uses: docker/metadata-action@v4
|
||||||
with:
|
with:
|
||||||
# list of Docker images to use as base name for tags
|
# list of Docker images to use as base name for tags
|
||||||
images: ghcr.io/sussycatgirl/automod-web
|
images: ghcr.io/janderedev/automod-web
|
||||||
# generate Docker tags based on branch and short commit SHA
|
# generate Docker tags based on branch and short commit SHA
|
||||||
tags: |
|
tags: |
|
||||||
type=ref,event=branch
|
type=ref,event=branch
|
||||||
|
@ -102,7 +102,7 @@ jobs:
|
||||||
uses: docker/metadata-action@v4
|
uses: docker/metadata-action@v4
|
||||||
with:
|
with:
|
||||||
# list of Docker images to use as base name for tags
|
# list of Docker images to use as base name for tags
|
||||||
images: ghcr.io/sussycatgirl/automod-bridge
|
images: ghcr.io/janderedev/automod-bridge
|
||||||
# generate Docker tags based on branch and short commit SHA
|
# generate Docker tags based on branch and short commit SHA
|
||||||
tags: |
|
tags: |
|
||||||
type=ref,event=branch
|
type=ref,event=branch
|
||||||
|
@ -144,7 +144,7 @@ jobs:
|
||||||
uses: docker/metadata-action@v4
|
uses: docker/metadata-action@v4
|
||||||
with:
|
with:
|
||||||
# list of Docker images to use as base name for tags
|
# list of Docker images to use as base name for tags
|
||||||
images: ghcr.io/sussycatgirl/automod-bot
|
images: ghcr.io/janderedev/automod-bot
|
||||||
# generate Docker tags based on branch and short commit SHA
|
# generate Docker tags based on branch and short commit SHA
|
||||||
tags: |
|
tags: |
|
||||||
type=ref,event=branch
|
type=ref,event=branch
|
||||||
|
|
|
@ -23,7 +23,7 @@
|
||||||
"log75": "^2.2.0",
|
"log75": "^2.2.0",
|
||||||
"monk": "^7.3.4",
|
"monk": "^7.3.4",
|
||||||
"prom-client": "^14.0.1",
|
"prom-client": "^14.0.1",
|
||||||
"revolt-api": "0.6.3",
|
"revolt-api": "0.5.19",
|
||||||
"revolt.js": "^7.0.0",
|
"revolt.js": "^7.0.0",
|
||||||
"ulid": "^2.3.0",
|
"ulid": "^2.3.0",
|
||||||
"xlsx": "^0.17.3"
|
"xlsx": "^0.17.3"
|
||||||
|
|
|
@ -319,7 +319,7 @@ export default {
|
||||||
`- **${DEFAULT_PREFIX}botctl filter message [message]** - Set the message sent when a message is matched.\n` +
|
`- **${DEFAULT_PREFIX}botctl filter message [message]** - Set the message sent when a message is matched.\n` +
|
||||||
`- **${DEFAULT_PREFIX}botctl filter action [log|delete|warn]** - Configure the action taken on filtered messages.\n` +
|
`- **${DEFAULT_PREFIX}botctl filter action [log|delete|warn]** - Configure the action taken on filtered messages.\n` +
|
||||||
`- **${DEFAULT_PREFIX}botctl filter test [phrase]** - Test whether a phrase matches your word list.\n` +
|
`- **${DEFAULT_PREFIX}botctl filter test [phrase]** - Test whether a phrase matches your word list.\n` +
|
||||||
`More documentation can be found [here](https://github.com/sussycatgirl/automod/wiki/Word-Filter).`,
|
`More documentation can be found [here](https://github.com/janderedev/automod/wiki/Word-Filter).`,
|
||||||
'Word filter',
|
'Word filter',
|
||||||
),
|
),
|
||||||
embed(
|
embed(
|
||||||
|
|
|
@ -254,7 +254,7 @@ export default {
|
||||||
return await message.reply({
|
return await message.reply({
|
||||||
embeds: [
|
embeds: [
|
||||||
embed(
|
embed(
|
||||||
"This channel is bridged to Discord. Please refer to the [Privacy Policy](<https://github.com/sussycatgirl/automod/wiki/Privacy-Policy>) for more info.",
|
"This channel is bridged to Discord. Please refer to the [Privacy Policy](<https://github.com/janderedev/automod/wiki/Privacy-Policy>) for more info.",
|
||||||
"Bridge Status",
|
"Bridge Status",
|
||||||
EmbedColor.Success
|
EmbedColor.Success
|
||||||
),
|
),
|
||||||
|
|
|
@ -12,7 +12,7 @@ import CommandCategory from "../../../struct/commands/CommandCategory";
|
||||||
|
|
||||||
Day.extend(RelativeTime);
|
Day.extend(RelativeTime);
|
||||||
|
|
||||||
const GLOBAL_BLACKLIST_TEXT = (reason?: string) => `> :warning: This user has been flagged and is globally blacklisted. [Learn more.](https://github.com/sussycatgirl/automod/wiki/Global-Blacklist)`
|
const GLOBAL_BLACKLIST_TEXT = (reason?: string) => `> :warning: This user has been flagged and is globally blacklisted. [Learn more.](https://github.com/janderedev/automod/wiki/Global-Blacklist)`
|
||||||
+ `${reason ? `\nReason: "${reason}"` : ''}\n\n`;
|
+ `${reason ? `\nReason: "${reason}"` : ''}\n\n`;
|
||||||
|
|
||||||
export default {
|
export default {
|
||||||
|
|
|
@ -263,7 +263,7 @@ const notifyPublicServers = async () => {
|
||||||
discoverAutospamNotify: { $in: [ undefined, false ] },
|
discoverAutospamNotify: { $in: [ undefined, false ] },
|
||||||
});
|
});
|
||||||
|
|
||||||
for (const serverConfig of res) {
|
res.forEach(async (serverConfig) => {
|
||||||
try {
|
try {
|
||||||
logger.info(`Sending notification to owner of server ${serverConfig.id}`);
|
logger.info(`Sending notification to owner of server ${serverConfig.id}`);
|
||||||
|
|
||||||
|
@ -293,7 +293,7 @@ Thanks for being part of Revolt!`);
|
||||||
} catch(e) {
|
} catch(e) {
|
||||||
console.error(e);
|
console.error(e);
|
||||||
}
|
}
|
||||||
}
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
awaitClient().then(() => notifyPublicServers());
|
awaitClient().then(() => notifyPublicServers());
|
||||||
|
|
|
@ -806,14 +806,14 @@ __metadata:
|
||||||
languageName: node
|
languageName: node
|
||||||
linkType: hard
|
linkType: hard
|
||||||
|
|
||||||
"revolt-api@npm:0.6.3":
|
"revolt-api@npm:0.5.19, revolt-api@npm:^0.5.19":
|
||||||
version: 0.6.3
|
version: 0.5.19
|
||||||
resolution: "revolt-api@npm:0.6.3"
|
resolution: "revolt-api@npm:0.5.19"
|
||||||
dependencies:
|
dependencies:
|
||||||
"@insertish/oapi": 0.1.18
|
"@insertish/oapi": 0.1.18
|
||||||
axios: ^0.26.1
|
axios: ^0.26.1
|
||||||
lodash.defaultsdeep: ^4.6.1
|
lodash.defaultsdeep: ^4.6.1
|
||||||
checksum: b568df2a05e2a4a9a5eb2ccb88a032d1f5e2e390471852e6f2ba366c6c2fb1c78f38af16f1f57768c4743f07b9d165eda3658c664c025d27f32ef00ecf33942b
|
checksum: 063a06fe73cb9650779ed367e9d850e690e1c8dda644050859f6b00b0de01f8c4486521a407ce49e4b6ed699b6e69d17151c4ff4c55dbd2fff034fa30f1462ea
|
||||||
languageName: node
|
languageName: node
|
||||||
linkType: hard
|
linkType: hard
|
||||||
|
|
||||||
|
@ -831,7 +831,7 @@ __metadata:
|
||||||
log75: ^2.2.0
|
log75: ^2.2.0
|
||||||
monk: ^7.3.4
|
monk: ^7.3.4
|
||||||
prom-client: ^14.0.1
|
prom-client: ^14.0.1
|
||||||
revolt-api: 0.6.3
|
revolt-api: 0.5.19
|
||||||
revolt.js: ^7.0.0
|
revolt.js: ^7.0.0
|
||||||
typescript: ^4.4.3
|
typescript: ^4.4.3
|
||||||
ulid: ^2.3.0
|
ulid: ^2.3.0
|
||||||
|
@ -849,7 +849,7 @@ __metadata:
|
||||||
eventemitter3: ^5.0.0
|
eventemitter3: ^5.0.0
|
||||||
isomorphic-ws: ^5.0.0
|
isomorphic-ws: ^5.0.0
|
||||||
long: ^5.2.1
|
long: ^5.2.1
|
||||||
revolt-api: 0.6.3
|
revolt-api: ^0.5.19
|
||||||
solid-js: ^1.7.3
|
solid-js: ^1.7.3
|
||||||
typedoc: ^0.24.1
|
typedoc: ^0.24.1
|
||||||
ulid: ^2.3.0
|
ulid: ^2.3.0
|
||||||
|
|
|
@ -24,7 +24,7 @@
|
||||||
"log75": "^2.2.0",
|
"log75": "^2.2.0",
|
||||||
"monk": "^7.3.4",
|
"monk": "^7.3.4",
|
||||||
"prom-client": "^14.0.1",
|
"prom-client": "^14.0.1",
|
||||||
"revolt-api": "0.6.3",
|
"revolt-api": "0.5.19",
|
||||||
"revolt.js": "^7.0.0",
|
"revolt.js": "^7.0.0",
|
||||||
"smart-replace": "^1.0.2",
|
"smart-replace": "^1.0.2",
|
||||||
"ulid": "^2.3.0"
|
"ulid": "^2.3.0"
|
||||||
|
|
|
@ -10,7 +10,7 @@ import { client as revoltClient } from "../revolt/client";
|
||||||
import { CONFIG_KEYS } from "automod/dist/misc/bridge_config_keys";
|
import { CONFIG_KEYS } from "automod/dist/misc/bridge_config_keys";
|
||||||
|
|
||||||
const PRIVACY_POLICY_URL =
|
const PRIVACY_POLICY_URL =
|
||||||
"https://github.com/sussycatgirl/automod/wiki/Privacy-Policy";
|
"https://github.com/janderedev/automod/wiki/Privacy-Policy";
|
||||||
|
|
||||||
const COMMANDS: any[] = [
|
const COMMANDS: any[] = [
|
||||||
{
|
{
|
||||||
|
@ -312,7 +312,7 @@ client.on("interactionCreate", async (interaction) => {
|
||||||
`If you have any questions regarding this bot or the Revolt counterpart, feel free to join ` +
|
`If you have any questions regarding this bot or the Revolt counterpart, feel free to join ` +
|
||||||
`[this](https://discord.gg/4pZgvqgYJ8) Discord server or [this](https://rvlt.gg/jan) Revolt server.\n` +
|
`[this](https://discord.gg/4pZgvqgYJ8) Discord server or [this](https://rvlt.gg/jan) Revolt server.\n` +
|
||||||
`If you want to report a bug, suggest a feature or browse the source code, ` +
|
`If you want to report a bug, suggest a feature or browse the source code, ` +
|
||||||
`feel free to do so [on GitHub](https://github.com/sussycatgirl/automod).\n` +
|
`feel free to do so [on GitHub](https://github.com/janderedev/automod).\n` +
|
||||||
`For other inquiries, please contact \`contact@automod.me\`.\n\n` +
|
`For other inquiries, please contact \`contact@automod.me\`.\n\n` +
|
||||||
`Before using this bot, please read the [Privacy Policy](${PRIVACY_POLICY_URL})!`
|
`Before using this bot, please read the [Privacy Policy](${PRIVACY_POLICY_URL})!`
|
||||||
);
|
);
|
||||||
|
|
|
@ -393,7 +393,7 @@ client.on("guildCreate", async (server) => {
|
||||||
"Thanks for adding AutoMod to this server! Please note that despite its name, this bot only provides " +
|
"Thanks for adding AutoMod to this server! Please note that despite its name, this bot only provides " +
|
||||||
"bridge integration with the AutoMod bot on Revolt (<https://revolt.chat>) and does not offer any moderation " +
|
"bridge integration with the AutoMod bot on Revolt (<https://revolt.chat>) and does not offer any moderation " +
|
||||||
"features on Discord. To get started, run the `/bridge help` command!\n\n" +
|
"features on Discord. To get started, run the `/bridge help` command!\n\n" +
|
||||||
"Before using AutoMod, please make sure you have read the privacy policy: <https://github.com/sussycatgirl/automod/wiki/Privacy-Policy>\n\n" +
|
"Before using AutoMod, please make sure you have read the privacy policy: <https://github.com/janderedev/automod/wiki/Privacy-Policy>\n\n" +
|
||||||
"A note to this server's administrators: When using the bridge, please make sure to also provide your members " +
|
"A note to this server's administrators: When using the bridge, please make sure to also provide your members " +
|
||||||
"with a link to AutoMod's privacy policy in an accessible place like your rules channel.";
|
"with a link to AutoMod's privacy policy in an accessible place like your rules channel.";
|
||||||
|
|
||||||
|
@ -426,7 +426,7 @@ async function renderMessageBody(message: string): Promise<string> {
|
||||||
const res = await axios.get(message, {
|
const res = await axios.get(message, {
|
||||||
headers: {
|
headers: {
|
||||||
"User-Agent":
|
"User-Agent":
|
||||||
"AutoMod/1.0; https://github.com/sussycatgirl/automod",
|
"AutoMod/1.0; https://github.com/janderedev/automod",
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
|
@ -270,7 +270,7 @@ __metadata:
|
||||||
log75: ^2.2.0
|
log75: ^2.2.0
|
||||||
monk: ^7.3.4
|
monk: ^7.3.4
|
||||||
prom-client: ^14.0.1
|
prom-client: ^14.0.1
|
||||||
revolt-api: 0.6.3
|
revolt-api: 0.5.19
|
||||||
revolt.js: ^7.0.0
|
revolt.js: ^7.0.0
|
||||||
smart-replace: ^1.0.2
|
smart-replace: ^1.0.2
|
||||||
typescript: ^4.7.4
|
typescript: ^4.7.4
|
||||||
|
@ -782,14 +782,14 @@ __metadata:
|
||||||
languageName: node
|
languageName: node
|
||||||
linkType: hard
|
linkType: hard
|
||||||
|
|
||||||
"revolt-api@npm:0.6.3":
|
"revolt-api@npm:0.5.19, revolt-api@npm:^0.5.19":
|
||||||
version: 0.6.3
|
version: 0.5.19
|
||||||
resolution: "revolt-api@npm:0.6.3"
|
resolution: "revolt-api@npm:0.5.19"
|
||||||
dependencies:
|
dependencies:
|
||||||
"@insertish/oapi": 0.1.18
|
"@insertish/oapi": 0.1.18
|
||||||
axios: ^0.26.1
|
axios: ^0.26.1
|
||||||
lodash.defaultsdeep: ^4.6.1
|
lodash.defaultsdeep: ^4.6.1
|
||||||
checksum: b568df2a05e2a4a9a5eb2ccb88a032d1f5e2e390471852e6f2ba366c6c2fb1c78f38af16f1f57768c4743f07b9d165eda3658c664c025d27f32ef00ecf33942b
|
checksum: 063a06fe73cb9650779ed367e9d850e690e1c8dda644050859f6b00b0de01f8c4486521a407ce49e4b6ed699b6e69d17151c4ff4c55dbd2fff034fa30f1462ea
|
||||||
languageName: node
|
languageName: node
|
||||||
linkType: hard
|
linkType: hard
|
||||||
|
|
||||||
|
@ -803,7 +803,7 @@ __metadata:
|
||||||
eventemitter3: ^5.0.0
|
eventemitter3: ^5.0.0
|
||||||
isomorphic-ws: ^5.0.0
|
isomorphic-ws: ^5.0.0
|
||||||
long: ^5.2.1
|
long: ^5.2.1
|
||||||
revolt-api: 0.6.3
|
revolt-api: ^0.5.19
|
||||||
solid-js: ^1.7.3
|
solid-js: ^1.7.3
|
||||||
typedoc: ^0.24.1
|
typedoc: ^0.24.1
|
||||||
ulid: ^2.3.0
|
ulid: ^2.3.0
|
||||||
|
|
Binary file not shown.
|
@ -1 +1 @@
|
||||||
Subproject commit 24d83ad41267313a5e4d256087536a19773b5234
|
Subproject commit 86995a45a3433ef30bc7ece94b18cfbacd80bd67
|
|
@ -22,7 +22,7 @@ const Home: FunctionComponent = () => {
|
||||||
<br />
|
<br />
|
||||||
You can also view usage stats and metrics for the bot <a href="https://grafana.janderedev.xyz/d/lC_-g_-nz/automod" target='_blank'>
|
You can also view usage stats and metrics for the bot <a href="https://grafana.janderedev.xyz/d/lC_-g_-nz/automod" target='_blank'>
|
||||||
here
|
here
|
||||||
</a>, or check out <a href="https://github.com/sussycatgirl/automod" target='_blank'>
|
</a>, or check out <a href="https://github.com/janderedev/automod" target='_blank'>
|
||||||
its GitHub repository.
|
its GitHub repository.
|
||||||
</a>
|
</a>
|
||||||
</span>
|
</span>
|
||||||
|
|
Loading…
Reference in a new issue