Added support for PMs.

Author: DanielN

src/bitbot/ChatServer.java

@@ -1,31 +1,37 @@
 package bitbot;
 
-import java.util.ArrayList;
-import java.util.List;
+import java.util.HashMap;
+import java.util.Map;
 
+import org.jivesoftware.smack.Chat;
+import org.jivesoftware.smack.ChatManagerListener;
 import org.jivesoftware.smack.Connection;
+import org.jivesoftware.smack.MessageListener;
 import org.jivesoftware.smack.PacketListener;
 import org.jivesoftware.smack.SmackConfiguration;
 import org.jivesoftware.smack.XMPPConnection;
 import org.jivesoftware.smack.XMPPException;
 import org.jivesoftware.smack.packet.Message;
 import org.jivesoftware.smack.packet.Packet;
+import org.jivesoftware.smack.util.StringUtils;
 import org.jivesoftware.smackx.muc.DiscussionHistory;
 import org.jivesoftware.smackx.muc.MultiUserChat;
 import org.jivesoftware.smackx.muc.Occupant;
 
 
 public class ChatServer {
 
-	private final List<Room> rooms = new ArrayList<Room>();
+	private final Map<String, Room> rooms = new HashMap<String, Room>();
 	private final ChatServerConfig config;
 	private final MessageHandler messageHandler;
+	private final PrivateChats privateChats;
 
 	private Connection connection;
 
 	public ChatServer(ChatServerConfig config, MessageHandler messageHandler) {
 		this.config = config;
 		this.messageHandler = messageHandler;
+		privateChats = new PrivateChats();
 	}
 
 	public void connect() {
@@ -35,6 +41,7 @@ public void connect() {
 			System.out.println("Connected to " + connection.getServiceName());
 			connection.login(config.getUsername(), config.getPassword(), config.getResource());
 			System.out.println("Logged in as " + connection.getUser());
+			connection.getChatManager().addChatListener(new ChatHandler());
 		} catch (XMPPException e) {
 			System.out.println("Failed to connect to " + config.getServer() + ": " + e);
 		}
@@ -47,13 +54,32 @@ public void disconnect() {
 
 	public void joinRoom(RoomConfig roomConfig) {
 		try {
-			rooms.add(new Room(roomConfig));
+			rooms.put(roomConfig.getRoom(), new Room(roomConfig));
 		} catch (XMPPException e) {
 			System.out.println("Failed to join " + roomConfig.getRoom() + ": " + e);
 		}
 	}
 
-	private class Room implements PacketListener {
+	private final class ChatHandler implements ChatManagerListener {
+
+		@Override
+		public void chatCreated(Chat chat, boolean createdLocally) {
+			if (!createdLocally) {
+				Room room = rooms.get(StringUtils.parseBareAddress(chat.getParticipant()));
+				if (room != null) {
+					System.out.println("New room private chat by " + chat.getParticipant());
+					chat.addMessageListener(room);
+				} else {
+					System.out.println("New private chat by " + chat.getParticipant());
+					chat.addMessageListener(privateChats);
+				}
+			} else {
+				System.out.println("Ignore chat created locally: " + chat.getParticipant());
+			}
+		}
+	}
+
+	private class Room implements PacketListener, MessageListener {
 
 		private MultiUserChat muc;
 
@@ -77,19 +103,29 @@ public void processPacket(Packet packet) {
 				} else if (occupant.getNick().equals(muc.getNickname())) {
 					System.out.println("Ignoring own message");
 				}
-				messageHandler.processMessage(msg.getBody(), new User(occupant), false, new RoomReplier(muc, msg.getFrom()));
+				messageHandler.processMessage(msg.getBody(), User.fromOccupant(occupant), false, new RoomReplier(this, muc, msg.getFrom()));
 			} else {
 				System.out.println("Unhandled packet type from room: " + packet.getClass());
 			}
 		}
+
+		@Override
+		public void processMessage(Chat chat, Message msg) {
+			System.out.println("Room PM: " + chat.getParticipant() + ": " + msg.getBody());
+			messageHandler.processMessage(msg.getBody(), User.fromRoomJID(chat.getParticipant()), true, new PrivateReplier(chat));
+		}
 	}
 
-	private static class RoomReplier implements Replier {
+	private class RoomReplier implements Replier {
 
+		private final Room room;
 		private final MultiUserChat muc;
 		private final String user;
 
-		public RoomReplier(MultiUserChat muc, String user) {
+		private Chat chat;
+
+		public RoomReplier(Room room, MultiUserChat muc, String user) {
+			this.room = room;
 			this.muc = muc;
 			this.user = user;
 		}
@@ -103,6 +139,57 @@ public void reply(String text) {
 			}
 		}
 
+		@Override
+		public void replyPrivately(String text) {
+			try {
+				if (chat == null) {
+					System.out.println("Starting private chat with " + user);
+					chat = muc.createPrivateChat(user, room);
+				}
+				System.out.println("Sending to " + chat.getParticipant() + ": " + text);
+				chat.sendMessage(text);
+			} catch (XMPPException e) {
+				System.out.println("Failed to send message to occupant " + chat.getParticipant() + ": " + e);
+			}
+		}
+
+	}
+
+	private class PrivateChats implements MessageListener {
+
+		public PrivateChats() {
+		}
+
+		@Override
+		public void processMessage(Chat chat, Message msg) {
+			System.out.println("PM: " + chat.getParticipant() + ": " + msg.getBody());
+			messageHandler.processMessage(msg.getBody(), User.fromRealJID(chat.getParticipant()), true, new PrivateReplier(chat));
+		}
+	}
+
+	private class PrivateReplier implements Replier {
+
+		private final Chat chat;
+
+		public PrivateReplier(Chat chat) {
+			this.chat = chat;
+		}
+
+		@Override
+		public void reply(String text) {
+			try {
+				System.out.println("PM to " + chat.getParticipant() + ": " + text);
+				chat.sendMessage(text);
+			} catch (XMPPException e) {
+				System.out.println("Failed to set PM to " + chat.getParticipant() + ": " + e);
+			}
+		}
+
+		@Override
+		public void replyPrivately(String text) {
+			reply(text);
+		}
+
 	}
 
 }

src/bitbot/MessageHandler.java

@@ -15,11 +15,15 @@ public void processMessage(String text, User user, boolean pm, Replier replier)
 			if (text.charAt(0) == commandPrefix) {
 				text = text.substring(1);
 			}
-			String[] parts = text.split("\\s", 1);
+			String[] parts = text.split("\\s", 2);
 			String cmd = parts[0];
-			String args = parts.length == 1 ? null : parts[1];
+			String args = parts.length == 1 ? "" : parts[1];
 			if (cmd.equalsIgnoreCase("hej")) {
 				replier.reply("Hej, " + user.getNick());
+			} else if (cmd.equalsIgnoreCase("test")) {
+				for (String s : args.split("\\s")) {
+					replier.replyPrivately(s);
+				}
 			}
 		}
 	}

src/bitbot/Replier.java

@@ -5,4 +5,6 @@ public interface Replier {
 
 	void reply(String text);
 
+	void replyPrivately(String text);
+
 }

src/bitbot/User.java

@@ -1,18 +1,31 @@
 package bitbot;
 
+import org.jivesoftware.smack.util.StringUtils;
 import org.jivesoftware.smackx.muc.Occupant;
 
 
 public class User {
 
-	private final Occupant occupant;
+	static User fromOccupant(Occupant occupant) {
+		return new User(occupant.getNick());
+	}
+	
+	static User fromRealJID(String jid) {
+		return new User(StringUtils.parseName(jid));
+	}
+
+	static User fromRoomJID(String jid) {
+		return new User(StringUtils.parseResource(jid));
+	}
+
+	private final String nick;
 
-	public User(Occupant occupant) {
-		this.occupant = occupant;
+	private User(String nick) {
+		this.nick = nick;
 	}
 
 	public String getNick() {
-		return occupant.getNick();
+		return nick;
 	}
 
 }