Add Twitter Parser.

Change-Id: I3afb4ec125fff7e02bc51296c5546a376fb99b55
Reviewed-on: http://gerrit.dmdirc.com/270
Reviewed-by: Chris Smith <chris@dmdirc.com>
Tested-by: Gregory Holmes <greboid@dmdirc.com>
Reviewed-by: Gregory Holmes <greboid@dmdirc.com>

src/com/dmdirc/addons/parser_twitter/Debug.java

@@ -0,0 +1,43 @@
+/*
+ *  Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ * 
+ *  Permission is hereby granted, free of charge, to any person obtaining a copy
+ *  of this software and associated documentation files (the "Software"), to deal
+ *  in the Software without restriction, including without limitation the rights
+ *  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ *  copies of the Software, and to permit persons to whom the Software is
+ *  furnished to do so, subject to the following conditions:
+ * 
+ *  The above copyright notice and this permission notice shall be included in
+ *  all copies or substantial portions of the Software.
+ * 
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ *  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ *  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ *  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ *  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ *  SOFTWARE.
+ */
+
+package com.dmdirc.addons.parser_twitter;
+
+/**
+ * Debug Info Enums
+ *
+ * @author shane
+ */
+enum Debug {
+    /** Debug information related to api calls. */
+    apiCalls,
+    /** Debug information related to sleeping. */
+    sleepTime,
+    /** Debug information for data input. */
+    dataIn,
+    /** Debug information for data output. */
+    dataOut,
+    /** General error info from the twitter parser. */
+    twitterError,
+    /** More debuggy error info from the twitter parser. */
+    twitterErrorMore;
+}

src/com/dmdirc/addons/parser_twitter/TwitterCallbackManager.java

@@ -0,0 +1,59 @@
+/*
+ * Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.dmdirc.addons.parser_twitter;
+
+import com.dmdirc.parser.common.CallbackObjectSpecific;
+import com.dmdirc.parser.common.CallbackObject;
+import com.dmdirc.parser.common.CallbackManager;
+import com.dmdirc.parser.interfaces.callbacks.CallbackInterface;
+
+/**
+ * Handles callbacks for the Twitter Parser.
+ * 
+ * @author chris
+ */
+public class TwitterCallbackManager extends CallbackManager<Twitter> {
+    /**
+     * Create a new TwitterCallbackManager
+     * 
+     * @param parser Parser that owns this callback manager.
+     */
+    public TwitterCallbackManager(final Twitter parser) {
+        super(parser);
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    protected CallbackObject getCallbackObject(final Twitter parser, final Class<?> type) {
+        return new TwitterCallbackObject(parser, this, type.asSubclass(CallbackInterface.class));
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    protected CallbackObjectSpecific getSpecificCallbackObject(final Twitter parser,
+            final Class<?> type) {
+        return new TwitterCallbackObjectSpecific(parser, this,
+                type.asSubclass(CallbackInterface.class));
+    }
+
+}

src/com/dmdirc/addons/parser_twitter/TwitterCallbackObject.java

@@ -0,0 +1,72 @@
+/*
+ * Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.dmdirc.addons.parser_twitter;
+
+import com.dmdirc.parser.common.CallbackManager;
+import com.dmdirc.parser.common.CallbackObject;
+import com.dmdirc.parser.interfaces.ChannelClientInfo;
+import com.dmdirc.parser.interfaces.ChannelInfo;
+import com.dmdirc.parser.interfaces.ClientInfo;
+import com.dmdirc.parser.interfaces.LocalClientInfo;
+import com.dmdirc.parser.interfaces.Parser;
+import com.dmdirc.parser.interfaces.callbacks.CallbackInterface;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * A callback object for the Twitter parser.
+ *
+ * @since 0.6.3m2
+ * @author chris
+ */
+public class TwitterCallbackObject extends CallbackObject {
+
+    /** A map of interfaces to the classes which should be instansiated for them. */
+    protected static Map<Class<?>, Class<?>> IMPL_MAP = new HashMap<Class<?>, Class<?>>();
+
+    static {
+        IMPL_MAP.put(ChannelClientInfo.class, TwitterChannelClientInfo.class);
+        IMPL_MAP.put(ChannelInfo.class, TwitterChannelInfo.class);
+        IMPL_MAP.put(ClientInfo.class, TwitterClientInfo.class);
+        IMPL_MAP.put(LocalClientInfo.class, TwitterClientInfo.class);
+    }
+
+    /**
+     * Create a new TwitterCallbackObject.
+     *
+     * @param parser Parser that owns this object.
+     * @param manager Callback Manager that owns this object.
+     * @param type Type of callback.
+     */
+    public TwitterCallbackObject(final Parser parser, final CallbackManager<?> manager,
+            final Class<? extends CallbackInterface> type) {
+        super(parser, manager, type);
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    protected Class<?> getImplementation(final Class<?> type) {
+        return IMPL_MAP.containsKey(type) ? IMPL_MAP.get(type) : type;
+    }
+
+}

src/com/dmdirc/addons/parser_twitter/TwitterCallbackObjectSpecific.java

@@ -0,0 +1,79 @@
+/*
+ * Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.dmdirc.addons.parser_twitter;
+
+import com.dmdirc.parser.common.CallbackManager;
+import com.dmdirc.parser.common.CallbackObjectSpecific;
+import com.dmdirc.parser.interfaces.ChannelClientInfo;
+import com.dmdirc.parser.interfaces.ChannelInfo;
+import com.dmdirc.parser.interfaces.ClientInfo;
+import com.dmdirc.parser.interfaces.LocalClientInfo;
+import com.dmdirc.parser.interfaces.Parser;
+import com.dmdirc.parser.interfaces.callbacks.CallbackInterface;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * A specific callback object for use with the Twitter Parser
+ *
+ * @since 0.6.3m2
+ * @author chris
+ */
+public class TwitterCallbackObjectSpecific extends CallbackObjectSpecific {
+
+    /** A map of interfaces to the classes which should be instansiated for them. */
+    protected static Map<Class<?>, Class<?>> IMPL_MAP = new HashMap<Class<?>, Class<?>>();
+
+    static {
+        IMPL_MAP.put(ChannelClientInfo.class, TwitterChannelClientInfo.class);
+        IMPL_MAP.put(ChannelInfo.class, TwitterChannelInfo.class);
+        IMPL_MAP.put(ClientInfo.class, TwitterClientInfo.class);
+        IMPL_MAP.put(LocalClientInfo.class, TwitterClientInfo.class);
+    }
+
+    /**
+     * Create a new TwitterCallbackObjectSpecific.
+     * This is a TwitterCallbackObject that has a specific target.
+     *
+     * @param parser Parser that owns this object.
+     * @param manager Callback Manager that owns this object.
+     * @param type Type of callback.
+     */
+    public TwitterCallbackObjectSpecific(final Parser parser,
+            final CallbackManager<?> manager, final Class<? extends CallbackInterface> type) {
+        super(parser, manager, type);
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    protected String translateHostname(final String hostname) {
+        return TwitterClientInfo.parseHost(hostname);
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    protected Class<?> getImplementation(final Class<?> type) {
+        return IMPL_MAP.containsKey(type) ? IMPL_MAP.get(type) : type;
+    }
+
+}

src/com/dmdirc/addons/parser_twitter/TwitterChannelClientInfo.java

@@ -0,0 +1,164 @@
+/*
+ * Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.dmdirc.addons.parser_twitter;
+
+import com.dmdirc.parser.interfaces.ChannelClientInfo;
+import com.dmdirc.parser.interfaces.ChannelInfo;
+import com.dmdirc.parser.interfaces.ClientInfo;
+import java.util.Map;
+import java.util.HashMap;
+
+/**
+ * ChannelClientInfo class for the Twitter plugin.
+ *
+ * @author shane
+ */
+public class TwitterChannelClientInfo implements ChannelClientInfo {
+    /** My ChannelInfo.  */
+    private TwitterChannelInfo myChannel;
+    
+    /** My ClientInfo. */
+    private TwitterClientInfo myClient;
+
+    /** Map of random objects. */
+    final Map<Object, Object> myMap = new HashMap<Object, Object>();
+
+    /**
+     * Create a new TwitterChannelClientInfo
+     *
+     * @param channel Channel that this client is in.
+     * @param ci Client that we represent.
+     */
+    public TwitterChannelClientInfo(final TwitterChannelInfo channel, final TwitterClientInfo ci) {
+        this.myChannel = channel;
+        this.myClient = ci;
+
+        myClient.addChannelClient(this);
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public ClientInfo getClient() {
+        return myClient;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public ChannelInfo getChannel() {
+        return myChannel;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public String getImportantModePrefix() {
+        switch (getImportantModeValue()) {
+            case 1:
+                return "+";
+            case 2:
+                return "%";
+            default:
+                return "";
+        }
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public String getImportantMode() {
+        switch (getImportantModeValue()) {
+            case 1:
+                return "v";
+            case 2:
+                return "h";
+            default:
+                return "";
+        }
+    }
+
+    /**
+     * Get the value for the mode this client has.
+     * Used for sorting.
+     *
+     * @return Value for this clients modes.
+     */
+    public int getImportantModeValue() {
+        if (myClient == null || myClient.isFake()) { return 0; }
+        final String ourNickname = ((Twitter) myClient.getParser()).getApi().getDisplayUsername();
+        
+        if (ourNickname.equalsIgnoreCase(myClient.getNickname())) {
+            // Show ourselves as half-op
+            return 2;
+        } else if (myClient.getUser() != null && myClient.getUser().isFollowingUs()) {
+            // Show followers as voiced
+            return 1;
+        } else {
+            // Show everyone else as nothing
+            return 0;
+        }
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public String getAllModes() {
+        return getImportantModePrefix();
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Map<Object, Object> getMap() {
+        return myMap;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public void kick(final String message) {
+        ((Twitter)myClient.getParser()).getApi().delFriend(myClient.getUser().getScreenName());
+        myChannel.delChannelClient(this);
+        myClient.delChannelClient(this);
+    }
+
+    /**
+     * Compare this TwitterChannelClientInfo to another.
+     *
+     * @param arg0
+     * @return
+     */
+    @Override
+    public int compareTo(final ChannelClientInfo arg0) {
+        if (arg0 instanceof TwitterChannelClientInfo) {
+            final TwitterChannelClientInfo other = (TwitterChannelClientInfo) arg0;
+            return (this.getImportantModeValue() - other.getImportantModeValue());
+        }
+
+        return 0;
+    }
+
+    /**
+     * String representation of this client.
+     *
+     * @return a String representation of this client.
+     */
+    @Override
+    public String toString() {
+        return getImportantModePrefix() + myClient.getNickname();
+    }
+}

src/com/dmdirc/addons/parser_twitter/TwitterChannelInfo.java

@@ -0,0 +1,281 @@
+/*
+ * Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.dmdirc.addons.parser_twitter;
+
+import com.dmdirc.addons.parser_twitter.api.TwitterUser;
+import com.dmdirc.parser.common.ChannelListModeItem;
+import com.dmdirc.parser.interfaces.ChannelClientInfo;
+import com.dmdirc.parser.interfaces.ChannelInfo;
+import com.dmdirc.parser.interfaces.ClientInfo;
+import com.dmdirc.parser.interfaces.Parser;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * ChannelInfo class for the Twitter plugin.
+ *
+ * @author shane
+ */
+public class TwitterChannelInfo implements ChannelInfo {
+    /** Name of this channel. */
+    private final String myName;
+
+    /** The Parser that owns this object. */
+    private final Twitter myParser;
+    
+    /** Topic of this channel. */
+    private String myTopic = "";
+
+    /** When was the topic set? */
+    private long topicTime = 0;
+
+    /** Who set the topic? */
+    private String topicSetter = "";
+
+    /** Known clients of this channel. */
+    private Map<String, TwitterChannelClientInfo> channelClients = new HashMap<String, TwitterChannelClientInfo>();
+
+    /** Map to store misc stuff in. */
+    private Map<Object, Object> myMap = new HashMap<Object, Object>();
+
+    /**
+     * Create a new TwitterChannelInfo.
+     *
+     * @param myName Name of this channel
+     * @param myParser parser that owns this TwitterChannelInfo
+     */
+    public TwitterChannelInfo(final String myName, final Twitter myParser) {
+        this.myName = myName;
+        this.myParser = myParser;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public String getName() {
+        return myName;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public String toString() {
+        return getName();
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public void setTopic(final String topic) {
+        myParser.setStatus(topic);
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public String getTopic() {
+        return myTopic;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public long getTopicTime() {
+        return topicTime;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public String getTopicSetter() {
+        return topicSetter;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public String getModes() {
+        return "";
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public String getMode(final char mode) {
+        return "";
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public void sendMessage(final String message) {
+        myParser.sendMessage(myName, message);
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public void sendAction(final String action) {
+        myParser.sendAction(myName, action);
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public void part(final String reason) {
+        myParser.partChannel(this);
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public void sendWho() {
+        return;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public void alterMode(final boolean add, final Character mode, final String parameter) {
+        if (mode == 'b') {
+            final String[] bits = parameter.split(" ");
+            if (add) {
+                myParser.getApi().blockUser(bits[0]);
+            } else {
+                myParser.getApi().unblockUser(bits[0]);
+            }
+        }
+        return;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public void flushModes() {
+        return;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public ChannelClientInfo getChannelClient(final ClientInfo client) {
+        return getChannelClient(client.getNickname());
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public ChannelClientInfo getChannelClient(final String client) {
+        return channelClients.containsKey(client.toLowerCase()) ? channelClients.get(client.toLowerCase()) : null;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public ChannelClientInfo getChannelClient(final String client, final boolean create) {
+        ChannelClientInfo cci = getChannelClient(client);
+        if (create && cci == null) {
+            cci = new TwitterChannelClientInfo(this, (TwitterClientInfo)myParser.getClient(client));
+        }
+        return cci;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Collection<ChannelClientInfo> getChannelClients() {
+        return new ArrayList<ChannelClientInfo>(channelClients.values());
+    }
+
+    /** {@inheritDoc} */
+    protected void clearChannelClients() {
+        channelClients.clear();
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public int getChannelClientCount() {
+        return channelClients.size();
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Parser getParser() {
+        return myParser;
+    }
+
+    /**
+     * Add a channel client to this channel.
+     *
+     * @param cci Channel Client to add.
+     */
+    public void addChannelClient(final TwitterChannelClientInfo cci) {
+        synchronized (channelClients) {
+            channelClients.put(cci.getClient().getNickname().toLowerCase(), cci);
+        }
+    }
+
+    /**
+     * Remove a channel client from this channel.
+     *
+     * @param cci Channel Client to remove.
+     */
+    public void delChannelClient(final TwitterChannelClientInfo cci) {
+        synchronized (channelClients) {
+            channelClients.remove(cci.getClient().getNickname().toLowerCase());
+        }
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Collection<ChannelListModeItem> getListMode(final char mode) {
+        final ArrayList<ChannelListModeItem> items = new ArrayList<ChannelListModeItem>();
+
+        // Ideally this should be cached somewhere, but for now this will do.
+        if (mode == 'b') {
+            final long time = System.currentTimeMillis() / 1000;
+            for (TwitterUser user : myParser.getApi().getBlocked()) {
+                items.add(new ChannelListModeItem(user.getScreenName(), myParser.getApi().getDisplayUsername(), time));
+            }
+        }
+
+        return items;
+    }
+
+    /**
+     * Set the topic for this channel.
+     *
+     * @param string Topic to set.
+     */
+    void setLocalTopic(final String string) {
+        myTopic = string;
+    }
+
+    /**
+     * Set the topic time for this channel.
+     *
+     * @param newValue New Time
+     */
+    public void setTopicTime(final long newValue) {
+        topicTime = newValue;
+    }
+
+    /**
+     * Set the topic setter for this channel.
+     *
+     * @param newValue New Setter
+     */
+    public void setTopicSetter(final String newValue) {
+        topicSetter = newValue;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Map<Object, Object> getMap() {
+        return myMap;
+    }
+}

src/com/dmdirc/addons/parser_twitter/TwitterClientInfo.java

@@ -0,0 +1,280 @@
+/*
+ * Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.dmdirc.addons.parser_twitter;
+
+import com.dmdirc.addons.parser_twitter.api.TwitterUser;
+import com.dmdirc.config.IdentityManager;
+import com.dmdirc.parser.interfaces.ChannelClientInfo;
+import com.dmdirc.parser.interfaces.LocalClientInfo;
+import com.dmdirc.parser.interfaces.Parser;
+import com.dmdirc.parser.interfaces.callbacks.ChannelNickChangeListener;
+import com.dmdirc.parser.interfaces.callbacks.ChannelUserModeChangeListener;
+import com.dmdirc.plugins.Plugin;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * ClientInfo class for the Twitter plugin.
+ *
+ * @author shane
+ */
+public class TwitterClientInfo implements LocalClientInfo {
+    /** This Clients User */
+    private String myUser;
+
+    /** My Parser */
+    private Twitter myParser;
+
+    /** Is this a fake client created just for a callback? */
+    private boolean isFake = false;
+
+    /** Map of random objects. */
+    final Map<Object, Object> myMap = new HashMap<Object, Object>();
+
+    /** List of my channelclients. */
+    final List<ChannelClientInfo> channelClients = new ArrayList<ChannelClientInfo>();
+
+    /**
+     * Parse an IRC Hostname into its separate parts.
+     *
+     * @param hostname Hostname to parse
+     * @return String array of nick, ident and host.
+     */
+    static String[] parseHostFull(final String hostname) {
+        return parseHostFull(hostname, null, null);
+    }
+
+    /**
+     * Parse an IRC Hostname into its separate parts.
+     *
+     * @param hostname Hostname to parse.
+     * @param plugin Plugin to use to get domain from.
+     * @return String array of nick, ident and host.
+     */
+    static String[] parseHostFull(String hostname, final Plugin plugin, final Twitter parser) {
+        boolean hadAt = false;
+        if (plugin != null && parser != null && parser.getConfigManager().getOptionBool(plugin.getDomain(), "autoAt")) {
+            if (!hostname.isEmpty() && hostname.charAt(0) == '@') {
+                hostname = hostname.substring(1);
+                hadAt = true;
+            }
+        }
+
+        String[] temp = null;
+        final String[] result = new String[3];
+        if (!hostname.isEmpty() && hostname.charAt(0) == ':') { hostname = hostname.substring(1); }
+        temp = hostname.split("@", 2);
+        if (temp.length == 1) { result[2] = ""; } else { result[2] = temp[1]; }
+        temp = temp[0].split("!", 2);
+        if (temp.length == 1) { result[1] = ""; } else { result[1] = temp[1]; }
+        result[0] = (hadAt ? "@" : "") + temp[0];
+
+        return result;
+    }
+
+    /**
+     * Return the nickname from an irc hostname.
+     *
+     * @param hostname host to parse
+     * @return nickname
+     */
+    static String parseHost(final String hostname) {
+        return parseHostFull(hostname)[0];
+    }
+
+    /**
+     * Create a new TwitterClientInfo
+     *
+     * @param user User object for this client.
+     * @param parser Parser that owns this client.
+     */
+    public TwitterClientInfo(final String user, final Twitter parser) {
+        this.myUser = user;
+        this.myParser = parser;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public void setNickname(final String name) {
+        if (this == myParser.getLocalClient()) {
+            // TODO: throw new UnsupportedOperationException("Not supported yet.");
+        } else {
+            // TODO: throw new UnsupportedOperationException("Can not set nickname on non-local clients");
+        }
+    }
+
+    /**
+     * Get the user object for this client.
+     *
+     * @return User object for this client.
+     */
+    public TwitterUser getUser() {
+        return myParser.getApi().getCachedUser(myUser);
+    }
+
+    /**
+    * Check if this is a fake client.
+    *
+    * @return True if this is a fake client, else false
+    */
+    public boolean isFake() { return isFake; }
+    
+    /**
+    * Check if this client is actually a server.
+    *
+    * @return True if this client is actually a server.
+    */
+    public boolean isServer() { return !(myUser.indexOf(':') == -1); }
+    
+    /**
+    * Set if this is a fake client.
+    * This returns "this" and thus can be used in the construction line.
+    *
+    * @param newValue new value for isFake - True if this is a fake client, else false
+    * @return this Object
+    */
+    public TwitterClientInfo setFake(final boolean newValue) {
+        isFake = newValue;
+        return this;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public String getModes() {
+        return "";
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public void setAway(final String reason) {
+        return;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public void setBack() {
+        return;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public void alterMode(final boolean add, final Character mode) {
+        return;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public void flushModes() {
+        return;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public String getNickname() {
+        return myUser;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public String getUsername() {
+        return "user";
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public String getHostname() {
+        return "twitter.com";
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public String toString() {
+        return getNickname() + "!" + getUsername() + "@" + getHostname();
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public String getRealname() {
+        return String.format("%s - http://%s/%s", getUser().getRealName(), getHostname(), getNickname());
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public int getChannelCount() {
+        synchronized (channelClients) {
+            return channelClients.size();
+        }
+    }
+
+    /**
+     * Get a list of all the channel clients associated with this user.
+     * 
+     * @return Channel Clients for this Client.
+     */
+    public List<ChannelClientInfo> getChannelClients() {
+        synchronized (channelClients) {
+            return new ArrayList<ChannelClientInfo>(channelClients);
+        }
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Map<Object, Object> getMap() {
+        return myMap;
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public Parser getParser() {
+        return myParser;
+    }
+
+    /**
+     * Add a channelClient to this Client.
+     * 
+     * @param channelClient channelClient to add as us.
+     */
+    public void addChannelClient(final TwitterChannelClientInfo channelClient) {
+        synchronized (channelClients) {
+            if (!channelClients.contains(channelClient)) {
+                channelClients.add(channelClient);
+            }
+        }
+    }
+
+    /**
+     * Remove a channelclient from this client..
+     *
+     * @param channelClient channelClient to remove.
+     */
+    public void delChannelClient(final TwitterChannelClientInfo channelClient) {
+        synchronized (channelClients) {
+            if (channelClients.contains(channelClient)) {
+                channelClients.remove(channelClient);
+            }
+        }
+    }
+
+}

src/com/dmdirc/addons/parser_twitter/TwitterPlugin.java

@@ -0,0 +1,91 @@
+/*
+ *  Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ *
+ *  Permission is hereby granted, free of charge, to any person obtaining a copy
+ *  of this software and associated documentation files (the "Software"), to deal
+ *  in the Software without restriction, including without limitation the rights
+ *  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ *  copies of the Software, and to permit persons to whom the Software is
+ *  furnished to do so, subject to the following conditions:
+ *
+ *  The above copyright notice and this permission notice shall be included in
+ *  all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ *  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ *  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ *  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ *  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ *  SOFTWARE.
+ */
+
+package com.dmdirc.addons.parser_twitter;
+
+import com.dmdirc.config.prefs.PreferencesCategory;
+import com.dmdirc.config.prefs.PreferencesManager;
+import com.dmdirc.config.prefs.PreferencesSetting;
+import com.dmdirc.config.prefs.PreferencesType;
+import com.dmdirc.parser.common.MyInfo;
+import com.dmdirc.parser.interfaces.Parser;
+import com.dmdirc.plugins.Plugin;
+import java.net.URI;
+import java.util.ArrayList;
+
+/**
+ *
+ * @author shane
+ */
+public class TwitterPlugin extends Plugin  {
+    /** Are we currently unloading? */
+    private static boolean unloading = false;
+
+    /**
+     * Create a TwitterPlugin
+     */
+    public TwitterPlugin() { }
+
+
+    @Override
+    public void onLoad() { }
+
+    @Override
+    public void onUnload() {
+        unloading = true;
+        for (Twitter parser : new ArrayList<Twitter>(Twitter.currentParsers)) {
+            parser.disconnect("");
+        }
+    }
+
+    /**
+     * Get a Twitter parser instance.
+     *
+     * @param myInfo The client information to use
+     * @param address The address of the server to connect to
+     * @return An appropriately configured parser
+     */
+    public Parser getParser(final MyInfo myInfo, final URI address) {
+        return (unloading) ? null : new Twitter(myInfo, address, this);
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public void showConfig(final PreferencesManager manager) {
+        final PreferencesCategory category = new PreferencesCategory("Twitter Plugin", "Settings related to the twitter plugin");
+        final PreferencesCategory advanced = new PreferencesCategory("Advanced", "Advanced Settings related to the twitter plugin");
+
+        category.addSetting(new PreferencesSetting(PreferencesType.INTEGER, getDomain(), "statuscount", "Statuses to request", "How many statuses to request at a time.?"));
+        category.addSetting(new PreferencesSetting(PreferencesType.INTEGER, getDomain(), "apicalls", "API Calls", "Aim to only use how many API Calls per hour? (Twitter has a max of 150)"));
+        category.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN, getDomain(), "saveLastIDs", "Remember shown items", "Should previously shown items not be shown again next time?"));
+        category.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN, getDomain(), "getSentMessages", "Show own Direct Messages", "Should we try to show our own direct messages to people not just ones to us?"));
+
+        advanced.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN, getDomain(), "autoAt", "Prepend nickanmes with @", "Should all nicknmaes be shown with an @ infront of them? (Makes tab competion easier)"));
+        advanced.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN, getDomain(), "replaceOpeningNickname", "Replace opening nickame?", "Should nicknames at the start of the message be replaced? (eg Replace foo: with @foo)"));
+        advanced.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN, getDomain(), "debugEnabled", "Debugging Enabled?", "Should more debugging be enabled on the twitter plugin?"));
+        advanced.addSetting(new PreferencesSetting(PreferencesType.BOOLEAN, getDomain(), "hide500Errors", "Hide HTTP 50x Errors", "At times twitter gives a lot of 502/503 errors. Should this be hidden from you?"));
+
+        category.addSubCategory(advanced);
+
+        manager.getCategory("Plugins").addSubCategory(category);
+    }
+}

src/com/dmdirc/addons/parser_twitter/api/APIAllowed.java

@@ -0,0 +1,57 @@
+/*
+ *  Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ *
+ *  Permission is hereby granted, free of charge, to any person obtaining a copy
+ *  of this software and associated documentation files (the "Software"), to deal
+ *  in the Software without restriction, including without limitation the rights
+ *  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ *  copies of the Software, and to permit persons to whom the Software is
+ *  furnished to do so, subject to the following conditions:
+ *
+ *  The above copyright notice and this permission notice shall be included in
+ *  all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ *  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ *  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ *  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ *  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ *  SOFTWARE.
+ */
+
+package com.dmdirc.addons.parser_twitter.api;
+
+/**
+ *
+ * @author shane
+ */
+public enum APIAllowed {
+    /** It is not known if we are allowed or not. */
+    UNKNOWN(false),
+    /** We are not allowed. */
+    FALSE(false),
+    /** We are allowed. */
+    TRUE(true);
+
+    /** Boolean value of this APIAllowed */
+    final boolean value;
+
+    /**
+     * Create an APIAllowed
+     *
+     * @param booleanValue boolean value for this if needed.
+     */
+    private APIAllowed(final boolean booleanValue) {
+        value = booleanValue;
+    }
+
+    /**
+     * Get the boolean value of this object.
+     *
+     * @return the boolean value of this object.
+     */
+    public boolean getBooleanValue() {
+        return value;
+    }
+}

src/com/dmdirc/addons/parser_twitter/api/TwitterErrorHandler.java

@@ -0,0 +1,42 @@
+/*
+ *  Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ * 
+ *  Permission is hereby granted, free of charge, to any person obtaining a copy
+ *  of this software and associated documentation files (the "Software"), to deal
+ *  in the Software without restriction, including without limitation the rights
+ *  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ *  copies of the Software, and to permit persons to whom the Software is
+ *  furnished to do so, subject to the following conditions:
+ * 
+ *  The above copyright notice and this permission notice shall be included in
+ *  all copies or substantial portions of the Software.
+ * 
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ *  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ *  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ *  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ *  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ *  SOFTWARE.
+ */
+
+package com.dmdirc.addons.parser_twitter.api;
+
+/**
+ * Errors from the twitter API will be passed to this callback.
+ *
+ * @author shane
+ */
+public interface TwitterErrorHandler {
+    /**
+     * Handle an error from the Twitter API.
+     *
+     * @param api the TwitterAPI that raised this error.
+     * @param t The throwable that caused the error.
+     * @param source Source of exception.
+     * @param twitterInput The input to the API that caused this error.
+     * @param twitterOutput The output from the API that caused this error.
+     * @param message If more information should be relayed to the user, it comes here
+     */
+     void handleTwitterError(final TwitterAPI api, final Throwable t, final String source, final String twitterInput, final String twitterOutput, final String message);
+}

src/com/dmdirc/addons/parser_twitter/api/TwitterException.java

@@ -0,0 +1,58 @@
+/*
+ *  Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ *
+ *  Permission is hereby granted, free of charge, to any person obtaining a copy
+ *  of this software and associated documentation files (the "Software"), to deal
+ *  in the Software without restriction, including without limitation the rights
+ *  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ *  copies of the Software, and to permit persons to whom the Software is
+ *  furnished to do so, subject to the following conditions:
+ *
+ *  The above copyright notice and this permission notice shall be included in
+ *  all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ *  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ *  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ *  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ *  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ *  SOFTWARE.
+ */
+
+package com.dmdirc.addons.parser_twitter.api;
+
+/**
+ * Exception in the twitter API!
+ *
+ * @author shane
+ */
+public class TwitterException extends Exception {
+
+    /**
+     * A version number for this class. It should be changed whenever the class
+     * structure is changed (or anything else that would prevent serialized
+     * objects being unserialized with the new class).
+     */
+    private static final long serialVersionUID = 1;
+
+    /**
+     * Create a new Twitter Exception!
+     *
+     * @param reason Reason for this exception.
+     */
+    public TwitterException(final String reason) {
+        super(reason);
+    }
+
+    /**
+     * Create a new Twitter Exception with a cause.
+     *
+     * @param reason Reason for this exception.
+     * @param cause Cause of this exception
+     */
+    public TwitterException(final String reason, final Throwable cause) {
+        super(reason, cause);
+    }
+
+}

src/com/dmdirc/addons/parser_twitter/api/TwitterMessage.java

@@ -0,0 +1,227 @@
+/*
+ *  Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ *
+ *  Permission is hereby granted, free of charge, to any person obtaining a copy
+ *  of this software and associated documentation files (the "Software"), to deal
+ *  in the Software without restriction, including without limitation the rights
+ *  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ *  copies of the Software, and to permit persons to whom the Software is
+ *  furnished to do so, subject to the following conditions:
+ *
+ *  The above copyright notice and this permission notice shall be included in
+ *  all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ *  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ *  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ *  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ *  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ *  SOFTWARE.
+ */
+
+package com.dmdirc.addons.parser_twitter.api;
+
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+
+/**
+ * Used for direct messages.
+ *
+ * @author shane
+ */
+public class TwitterMessage implements Comparable<TwitterMessage> {
+    /** ID of this message. */
+    final long id;
+
+    /** Contents of this message. */
+    final String message;
+
+    /** Owner of this message. */
+    final String sender;
+    
+    /** Target of this message. */
+    final String target;
+
+    /** API Object that owns this. */
+    private final TwitterAPI myAPI;
+
+    /** Time this message was sent. */
+    private final long time;
+
+    /**
+     * Create a new TwitterMessage
+     *
+     * @param api
+     * @param message Message contents
+     */
+    protected TwitterMessage(final TwitterAPI api, final String message) {
+        this(api, message, -1, "", "", System.currentTimeMillis());
+    }
+
+    /**
+     * Create a new TwitterMessage
+     *
+     * @param api
+     * @param message Message contents
+     * @param id ID of message
+     * @param sender User who send this.
+     * @param time Time this message was sent
+     */
+    protected TwitterMessage(final TwitterAPI api, final String message, final long id, final String sender, final String target, final Long time) {
+        this.myAPI = api;
+        this.id = id;
+        this.message = message;
+        this.sender = sender;
+        this.target = target;
+        this.time = time;
+    }
+
+    /**
+     * Create a twitter status from a node!
+     *
+     * @param api API that owns this.
+     * @param node Node to use.
+     */
+    protected TwitterMessage(final TwitterAPI api, final Node node) {
+        if (!(node instanceof Element)) { throw new TwitterRuntimeException("Can only use Element type nodes for message creation."); }
+        this.myAPI = api;
+        final Element element = (Element) node;
+
+        this.message = TwitterAPI.getElementContents(element, "text", "");
+
+        final TwitterUser senderUser;
+
+        final NodeList senderNodes = element.getElementsByTagName("sender");
+        if (senderNodes != null && senderNodes.getLength() > 0) {
+            senderUser = new TwitterUser(api, senderNodes.item(0), null);
+            this.sender = senderUser.getScreenName();
+            myAPI.updateUser(senderUser);
+        } else {
+            senderUser = new TwitterUser(api, "unknown", -1, "realname", false);
+            this.sender = senderUser.getScreenName();
+        }
+
+        final TwitterUser targetUser;
+        final NodeList recipientNodes = element.getElementsByTagName("recipient");
+        if (recipientNodes != null && recipientNodes.getLength() > 0) {
+            targetUser = new TwitterUser(api, recipientNodes.item(0), null);
+            this.target = targetUser.getScreenName();
+            myAPI.updateUser(targetUser);
+        } else {
+            targetUser = new TwitterUser(api, "unknown", -1, "realname", false);
+            this.target = targetUser.getScreenName();
+        }
+
+        this.id = TwitterAPI.parseLong(TwitterAPI.getElementContents(element, "id", ""), -1);
+        this.time = TwitterAPI.timeStringToLong(TwitterAPI.getElementContents(element, "created_at", ""), 0);
+    }
+
+    /**
+     * Get the screen name of the user who sent this message.
+     *
+     * @return Screen name of the user who sent this message.
+     */
+    public String getSenderScreenName() {
+        return sender;
+    }
+
+    /**
+     * Get the user who sent this message.
+     *
+     * @return The user who sent this message.
+     */
+    public TwitterUser getSender() {
+        return myAPI.getCachedUser(sender);
+    }
+
+    /**
+     * Get the screen name of the user who received this message.
+     *
+     * @return Screen name of the user who received this message.
+     */
+    public String getTargetScreenName() {
+        return target;
+    }
+
+    /**
+     * Get the user who received this message.
+     *
+     * @return The user who received this message.
+     */
+    public TwitterUser getTarget() {
+        return myAPI.getCachedUser(target);
+    }
+    
+    /**
+     * Get the ID of this message.
+     *
+     * @return ID of this message.
+     */
+    public long getID() {
+        return id;
+    }
+
+    /**
+     * What time was this message sent?
+     *
+     * @return Time this message was sent.
+     */
+    public long getTime() {
+        return this.time;
+    }
+
+    /**
+     * Get the contents of this message.
+     *
+     * @return contents of this message.
+     */
+    public String getText() {
+        return message;
+    }
+
+    /**
+     * Is this equal to the given Status?
+     * @param message
+     * @return
+     */
+    @Override
+    public boolean equals(final Object message) {
+        if (message instanceof TwitterMessage) {
+            return ((TwitterMessage)message).getID() == this.id;
+        } else {
+            return false;
+        }
+    }
+
+    /**
+     * Generate hashCode for this object.
+     * @return
+     */
+    @Override
+    public int hashCode() {
+        int hash = 5;
+        hash = 53 * hash + (int) (this.id ^ (this.id >>> 32));
+        return hash;
+    }
+
+    /**
+     * Compare the given object to this one.
+     *
+     * @param arg0
+     * @return Comparison
+     */
+    @Override
+    public int compareTo(final TwitterMessage arg0) {
+        if (this.time < arg0.getTime()) {
+            return -1;
+        } else if (this.time > arg0.getTime()) {
+            return 1;
+        } else {
+            return 0;
+        }
+    }
+}

src/com/dmdirc/addons/parser_twitter/api/TwitterRawHandler.java

@@ -0,0 +1,46 @@
+/*
+ *  Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ * 
+ *  Permission is hereby granted, free of charge, to any person obtaining a copy
+ *  of this software and associated documentation files (the "Software"), to deal
+ *  in the Software without restriction, including without limitation the rights
+ *  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ *  copies of the Software, and to permit persons to whom the Software is
+ *  furnished to do so, subject to the following conditions:
+ * 
+ *  The above copyright notice and this permission notice shall be included in
+ *  all copies or substantial portions of the Software.
+ * 
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ *  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ *  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ *  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ *  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ *  SOFTWARE.
+ */
+
+package com.dmdirc.addons.parser_twitter.api;
+
+/**
+ * Raw output from the twitter API will be passed to this callback.
+ *
+ * @author shane
+ */
+public interface TwitterRawHandler {
+    /**
+     * Handle input from twitter.
+     *
+     * @param api the TwitterAPI that recieved this input.
+     * @param data The raw data to handle.
+     */
+     void handleRawTwitterInput(final TwitterAPI api, final String data);
+
+    /**
+     * Handle an output to twitter.
+     *
+     * @param api the TwitterAPI that sent this output.
+     * @param data The raw data to handle.
+     */
+     void handleRawTwitterOutput(final TwitterAPI api, final String data);
+}

src/com/dmdirc/addons/parser_twitter/api/TwitterRuntimeException.java

@@ -0,0 +1,58 @@
+/*
+ *  Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ *
+ *  Permission is hereby granted, free of charge, to any person obtaining a copy
+ *  of this software and associated documentation files (the "Software"), to deal
+ *  in the Software without restriction, including without limitation the rights
+ *  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ *  copies of the Software, and to permit persons to whom the Software is
+ *  furnished to do so, subject to the following conditions:
+ *
+ *  The above copyright notice and this permission notice shall be included in
+ *  all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ *  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ *  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ *  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ *  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ *  SOFTWARE.
+ */
+
+package com.dmdirc.addons.parser_twitter.api;
+
+/**
+ * Exception in the twitter API!
+ *
+ * @author shane
+ */
+public class TwitterRuntimeException extends RuntimeException {
+
+    /**
+     * A version number for this class. It should be changed whenever the class
+     * structure is changed (or anything else that would prevent serialized
+     * objects being unserialized with the new class).
+     */
+    private static final long serialVersionUID = 1;
+
+    /**
+     * Create a new Twitter Exception!
+     *
+     * @param reason Reason for this exception.
+     */
+    public TwitterRuntimeException(final String reason) {
+        super(reason);
+    }
+
+    /**
+     * Create a new Twitter Exception with a cause.
+     *
+     * @param reason Reason for this exception.
+     * @param cause Cause of this exception
+     */
+    public TwitterRuntimeException(final String reason, final Throwable cause) {
+        super(reason, cause);
+    }
+
+}

src/com/dmdirc/addons/parser_twitter/api/TwitterStatus.java

@@ -0,0 +1,287 @@
+/*
+ *  Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ *
+ *  Permission is hereby granted, free of charge, to any person obtaining a copy
+ *  of this software and associated documentation files (the "Software"), to deal
+ *  in the Software without restriction, including without limitation the rights
+ *  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ *  copies of the Software, and to permit persons to whom the Software is
+ *  furnished to do so, subject to the following conditions:
+ *
+ *  The above copyright notice and this permission notice shall be included in
+ *  all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ *  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ *  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ *  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ *  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ *  SOFTWARE.
+ */
+
+package com.dmdirc.addons.parser_twitter.api;
+
+import com.dmdirc.addons.parser_twitter.api.commons.StringEscapeUtils;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+
+/**
+ * Used for status messages.
+ *
+ * @author shane
+ */
+public class TwitterStatus implements Comparable<TwitterStatus> {
+    /** The ID this message was in reply to. */
+    private long replyID;
+
+    /** The ID of this message */
+    private final long id;
+
+    /** The time of this message */
+    private final long time;
+
+    /** The user who owns this message
+     * (In the case of a retweet, this will be the retweeter)
+     */
+    private final String user;
+
+    /**
+     * The contents of this message.
+     * (In the case of a retweet, this will be the retweeted message)
+     */
+    private final String message;
+
+    /** API Object that owns this. */
+    private final TwitterAPI myAPI;
+
+    /** Is this a retweet? */
+    private final boolean retweet;
+
+    /** The original tweet of this message */
+    private final TwitterStatus originalStatus;
+
+    /**
+     * Create a new TwitterStatus.
+     * (Used for creating new status updates.)
+     *
+     * @param api API that owns this.
+     * @param message Message for this status.
+     * @param replyID Id to reply to (or -1);
+     */
+    protected TwitterStatus(final TwitterAPI api, final String message, final long replyID) {
+        this(api, message, replyID, -1, null, System.currentTimeMillis());
+    }
+
+    /**
+     * Create a new TwitterStatus.
+     *
+     * @param api API that owns this.
+     * @param replyID ID this is in reply to
+     * @param id ID of this message
+     * @param user User for this message
+     * @param message Message!
+     * @param time
+     */
+    protected TwitterStatus(final TwitterAPI api, final String message, final long replyID, final long id, final String user, final long time) {
+        this.myAPI = api;
+        this.replyID = replyID;
+        this.id = id;
+        this.user = user;
+        this.message = message;
+        this.time = time;
+        this.retweet = false;
+        this.originalStatus = null;
+
+        api.updateStatus(this);
+    }
+
+    /**
+     * Create a twitter status from an element!
+     *
+     * @param api API that owns this.
+     * @param node Node to use.
+     */
+    protected TwitterStatus(final TwitterAPI api, final Node node) {
+        this(api, node, null);
+    }
+
+    /**
+     * Create a twitter status from a node!
+     *
+     * @param api API that owns this.
+     * @param node Node to use.
+     * @param user User who this status belongs to.
+     */
+    protected TwitterStatus(final TwitterAPI api, final Node node, final String user) {
+        if (!(node instanceof Element)) { throw new TwitterRuntimeException("Can only use Element type nodes for status creation."); }
+        this.myAPI = api;
+        final Element element = (Element) node;
+
+        // Get retweet status if it exists
+        final NodeList retweetNodes = element.getElementsByTagName("retweeted_status");
+        if (retweetNodes != null && retweetNodes.getLength() > 0) {
+            this.retweet = true;
+            this.originalStatus = new TwitterStatus(api, retweetNodes.item(0));
+            element.removeChild(retweetNodes.item(0));
+        } else {
+            this.retweet = false;
+            this.originalStatus = null;
+        }
+
+        this.message = StringEscapeUtils.unescapeHtml(TwitterAPI.getElementContents(element, "text", "").replace('\n', ' '));
+
+        this.id = TwitterAPI.parseLong(TwitterAPI.getElementContents(element, "id", ""), -1);
+        this.replyID = TwitterAPI.parseLong(TwitterAPI.getElementContents(element, "in_reply_to_status_id", ""), -1);
+        
+        this.time = TwitterAPI.timeStringToLong(TwitterAPI.getElementContents(element, "created_at", ""), 0);
+
+        final TwitterUser userUser;
+        if (user == null) {
+            final NodeList nodes = element.getElementsByTagName("user");
+            if (nodes != null && nodes.getLength() > 0) {
+                userUser = new TwitterUser(api, nodes.item(0), this);
+                this.user = userUser.getScreenName();
+                myAPI.updateUser(userUser);
+            } else {
+                userUser = new TwitterUser(api, "name", -1, "realname", false);
+                this.user = userUser.getScreenName();
+            }
+        } else {
+            this.user = user;
+        }
+
+        api.updateStatus(this);
+    }
+
+
+    /**
+     * Get the ID of this message
+     *
+     * @return ID of this message. (-1 if not known)
+     */
+    public long getID() {
+        return (this.retweet) ? this.originalStatus.getID() : this.id;
+    }
+
+    /**
+     * Get the owner of this message
+     *
+     * @return owner of this message. (null if not known)
+     */
+    public TwitterUser getUser() {
+        return (this.retweet) ? this.originalStatus.getUser() : myAPI.getUser(this.user);
+    }
+
+    /**
+     * Get the contents of this message
+     *
+     * @return contents of this message.
+     */
+    public String getText() {
+        return (this.retweet) ? this.originalStatus.getText() : this.message;
+    }
+
+    /**
+     * What message is this in reply to?
+     *
+     * @return reply ID or -1 if this message isn't replying to anything.
+     */
+    public long getReplyTo() {
+        return this.replyID;
+    }
+
+    /**
+     * What time was this message sent?
+     *
+     * @return Time this message was sent.
+     */
+    public long getTime() {
+        return this.time;
+    }
+
+    /**
+     * Is this status a retweet?
+     *
+     * @return true is this is a retweet.
+     */
+    public boolean isRetweet() {
+        return this.retweet;
+    }
+
+    /**
+     * Get the user who retweeted this message.
+     * If this is not a retweet, this will return the same as getUser();
+     *
+     * @return user who retweeted this message. (null if not known)
+     *         If this is not a retweet, this will return the same as getUser();
+     */
+    public TwitterUser getRetweetUser() {
+        return myAPI.getUser(this.user);
+    }
+
+    /**
+     * Get the retweed version of this message
+     * If this is not a retweet, this will return the same as getText();
+     *
+     * @return retweeted version of this message.
+     *         If this is not a retweet, this will return the same as getText();
+     */
+    public String getRetweetText() {
+        return this.message;
+    }
+
+    /**
+     * Get the retweed ID of this message.
+     * If this is not a retweet, this will return the same as getID();
+     *
+     * @return retweeted ID of this message.
+     *         If this is not a retweet, this will return the same as getID();
+     */
+    public long getRetweetId() {
+        return this.id;
+    }
+
+    /**
+     * Is this equal to the given Status?
+     * @param status
+     * @return 
+     */
+    @Override
+    public boolean equals(final Object status) {
+        if (status instanceof TwitterStatus) {
+            return ((TwitterStatus)status).getID() == this.id;
+        } else {
+            return false;
+        }
+    }
+
+    /**
+     * Generate hashCode for this object.
+     * @return
+     */
+    @Override
+    public int hashCode() {
+        int hash = 5;
+        hash = 53 * hash + (int) (this.id ^ (this.id >>> 32));
+        return hash;
+    }
+
+    /**
+     * Compare the given object to this one.
+     *
+     * @param arg0
+     * @return Comparison
+     */
+    @Override
+    public int compareTo(final TwitterStatus arg0) {
+        if (this.time < arg0.getTime()) {
+            return -1;
+        } else if (this.time > arg0.getTime()) {
+            return 1;
+        } else {
+            return 0;
+        }
+    }
+}

src/com/dmdirc/addons/parser_twitter/api/TwitterUser.java

@@ -0,0 +1,292 @@
+/*
+ *  Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ *
+ *  Permission is hereby granted, free of charge, to any person obtaining a copy
+ *  of this software and associated documentation files (the "Software"), to deal
+ *  in the Software without restriction, including without limitation the rights
+ *  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ *  copies of the Software, and to permit persons to whom the Software is
+ *  furnished to do so, subject to the following conditions:
+ *
+ *  The above copyright notice and this permission notice shall be included in
+ *  all copies or substantial portions of the Software.
+ *
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ *  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ *  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ *  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ *  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ *  SOFTWARE.
+ */
+
+package com.dmdirc.addons.parser_twitter.api;
+
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+
+/**
+ *
+ * @author shane
+ */
+public class TwitterUser {
+    /** What is the screen name of this user? */
+    private final String screenName;
+
+    /** What is the user id of this user? */
+    private final long userID;
+    
+    /** What is the real name of this user? */
+    private final String realName;
+
+    /** Are we following the user? */
+    private final boolean following;
+
+    /** Is the user following us? */
+    private boolean followingUs = false;
+
+    /** What was the last status of this user? */
+    private final TwitterStatus lastStatus;
+
+    /** API Object that owns this. */
+    private final TwitterAPI myAPI;
+
+    /** URL to users profile picture. */
+    private String myProfilePicture;
+
+    /** URL from users profile. */
+    private String myURL;
+
+    /** Location of user */
+    private String myLocation;
+
+    /** Description of user */
+    private String myDescription;
+
+    /** Time user registered with twitter. */
+    private Long myRegisteredTime;
+
+    /**
+     * Create a unknown TwitterUser
+     *
+     * @param api 
+     * @param screenName Screen name for the user.
+     */
+    protected TwitterUser(final TwitterAPI api, final String screenName) {
+        this(api, screenName, -1, "", false);
+    }
+
+    /**
+     * Create a new TwitterUser
+     *
+     * @param api
+     * @param screenName Screen name for the user.
+     * @param userID User ID for the user.
+     * @param realName Realname for the user.
+     * @param following Are we following the user?
+     */
+    protected TwitterUser(final TwitterAPI api, final String screenName, final long userID, final String realName, final boolean following) {
+        this.myAPI = api;
+        this.screenName = screenName;
+        this.userID = userID;
+        this.realName = realName;
+        this.following = following;
+        this.lastStatus = null;
+        this.myProfilePicture = "";
+        this.myURL = "";
+        this.myLocation = "";
+        this.myDescription = "";
+        this.myRegisteredTime = 0L;
+    }
+
+    /**
+     * Create a twitter user from a node!
+     *
+     * @param api
+     * @param node Node to use.
+     */
+    protected TwitterUser(final TwitterAPI api, final Node node) {
+        this(api, node, null);
+    }
+
+    /**
+     * Create a twitter user from a node, with a pre-defined status.
+     *
+     * @param api
+     * @param node Node to use.
+     * @param status Status to use
+     */
+    protected TwitterUser(final TwitterAPI api, final Node node, final TwitterStatus status) {
+        if (!(node instanceof Element)) { throw new TwitterRuntimeException("Can only use Element type nodes for user creation."); }
+
+        final Element element = (Element) node;
+        this.myAPI = api;
+
+        this.realName = TwitterAPI.getElementContents(element, "name", "");
+        this.screenName = (api.autoAt() ? "@" : "") + TwitterAPI.getElementContents(element, "screen_name", "");
+        
+        this.myProfilePicture = TwitterAPI.getElementContents(element, "profile_image_url", "");
+        this.myURL = TwitterAPI.getElementContents(element, "url", "");
+        this.myLocation = TwitterAPI.getElementContents(element, "location", "");
+        this.myDescription = TwitterAPI.getElementContents(element, "description", "");
+
+        this.myRegisteredTime = TwitterAPI.timeStringToLong(TwitterAPI.getElementContents(element, "created_at", ""), 0);
+
+        this.userID = TwitterAPI.parseLong(TwitterAPI.getElementContents(element, "id", ""), -1);
+        this.following = TwitterAPI.parseBoolean(TwitterAPI.getElementContents(element, "following", ""));
+
+        // Check to see if a cached user object for us exists that we can
+        // take some information from.
+        final TwitterUser oldUser = api.getCachedUser(this.screenName);
+
+        // First, are they following us back do we know?
+        if (oldUser != null) {
+            this.followingUs = oldUser.isFollowingUs();
+        }
+
+        TwitterStatus newStatus = null;
+        boolean useOldStatus = true;
+
+        // Now set the status, using either the oldStatus, the given status or null!
+        if (status == null) {
+            final TwitterStatus proposedStatus;
+            final NodeList nodes = element.getElementsByTagName("status");
+            if (nodes != null && nodes.getLength() > 0) {
+                proposedStatus = new TwitterStatus(api, nodes.item(0), this.getScreenName());
+                if (oldUser == null || oldUser.getStatus() == null || oldUser.getStatus().getID() < proposedStatus.getID()) {
+                    useOldStatus = false;
+                    newStatus = proposedStatus;
+                }
+            } else if (oldUser == null || oldUser.getStatus() == null) {
+                useOldStatus = false;
+                newStatus = new TwitterStatus(api, "", -1, -1, this.getScreenName(), System.currentTimeMillis());
+            }
+        } else {
+            // Keep the status from the old version of this user if it has a
+            // higher ID, regardless of the fact we were given a specific
+            // status to use.
+            if (oldUser == null || oldUser.getStatus() == null || oldUser.getStatus().getRetweetId() < status.getRetweetId()) {
+                useOldStatus = false;
+                newStatus = status;
+            }
+        }
+
+        if (useOldStatus && oldUser != null && oldUser.getStatus() != null) {
+            newStatus = oldUser.getStatus();
+        }
+
+        this.lastStatus = newStatus;
+    }
+
+
+    /**
+     * Get the screen name for this user.
+     *
+     * @return this users screen name.
+     */
+    public String getScreenName() {
+        return screenName;
+    }
+    
+    /**
+     * Get the id for this user.
+     * 
+     * @return this users id.
+     */
+    public long getID() {
+        return userID;
+    }
+
+    /**
+     * Get the real name for this user.
+     * 
+     * @return this users real name.
+     */
+    public String getRealName() {
+        return realName;
+    }
+
+    /**
+     * Are we following this user?
+     * 
+     * @return True if we are following this user, else false.
+     */
+    public boolean isFollowing() {
+        return following;
+    }
+
+    /**
+     * Get the last known status of this user
+     *
+     * @return Last known status.
+     */
+    public TwitterStatus getStatus() {
+        return lastStatus;
+    }
+
+    /**
+     * Are we being followed by this user?
+     *
+     * @return True if we are being followed by this user, else false.
+     */
+    public boolean isFollowingUs() {
+        return followingUs;
+    }
+
+    /**
+     * Change if this user is following us.
+     *
+     * @param followingUs The new value for this setting.
+     */
+    public void setFollowingUs(final boolean followingUs) {
+        this.followingUs = followingUs;
+    }
+
+    /**
+     * URL for users profile pic.
+     *
+     * @return URL for users profile pic.
+     */
+    public String getProfilePicture() {
+        return myProfilePicture;
+    }
+
+    /**
+     * URL for user.
+     *
+     * @return URL for user.
+     */
+    public String getURL() {
+        return myURL;
+    }
+
+    /**
+     * Description for user.
+     *
+     * @return Description for user.
+     */
+    public String getDescription() {
+        return myDescription;
+    }
+
+    /**
+     * Location for user.
+     *
+     * @return Location for user.
+     */
+    public String getLocation() {
+        return myLocation;
+    }
+
+    /**
+     * Time user registered at.
+     *
+     * @return Time user registered at.
+     */
+    public Long getRegisteredTime() {
+        return myRegisteredTime;
+    }
+
+
+}

src/com/dmdirc/addons/parser_twitter/api/XMLResponse.java

@@ -0,0 +1,153 @@
+/*
+ *  Copyright (c) 2006-2009 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ * 
+ *  Permission is hereby granted, free of charge, to any person obtaining a copy
+ *  of this software and associated documentation files (the "Software"), to deal
+ *  in the Software without restriction, including without limitation the rights
+ *  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ *  copies of the Software, and to permit persons to whom the Software is
+ *  furnished to do so, subject to the following conditions:
+ * 
+ *  The above copyright notice and this permission notice shall be included in
+ *  all copies or substantial portions of the Software.
+ * 
+ *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ *  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ *  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ *  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ *  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ *  SOFTWARE.
+ */
+
+package com.dmdirc.addons.parser_twitter.api;
+
+import java.io.IOException;
+import java.net.HttpURLConnection;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.NodeList;
+
+/**
+ *
+ * @author shane
+ */
+public class XMLResponse {
+    /** The HttpURLConnection that was used. */
+    private final HttpURLConnection request;
+
+    /** The Document that was returned (if any). */
+    private final Document document;
+
+    /**
+     * Create a new XMLResponse
+     *
+     * @param request Request of response
+     * @param doc Document for response.
+     */
+    public XMLResponse(final HttpURLConnection request, final Document doc) {
+        this.request = request;
+        this.document = doc;
+    }
+
+    /**
+     * Get the Document for this response.
+     *
+     * @return the Document for this response.
+     */
+    public Document getDocument() {
+        return document;
+    }
+
+    /**
+     * Get the HttpURLConnection for this response.
+     *
+     * @return the HttpURLConnection for this response.
+     */
+    public HttpURLConnection getRequest() {
+        return request;
+    }
+
+    /**
+     * Was this an error?
+     *
+     * @return True if an error element exists in the document, there is no
+     *         document, or a non-200 status code was returned.
+     */
+    public boolean isError() {
+        return !(getError().isEmpty());
+    }
+
+    /**
+     * Get the contents of this error.
+     * If an error element is found then the contents will be returned, else
+     * a description of the status code if non-200, or "" if no error.
+     *
+     * @return The contents of this error.
+     */
+    public String getError() {
+        if (document == null || request == null) {
+            return "No document or request found.";
+        } else {
+            final String error = TwitterAPI.getElementContents(getDocumentElement(), "error", "");
+            if (error.isEmpty()) {
+                try {
+                    if (request.getResponseCode() != 200) {
+                        return "(" + request.getResponseCode() + ") " + request.getResponseMessage();
+                    }
+                } catch (IOException ex) {
+                    return "Error obtaining response code: "+ex;
+                }
+            } else {
+                return error;
+            }
+        }
+
+        return "";
+    }
+
+    /**
+     * Get the Document Element from the Document or null on error.
+     *
+     * @return The Document Element from the Document or null on error.
+     */
+    public Element getDocumentElement() {
+        return (document == null) ? null : document.getDocumentElement();
+    }
+
+    /**
+     * Return the elements that match the given name, or null on error.
+     *
+     * @param name The element name to look for.
+     * @return The elements that match the given name, or null on error.
+     */
+    public NodeList getElementsByTagName(final String name) {
+        return (document == null) ? null : document.getElementsByTagName(name);
+    }
+
+    /**
+     * Get the response code from the request.
+     * 
+     * @return The response code, or 0 on error.
+     */
+    public int getResponseCode() {
+        if (request != null) {
+            try {
+                return request.getResponseCode();
+            } catch (IOException ex) { }
+        }
+
+        return 0;
+    }
+
+    /**
+     * Checks to see if the response code was 200, the document is not null
+     * and no error element is in the document.
+     * 
+     * @return true if the response code was 200, the document is not null
+     * and no error element is in the document.
+     */
+    public boolean isGood() {
+        return getResponseCode() == 200 && getDocument() != null && !isError();
+    }
+}

src/com/dmdirc/addons/parser_twitter/api/commons/IntHashMap.java

@@ -0,0 +1,364 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/*
+ * Note: originally released under the GNU LGPL v2.1, 
+ * but rereleased by the original author under the ASF license (above).
+ */
+package com.dmdirc.addons.parser_twitter.api.commons;
+
+/**
+ * <p>A hash map that uses primitive ints for the key rather than objects.</p>
+ *
+ * <p>Note that this class is for internal optimization purposes only, and may
+ * not be supported in future releases of Apache Commons Lang.  Utilities of
+ * this sort may be included in future releases of Apache Commons Collections.</p>
+ *
+ * @author Justin Couch
+ * @author Alex Chaffee (alex@apache.org)
+ * @author Stephen Colebourne
+ * @since 2.0
+ * @version $Revision$
+ * @see java.util.HashMap
+ */
+class IntHashMap {
+
+    /**
+     * The hash table data.
+     */
+    private transient Entry table[];
+
+    /**
+     * The total number of entries in the hash table.
+     */
+    private transient int count;
+
+    /**
+     * The table is rehashed when its size exceeds this threshold.  (The
+     * value of this field is (int)(capacity * loadFactor).)
+     *
+     * @serial
+     */
+    private int threshold;
+
+    /**
+     * The load factor for the hashtable.
+     *
+     * @serial
+     */
+    private float loadFactor;
+
+    /**
+     * <p>Innerclass that acts as a datastructure to create a new entry in the
+     * table.</p>
+     */
+    private static class Entry {
+        int hash;
+//        int key;    // not used currently
+        Object value;
+        Entry next;
+
+        /**
+         * <p>Create a new entry with the given values.</p>
+         *
+         * @param hash The code used to hash the object with
+         * @param key The key used to enter this in the table
+         * @param value The value for this key
+         * @param next A reference to the next entry in the table
+         */
+        protected Entry(int hash, int key, Object value, Entry next) {
+            this.hash = hash;
+//            this.key = key;
+            this.value = value;
+            this.next = next;
+        }
+    }
+
+    /**
+     * <p>Constructs a new, empty hashtable with a default capacity and load
+     * factor, which is <code>20</code> and <code>0.75</code> respectively.</p>
+     */
+    public IntHashMap() {
+        this(20, 0.75f);
+    }
+
+    /**
+     * <p>Constructs a new, empty hashtable with the specified initial capacity
+     * and default load factor, which is <code>0.75</code>.</p>
+     *
+     * @param  initialCapacity the initial capacity of the hashtable.
+     * @throws IllegalArgumentException if the initial capacity is less
+     *   than zero.
+     */
+    public IntHashMap(int initialCapacity) {
+        this(initialCapacity, 0.75f);
+    }
+
+    /**
+     * <p>Constructs a new, empty hashtable with the specified initial
+     * capacity and the specified load factor.</p>
+     *
+     * @param initialCapacity the initial capacity of the hashtable.
+     * @param loadFactor the load factor of the hashtable.
+     * @throws IllegalArgumentException  if the initial capacity is less
+     *             than zero, or if the load factor is nonpositive.
+     */
+    public IntHashMap(int initialCapacity, float loadFactor) {
+        super();
+        if (initialCapacity < 0) {
+            throw new IllegalArgumentException("Illegal Capacity: " + initialCapacity);
+        }
+        if (loadFactor <= 0) {
+            throw new IllegalArgumentException("Illegal Load: " + loadFactor);
+        }
+        if (initialCapacity == 0) {
+            initialCapacity = 1;
+        }
+
+        this.loadFactor = loadFactor;
+        table = new Entry[initialCapacity];
+        threshold = (int) (initialCapacity * loadFactor);
+    }
+
+    /**
+     * <p>Returns the number of keys in this hashtable.</p>
+     *
+     * @return  the number of keys in this hashtable.
+     */
+    public int size() {
+        return count;
+    }
+
+    /**
+     * <p>Tests if this hashtable maps no keys to values.</p>
+     *
+     * @return  <code>true</code> if this hashtable maps no keys to values;
+     *          <code>false</code> otherwise.
+     */
+    public boolean isEmpty() {
+        return count == 0;
+    }
+
+    /**
+     * <p>Tests if some key maps into the specified value in this hashtable.
+     * This operation is more expensive than the <code>containsKey</code>
+     * method.</p>
+     *
+     * <p>Note that this method is identical in functionality to containsValue,
+     * (which is part of the Map interface in the collections framework).</p>
+     *
+     * @param      value   a value to search for.
+     * @return     <code>true</code> if and only if some key maps to the
+     *             <code>value</code> argument in this hashtable as
+     *             determined by the <tt>equals</tt> method;
+     *             <code>false</code> otherwise.
+     * @throws  NullPointerException  if the value is <code>null</code>.
+     * @see        #containsKey(int)
+     * @see        #containsValue(Object)
+     * @see        java.util.Map
+     */
+    public boolean contains(Object value) {
+        if (value == null) {
+            throw new NullPointerException();
+        }
+
+        Entry tab[] = table;
+        for (int i = tab.length; i-- > 0;) {
+            for (Entry e = tab[i]; e != null; e = e.next) {
+                if (e.value.equals(value)) {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
+
+    /**
+     * <p>Returns <code>true</code> if this HashMap maps one or more keys
+     * to this value.</p>
+     *
+     * <p>Note that this method is identical in functionality to contains
+     * (which predates the Map interface).</p>
+     *
+     * @param value value whose presence in this HashMap is to be tested.
+     * @return boolean <code>true</code> if the value is contained
+     * @see    java.util.Map
+     * @since JDK1.2
+     */
+    public boolean containsValue(Object value) {
+        return contains(value);
+    }
+
+    /**
+     * <p>Tests if the specified object is a key in this hashtable.</p>
+     *
+     * @param  key  possible key.
+     * @return <code>true</code> if and only if the specified object is a
+     *    key in this hashtable, as determined by the <tt>equals</tt>
+     *    method; <code>false</code> otherwise.
+     * @see #contains(Object)
+     */
+    public boolean containsKey(int key) {
+        Entry tab[] = table;
+        int hash = key;
+        int index = (hash & 0x7FFFFFFF) % tab.length;
+        for (Entry e = tab[index]; e != null; e = e.next) {
+            if (e.hash == hash) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * <p>Returns the value to which the specified key is mapped in this map.</p>
+     *
+     * @param   key   a key in the hashtable.
+     * @return  the value to which the key is mapped in this hashtable;
+     *          <code>null</code> if the key is not mapped to any value in
+     *          this hashtable.
+     * @see     #put(int, Object)
+     */
+    public Object get(int key) {
+        Entry tab[] = table;
+        int hash = key;
+        int index = (hash & 0x7FFFFFFF) % tab.length;
+        for (Entry e = tab[index]; e != null; e = e.next) {
+            if (e.hash == hash) {
+                return e.value;
+            }
+        }
+        return null;
+    }
+
+    /**
+     * <p>Increases the capacity of and internally reorganizes this
+     * hashtable, in order to accommodate and access its entries more
+     * efficiently.</p>
+     *
+     * <p>This method is called automatically when the number of keys
+     * in the hashtable exceeds this hashtable's capacity and load
+     * factor.</p>
+     */
+    protected void rehash() {
+        int oldCapacity = table.length;
+        Entry oldMap[] = table;
+
+        int newCapacity = oldCapacity * 2 + 1;
+        Entry newMap[] = new Entry[newCapacity];
+
+        threshold = (int) (newCapacity * loadFactor);
+        table = newMap;
+
+        for (int i = oldCapacity; i-- > 0;) {
+            for (Entry old = oldMap[i]; old != null;) {
+                Entry e = old;
+                old = old.next;
+
+                int index = (e.hash & 0x7FFFFFFF) % newCapacity;
+                e.next = newMap[index];
+                newMap[index] = e;
+            }
+        }
+    }
+
+    /**
+     * <p>Maps the specified <code>key</code> to the specified
+     * <code>value</code> in this hashtable. The key cannot be
+     * <code>null</code>. </p>
+     *
+     * <p>The value can be retrieved by calling the <code>get</code> method
+     * with a key that is equal to the original key.</p>
+     *
+     * @param key     the hashtable key.
+     * @param value   the value.
+     * @return the previous value of the specified key in this hashtable,
+     *         or <code>null</code> if it did not have one.
+     * @throws  NullPointerException  if the key is <code>null</code>.
+     * @see     #get(int)
+     */
+    public Object put(int key, Object value) {
+        // Makes sure the key is not already in the hashtable.
+        Entry tab[] = table;
+        int hash = key;
+        int index = (hash & 0x7FFFFFFF) % tab.length;
+        for (Entry e = tab[index]; e != null; e = e.next) {
+            if (e.hash == hash) {
+                Object old = e.value;
+                e.value = value;
+                return old;
+            }
+        }
+
+        if (count >= threshold) {
+            // Rehash the table if the threshold is exceeded
+            rehash();
+
+            tab = table;
+            index = (hash & 0x7FFFFFFF) % tab.length;
+        }
+
+        // Creates the new entry.
+        Entry e = new Entry(hash, key, value, tab[index]);
+        tab[index] = e;
+        count++;
+        return null;
+    }
+
+    /**
+     * <p>Removes the key (and its corresponding value) from this
+     * hashtable.</p>
+     *
+     * <p>This method does nothing if the key is not present in the
+     * hashtable.</p>
+     *
+     * @param   key   the key that needs to be removed.
+     * @return  the value to which the key had been mapped in this hashtable,
+     *          or <code>null</code> if the key did not have a mapping.
+     */
+    public Object remove(int key) {
+        Entry tab[] = table;
+        int hash = key;
+        int index = (hash & 0x7FFFFFFF) % tab.length;
+        for (Entry e = tab[index], prev = null; e != null; prev = e, e = e.next) {
+            if (e.hash == hash) {
+                if (prev != null) {
+                    prev.next = e.next;
+                } else {
+                    tab[index] = e.next;
+                }
+                count--;
+                Object oldValue = e.value;
+                e.value = null;
+                return oldValue;
+            }
+        }
+        return null;
+    }
+
+    /**
+     * <p>Clears this hashtable so that it contains no keys.</p>
+     */
+    public synchronized void clear() {
+        Entry tab[] = table;
+        for (int index = tab.length; --index >= 0;) {
+            tab[index] = null;
+        }
+        count = 0;
+    }
+    
+}

src/com/dmdirc/addons/parser_twitter/api/commons/StringEscapeUtils.java

@@ -0,0 +1,180 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.dmdirc.addons.parser_twitter.api.commons;
+
+import java.io.IOException;
+import java.io.StringWriter;
+import java.io.Writer;
+import java.util.Locale;
+
+/**
+ * <p>Escapes and unescapes <code>String</code>s for
+ * Java, Java Script, HTML, XML, and SQL.</p>
+ *
+ * @author Apache Jakarta Turbine
+ * @author Purple Technology
+ * @author <a href="mailto:alex@purpletech.com">Alexander Day Chaffee</a>
+ * @author Antony Riley
+ * @author Helge Tesgaard
+ * @author <a href="sean@boohai.com">Sean Brown</a>
+ * @author <a href="mailto:ggregory@seagullsw.com">Gary Gregory</a>
+ * @author Phil Steitz
+ * @author Pete Gieser
+ * @since 2.0
+ * @version $Id$
+ */
+public class StringEscapeUtils {
+    // HTML and XML
+    //--------------------------------------------------------------------------
+    /**
+     * <p>Escapes the characters in a <code>String</code> using HTML entities.</p>
+     *
+     * <p>
+     * For example:
+     * </p> 
+     * <p><code>"bread" & "butter"</code></p>
+     * becomes:
+     * <p>
+     * <code>&amp;quot;bread&amp;quot; &amp;amp; &amp;quot;butter&amp;quot;</code>.
+     * </p>
+     *
+     * <p>Supports all known HTML 4.0 entities, including funky accents.
+     * Note that the commonly used apostrophe escape character (&amp;apos;)
+     * is not a legal entity and so is not supported). </p>
+     *
+     * @param str  the <code>String</code> to escape, may be null
+     * @return a new escaped <code>String</code>, <code>null</code> if null string input
+     * 
+     * @see #unescapeHtml(String)
+     * @see <a href="http://hotwired.lycos.com/webmonkey/reference/special_characters/">ISO Entities</a>
+     * @see <a href="http://www.w3.org/TR/REC-html32#latin1">HTML 3.2 Character Entities for ISO Latin-1</a>
+     * @see <a href="http://www.w3.org/TR/REC-html40/sgml/entities.html">HTML 4.0 Character entity references</a>
+     * @see <a href="http://www.w3.org/TR/html401/charset.html#h-5.3">HTML 4.01 Character References</a>
+     * @see <a href="http://www.w3.org/TR/html401/charset.html#code-position">HTML 4.01 Code positions</a>
+     */
+    public static String escapeHtml(String str) {
+        if (str == null) {
+            return null;
+        }
+        try {
+            StringWriter writer = new StringWriter ((int)(str.length() * 1.5));
+            escapeHtml(writer, str);
+            return writer.toString();
+        } catch (IOException ioe) {
+            //should be impossible
+            throw new UnhandledException(ioe);
+        }
+    }
+
+    /**
+     * <p>Escapes the characters in a <code>String</code> using HTML entities and writes
+     * them to a <code>Writer</code>.</p>
+     *
+     * <p>
+     * For example:
+     * </p> 
+     * <code>"bread" & "butter"</code>
+     * <p>becomes:</p>
+     * <code>&amp;quot;bread&amp;quot; &amp;amp; &amp;quot;butter&amp;quot;</code>.
+     *
+     * <p>Supports all known HTML 4.0 entities, including funky accents.
+     * Note that the commonly used apostrophe escape character (&amp;apos;)
+     * is not a legal entity and so is not supported). </p>
+     *
+     * @param writer  the writer receiving the escaped string, not null
+     * @param string  the <code>String</code> to escape, may be null
+     * @throws IllegalArgumentException if the writer is null
+     * @throws IOException when <code>Writer</code> passed throws the exception from
+     *                                       calls to the {@link Writer#write(int)} methods.
+     * 
+     * @see #escapeHtml(String)
+     * @see #unescapeHtml(String)
+     * @see <a href="http://hotwired.lycos.com/webmonkey/reference/special_characters/">ISO Entities</a>
+     * @see <a href="http://www.w3.org/TR/REC-html32#latin1">HTML 3.2 Character Entities for ISO Latin-1</a>
+     * @see <a href="http://www.w3.org/TR/REC-html40/sgml/entities.html">HTML 4.0 Character entity references</a>
+     * @see <a href="http://www.w3.org/TR/html401/charset.html#h-5.3">HTML 4.01 Character References</a>
+     * @see <a href="http://www.w3.org/TR/html401/charset.html#code-position">HTML 4.01 Code positions</a>
+     */
+    public static void escapeHtml(Writer writer, String string) throws IOException {
+        if (writer == null ) {
+            throw new IllegalArgumentException ("The Writer must not be null.");
+        }
+        if (string == null) {
+            return;
+        }
+        Entities.HTML40.escape(writer, string);
+    }
+
+    //-----------------------------------------------------------------------
+    /**
+     * <p>Unescapes a string containing entity escapes to a string
+     * containing the actual Unicode characters corresponding to the
+     * escapes. Supports HTML 4.0 entities.</p>
+     *
+     * <p>For example, the string "&amp;lt;Fran&amp;ccedil;ais&amp;gt;"
+     * will become "&lt;Fran&ccedil;ais&gt;"</p>
+     *
+     * <p>If an entity is unrecognized, it is left alone, and inserted
+     * verbatim into the result string. e.g. "&amp;gt;&amp;zzzz;x" will
+     * become "&gt;&amp;zzzz;x".</p>
+     *
+     * @param str  the <code>String</code> to unescape, may be null
+     * @return a new unescaped <code>String</code>, <code>null</code> if null string input
+     * @see #escapeHtml(Writer, String)
+     */
+    public static String unescapeHtml(String str) {
+        if (str == null) {
+            return null;
+        }
+        try {
+            StringWriter writer = new StringWriter ((int)(str.length() * 1.5));
+            unescapeHtml(writer, str);
+            return writer.toString();
+        } catch (IOException ioe) {
+            //should be impossible
+            throw new UnhandledException(ioe);
+        }
+    }
+
+    /**
+     * <p>Unescapes a string containing entity escapes to a string
+     * containing the actual Unicode characters corresponding to the
+     * escapes. Supports HTML 4.0 entities.</p>
+     *
+     * <p>For example, the string "&amp;lt;Fran&amp;ccedil;ais&amp;gt;"
+     * will become "&lt;Fran&ccedil;ais&gt;"</p>
+     *
+     * <p>If an entity is unrecognized, it is left alone, and inserted
+     * verbatim into the result string. e.g. "&amp;gt;&amp;zzzz;x" will
+     * become "&gt;&amp;zzzz;x".</p>
+     *
+     * @param writer  the writer receiving the unescaped string, not null
+     * @param string  the <code>String</code> to unescape, may be null
+     * @throws IllegalArgumentException if the writer is null
+     * @throws IOException if an IOException occurs
+     * @see #escapeHtml(String)
+     */
+    public static void unescapeHtml(Writer writer, String string) throws IOException {
+        if (writer == null ) {
+            throw new IllegalArgumentException ("The Writer must not be null.");
+        }
+        if (string == null) {
+            return;
+        }
+        Entities.HTML40.unescape(writer, string);
+    }
+}

src/com/dmdirc/addons/parser_twitter/api/commons/UnhandledException.java

@@ -0,0 +1,71 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.dmdirc.addons.parser_twitter.api.commons;
+
+/**
+ * <p>Thrown when it is impossible or undesirable to consume or throw a checked exception.</p>
+ * This exception supplements the standard exception classes by providing a more
+ * semantically rich description of the problem.</p>
+ * 
+ * <p><code>UnhandledException</code> represents the case where a method has to deal
+ * with a checked exception but does not wish to.
+ * Instead, the checked exception is rethrown in this unchecked wrapper.</p>
+ * 
+ * <pre>
+ * public void foo() {
+ *   try {
+ *     // do something that throws IOException
+ *   } catch (IOException ex) {
+ *     // don't want to or can't throw IOException from foo()
+ *     throw new UnhandledException(ex);
+ *   }
+ * }
+ * </pre>
+ *
+ * @author Matthew Hawthorne
+ * @since 2.0
+ * @version $Id$
+ */
+public class UnhandledException extends RuntimeException {
+
+    /**
+     * Required for serialization support.
+     * 
+     * @see java.io.Serializable
+     */
+    private static final long serialVersionUID = 1832101364842773720L;
+
+    /**
+     * Constructs the exception using a cause.
+     *
+     * @param cause  the underlying cause
+     */
+    public UnhandledException(Throwable cause) {
+        super(cause);
+    }
+
+    /**
+     * Constructs the exception using a message and cause.
+     *
+     * @param message  the message to use
+     * @param cause  the underlying cause
+     */
+    public UnhandledException(String message, Throwable cause) {
+        super(message, cause);
+    }
+
+}

src/com/dmdirc/addons/parser_twitter/plugin.config

@@ -0,0 +1,46 @@
+# This is a DMDirc configuration file.
+
+# This section indicates which sections below take key/value
+# pairs, rather than a simple list. It should be placed above
+# any sections that take key/values.
+keysections:
+  metadata
+  updates
+  version
+  defaults
+
+metadata:
+  author=Shane <shane@dmdirc.com>
+  mainclass=com.dmdirc.addons.parser_twitter.TwitterPlugin
+  description=Provides twitter access for DMDirc.
+  name=twitter
+  nicename=Twitter Plugin
+
+updates:
+  id=49
+
+version:
+  number=27
+  friendly=2.7
+
+defaults:
+  statuscount=20
+  apicalls=60
+  debugEnabled=false
+  hide500Errors=true
+  saveLastIDs=false
+  getSentMessages=false
+  replaceOpeningNickname=false
+  autoAt=false
+  # Pre-configured support for twitter api
+  api.address.twitter.com=api.twitter.com
+  api.versioned.twitter.com=true
+  # Pre-configured support for identi.ca twitter-ish api
+  api.address.identi.ca=identi.ca/api
+  api.versioned.identi.ca=false
+
+provides:
+  twitter parser
+
+exports:
+  getParser in com.dmdirc.addons.parser_twitter.TwitterPlugin as getParser