snxraven/LinkUp-P2P-Chat
1
1
Fork 2
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Merge pull request 'Fixed rooms not being deleted from the json file' (#4) from MiTask/LinkUp-P2P-Chat:main into main

Browse Source 
Reviewed-on: #4

#killinit. - Coding and vibin like it should be!
This commit is contained in:
snxraven 2024-06-09 08:19:59 +00:00
commit 1c07819d91
3 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app.js
View File

@ -278,14 +278,15 @@ function leaveRoom() {
if (roomItem) { if (roomItem) {
roomItem.remove(); roomItem.remove();
} }
config.rooms = config.rooms.filter(e => e !== topic);
writeConfigToFile("./config.json");
currentRoom.destroy(); currentRoom.destroy();
currentRoom = null; currentRoom = null;
} }
document.querySelector('#chat').classList.add('hidden'); document.querySelector('#chat').classList.add('hidden');
document.querySelector('#setup').classList.remove('hidden'); document.querySelector('#setup').classList.remove('hidden');
config.rooms = config.rooms.filter(e => e !== currentRoom.topic);
writeConfigToFile("./config.json");
} }
function sendMessage(e) { function sendMessage(e) {

7
chatBot/bot.js
View File

@ -35,14 +35,14 @@ async function loadCommands() {
loadCommands().then(commands => { loadCommands().then(commands => {
// Create the chatBot instance with the defined onMessageReceived function // Create the chatBot instance with the defined onMessageReceived function
const bot = new Client(process.env.LINKUP_ROOM_ID, botName); const bot = new Client(botName);
// We use Event Emitter here to handle new messages // We use Event Emitter here to handle new messages
bot.on('onMessage', (peer, message) => { bot.on('onMessage', (peer, message) => {
if (message.type == "icon") return; if (message.type == "icon") return;
console.log(message); console.log(message);
console.log(`Message received from ${message.name} at ${new Date(message.timestamp).toLocaleTimeString()}: ${message.message}`); console.log(`Message received from ${message.name}@${peer} at ${new Date(message.timestamp).toLocaleTimeString()}: ${message.message}`);
// Check if the message starts with a command prefix // Check if the message starts with a command prefix
if (message.message.startsWith('!')) { if (message.message.startsWith('!')) {
@ -64,7 +64,8 @@ loadCommands().then(commands => {
bot.sendMessage(process.env.ON_READY_MESSAGE); bot.sendMessage(process.env.ON_READY_MESSAGE);
}); });
bot.joinChatRoom(); bot.joinChatRoom(process.env.LINKUP_ROOM_ID);
bot.joinChatRoom(process.env.LINKUP_ROOM_ID2);
}).catch(error => { }).catch(error => {
console.error('Error loading commands:', error); console.error('Error loading commands:', error);
}); });

11
chatBot/includes/client.js
View File

@ -2,12 +2,9 @@ import Hyperswarm from 'hyperswarm';
import EventEmitter from 'node:events' import EventEmitter from 'node:events'
class Client extends EventEmitter { class Client extends EventEmitter {
constructor(chatRoomID, botName) { constructor(botName) {
super(); super();
if(!botName) return console.error("BotName is not defined!");
if(!chatRoomID || !botName) return console.error("ChatRoomID or BotName is not defined!");
this.topicBuffer = Buffer.from(chatRoomID, 'hex');
this.botName = botName; this.botName = botName;
this.swarm = new Hyperswarm(); this.swarm = new Hyperswarm();
this.setupSwarm(); this.setupSwarm();
@ -27,8 +24,8 @@ class Client extends EventEmitter {
}); });
} }
joinChatRoom() { joinChatRoom(chatRoomID) {
this.discovery = this.swarm.join(this.topicBuffer, {client: true, server: true}); this.discovery = this.swarm.join(Buffer.from(chatRoomID, 'hex'), {client: true, server: true});
this.discovery.flushed().then(() => { this.discovery.flushed().then(() => {
console.log(`Bot ${this.botName} joined the chat room.`); console.log(`Bot ${this.botName} joined the chat room.`);
this.emit('onBotJoinRoom'); this.emit('onBotJoinRoom');