From 3da596612cb845a8a6bd6015b0345fa695923d3e Mon Sep 17 00:00:00 2001 From: Andy Spencer Date: Sun, 14 Apr 2013 04:51:44 +0000 Subject: [PATCH] Clean up IRC formatting a little --- src/org/pileus/spades/Main.java | 55 ++++++++++++++---------------- src/org/pileus/spades/Message.java | 6 +++- 2 files changed, 31 insertions(+), 30 deletions(-) diff --git a/src/org/pileus/spades/Main.java b/src/org/pileus/spades/Main.java index bc98285..3c39414 100644 --- a/src/org/pileus/spades/Main.java +++ b/src/org/pileus/spades/Main.java @@ -57,43 +57,37 @@ public class Main extends Activity String from = String.format("%s", msg.from); String text = msg.msg; String fmt = null; - Os.debug("msg: " + Os.base64(msg.msg)); - // Do IRC Colors - // - This doesn't actually work - String fg = "\">"; - String bg = "\">"; + // Do IRC Colors - only partly works + String fg = "\">"; text = text .replaceAll("&", "&") .replaceAll("<", "<") .replaceAll(">", ">"); text = text - .replaceAll("\\002", "") // bold - .replaceAll("\\011", "") // italic - .replaceAll("\\025", "") // underline - .replaceAll("\\022", ""); // reverse + .replaceAll("\\002", "") // bold + .replaceAll("\\011", "") // italic + .replaceAll("\\025", ""); // underline text = text - .replaceAll("\\003(\\d+),(\\d+)", fg + bg) // color - .replaceAll("\\013(\\d+),(\\d+)", fg + bg) // color - .replaceAll("\\003(\\d+)", fg) // color - .replaceAll("\\013(\\d+)", fg); // color + .replaceAll("\\003(\\d+)(,\\d+)?", fg) // color + .replaceAll("\\013(\\d+)(,\\d+)?", fg); // color text = text - .replaceAll("<0?0>", "#000000") // White - .replaceAll("<0?1>", "#000000") // Black - .replaceAll("<0?2>", "#000080") // Navy Blue - .replaceAll("<0?3>", "#008000") // Green - .replaceAll("<0?4>", "#FF0000") // Red - .replaceAll("<0?5>", "#804040") // Brown - .replaceAll("<0?6>", "#8000FF") // Purple - .replaceAll("<0?7>", "#808000") // Olive - .replaceAll("<0?8>", "#FFFF00") // Yellow - .replaceAll("<0?9>", "#00FF00") // Lime Green - .replaceAll("<10>", "#008080") // Teal - .replaceAll("<11>", "#00FFFF") // Aqua Light - .replaceAll("<12>", "#0000FF") // Royal Blue - .replaceAll("<13>", "#FF00FF") // Hot Pink - .replaceAll("<14>", "#808080") // Dark Gray - .replaceAll("<15>", "#C0C0C0"); // Light Gray + .replaceAll("<0?0>", "#000000") // White + .replaceAll("<0?1>", "#000000") // Black + .replaceAll("<0?2>", "#000080") // Navy Blue + .replaceAll("<0?3>", "#008000") // Green + .replaceAll("<0?4>", "#FF0000") // Red + .replaceAll("<0?5>", "#804040") // Brown + .replaceAll("<0?6>", "#8000FF") // Purple + .replaceAll("<0?7>", "#808000") // Olive + .replaceAll("<0?8>", "#FFFF00") // Yellow + .replaceAll("<0?9>", "#00FF00") // Lime Green + .replaceAll("<10>", "#008080") // Teal + .replaceAll("<11>", "#00FFFF") // Aqua Light + .replaceAll("<12>", "#0000FF") // Royal Blue + .replaceAll("<13>", "#FF00FF") // Hot Pink + .replaceAll("<14>", "#808080") // Dark Gray + .replaceAll("<15>", "#C0C0C0"); // Light Gray // Message formatting switch (msg.how) { @@ -102,6 +96,9 @@ public class Main extends Activity case PRIVMSG: fmt = "(%s) %s: %s"; break; + case SENT: + fmt = "(%s) %s: %s"; + break; default: fmt = "(%s) %s: %s"; break; diff --git a/src/org/pileus/spades/Message.java b/src/org/pileus/spades/Message.java index ad71c2d..77e657b 100644 --- a/src/org/pileus/spades/Message.java +++ b/src/org/pileus/spades/Message.java @@ -24,7 +24,8 @@ public class Message CHANNEL, // Normal message to a channel MENTION, // User was mentioned in message text DIRECT, // Message directed towards user - PRIVMSG // Private message to user only + PRIVMSG, // Private message to user only + SENT // Message was sent by the user }; /* Constants */ @@ -62,7 +63,10 @@ public class Message /* Public Methods */ public Message(String dst, String from, String msg) { + this.time = new Date(); + this.type = Type.PRIVMSG; this.cmd = "PRIVMSG"; + this.how = How.SENT; this.dst = dst; this.from = from; this.msg = msg; -- 2.43.2