From c6b522f419ea6d4ab2cb2269c56cdc869932622d Mon Sep 17 00:00:00 2001
From: Andy Spencer <andy753421@gmail.com>
Date: Sat, 13 Apr 2013 02:37:15 +0000
Subject: [PATCH] Show topic and current users

---
 src/org/pileus/spades/Main.java    | 27 ++++++++++++++++++++++-----
 src/org/pileus/spades/Message.java | 20 +++++++++++++++++++-
 2 files changed, 41 insertions(+), 6 deletions(-)

diff --git a/src/org/pileus/spades/Main.java b/src/org/pileus/spades/Main.java
index ebca439..0ca3603 100644
--- a/src/org/pileus/spades/Main.java
+++ b/src/org/pileus/spades/Main.java
@@ -22,13 +22,15 @@ import android.widget.Toast;
 public class Main extends Activity
 {
 	/* Static data */
-	private Handler      handler; 
-	private Messenger    messenger; 
+	private Handler      handler;
+	private Messenger    messenger;
 
 	/* Private data */
 	private Task         task;
 	private Toast        toast;
 	private boolean      ready;
+	private String       topic;
+	private String       names;
 
 	/* Widgets */
 	private TabHost      window;
@@ -54,18 +56,33 @@ public class Main extends Activity
 	{
 		Message msg = (Message)obj;
 
+		// Debug
 		this.debug.append("> " + msg.line + "\n");
 		this.dscroll.smoothScrollTo(0, this.debug.getBottom());
 
-		if (msg.cmd.equals("PRIVMSG")) {
-			this.log.append(msg.from + ": " + msg.msg + "\n");
-			this.lscroll.smoothScrollTo(0, this.log.getBottom());
+		// Chat
+		switch (msg.type) {
+			case PRIVMSG:
+				this.log.append(msg.from + ": " + msg.msg + "\n");
+				break;
+			case TOPIC:
+				if (!msg.txt.equals(this.topic))
+					this.log.append("** Topic for " + msg.arg + ": " + msg.txt + " **\n");
+				this.topic = msg.txt;
+				break;
+			case NAMES:
+				if (!msg.txt.equals(this.names))
+					this.log.append("** Users in " + msg.arg + ": " + msg.txt + " **\n");
+				this.names = msg.txt;
+				break;
 		}
+		this.lscroll.smoothScrollTo(0, this.log.getBottom());
 	}
 
 	private void onNotify(String text)
 	{
 		Os.debug("Main: onNotify - " + text);
+		this.log.append("** " + text + " **\n");
 		this.toast.setText(text);
 		this.toast.show();
 	}
diff --git a/src/org/pileus/spades/Message.java b/src/org/pileus/spades/Message.java
index 73a8fab..331657e 100644
--- a/src/org/pileus/spades/Message.java
+++ b/src/org/pileus/spades/Message.java
@@ -5,8 +5,16 @@ import java.util.regex.Matcher;
 
 public class Message
 {
+	/* Enumerations */
+	enum Type {
+		OTHER,
+		PRIVMSG,
+		TOPIC,
+		NAMES,
+	};
+
 	/* Constnats */
-	private final  String  reMsg  = "(:([^ ]+) +)?(([A-Z0-9]+) +)(([^ ]+) +)?(([^: ]+) +)?(:(.*))";
+	private final  String  reMsg  = "(:([^ ]+) +)?(([A-Z0-9]+) +)(([^ ]+)[= ]+)?(([^: ]+) +)?(:(.*))";
 	private final  String  reFrom = "([^! ]+)!.*";
 	private final  String  reTo   = "(([^ :,]*)[:,] *)?(.*)";
 
@@ -23,6 +31,7 @@ public class Message
 	public String  arg  = "";
 	public String  msg  = "";
 
+	public Type    type = Type.OTHER;
 	public String  from = "";
 	public String  to   = "";
 	public String  txt  = "";
@@ -45,15 +54,18 @@ public class Message
 
 	public Message(String line)
 	{
+		// Initialize regexes
 		if (ptMsg  == null) ptMsg  = Pattern.compile(reMsg);
 		if (ptFrom == null) ptFrom = Pattern.compile(reFrom);
 		if (ptTo   == null) ptTo   = Pattern.compile(reTo);
 
+		// Cleanup line
 		line = line.replaceAll("\\s+",       " ");
 		line = line.replaceAll("^ | $",      "");
 		line = line.replaceAll("\003[0-9]*", "");
 		this.line = line;
 
+		// Split line into parts
 		Matcher mrMsg = ptMsg.matcher(line);
 		if (mrMsg.matches()) {
 			this.src  = notnull(mrMsg.group(2));
@@ -63,6 +75,7 @@ public class Message
 			this.msg  = notnull(mrMsg.group(10));
 		}
 
+		// Determine friendly parts
 		Matcher mrFrom = ptFrom.matcher(this.src);
 		if (mrFrom.matches())
 			this.from = notnull(mrFrom.group(1));
@@ -75,6 +88,11 @@ public class Message
 			this.txt  = notnull(this.msg);
 		else
 			this.txt  = notnull(mrTo.group(3));
+
+		// Parse commands names
+		if (this.cmd.equals("PRIVMSG")) this.type = Type.PRIVMSG;
+		if (this.cmd.equals("332"))     this.type = Type.TOPIC;
+		if (this.cmd.equals("353"))     this.type = Type.NAMES;
 	}
 
 	public void debug()
-- 
2.43.2