From b4f6300a2324a12120df89fd4d4f07977e8e6cc0 Mon Sep 17 00:00:00 2001
From: Evert Prants <imsonotsleepy@gmail.com>
Date: Sun, 13 Dec 2020 12:17:25 +0200
Subject: [PATCH] add reject

---
 discord/plugin.json | 2 +-
 discord/plugin.ts   | 9 +++++++--
 squeebot.repo.json  | 2 +-
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/discord/plugin.json b/discord/plugin.json
index d941482..0c2f6f7 100644
--- a/discord/plugin.json
+++ b/discord/plugin.json
@@ -2,7 +2,7 @@
   "main": "plugin.js",
   "name": "discord",
   "description": "Discord Service for Squeebot 3",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "tags": ["service", "discord"],
   "dependencies": ["control?"],
   "npmDependencies": ["discord.js@^12.5.1"]
diff --git a/discord/plugin.ts b/discord/plugin.ts
index fa7f94a..163ec5f 100644
--- a/discord/plugin.ts
+++ b/discord/plugin.ts
@@ -56,6 +56,11 @@ class DiscordMessageAdapter implements IMessage {
     this.source.resolve(this, ...args);
   }
 
+  public reject(error: Error): void {
+    this.resolved = true;
+    this.source.resolve(this, error.message);
+  }
+
   public mention(user: IMessageTarget): string {
     return `<@${user.id}>`;
   }
@@ -128,7 +133,7 @@ class DiscordProtocol extends Protocol {
         member,
         this,
         { id: member.user.id, name: member.user.username },
-        { server: member.guild.id, id: '', name: ''});
+        { server: member.guild.id, id: '*', name: '*'});
       this.plugin.stream.emitTo('channel', 'event', newMessage);
     });
 
@@ -144,7 +149,7 @@ class DiscordProtocol extends Protocol {
         member,
         this,
         { id: member.user.id, name: member.user.username },
-        { server: member.guild.id, id: '', name: ''});
+        { server: member.guild.id, id: '*', name: '*'});
       this.plugin.stream.emitTo('channel', 'event', newMessage);
     });
   }
diff --git a/squeebot.repo.json b/squeebot.repo.json
index 99f1b82..6b8d04e 100644
--- a/squeebot.repo.json
+++ b/squeebot.repo.json
@@ -3,7 +3,7 @@
   "plugins": [
     {
       "name": "discord",
-      "version": "1.0.0"
+      "version": "1.1.0"
     }
   ],
   "typescript": true