Merge pull request #9 from Eviloma/fix/welcome-message

Fix welcome message

.github/workflows/docker-image.yml

@@ -3,8 +3,6 @@ name: Docker Image CI
 on:
   push:
     branches: [ "master" ]
-  pull_request:
-    branches: [ "master" ]
 
 jobs:
   build:

.vscode/settings.json

@@ -2,9 +2,5 @@
   "typescript.tsdk": "node_modules\\typescript\\lib",
   "eslint.enable": true,
   "editor.formatOnSave": true,
-  "eslint.validate": ["json"],
-  "eslint.runtime": "bun",
-  "eslint.execArgv": ["--bun"],
-  "eslint.trace.server": "messages",
-  "eslint.workingDirectories": [{ "mode": "auto" }]
+  "eslint.validate": ["json", "javascript", "typescript", "typescriptreact"]
 }

CHANGELOG.md

@@ -8,6 +8,16 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/)
 
 ---
 
+## [**4.4.2**] - 2024-04-04
+
+### Added
+
+- Readded join message
+
+### Deleted
+
+- Deleted leave message permanently
+
 ## [**4.4.1**] - 2024-04-04
 
 ### Fixed

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@eviloma/evilbot",
-  "version": "4.4.1",
+  "version": "4.4.2",
   "private": true,
   "description": "Official discord bot for Eviloma server",
   "keywords": [
@@ -28,6 +28,7 @@
     "start": "bun ."
   },
   "dependencies": {
+    "@napi-rs/canvas": "^0.1.51",
     "axios": "^1.6.8",
     "canvacord": "^6.0.2",
     "console-table-printer": "^2.12.0",
@@ -36,6 +37,7 @@
     "drizzle-orm": "^0.30.6",
     "easy-discord-components": "^1.1.2",
     "envalid": "^8.0.0",
+    "greetify": "^2.0.1",
     "kazagumo": "^3.0.3",
     "kazagumo-filter": "^2.0.0",
     "kazagumo-spotify": "^2.0.1",

src/events/guild/MemberJoin.ts

@@ -1,4 +1,5 @@
 import { Events, GuildMember } from 'discord.js';
+import { Minimal } from 'greetify';
 
 import type Client from '@/classes/Client';
 import Event from '@/classes/Event';
@@ -13,26 +14,27 @@ export default class MemberJoin extends Event {
   }
 
   async Execute(member: GuildMember) {
-    const { user, guild } = member;
+    const { user, guild, roles } = member;
     const globalChannel = guild.channels.cache.get(this.client.GetSetting('global_channel_id') ?? '');
 
     if (!globalChannel || !globalChannel.isTextBased()) return;
-    // await Font.fromFile('src/assets/Raleway.ttf');
-
-    // const card = new GreetingsCard()
-    //   .setAvatar(user.displayAvatarURL({ forceStatic: true }))
-    //   .setDisplayName(user.username)
-    //   .setType('welcome')
-    //   .setMessage(`Вітаємо на сервері ${guild.name}!`);
-
-    // const image = await card.build({ format: 'png' });
+    const card = await Minimal({
+      name: user.username,
+      avatar: user.displayAvatarURL({
+        size: 4096,
+      }),
+      circleBorder: true,
+      backgroundImage: 'https://ik.imagekit.io/eviloma/card-background',
+      type: 'Welcome',
+      message: `You are ${guild.memberCount}th member`,
+      nameColor: '#6666ff',
+    });
 
-    // await globalChannel.send({ content: `<@${user.id}>`, files: [image] });
-    await globalChannel.send({ content: `<@${user.id}>` });
+    await globalChannel.send({ files: [{ attachment: card, name: `welcome-${user.username}.png` }] });
 
     const initialRole = guild.roles.cache.get(this.client.GetSetting('join_role_id') ?? '');
     if (initialRole) {
-      await member.roles.add(initialRole, 'User joined to server');
+      await roles.add(initialRole, 'User joined to server');
     }
   }
 }