Terminology Change

src/main/java/com/konloch/ircbot/listener/IRCChannelMessage.java

@@ -0,0 +1,12 @@
+package com.konloch.ircbot.listener;
+
+import com.konloch.ircbot.listener.event.ChannelMessageEvent;
+
+/**
+ * @author Konloch
+ * @since 12/15/2023
+ */
+public interface IRCChannelMessage
+{
+	void message(ChannelMessageEvent event);
+}

src/main/java/com/konloch/ircbot/listener/IRCJoin.java

@@ -1,14 +1,12 @@
 package com.konloch.ircbot.listener;
 
-import com.konloch.ircbot.listener.event.GenericRoomEvent;
-import com.konloch.ircbot.server.Room;
-import com.konloch.ircbot.server.User;
+import com.konloch.ircbot.listener.event.GenericChannelEvent;
 
 /**
  * @author Konloch
  * @since 12/15/2023
  */
 public interface IRCJoin
 {
-	void join(GenericRoomEvent event);
+	void join(GenericChannelEvent event);
 }

src/main/java/com/konloch/ircbot/listener/IRCLeave.java

@@ -1,14 +1,12 @@
 package com.konloch.ircbot.listener;
 
-import com.konloch.ircbot.listener.event.GenericRoomEvent;
-import com.konloch.ircbot.server.Room;
-import com.konloch.ircbot.server.User;
+import com.konloch.ircbot.listener.event.GenericChannelEvent;
 
 /**
  * @author Konloch
  * @since 12/15/2023
  */
 public interface IRCLeave
 {
-	void leave(GenericRoomEvent event);
+	void leave(GenericChannelEvent event);
 }

src/main/java/com/konloch/ircbot/listener/event/RoomMessageEvent.java → src/main/java/com/konloch/ircbot/listener/event/ChannelMessageEvent.java

@@ -1,20 +1,20 @@
 package com.konloch.ircbot.listener.event;
 
-import com.konloch.ircbot.server.Room;
+import com.konloch.ircbot.server.Channel;
 import com.konloch.ircbot.server.Server;
 import com.konloch.ircbot.server.User;
 
 /**
  * @author Konloch
  * @since 12/15/2023
  */
-public class RoomMessageEvent extends GenericRoomEvent
+public class ChannelMessageEvent extends GenericChannelEvent
 {
 	private final String message;
 
-	public RoomMessageEvent(Server server, Room room, User user, String message)
+	public ChannelMessageEvent(Server server, Channel channel, User user, String message)
 	{
-		super(server, room, user);
+		super(server, channel, user);
 		this.message = message;
 	}
 

src/main/java/com/konloch/ircbot/listener/event/GenericRoomEvent.java → src/main/java/com/konloch/ircbot/listener/event/GenericChannelEvent.java

@@ -1,28 +1,28 @@
 package com.konloch.ircbot.listener.event;
 
-import com.konloch.ircbot.server.Room;
+import com.konloch.ircbot.server.Channel;
 import com.konloch.ircbot.server.Server;
 import com.konloch.ircbot.server.User;
 
 /**
  * @author Konloch
  * @since 12/15/2023
  */
-public class GenericRoomEvent extends GenericServerEvent
+public class GenericChannelEvent extends GenericServerEvent
 {
-	private final Room room;
+	private final Channel channel;
 	private final User user;
 
-	public GenericRoomEvent(Server server, Room room, User user)
+	public GenericChannelEvent(Server server, Channel channel, User user)
 	{
 		super(server);
-		this.room = room;
+		this.channel = channel;
 		this.user = user;
 	}
 
-	public Room getRoom()
+	public Channel getChannel()
 	{
-		return room;
+		return channel;
 	}
 
 	public User getUser()

src/main/java/com/konloch/ircbot/message/integer/impl/RPLNameply.java

@@ -1,7 +1,7 @@
 package com.konloch.ircbot.message.integer.impl;
 
 import com.konloch.ircbot.message.integer.IntegerMessageEvent;
-import com.konloch.ircbot.server.Room;
+import com.konloch.ircbot.server.Channel;
 import com.konloch.ircbot.server.Server;
 import com.konloch.ircbot.server.User;
 
@@ -25,20 +25,20 @@ public void handle(Server server, String[] splitPartMessage)
 		String channelName = channelThenUsers[0];
 		String[] users = split(channelThenUsers[1].substring(1), " ");
 
-		Room room = server.get(channelName);
+		Channel channel = server.get(channelName);
 
-		if(room != null)
+		if(channel != null)
 		{
-			room.setJoined(true);
+			channel.setJoined(true);
 
 			//process each nick
 			for(String nickname : users)
 			{
-				//add user to room
-				User user = room.add(nickname);
+				//add user to channel
+				User user = channel.add(nickname);
 
 				//call on listener event
-				server.getBot().getListeners().callOnJoin(room, user);
+				server.getBot().getListeners().callOnJoin(channel, user);
 			}
 		}
 	}

src/main/java/com/konloch/ircbot/message/text/impl/Join.java

@@ -1,7 +1,7 @@
 package com.konloch.ircbot.message.text.impl;
 
 import com.konloch.ircbot.message.text.TextMessageEvent;
-import com.konloch.ircbot.server.Room;
+import com.konloch.ircbot.server.Channel;
 import com.konloch.ircbot.server.Server;
 import com.konloch.ircbot.server.User;
 
@@ -17,19 +17,19 @@ public class Join implements TextMessageEvent
 	public void handle(Server server, String[] splitPartMessage)
 	{
 		String nickname = split(splitPartMessage[0].substring(1), "!", 2)[0];
-		String roomName = splitPartMessage[2];
+		String channelName = splitPartMessage[2];
 
-		Room room = server.get(roomName);
+		Channel channel = server.get(channelName);
 
-		if (room != null)
+		if (channel != null)
 		{
-			room.setJoined(true);
+			channel.setJoined(true);
 
-			//add user to room
-			User user = room.add(nickname);
+			//add user to channel
+			User user = channel.add(nickname);
 
 			//call on listener event
-			server.getBot().getListeners().callOnJoin(room, user);
+			server.getBot().getListeners().callOnJoin(channel, user);
 		}
 	}
 }

src/main/java/com/konloch/ircbot/message/text/impl/PrivMSG.java

@@ -1,7 +1,7 @@
 package com.konloch.ircbot.message.text.impl;
 
 import com.konloch.ircbot.message.text.TextMessageEvent;
-import com.konloch.ircbot.server.Room;
+import com.konloch.ircbot.server.Channel;
 import com.konloch.ircbot.server.Server;
 import com.konloch.ircbot.server.User;
 
@@ -22,16 +22,16 @@ public void handle(Server server, String[] splitPartMessage)
 
 		if(location.startsWith("#"))
 		{
-			Room room = server.get(location);
+			Channel channel = server.get(location);
 
-			if (room != null)
+			if (channel != null)
 			{
-				room.setJoined(true);
+				channel.setJoined(true);
 
-				User user = room.get(nickname);
+				User user = channel.get(nickname);
 
 				//call on listener event
-				server.getBot().getListeners().callRoomMessage(room, user, msg);
+				server.getBot().getListeners().callChannelMessage(channel, user, msg);
 			}
 		}
 		else

src/main/java/com/konloch/ircbot/message/text/impl/Quit.java

@@ -1,7 +1,7 @@
 package com.konloch.ircbot.message.text.impl;
 
 import com.konloch.ircbot.message.text.TextMessageEvent;
-import com.konloch.ircbot.server.Room;
+import com.konloch.ircbot.server.Channel;
 import com.konloch.ircbot.server.Server;
 import com.konloch.ircbot.server.User;
 
@@ -18,15 +18,15 @@ public void handle(Server server, String[] splitPartMessage)
 	{
 		String nickname = split(splitPartMessage[0].substring(1), "!", 2)[0];
 
-		for(Room room : server.getRooms())
+		for(Channel channel : server.getChannels())
 		{
-			//remove user from room
-			User user = room.remove(nickname);
+			//remove user from channel
+			User user = channel.remove(nickname);
 
 			if(user != null)
 			{
 				//call on listener event
-				server.getBot().getListeners().callOnLeave(room, user);
+				server.getBot().getListeners().callOnLeave(channel, user);
 				break;
 			}
 		}

src/main/java/com/konloch/ircbot/server/Room.java → src/main/java/com/konloch/ircbot/server/Channel.java

@@ -2,8 +2,7 @@
 
 import com.konloch.ircbot.listener.IRCJoin;
 import com.konloch.ircbot.listener.IRCLeave;
-import com.konloch.ircbot.listener.IRCPrivateMessage;
-import com.konloch.ircbot.listener.IRCRoomMessage;
+import com.konloch.ircbot.listener.IRCChannelMessage;
 
 import java.util.LinkedList;
 import java.util.List;
@@ -14,7 +13,7 @@
  * @author Konloch
  * @since 12/15/2023
  */
-public class Room
+public class Channel
 {
 	private final Server server;
 	private final String name;
@@ -24,7 +23,7 @@ public class Room
 	private final Queue<String> messageQueue = new LinkedList<>();
 	private final List<User> users = new CopyOnWriteArrayList<>();
 
-	public Room(Server server, String name)
+	public Channel(Server server, String name)
 	{
 		this.server = server;
 		this.name = name;
@@ -34,7 +33,7 @@ public void process()
 	{
 		try
 		{
-			//rejoin room after 5 seconds from initial attempt
+			//rejoin channel after 5 seconds from initial attempt
 			if (!isJoined() && System.currentTimeMillis() - getLastJoinAttempt() >= 5000)
 			{
 				setLastJoinAttempt(System.currentTimeMillis());
@@ -62,7 +61,7 @@ public void process()
 					}
 				}
 
-				//send room messages
+				//send channel messages
 				for (int i = 0; i < 5; i++)
 				{
 					if (getMessageQueue().isEmpty())
@@ -140,7 +139,7 @@ public void onJoin(IRCJoin join)
 		//filter listener events to only call for this server
 		server.getBot().getListeners().onJoin(event ->
 		{
-			if(event.getRoom() != this)
+			if(event.getChannel() != this)
 				return;
 
 			join.join(event);
@@ -152,22 +151,22 @@ public void onLeave(IRCLeave leave)
 		//filter listener events to only call for this server
 		server.getBot().getListeners().onLeave(event ->
 		{
-			if(event.getRoom() != this)
+			if(event.getChannel() != this)
 				return;
 
 			leave.leave(event);
 		});
 	}
 
-	public void onMessage(IRCRoomMessage roomMessage)
+	public void onMessage(IRCChannelMessage message)
 	{
 		//filter listener events to only call for this server
-		server.getBot().getListeners().onRoomMessage(event ->
+		server.getBot().getListeners().onChannelMessage(event ->
 		{
-			if(event.getRoom() != this)
+			if(event.getChannel() != this)
 				return;
 
-			roomMessage.message(event);
+			message.message(event);
 		});
 	}