Merge lp:~julien-spautz/cable/pm into lp:cable

[Julien Spautz]

This branch implements basic private chat features.

A chat will be opened when you receive a /msg or when you double click on a name in the user list.

[Julien Spautz (julien-spautz)]

Now open for review.

[982c80311320c1b (alexander-wilms)]

Compiles and works as expected

[Daniele "OpenNingia" Simonetti (oppifjellet)]

Compiles and works with some quirks:

* You can have a private chat with yourself that is quite confusing.
* IRC commands ( e.g. /join ) don't work in the private chat window.

[lp:~julien-spautz/cable/pm]

146. By Julien Spautz on 2013-09-22

don't allow talking to yourself (you weirdo)

[Julien Spautz (julien-spautz)]

Private chats with yourself have been fixed.

IRC commands will need some more code shifting, but I don't want to unnecessarily bloat the diff, so that's for another merge.

This branch should allow basic private chat functionality including opening chats by double clicking a name and when receiving a /msg.

[Julien Spautz (julien-spautz)]

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2013-09-14 18:12:05 +0000
+++ CMakeLists.txt	2013-09-22 16:58:59 +0000
@@ -69,6 +69,7 @@
     src/Controller/Window.vala
     src/Controller/Server.vala
     src/Controller/Channel.vala
+    src/Controller/PrivateChat.vala
 
     src/View/Server.vala
     src/View/Channel.vala
@@ -89,6 +90,7 @@
     src/Widgets/Room.vala
     src/Widgets/ChatDisplay.vala
     src/Widgets/User.vala
+    src/Widgets/UserList.vala
     src/Widgets/TopicBar.vala
 
     src/Dialogs/JoinChannel.vala

=== modified file 'src/Controller/Channel.vala'
--- src/Controller/Channel.vala	2013-09-14 12:55:26 +0000
+++ src/Controller/Channel.vala	2013-09-22 16:58:59 +0000
@@ -17,24 +17,22 @@
     Boston, MA 02110-1301 USA.
 ***/
 
-internal class Cable.Controller.Channel : GLib.Object {
-
-    internal weak Server server;
-    internal View.Channel view;
-    internal Irc.Channel backend;
-
-    internal string name; //TODO id
-
-    internal Channel (Server server, string name) {
-        debug (@"+ CONTROLLER CHANNEL $name");
-
+public class Cable.Controller.Channel : GLib.Object {
+
+    public weak Server server;
+    public View.Channel view;
+    public Irc.Channel backend;
+
+    public string name; //TODO id
+
+    public Channel (Server server, string name) {
         this.server = server;
         this.name = name;
 
-        if (server.view.has_channel (name) == false)
+        if (server.view.has_chat (name) == false)
             server.view.add_channel (name, name);
 
-        view = server.view.get_channel_by_id (name);
+        view = server.view.get_chat (name) as View.Channel;
         view.nick = server.nick;
         backend = new Irc.Channel (name, server.backend);
 
@@ -44,8 +42,6 @@
         load_state ();
     }
 
-    ~Channel () { debug (@"- CONTROLLER CHANNEL $name"); }
-
     void load_state () {
         /*if (backend.joined) {
             view.room.state = Widgets.Room.State.CHAT;
@@ -102,12 +98,17 @@
             return false;
         });
 
+        view.private_chat_requested.connect ((name) => {
+            server.open_new_chat_with (name);
+            if (server.private_chats.has_key (name))
+                server.window.view.current_chat = server.private_chats [name].view;
+        });
     }
 
     // IRC signals
     void connect_backend_signals () {
         backend.event_message.connect ((from, message) => {
-            if (server.window.view.current_channel != view)
+            if (server.window.view.current_chat != view)
                 view.unread_messages++;
         });
 
@@ -207,7 +208,7 @@
                 }
                 var channel = new Channel (server, channel_with_hash);
                 server.channels[channel_with_hash] = channel;
-                server.window.view.current_channel = channel.view;
+                server.window.view.current_chat = channel.view;
                 break;
 
             case "part":

=== added file 'src/Controller/PrivateChat.vala'
--- src/Controller/PrivateChat.vala	1970-01-01 00:00:00 +0000
+++ src/Controller/PrivateChat.vala	2013-09-22 16:58:59 +0000
@@ -0,0 +1,85 @@
+/***
+    Copyright (C) 2013 Cable Developers
+
+    This program or library is free software; you can redistribute it
+    and/or modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 3 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General
+    Public License along with this library; if not, write to the
+    Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+    Boston, MA 02110-1301 USA.
+***/
+
+public class Cable.Controller.PrivateChat : GLib.Object {
+    
+    public weak Server server;
+    public View.PrivateChat view;
+    string id;
+    
+    public PrivateChat (Server server, string id, string? message = null) {
+        this.id = id;
+        this.server = server;
+        
+        server.view.add_private_chat (id, id);
+        view = server.view.get_chat (id) as View.PrivateChat;
+        view.nick = server.nick;
+        
+        if (message != null)
+            on_backend_message (id, server.nick, message);
+        
+        connect_signals ();
+    }
+    
+    void connect_signals () {
+        server.backend.event_message.connect (on_backend_message);
+        view.send_message.connect (on_frontend_message);
+        server.window.view.selected.connect (on_chat_selected);
+    }
+    
+    void on_backend_message (string from, string target, string message) {
+        if (is_not_me (target))
+            return;
+            
+        if (is_not_correspondent (from))
+            return;
+        
+        var nick_from = from.split ("!")[0];
+        
+        view.message (nick_from, message);
+        
+        if (view.has_focus == false) {
+            Services.Notify.send (nick_from, message);
+            Services.Launcher.jobs++;
+            Services.Launcher.urgent = true;
+        }
+        
+        if (server.window.view.current_chat != view)
+            view.unread_messages++;
+    }
+    
+    void on_frontend_message (string message) {
+        server.backend.send_message (id.split("!")[0], message);
+        view.message (server.nick, message);
+        view.entry = "";
+    }
+    
+    void on_chat_selected (View.Chat chat) {
+        if (chat == view)
+            view.unread_messages = 0;
+    }
+    
+    bool is_not_me (string nick) {
+        return nick != server.nick;
+    }
+    
+    bool is_not_correspondent (string from) {
+        return from.split ("!")[0] != id;
+    }
+}

=== modified file 'src/Controller/Server.vala'
--- src/Controller/Server.vala	2013-08-25 18:02:19 +0000
+++ src/Controller/Server.vala	2013-09-22 16:58:59 +0000
@@ -17,22 +17,25 @@
     Boston, MA 02110-1301 USA.
 ***/
 
-internal class Cable.Controller.Server : GLib.Object {
+public class Cable.Controller.Server : GLib.Object {
 
-    internal weak Window window;
-    internal View.Server view;
-    internal Irc.Server backend;
+    public weak Window window;
+    public View.Server view;
+    public Irc.Server backend;
     
-    internal string nick; // FIXME not reliable
-    internal string address; // FIXME not reliable
-    internal string name;
+    public string nick; // FIXME not reliable
+    public string address; // FIXME not reliable
+    public string name;
 
-    internal Gee.HashMap <string, Channel> channels {
+    public Gee.HashMap <string, Channel> channels {
         get; set; default = new Gee.HashMap <string, Channel>  ();
     }
+    
+    public Gee.HashMap <string, PrivateChat> private_chats {
+        get; set; default = new Gee.HashMap <string, PrivateChat>  ();
+    }
 
-    internal Server (string address, string nick, Window window) {
-    debug (@"+ CONTROLLER SERVER $address");
+    public Server (string address, string nick, Window window) {
         this.backend = Irc.Server.get_or_create (address, nick);
 
         this.name = backend.name;
@@ -49,8 +52,6 @@
         connect_backend_signals ();
     }
     
-    ~Server () { debug (@"- CONTROLLER SERVER $address"); }
-    
     void connect_frontend_signals () {
         view.toggle_away.connect (() =>  {
             if (backend.away) {
@@ -85,5 +86,24 @@
             foreach (var channel in channels.values)
                 channel.view.remove_user (nick, message);
         });
+        
+        backend.event_message.connect ((from, target, message) => {
+            if (target != nick)
+                return;
+            
+            var from_nick = from.split ("!")[0];
+            
+            open_new_chat_with (from_nick, message);
+        });
+    }
+    
+    public void open_new_chat_with (string from_nick, string message = "") {
+        if (from_nick == backend.nick)
+            return;
+            
+        if (!private_chats.has_key (from_nick)) {
+            var chat = new PrivateChat (this, from_nick, message);
+            private_chats [from_nick] = chat;
+        }
     }
 }

=== modified file 'src/Controller/Window.vala'
--- src/Controller/Window.vala	2013-09-12 20:26:19 +0000
+++ src/Controller/Window.vala	2013-09-22 16:58:59 +0000
@@ -17,16 +17,16 @@
     Boston, MA 02110-1301 USA.
 ***/
 
-internal class Cable.Controller.Window : GLib.Object {
-
-    internal View.Window view { get; set; }
-
-    internal Gee.HashMap <string, Server> servers {
+public class Cable.Controller.Window : GLib.Object {
+
+    public View.Window view { get; set; }
+
+    public Gee.HashMap <string, Server> servers {
         get; set;
         default = new Gee.HashMap <string, Server> ();
     }
 
-    internal Window (View.Window window) {
+    public Window (View.Window window) {
         GLib.Object (view: window);
 
         connect_frontend_signals ();
@@ -61,11 +61,11 @@
     // backend events that affect the window's state
     void connect_backend_signals () {
         Irc.client.event_nick.connect ((time, server, from, nick) => {
-            var current_channel = view.current_channel;
+            var current_chat = view.current_chat;
             var current_server = view.current_server;
 
             if (server == current_server.id)
-                view.title = string.join (" — ", current_channel.name, nick);
+                view.title = string.join (" — ", current_chat.name, nick);
         });
     }
 
@@ -84,13 +84,26 @@
         });
 
         view.remove_channel.connect (() => {
-            var channel_id = view.current_channel.id;
+            var channel_id = view.current_chat.id;
             var server_id = view.current_server.id;
 
-            if (view.current_channel != null) {
+            if (view.current_chat == null) {
+                warning ("No channel selected, cannot leave.");
+            } else if (view.current_chat is View.Channel) {
                 part_channel (servers[server_id].channels[channel_id]);
-            } else {
-                warning ("No channel selected, cannot leave.");
+            } else if (view.current_chat is View.PrivateChat) {
+                var channel = servers[server_id].private_chats[channel_id];
+                var server = channel.server;
+                server.view.remove_chat (channel.view.id);
+                server.private_chats.unset (channel.view.id);
+
+                if (server.channels.size == 0)
+                    servers.unset (server.view.id);
+
+                if (servers.size == 0) {
+                    view.title = App.TITLE;
+                    view.welcome_shown = true;
+                }
             }
         });
 
@@ -130,7 +143,7 @@
             servers[server.backend.name] = server;
         }
 
-        if (server.view.has_channel (channel_name)) {
+        if (server.view.has_chat (channel_name)) {
             warning ("Channel is already joined");
             return;
         }
@@ -138,7 +151,7 @@
         var channel = new Channel (server, channel_name);
         server.channels[channel_name] = channel;
         
-        view.current_channel = channel.view;
+        view.current_chat = channel.view;
         view.welcome_shown = false;
     }
 
@@ -146,7 +159,7 @@
         var server = channel.server;
 
         channel.backend.send_part ();
-        server.view.remove_channel (channel.view.id);
+        server.view.remove_chat (channel.view.id);
         server.channels.unset (channel.view.id);
 
         if (server.channels.size == 0)
@@ -157,27 +170,4 @@
             view.welcome_shown = true;
         }
     }
-
-    /*void leave_channel (Settings.Network network, Settings.Identity identity, string channel_name) {
-        var server_backend = Irc.Server.search (network.address, identity.nick_name);
-
-        var server_view = servers[server_backend.name].view;
-
-        if (server_view == null) {
-            warning ("Cannot leave channel: server does not exist (%s - %s)", network.address, identity.nick_name);
-            return;
-        }
-        if (!server_view.has_channel (channel_name)) {
-            warning ("Cannot leave channel: channel not joined (%s)", channel_name);
-            return;
-        }
-
-        server_view.remove_channel (channel_name);
-        server_backend.send_part (channel_name);
-
-        if (view.n_servers == 0) {
-            view.title = App.TITLE;
-            view.welcome_shown = true;
-        }
-    }*/
 }

=== added file 'src/Utils/HostMask.vala'
--- src/Utils/HostMask.vala	1970-01-01 00:00:00 +0000
+++ src/Utils/HostMask.vala	2013-09-22 16:58:59 +0000
@@ -0,0 +1,31 @@
+// parses a hostmask in form of <nick>!<user>@<host>
+/*public class Cable.Utils.HostMask : GLib.Object { // TODO use this
+
+    string nick { get; private set; }
+    string user { get; private set; }
+    string host { get; private set; }
+
+    public HostMask (string hostmask)
+        requires (is_well_formed (hostmask)) {
+
+        var first_split = hostmask.split ("!", 2);
+        var user_and_host = first_split[1];
+        var second_split = user_and_host.split ("@", 2);
+
+        this.nick = first_split[0];
+        this.user = second_split[0];
+        this.host = second_split[1];
+    }
+
+    bool is_well_formed (string hostmask) {
+        if ("!" in hostmask == false)
+            return false;
+
+        var remainder = hostmask.split ("!", 2)[-1];
+
+        if ("@" in remainder == false);
+            return false;
+
+        return true;
+    }
+}*/
\ No newline at end of file

=== modified file 'src/View/Channel.vala'
--- src/View/Channel.vala	2013-08-16 15:31:17 +0000
+++ src/View/Channel.vala	2013-09-22 16:58:59 +0000
@@ -17,42 +17,42 @@
     Boston, MA 02110-1301 USA.
 ***/
 
-public interface Cable.View.Channel : GLib.Object {
+public interface Cable.View.Chat : GLib.Object {
 
     public abstract int unread_messages { get; set; }
-
     public abstract string nick { get; set; }
-
     public abstract string name { get; set; }
-
-    public abstract State state { get; set; }
-
-    public abstract string topic { get; set; }
-
     public abstract string id { get; set; }
-
     public abstract string entry { get; set; }
-
     public abstract bool has_focus { get; }
+    
+    public signal void send_message (string message);
+    public signal bool focused ();
+    
+    public abstract void rename_user (string? old_nick, string new_nick, UserType type, bool silent = false);
+    public abstract void set_away_status (string nick, bool is_away);
+    public abstract void message (owned string from, string message, MessageType type = MessageType.NORMAL);
+}
+
+public interface Cable.View.Channel : GLib.Object, View.Chat {
+
+    public abstract State state { get; set; }
+    public abstract string topic { get; set; }
 
     public signal void join ();
-
     public signal void part ();
-
     public signal void send_message (string message);
-
     public signal bool focused ();
+    public signal void private_chat_requested (string name);
 
     public abstract bool has_user (string nick);
-
     public abstract void list_users (string[] nicks, string[] prefixes);
-
     public abstract void add_user (string nick, UserType type, bool silent = false);
-
-    public abstract bool remove_user (string nick, string message, bool silent = false);
-
-    public abstract void rename_user (string? old_nick, string new_nick, UserType type, bool silent = false);
-    public abstract void set_away_status (string nick, bool is_away);
-
-    public abstract void message (owned string from, string message, MessageType type = MessageType.NORMAL);
+    public abstract void remove_user (string nick, string message, bool silent = false);
+}
+
+public interface Cable.View.PrivateChat : GLib.Object, View.Chat {
+
+    public signal void send_message (string message);
+    public signal bool focused ();
 }

=== modified file 'src/View/Server.vala'
--- src/View/Server.vala	2013-08-16 15:31:17 +0000
+++ src/View/Server.vala	2013-09-22 16:58:59 +0000
@@ -19,70 +19,37 @@
 
 public interface Cable.View.Server : GLib.Object {
 
-    // TODO parent-tier reference (i.e. window tier)
-
-    /**
-     * Change the away status of this server. Set-only.
-     */
     public abstract bool away { set; }
-    
     public abstract string name { get; set; }
-    
     public abstract string id { get; set; }
     
-    /**
-     * List of all channels of this server.
-     */
-    public abstract Gee.ArrayList <Channel> channels { owned get; }
-    
-    public abstract signal void toggle_away ();
-    
-    public abstract signal void part_all ();
-    
-    /**
-     * Create and add a new channel to this server.
-     * @param channel_name Name of the new channel.
-     */
-    public abstract void add_channel (string channel_name, string channel_id);
-
-    /**
-     * Remove a channel from this server.
-     * @param channel_name Name of the channel to be removed.
-     */
-    public abstract void remove_channel (string channel_id);
-    
-    /**
-     * Names of all owned channels.
-     */
-    public string[] channel_ids {
+    public abstract Gee.ArrayList <Chat> chats { owned get; }
+    
+    public string[] chat_ids {
         owned get {
             string[] result = {};
-            foreach (var channel in channels)
-                result += channel.id;
+            foreach (var chat in chats)
+                result += chat.id;
             return result;
         }
     }
     
-    /**
-     * Check whether this server has a given channel.
-     * @param channel_name Name of the channel you are looking for.
-     * @return True if the channel exists, else false.
-     */
-    public bool has_channel (string channel_id) {
-        return channel_id in channel_ids;
-    }
+    public abstract signal void toggle_away ();
+    public abstract signal void part_all ();
+
+    public abstract void add_channel (string chat_name, string chat_id);
+    public abstract void add_private_chat (string chat_name, string chat_id);
+    public abstract void remove_chat (string chat_id);
     
-    /**
-     * Retrieve a channel by its name.
-     *
-     * @param channel_name Name of the channel you are looking for.
-     * @return The channel or null if not found.
-     */
-    public Channel? get_channel_by_id (string channel_id) {
-        foreach (var channel in channels)
-            if (channel.id == channel_id)
-                return channel;
-
-        return (Channel) null;
+    public bool has_chat (string chat_id) {
+        return chat_id in chat_ids;
+    }
+
+    public Chat? get_chat (string chat_id) {
+        foreach (var chat in chats)
+            if (chat.id == chat_id)
+                return chat;
+
+        return (Chat) null;
     }
 }

=== modified file 'src/View/Window.vala'
--- src/View/Window.vala	2013-08-16 15:31:17 +0000
+++ src/View/Window.vala	2013-09-22 16:58:59 +0000
@@ -46,7 +46,7 @@
     /**
      * Get the currently selected channel.
      */
-    public abstract Channel? current_channel { get; set; }
+    public abstract Chat? current_chat { get; set; }
 
     /**
      * Amount of opened servers.
@@ -65,7 +65,7 @@
 
     public signal void add_channel ();
 
-    public signal void selected (Channel channel);
+    public signal void selected (Chat chat);
 
     public signal void show_preferences ();
 

=== modified file 'src/Widgets/Channel.vala'
--- src/Widgets/Channel.vala	2013-08-12 22:09:44 +0000
+++ src/Widgets/Channel.vala	2013-09-22 16:58:59 +0000
@@ -17,62 +17,84 @@
     Boston, MA 02110-1301 USA.
 ***/
 
-/**
- * An implementation of the View.Channel interface.
- */
-public class Cable.Widgets.Channel : Granite.Widgets.SourceList.Item, View.Channel {
-
-    Gtk.Menu menu;
-    Gtk.MenuItem leave_menu_item;
-    internal Room room;
-    
-    /**
-     * Amount of unread messages. Displayed in a badge.
-     */
+public class Cable.Widgets.Chat : Granite.Widgets.SourceList.Item {
+
+    public Room room;
+
+    public string nick { get; set; }
+    public string id { get; set; }
+    public string entry { get; set; }
+
     public int unread_messages {
         get { return int.parse (badge); }
         set { badge = (value <= 0) ? "" : value.to_string (); }
     }
-    
+
+    public bool has_focus {
+        get { return room.text_entry.has_focus; }
+    }
+
+    public void rename_user (string? old_name, string new_name, UserType type, bool silent = false) {
+        room.rename_user (old_name, new_name, type, silent);
+    }
+
+    public void set_away_status (string nick, bool away) {
+        room.chat.message_away (nick, away);
+    }
+
+    public void message (owned string from, string message, MessageType type = MessageType.NORMAL) {
+        room.chat.add_message (from, message, type);
+    }
+}
+
+public class Cable.Widgets.PrivateChat : Widgets.Chat, View.Chat, View.PrivateChat {
+    public PrivateChat (string name, string id) {
+        GLib.Object (name: name, id: id);
+        this.room = new Room (name);
+        
+        room.send_message.connect ((msg) => send_message (msg));
+        room.text_entry.grab_focus.connect (() => { focused (); });
+        
+        // bind properties
+        bind_property ("nick", room, "nick", GLib.BindingFlags.BIDIRECTIONAL);
+        bind_property ("name", room, "name", GLib.BindingFlags.BIDIRECTIONAL);
+        bind_property ("entry", room, "entry", GLib.BindingFlags.BIDIRECTIONAL);
+    }
+}
+
+public class Cable.Widgets.Channel : Widgets.Chat, View.Chat, View.Channel {
+
+    Gtk.Menu menu;
+    Gtk.MenuItem leave_menu_item;
+
     public State state { get; set; }
-
-    public string nick { get; set; }
-
     public string topic { get; set; }
 
-    public string id { get; set; }
-    
-    public string entry { get; set; }
-    
-    public bool has_focus {
-        get { return room.text_entry.has_focus; }
-    }
-    
-    /*
-    signal void autocomplete (int pos)
-    */
-
-    /**
-     * Create a new channel item for the source list.
-     * @param channel_name Displayed name and id.
-     */
-    internal Channel (string name, string id) {
-    debug (@"+ VIEW CHANNEL $name");
-    
+    public Channel (string name, string id) {
         GLib.Object (name: name, id: id);
         this.room = new Room (name);
-        
+
         this.menu = new Gtk.Menu ();
         this.leave_menu_item = new Gtk.MenuItem.with_label (_("Leave Channel"));
         menu.append (leave_menu_item);
         menu.show_all ();
-        
+
         // setup signals
-        leave_menu_item.activate.connect (() => part ());
-        room.send_message.connect ((msg) => send_message (msg));
-        room.rejoin.connect (() => join ());
-        room.text_entry.grab_focus.connect (() => { focused (); });
+        leave_menu_item.activate.connect (()
+            => part ());
+            
+        room.send_message.connect ((msg)
+            => send_message (msg));
+            
+        room.rejoin.connect (()
+            => join ());
+            
+        room.text_entry.grab_focus.connect (()
+            => { focused (); });
         
+        room.user_list.private_chat_requested.connect ((name)
+            => private_chat_requested (name));
+
         // bind properties
         bind_property ("state", room, "state", GLib.BindingFlags.BIDIRECTIONAL);
         bind_property ("nick", room, "nick", GLib.BindingFlags.BIDIRECTIONAL);
@@ -80,17 +102,13 @@
         bind_property ("topic", room.topic_bar, "topic", GLib.BindingFlags.BIDIRECTIONAL);
         bind_property ("entry", room, "entry", GLib.BindingFlags.BIDIRECTIONAL);
     }
-    
-    ~Channel () {
-        debug (@"- VIEW CHANNEL $name");
-    }
 
     public override Gtk.Menu? get_context_menu () {
         if (menu != null && menu.get_attach_widget () != null)
             menu.detach ();
         return menu;
     }
-    
+
     public bool has_user (string nick) {
         return room.has_user (nick);
     }
@@ -103,19 +121,8 @@
         room.add_user (name, type, silent);
     }
 
-    public bool remove_user (string name, string message, bool silent = false) {
-        return room.remove_user (name, message, silent);
-    }
-
-    public void rename_user (string? old_name, string new_name, UserType type, bool silent = false) {
-        room.rename_user (old_name, new_name, type, silent);
-    }
-    
-    public void set_away_status (string nick, bool away) {
-        room.chat.message_away (nick, away);
-    }
-
-    public void message (owned string from, string message, MessageType type = MessageType.NORMAL) {
-        room.chat.add_message (from, message, type);
-    }
+    public void remove_user (string name, string message, bool silent = false) {
+        room.remove_user (name, message, silent);
+    }
+
 }

=== modified file 'src/Widgets/ChatDisplay.vala'
--- src/Widgets/ChatDisplay.vala	2013-08-25 21:01:06 +0000
+++ src/Widgets/ChatDisplay.vala	2013-09-22 16:58:59 +0000
@@ -39,9 +39,7 @@
             case LEAVE:
                 return "#a99";
             case SUGGESTION:
-                return "#999";
             case NICK:
-                return "#999";
             case AWAY:
                 return "#999";
             case PING:
@@ -152,25 +150,4 @@
         
         return color_map[nick];
     }
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+}
\ No newline at end of file

=== modified file 'src/Widgets/Room.vala'
--- src/Widgets/Room.vala	2013-09-12 15:16:56 +0000
+++ src/Widgets/Room.vala	2013-09-22 16:58:59 +0000
@@ -37,25 +37,20 @@
  */
 public class Cable.Widgets.Room : Gtk.Grid {
 
-    Granite.Widgets.SourceList.ExpandableItem operators;
-    Granite.Widgets.SourceList.ExpandableItem voiced;
-    Granite.Widgets.SourceList.ExpandableItem regular;
-
-    Granite.Widgets.SourceList users;
+    public UserList user_list;
     public ChatDisplay chat;
+    public Gtk.Entry text_entry;
+    public Widgets.Topic topic_bar;
+    public Gtk.Label pseudo_label;
+    
     Granite.Widgets.EmbeddedAlert not_joined_alert;
     Granite.Widgets.EmbeddedAlert no_such_alert;
     Granite.Widgets.EmbeddedAlert loading_screen;
     Granite.Widgets.ThinPaned paned;
 
-    internal Gtk.Entry text_entry;
     Utils.AutoScrolled left_scrolled;
 
-    Gtk.Box user_box;
-
-    public Widgets.Topic topic_bar;
     Gtk.Action action_join;
-    public Gtk.Label pseudo_label;
 
     public signal void send_message (string message);
     // public signal void request_complete ();
@@ -107,18 +102,7 @@
         }
     }
 
-    private Gee.Set <string> nicks {
-        owned get {
-            var _nicks = new Gee.HashSet <string> ();
-            Granite.Widgets.SourceList.ExpandableItem[] lists = {voiced, operators, regular};
-            foreach (var list in lists)
-                foreach (var child in list.children)
-                    _nicks.add (child.name);
-            return _nicks as Gee.Set;
-        }
-    }
-
-    public Room (string channel, string nick="") {
+    public Room (string channel, string nick = "") {
         this.channel = channel;
 
         history = new Utils.MessageHistory ();
@@ -128,31 +112,13 @@
     }
 
     void init_layout () {
+        user_list = new UserList ();
+        
         paned = new Granite.Widgets.ThinPaned ();
         var box = new Gtk.Box (Gtk.Orientation.VERTICAL, 0);
 
-        operators = new Granite.Widgets.SourceList.ExpandableItem (_("Operators"));
-        operators.expanded = true;
-
-        regular = new Granite.Widgets.SourceList.ExpandableItem (_("Regular"));
-        regular.expanded = true;
-
-        voiced = new Granite.Widgets.SourceList.ExpandableItem (_("Voiced"));
-        voiced.expanded = true;
-
-        users = new Granite.Widgets.SourceList ();
-        users.hscrollbar_policy = Gtk.PolicyType.NEVER;
-        users.width_request = 150;
-        users.set_sort_func ((a,b) => {return a.name.collate (b.name);});
-
-        users.root.add (operators);
-        users.root.add (voiced);
-        users.root.add (regular);
-
-        user_box = new Gtk.Box (Gtk.Orientation.VERTICAL, 0);
-        user_box.pack_start (users);
         paned.pack1 (box, true, false);
-        paned.pack2 (user_box, false, false);
+        paned.pack2 (user_list, false, false);
 
         text_entry = new Gtk.Entry ();
         text_entry.hexpand = true;
@@ -165,7 +131,7 @@
         topic_bar = new Widgets.Topic ();
 
         pseudo_label = new Gtk.Label ("");
-        pseudo_label.set_alignment (1, (float)0.5);
+        pseudo_label.set_alignment (1, (float) 0.5);
         pseudo_label.width_request = 80;
 
         var entry_eventbox = new Gtk.EventBox ();
@@ -177,14 +143,14 @@
 
         entry_grid.attach (pseudo_label, 0, 0, 1, 1);
         entry_grid.attach (text_entry, 1, 0, 1, 1);
-        left_scrolled.add_with_viewport(chat);
+        left_scrolled.add_with_viewport (chat);
 
         box.pack_start (topic_bar, false);
         box.pack_start (left_scrolled);
         box.pack_start (entry_eventbox, false);
 
         loading_screen = new Granite.Widgets.EmbeddedAlert ();
-        loading_screen.primary_text = _("Joining channel %s").printf(channel);
+        loading_screen.primary_text = _("Joining channel %s").printf (channel);
         loading_screen.working = true;
 
         action_join = new Gtk.Action ("join", "Join Channel", "Join this channel", null);
@@ -201,6 +167,8 @@
         no_such_alert.message_type = Gtk.MessageType.WARNING;
         no_such_alert.show_icon=  true;
 
+        state = State.CHAT;
+
         this.show_all ();
     }
 
@@ -219,7 +187,7 @@
                     return false;
 
                 string[] completion = null;
-                foreach (var nick in nicks)
+                foreach (var nick in user_list.nicks)
                     if (word.down () == nick[0:word.length].down ())
                         completion += nick;
 
@@ -232,7 +200,7 @@
                 } else {
                     text_entry.buffer.delete_text (text_entry.cursor_position - word.length, word.length);
 
-                    if( text_entry.text != "" ){
+                    if (text_entry.text != "") {
                         text_entry.insert_at_cursor (completion[0] + " ");
                     } else {
                         text_entry.insert_at_cursor (completion[0] + ": ");
@@ -264,100 +232,52 @@
         });
     }
 
-    public bool has_user (string nick) {
-        Granite.Widgets.SourceList.ExpandableItem[] lists = {voiced, operators, regular};
-        foreach (var list in lists)
-            foreach (var child in list.children)
-                if (child.name == nick)
-                    return true;
-        return false;
-    }
-
     public void list_users (string[] nicks, string[] prefixes)
         requires (nicks.length == prefixes.length) {
 
         for (int i = 0; i < nicks.length; i++) {
             switch (prefixes[i]) {
                 case "@":
-                    add_user (nicks[i], UserType.OPERATOR, true);
+                    user_list.add_user (nicks[i], UserType.OPERATOR);
                     break;
                 case "+":
-                    add_user (nicks[i], UserType.VOICED, true);
+                    user_list.add_user (nicks[i], UserType.VOICED);
                     break;
                 default:
-                    add_user (nicks[i], UserType.REGULAR, true);
+                    user_list.add_user (nicks[i], UserType.REGULAR);
                     break;
             }
         }
-}
-
-    public void rename_user (string? old_name, string new_name, UserType type, bool silent = false)
-        requires (has_user (old_name))
-        requires (!has_user (new_name))
-        ensures (!has_user (old_name))
-        ensures (has_user (new_name)) {
+    }
+
+    public bool has_user (string name) {
+        return user_list.has_user (name);
+    }
+
+    public void rename_user (string? old_name, string new_name,
+                             UserType type, bool silent = false) {
 
         if (old_name == null) {
             add_user (new_name, type, true);
             return;
         }
 
-        if (remove_user (old_name, "", true)) {
-            add_user (new_name, type, true);
-            if (!silent)
-                chat.message_nick (old_name, new_name);
-        }
+        remove_user (old_name, "", true);
+        add_user (new_name, type, true);
+        
+        if (!silent)
+            chat.message_nick (old_name, new_name);
     }
 
-    public void add_user (string name, UserType type, bool silent = false)
-        requires (!has_user (name))
-        ensures (has_user (name)) {
-
-        var user = new User (name);
-        user.selectable = false;
-
-        switch (type) {
-            case UserType.OPERATOR:
-                operators.add (user);
-                break;
-            case UserType.VOICED:
-                voiced.add (user);
-                break;
-            default:
-                regular.add (user);
-                break;
-        }
-
+    public void add_user (string name, UserType type, bool silent = false) {
+        user_list.add_user (name, type);
         if (!silent)
             chat.message_join (name);
-
-        regular.name = _("Regular") + " (" + regular.n_children.to_string () + ")";
-        operators.name = _("Operators") + " (" + operators.n_children.to_string () + ")";
-        voiced.name = _("Voiced") + " (" + voiced.n_children.to_string () + ")";
     }
 
-    public bool remove_user (string name, string message, bool silent = false)
-        requires (has_user (name))
-        ensures (!has_user (name)) {
-
-        Granite.Widgets.SourceList.ExpandableItem[] lists = {voiced, operators, regular};
-        foreach (var list in lists) {
-            foreach (var child in list.children) {
-                if (child.name == name) {
-                    list.remove (child);
-
-                    if (!silent)
-                        chat.message_part (child.name, message);
-
-                    regular.name = _("Regular") + " (" + regular.n_children.to_string () + ")";
-                    operators.name = _("Operators") + " (" + operators.n_children.to_string () + ")";
-                    voiced.name = _("Voiced") + " (" + voiced.n_children.to_string () + ")";
-
-                    return true;
-                }
-            }
-        }
-        return false;
+    public void remove_user (string name, string message, bool silent = false) {
+        user_list.remove_user (name);
+        if (!silent)
+            chat.message_part (name, message);
     }
 }
-

=== modified file 'src/Widgets/Server.vala'
--- src/Widgets/Server.vala	2013-08-12 21:04:54 +0000
+++ src/Widgets/Server.vala	2013-09-22 16:58:59 +0000
@@ -23,15 +23,12 @@
  */
 public class Cable.Widgets.Server : Granite.Widgets.SourceList.ExpandableItem, View.Server {
 
-    /**
-     * List of all channels.
-     */
-    public Gee.ArrayList <View.Channel> channels {
+    public Gee.ArrayList <View.Chat> chats {
         owned get {
-            var _channels = new Gee.ArrayList <View.Channel> ();
+            var _chats = new Gee.ArrayList <View.Chat> ();
             foreach (var child in children)
-                _channels.add (child as View.Channel);
-            return _channels;
+                _chats.add (child as View.Chat);
+            return _chats;
        }
     }
 
@@ -49,15 +46,10 @@
     Gtk.MenuItem part_menu_item;
 
     internal Server (string name, string id) {
-    debug (@"+ VIEW SERVER $name");
         GLib.Object (name: name, id: id);
         setup_contextmenu ();
     }
 
-    ~Server () {
-        debug (@"- VIEW SERVER $name");
-    }
-
     void setup_contextmenu ()
         requires (menu == null)
         ensures (menu != null) {
@@ -82,28 +74,27 @@
         return menu;
     }
     
-    /**
-     * Create and add a new channel to this server.
-     * @param channel_name Name of the new channel.
-     */
-    public void add_channel (string channel_name, string channel_id)
-        requires (!has_channel (channel_name))
-        ensures (has_channel (channel_name)) {
-
-        var channel = new Channel (channel_name, channel_id);
-        add (channel);
-    }
-
-    /**
-     * Remove a channel from this server.
-     * @param channel_name Name of the channel to be removed.
-     */
-    public void remove_channel (string channel_name)
-        requires (has_channel (channel_name))
-        ensures (!has_channel (channel_name)) {
-
-        var channel = get_channel_by_id (channel_name) as Widgets.Channel;
-        return_if_fail (channel != null);
-        remove (channel);
+    public void add_channel (string chat_name, string chat_id)
+        requires (!has_chat (chat_name))
+        ensures (has_chat (chat_name)) {
+
+        var chat = new Channel (chat_name, chat_id);
+        add (chat);
+    }
+    
+    public void add_private_chat (string chat_name, string chat_id)
+        requires (!has_chat (chat_name))
+        ensures (has_chat (chat_name)) {
+
+        var chat = new PrivateChat (chat_name, chat_id);
+        add (chat);
+    }
+
+    public void remove_chat (string chat_name)
+        requires (has_chat (chat_name))
+        ensures (!has_chat (chat_name)) {
+
+        var chat = get_chat (chat_name) as Widgets.Chat;
+        remove (chat);
     }
 }

=== modified file 'src/Widgets/User.vala'
--- src/Widgets/User.vala	2013-07-26 13:16:58 +0000
+++ src/Widgets/User.vala	2013-09-22 16:58:59 +0000
@@ -21,8 +21,16 @@
 /*Gtk.MenuItem kick_item;
 Gtk.MenuItem ban_item;
 Gtk.MenuItem ignore_item;*/
+
 public class Cable.Widgets.User : Granite.Widgets.SourceList.Item {
+
+    public signal void private_chat_requested ();
+
     public User (string name) {
         base (name);
+        
+        activated.connect (() => {
+            private_chat_requested (); // signal
+        });
     }
 }

=== added file 'src/Widgets/UserList.vala'
--- src/Widgets/UserList.vala	1970-01-01 00:00:00 +0000
+++ src/Widgets/UserList.vala	2013-09-22 16:58:59 +0000
@@ -0,0 +1,122 @@
+/***
+    Copyright (C) 2013 Cable Developers
+
+    This program or library is free software; you can redistribute it
+    and/or modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 3 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General
+    Public License along with this library; if not, write to the
+    Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+    Boston, MA 02110-1301 USA.
+***/
+
+public class Cable.Widgets.UserList : Granite.Widgets.SourceList {
+
+    Granite.Widgets.SourceList.ExpandableItem operators;
+    Granite.Widgets.SourceList.ExpandableItem voiced;
+    Granite.Widgets.SourceList.ExpandableItem regular;
+
+    delegate void ForeachFunction (User user);
+
+    public Gee.Set <string> nicks {
+        owned get {
+            var _nicks = new Gee.HashSet <string> ();
+            @foreach ((child) => _nicks.add (child.name));
+            return _nicks as Gee.Set;
+        }
+    }
+    
+    public signal void private_chat_requested (string user_name);
+
+    public UserList () {
+        operators = new Granite.Widgets.SourceList.ExpandableItem (_("Operators"));
+        voiced = new Granite.Widgets.SourceList.ExpandableItem (_("Voiced"));
+        regular = new Granite.Widgets.SourceList.ExpandableItem (_("Regular"));
+
+        regular.expanded = true;
+        operators.expanded = true;
+        voiced.expanded = true;
+
+        hscrollbar_policy = Gtk.PolicyType.NEVER;
+        width_request = 150;
+        set_sort_func ((a,b) => {
+            return a.name.collate (b.name);
+        });
+
+        root.add (operators);
+        root.add (voiced);
+        root.add (regular);
+        
+        no_show_all = true;
+        visible = false;
+    }
+    
+    public bool has_user (string name) {
+        return name in nicks;
+    }
+
+    public void add_user (string name, UserType user_type = UserType.REGULAR) {
+        var user = new User (name);
+        user.selectable = false;
+
+        switch (user_type) {
+            case UserType.OPERATOR:
+                operators.add (user);
+                break;
+            case UserType.VOICED:
+                voiced.add (user);
+                break;
+            default:
+                regular.add (user);
+                break;
+        }
+        
+        user.private_chat_requested.connect (() => {
+            private_chat_requested (user.name);
+        });
+        
+        update_user_counts ();
+        
+        if (visible == false) {
+            no_show_all = false;
+            visible = true;
+        }
+    }
+    
+    public void remove_user (string name) {
+        @foreach ((child) => {
+            if (child.name != name)
+                return;
+            child.parent.remove (child);
+            update_user_counts ();
+        });
+        
+        if (nicks.size == 0) {
+            no_show_all = true;
+            visible = false;
+        }
+    }
+    
+    void update_user_counts () {
+        regular.name = _("Regular") + @" ($(regular.n_children.to_string ()))";
+        operators.name = _("Operators") + @" ($(operators.n_children.to_string ()))";
+        voiced.name = _("Voiced") + @" ($(voiced.n_children.to_string ()))";
+    }
+    
+    new void @foreach (ForeachFunction func) {
+        Granite.Widgets.SourceList.ExpandableItem[] lists = {
+            voiced, operators, regular
+        };
+        
+        foreach (var list in lists)
+            foreach (var child in list.children)
+                func (child as User);
+    }
+}

=== modified file 'src/Widgets/Window.vala'
--- src/Widgets/Window.vala	2013-08-20 14:28:43 +0000
+++ src/Widgets/Window.vala	2013-09-22 16:58:59 +0000
@@ -112,9 +112,9 @@
     /**
      * Get the currently selected channel.
      */
-    public View.Channel? current_channel {
-        get { return server_list.selected as View.Channel; }
-        set { server_list.selected = value as Widgets.Channel; }
+    public View.Chat? current_chat {
+        get { return server_list.selected as View.Chat; }
+        set { server_list.selected = value as Widgets.Chat; }
     }
 
     //public signal void edit_identity ();
@@ -126,8 +126,8 @@
 
         server_list.item_selected.connect ((item) => {
             if (item != null) {
-                display_widget = (current_channel as Widgets.Channel).room;
-                selected (current_channel);
+                display_widget = (current_chat as Widgets.Chat).room;
+                selected (current_chat);
             }
         });