automod/old-automod
1
0
Fork 0
mirror of https://github.com/janderedev/automod.git synced 2024-12-22 18:55:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

port bridge to revolt.js 6.0

Browse source
This commit is contained in:
janderedev 2022-04-30 16:17:46 +02:00
parent 0917a476fc
commit 9d035c4e2b
Signed by: Lea
GPG key ID: 5D5E18ACB990F57A
6 changed files with 47 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
bridge/package.json
View file

@ -14,7 +14,7 @@
"license": "ISC", "license": "ISC",
"dependencies": { "dependencies": {
"@discordjs/rest": "^0.4.1", "@discordjs/rest": "^0.4.1",
"@janderedev/revolt.js": "^5.2.8-patch.2", "@janderedev/revolt.js": "^6.0.0-rc.21",
"axios": "^0.26.1", "axios": "^0.26.1",
"discord-api-types": "^0.31.2", "discord-api-types": "^0.31.2",
"discord.js": "^13.6.0", "discord.js": "^13.6.0",

9
bridge/src/discord/events.ts
View file

@ -1,7 +1,6 @@
import { BRIDGED_MESSAGES, BRIDGE_CONFIG, logger } from ".."; import { BRIDGED_MESSAGES, BRIDGE_CONFIG, logger } from "..";
import { client } from "./client"; import { client } from "./client";
import { AUTUMN_URL, client as revoltClient } from "../revolt/client"; import { AUTUMN_URL, client as revoltClient } from "../revolt/client";
import { ChannelPermission } from "@janderedev/revolt.js";
import axios from 'axios'; import axios from 'axios';
import { ulid } from "ulid"; import { ulid } from "ulid";
import GenericEmbed from "../types/GenericEmbed"; import GenericEmbed from "../types/GenericEmbed";
@ -84,11 +83,15 @@ client.on('messageCreate', async message => {
const channel = revoltClient.channels.get(bridgeCfg.revolt); const channel = revoltClient.channels.get(bridgeCfg.revolt);
if (!channel) return logger.debug(`Discord: Cannot find associated channel`); if (!channel) return logger.debug(`Discord: Cannot find associated channel`);
if (!(channel.permission & ChannelPermission.SendMessage)) { if (!(channel.havePermission('SendMessage'))) {
return logger.debug(`Discord: Lacking SendMessage permission; refusing to send`); return logger.debug(`Discord: Lacking SendMessage permission; refusing to send`);
} }
if (!(channel.permission & ChannelPermission.Masquerade)) { if (!(channel.havePermission('SendEmbeds'))) {
return logger.debug(`Discord: Lacking SendEmbeds permission; refusing to send`);
}
if (!(channel.havePermission('Masquerade'))) {
return logger.debug(`Discord: Lacking Masquerade permission; refusing to send`); return logger.debug(`Discord: Lacking Masquerade permission; refusing to send`);
} }

4
bridge/src/revolt/client.ts
View file

@ -4,7 +4,9 @@ import { logger } from '..';
let AUTUMN_URL = `http://autumnUrl`; let AUTUMN_URL = `http://autumnUrl`;
const client = new Client({ }); const client = new Client({
apiURL: process.env.REVOLT_API_URL,
});
const login = () => new Promise((resolve: (value: Client) => void) => { const login = () => new Promise((resolve: (value: Client) => void) => {
client.loginBot(process.env['REVOLT_TOKEN']!); client.loginBot(process.env['REVOLT_TOKEN']!);

2
bridge/src/revolt/events.ts
View file

@ -43,7 +43,7 @@ client.on('message/delete', async id => {
}); });
client.on('message/update', async message => { client.on('message/update', async message => {
if (message.content && typeof message.content != 'string') return; if (!message.content || typeof message.content != 'string') return;
if (message.author_id == client.user?._id) return; if (message.author_id == client.user?._id) return;
try { try {

48
bridge/yarn.lock
View file

@ -37,10 +37,10 @@
node-fetch "^2.6.7" node-fetch "^2.6.7"
tslib "^2.3.1" tslib "^2.3.1"
"@insertish/exponential-backoff@3.1.0-patch.0": "@insertish/exponential-backoff@3.1.0-patch.2":
version "3.1.0-patch.0" version "3.1.0-patch.2"
resolved "https://registry.yarnpkg.com/@insertish/exponential-backoff/-/exponential-backoff-3.1.0-patch.0.tgz#1fff134f70fc0906d11d09069d51183b542e42cf" resolved "https://registry.yarnpkg.com/@insertish/exponential-backoff/-/exponential-backoff-3.1.0-patch.2.tgz#08310c856b795c783a832f3f608c0feaff262c0d"
integrity sha512-1qhW81s3GDbssyaxRWdpBAn1cIw5s393HnrdYFjfa2i6rq3SEjQDK6U80g6dq/K0or6JRr2eCn75Wfc1IrGM0g== integrity sha512-0lsMVexkZ7dHpQlPrTZDRsm42hZ4/CzKxP1hbAEJH8IaEwrIEhhTKJuFxPuLOi2TwPImuocncjYHpGpwVNOemQ==
"@insertish/isomorphic-ws@^4.0.1": "@insertish/isomorphic-ws@^4.0.1":
version "4.0.1" version "4.0.1"
@ -57,20 +57,31 @@
axios "^0.26.1" axios "^0.26.1"
openapi-typescript "^5.2.0" openapi-typescript "^5.2.0"
"@janderedev/revolt.js@^5.2.8-patch.2": "@insertish/oapi@0.1.15":
version "5.2.8-patch.2" version "0.1.15"
resolved "https://registry.yarnpkg.com/@janderedev/revolt.js/-/revolt.js-5.2.8-patch.2.tgz#d74a6500e217a4cb94d139027dec2acb71f73a0f" resolved "https://registry.yarnpkg.com/@insertish/oapi/-/oapi-0.1.15.tgz#ee58b82d879ed5af54db846699941b8ad0262e7b"
integrity sha512-2nucMuToKC5F4jsajmTauBaV9Q7oyl1KWKF0ysYYPzEKxK9LfPL560v9bQR/ff1g8GkEv4biAN/A17MCcddAuw== integrity sha512-2G8eFxrojF651tBoRutQ8CJOw0u8UjYSlw/LQU+xycw5KpXslhWp/KSR86uIFyDIPddwfMCNA91vwHGCFRA63w==
dependencies: dependencies:
"@insertish/exponential-backoff" "3.1.0-patch.0" typescript "^4.6.2"
optionalDependencies:
axios "^0.26.1"
openapi-typescript "^5.2.0"
"@janderedev/revolt.js@^6.0.0-rc.21":
version "6.0.0-rc.21"
resolved "https://registry.yarnpkg.com/@janderedev/revolt.js/-/revolt.js-6.0.0-rc.21.tgz#0629700cd78d0f7db5f4707dc7a8f5ba67482e1a"
integrity sha512-uLFXrv6ZjLJ+e9keevv0sUeZY8gDw3RfSg07LNYVUfqi1T64WwmZypz3zc2kTacbfthIgI368K2e6f3q4toc4Q==
dependencies:
"@insertish/exponential-backoff" "3.1.0-patch.2"
"@insertish/isomorphic-ws" "^4.0.1" "@insertish/isomorphic-ws" "^4.0.1"
axios "^0.21.4" axios "^0.21.4"
eventemitter3 "^4.0.7" eventemitter3 "^4.0.7"
lodash.defaultsdeep "^4.6.1" lodash.defaultsdeep "^4.6.1"
lodash.flatten "^4.4.0" lodash.flatten "^4.4.0"
lodash.isequal "^4.5.0" lodash.isequal "^4.5.0"
long "^5.2.0"
mobx "^6.3.2" mobx "^6.3.2"
revolt-api "0.5.3-alpha.12" revolt-api "0.5.3-rc.15"
ulid "^2.3.0" ulid "^2.3.0"
ws "^8.2.2" ws "^8.2.2"
@ -337,6 +348,11 @@ log75@^2.2.0:
dependencies: dependencies:
ansi-colors "^4.1.1" ansi-colors "^4.1.1"
long@^5.2.0:
version "5.2.0"
resolved "https://registry.yarnpkg.com/long/-/long-5.2.0.tgz#2696dadf4b4da2ce3f6f6b89186085d94d52fd61"
integrity sha512-9RTUNjK60eJbx3uz+TEGF7fUr29ZDxR5QzXcyDpeSfeH28S9ycINflOgOlppit5U+4kNTe83KQnMEerw7GmE8w==
memory-pager@^1.0.2: memory-pager@^1.0.2:
version "1.5.0" version "1.5.0"
resolved "https://registry.yarnpkg.com/memory-pager/-/memory-pager-1.5.0.tgz#d8751655d22d384682741c972f2c3d6dfa3e66b5" resolved "https://registry.yarnpkg.com/memory-pager/-/memory-pager-1.5.0.tgz#d8751655d22d384682741c972f2c3d6dfa3e66b5"
@ -494,10 +510,14 @@ require-at@^1.0.6:
resolved "https://registry.yarnpkg.com/require-at/-/require-at-1.0.6.tgz#9eb7e3c5e00727f5a4744070a7f560d4de4f6e6a" resolved "https://registry.yarnpkg.com/require-at/-/require-at-1.0.6.tgz#9eb7e3c5e00727f5a4744070a7f560d4de4f6e6a"
integrity sha512-7i1auJbMUrXEAZCOQ0VNJgmcT2VOKPRl2YGJwgpHpC9CE91Mv4/4UYIUm4chGJaI381ZDq1JUicFii64Hapd8g== integrity sha512-7i1auJbMUrXEAZCOQ0VNJgmcT2VOKPRl2YGJwgpHpC9CE91Mv4/4UYIUm4chGJaI381ZDq1JUicFii64Hapd8g==
revolt-api@0.5.3-alpha.12: revolt-api@0.5.3-rc.15:
version "0.5.3-alpha.12" version "0.5.3-rc.15"
resolved "https://registry.yarnpkg.com/revolt-api/-/revolt-api-0.5.3-alpha.12.tgz#78f25b567b840c1fd072595526592a422cb01f25" resolved "https://registry.yarnpkg.com/revolt-api/-/revolt-api-0.5.3-rc.15.tgz#abd08dd8109d0ca31be118461eabbeb6c3b7792e"
integrity sha512-MM42oI5+5JJMnAs3JiOwSQOy/SUYzYs3M8YRC5QI4G6HU7CfyB2HNWh5jFsyRlcLdSi13dGazHm31FUPHsxOzw== integrity sha512-MYin3U+KoObNkILPf2cz+FPperynExkUu7CjzurMJCRvBncpnhb2czvWDvnhLDKBHlpo8W597xNqzQnaklV4ug==
dependencies:
"@insertish/oapi" "0.1.15"
axios "^0.26.1"
lodash.defaultsdeep "^4.6.1"
revolt-api@^0.5.3-rc.8: revolt-api@^0.5.3-rc.8:
version "0.5.3-rc.8" version "0.5.3-rc.8"

2
docker-compose.yml.example
View file

@ -54,7 +54,7 @@ services:
- DB_STRING=mongodb://mogus:${DB_PASS}@mongo:27017/admin - DB_STRING=mongodb://mogus:${DB_PASS}@mongo:27017/admin
- NODE_ENV=production - NODE_ENV=production
- BRIDGE_METRICS_PORT - BRIDGE_METRICS_PORT
- API_URL - REVOLT_API_URL=${API_URL}
# Uncomment if you enabled Prometheus metrics # Uncomment if you enabled Prometheus metrics
#ports: #ports:
# - 127.0.0.1:${BRIDGE_METRICS_PORT}:${BRIDGE_METRICS_PORT} # - 127.0.0.1:${BRIDGE_METRICS_PORT}:${BRIDGE_METRICS_PORT}