Merge branch 'dummy-notification-and-service-name' into 'dev'

add dummy notification

Closes #9 and #10

See merge request ergo/rosen-bridge/notification!11

.changeset/empty-pigs-hope.md

@@ -0,0 +1,5 @@
+---
+'@rosen-bridge/abstract-notification': minor
+---
+
+Dummy Notification class

.changeset/nasty-chicken-vanish.md

@@ -0,0 +1,5 @@
+---
+'@rosen-bridge/discord-notification': minor
+---
+
+Add service name and update message bosy in discord

.gitignore

@@ -131,3 +131,4 @@ dist
 
 # Sqlite databases
 *.sqlite
+.idea/*

packages/abstract-notification/lib/DummyNotification.ts

@@ -0,0 +1,11 @@
+import AbstractNotification from './AbstractNotification';
+
+class DummyNotification extends AbstractNotification {
+  error = () => Promise.resolve();
+  warning = () => Promise.resolve();
+  success = () => Promise.resolve();
+  info = () => Promise.resolve();
+  raw = () => Promise.resolve();
+}
+
+export default DummyNotification;

packages/abstract-notification/lib/index.ts

@@ -1,2 +1,3 @@
 export { default as AbstractNotification } from './AbstractNotification';
+export { default as DummyNotification } from './DummyNotification';
 export * from './types';

packages/discord/lib/DiscordNotification.ts

@@ -1,10 +1,13 @@
 import { AbstractNotification } from '@rosen-bridge/abstract-notification';
-import { WebhookClient } from 'discord.js';
+import { EmbedBuilder, WebhookClient } from 'discord.js';
 
 class DiscordNotification extends AbstractNotification {
   private client: WebhookClient;
 
-  constructor(webhookURL: string) {
+  constructor(
+    webhookURL: string,
+    private serviceName?: string,
+  ) {
     super();
     this.client = new WebhookClient({
       url: webhookURL,
@@ -13,11 +16,22 @@ class DiscordNotification extends AbstractNotification {
 
   /**
    * send a string to Discord, trimming all lines
+   * @param title
    * @param message
+   * @param color
    */
-  private sendMessage = async (message: string) => {
+  private sendMessage = async (
+    title: string,
+    message: string,
+    color: number,
+  ) => {
+    const embed = new EmbedBuilder()
+      .setAuthor({ name: this.serviceName ?? ' ' })
+      .setTitle(title)
+      .setDescription(message.replace(/^ +| +$/gm, ''))
+      .setColor(color);
     await this.client.send({
-      content: message.replace(/^ +| +$/gm, ''), // trim all lines
+      embeds: [embed],
     });
   };
 
@@ -26,60 +40,40 @@ class DiscordNotification extends AbstractNotification {
    * @param title
    * @param message
    */
-  error = async (title: string, message: string) => {
-    await this.sendMessage(`
-      ## ❌ ${title}
-      ${message}
-      `);
-  };
+  error = async (title: string, message: string) =>
+    this.sendMessage(`❌ ${title}`, message, 0xd32f2f);
 
   /**
    * send a warning notification
    * @param title
    * @param message
    */
-  warning = async (title: string, message: string) => {
-    await this.sendMessage(`
-      ## ⚠️ ${title}
-      ${message}
-      `);
-  };
+  warning = async (title: string, message: string) =>
+    this.sendMessage(`⚠️ ${title}`, message, 0xed6c02);
 
   /**
    * send an info notification
    * @param title
    * @param message
    */
-  info = async (title: string, message: string) => {
-    await this.sendMessage(`
-      ## ℹ️ ${title}
-      ${message}
-      `);
-  };
+  info = async (title: string, message: string) =>
+    this.sendMessage(`ℹ️ ${title}`, message, 0x0288d1);
 
   /**
    * send a success notification
    * @param title
    * @param message
    */
-  success = async (title: string, message: string) => {
-    await this.sendMessage(`
-      ## ✅ ${title}
-      ${message}
-      `);
-  };
+  success = async (title: string, message: string) =>
+    this.sendMessage(`✅ ${title}`, message, 0x2e7d32);
 
   /**
    * send a raw notification
    * @param title
    * @param message
    */
-  raw = async (title: string, message: string) => {
-    await this.sendMessage(`
-      ## ${title}
-      ${message}
-      `);
-  };
+  raw = async (title: string, message: string) =>
+    this.sendMessage(`${title}`, message, 0x000000);
 }
 
 export default DiscordNotification;