diff --git a/.gitignore b/.gitignore index 684cf28..aff4c88 100644 --- a/.gitignore +++ b/.gitignore @@ -44,3 +44,6 @@ jspm_packages # config config.js badwords.js + +# other +package-lock.json diff --git a/config.example.js b/config.example.js index 42588fe..78b8e33 100644 --- a/config.example.js +++ b/config.example.js @@ -91,6 +91,7 @@ module.exports = { [ 'irc/#test', 'telegram/-12345678', // Telegram 群組號碼:可以先把 bot 拉到群組中,然後透過 /thisgroupid 來取得 id + 'Discord/1234567898765432123', 'qq/12345678' // 'QQ/87654321' // 如果有這種需求,亦可以連接 ] diff --git a/lib/handlers/DiscordMessageHandler.js b/lib/handlers/DiscordMessageHandler.js index 451f4b6..07127a9 100644 --- a/lib/handlers/DiscordMessageHandler.js +++ b/lib/handlers/DiscordMessageHandler.js @@ -46,10 +46,10 @@ class DiscordMessageHandler extends MessageHandler { client: 'Discord', type: 'photo', id: p.id, - size: p.filesize, + size: p.size, url: this._useProxyURL ? p.proxyURL : p.url, }]; - text += ` `; + text += ` `; } } @@ -100,7 +100,10 @@ class DiscordMessageHandler extends MessageHandler { } else if (this._keepSilence.indexOf(target) !== -1) { return Promise.resolve(); } else { - this._client.channels.get(target).send(message); + this._client.channels.fetch(target) + .then(target_channel => { + (async () => await target_channel.send(message))() + }); return Promise.resolve(); } } diff --git a/main.js b/main.js index fe93554..b540431 100644 --- a/main.js +++ b/main.js @@ -265,7 +265,7 @@ if (config.Discord && !config.Discord.disabled) { useProxyURL: options.useProxyURL, }; - const discordHandler = new DiscordMessageHandler(discordClient); + const discordHandler = new DiscordMessageHandler(discordClient, options2); pluginManager.handlers.set('Discord', discordHandler); pluginManager.handlerClasses.set('Discord', { object: DiscordMessageHandler,