Merge lp:~julien-spautz/cable/irc-commands into lp:cable

[Julien Spautz]

Started implementing irc commands. Also added support for actions (/me or /action) because they where not displayed previously. Also added missing copyright headers.

I only implemented a few commands so far, which should I add next?

[Eduard Gotwig (gotwig)]

Why can't you forward all commands, which beginn with a "/"?

[Julien Spautz (julien-spautz)]

It does forward all unknown commands.

Some commands, like /me, do not exits in the IRC protocol, so you can't just forward them, if that's what you mean.

[Eduard Gotwig (gotwig)]

Ok, I think "/describe" is not there.

Also I found here a nice list: http://www.greenday.net/chat/commands.html .

Also, for autocompletition, it should first check if the entry is free, does not contain any charachters, and only than add ":" to the username. Else it should just autocomplete the username, without :.

Example: if you type /describe ma<TAB> the result is
 /describe max: instead of /describe max, so the user has to remove the ":" manually.

This also happens when you want to refer to a user, in the chat.

example: Hello ma<TAB>
results in Hello max: .

This is not what we want, instead we want "Hello max".

Thanks for your work Julien, it seems to work for me.

review: Needs Fixing

[Marcus Lundgren (marcus-lundgren)]

A list of the available IRC commands that might be of help: http://en.wikipedia.org/wiki/List_of_Internet_Relay_Chat_commands

At a glance, you seem to be missing /quit.

[lp:~julien-spautz/cable/irc-commands]

114. By Julien Spautz on 2013-08-24

a few more commands

=== modified file 'src/Controller/Channel.vala'
--- src/Controller/Channel.vala	2013-08-08 00:37:02 +0000
+++ src/Controller/Channel.vala	2013-08-24 21:40:34 +0000
@@ -1,13 +1,33 @@
+/***
+    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.
+***/
+
 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");
+        debug (@"+ CONTROLLER CHANNEL $name");
+
         this.server = server;
         this.name = name;
 
@@ -51,8 +71,8 @@
         }
     }
 
+    // GUI signals
     void connect_frontend_signals () {
-
         view.part.connect (() => {
             backend.send_part ();
         });
@@ -69,7 +89,7 @@
 
         view.send_message.connect ((message) => {
             if (message.has_prefix ("/"))
-                server.backend.send_raw (message.replace ("/", ""));
+                send_command (message.replace ("/", ""));
             else
                 server.backend.send_message (name, message);
 
@@ -84,6 +104,7 @@
 
     }
 
+    // IRC signals
     void connect_backend_signals () {
         backend.event_message.connect ((from, message) => {
             if (server.window.view.current_channel != view)
@@ -98,7 +119,7 @@
             if (server.backend.is_me (from)) {
                 view.nick = new_nick;
             }
-            
+
             assert (new_nick != null);
 
             var name = from.split ("!")[0];
@@ -165,6 +186,85 @@
             }
         });
 
+        backend.event_action.connect ((from, message) => {
+            var nick = from.split ("!")[0];
+            view.message ("", "* " + nick + " " + message, MessageType.ACTION);
+        });
+
         backend.event_names.connect (view.list_users);
     }
+
+    void send_command (string command) {
+
+        var args = command.split (" ");
+
+        switch (args[0]) {
+            case "join":
+                return_if_fail (args.length > 1);
+                var channel = new Channel (server, args[1]);
+                server.channels[args[1]] = channel;
+                server.window.view.current_channel = channel.view;
+                break;
+
+            case "part":
+                backend.send_part ();
+                break;
+
+            case "quit":
+                server.backend.send_quit ();
+                break;
+
+            case "nick":
+                return_if_fail (args.length > 1);
+                server.backend.send_nick (args[1]);
+                break;
+
+            case "topic":
+                return_if_fail (args.length > 1);
+                backend.send_topic (string.joinv (" ", args[1:-1]));
+                break;
+
+            case "me":
+            case "action":
+                return_if_fail (args.length > 1);
+                backend.send_action (string.joinv (" ", args[1:-1]));
+                break;
+
+            case "kick":
+                return_if_fail (args.length > 2);
+                backend.send_kick (args[1], string.joinv (" ", args[2:-1]));
+                break;
+
+            case "ignore":
+                return_if_fail (args.length > 1);
+                server.backend.send_ignore (string.joinv (" ", args[1:-1]));
+                break;
+
+            case "unignore":
+                return_if_fail (args.length > 1);
+                server.backend.send_unignore (string.joinv (" ", args[1:-1]));
+                break;
+
+            case "msg":
+                return_if_fail (args.length > 2);
+                server.backend.send_message (args[1], string.joinv (" ", args[2:-1]));
+                break;
+
+            case "notice":
+                return_if_fail (args.length > 2);
+                server.backend.send_notice (args[1], string.joinv (" ", args[2:-1]));
+                break;
+
+            case "away":
+                if (args.length < 2)
+                    server.backend.send_back ();
+                else
+                    server.backend.send_away (string.joinv (" ", args[1:-1]));
+                break;
+
+            default:
+                server.backend.send_raw (command);
+                break;
+        }
+    }
 }

=== modified file 'src/Controller/Server.vala'
--- src/Controller/Server.vala	2013-08-20 19:51:01 +0000
+++ src/Controller/Server.vala	2013-08-24 21:40:34 +0000
@@ -1,3 +1,22 @@
+/***
+    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.
+***/
+
 internal class Cable.Controller.Server : GLib.Object {
 
     internal weak Window window;

=== modified file 'src/Controller/Window.vala'
--- src/Controller/Window.vala	2013-08-08 00:37:02 +0000
+++ src/Controller/Window.vala	2013-08-24 21:40:34 +0000
@@ -1,3 +1,22 @@
+/***
+    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.
+***/
+
 internal class Cable.Controller.Window : GLib.Object {
 
     internal View.Window view { get; set; }

=== modified file 'src/Irc/Channel.vala'
--- src/Irc/Channel.vala	2013-08-06 15:32:12 +0000
+++ src/Irc/Channel.vala	2013-08-24 21:40:34 +0000
@@ -66,6 +66,7 @@
         get { return name in server.channel_names; }
     }
 
+    public signal void event_action (string from, string message);
     public signal void event_banlist (string mask, string who, int64 when); // TODO wtf is this?
 
     /**
@@ -264,6 +265,11 @@
     }
     
     void setup_signals () {
+        client.event_action.connect ((time, server, from, target, message) => {
+            if (server == this.server.name && name == target)
+                event_action (from, message);
+        });
+        
         client.event_banlist.connect ((time, server, channel, mask, who, when) => {
             if (server == this.server.name && name == channel)
                 event_banlist (mask, who, when);

=== modified file 'src/Settings/Preferences.vala'
--- src/Settings/Preferences.vala	2013-08-20 14:28:43 +0000
+++ src/Settings/Preferences.vala	2013-08-24 21:40:34 +0000
@@ -1,3 +1,22 @@
+/***
+    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.Settings.Preferences : Granite.Services.Settings {
 
     public string[] networks { get; set; }

=== modified file 'src/Settings/SavedState.vala'
--- src/Settings/SavedState.vala	2013-08-20 06:46:01 +0000
+++ src/Settings/SavedState.vala	2013-08-24 21:40:34 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 public class Cable.Settings.SavedState : Granite.Services.Settings {
 
     public int window_width { get; set; }
@@ -15,3 +16,24 @@
         MAXIMIZED
     }
 }
+=======
+/***
+    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.
+***/
+
+// XXX>>>>>>> MERGE-SOURCE

=== modified file 'src/Tests/Tests.vala'
--- src/Tests/Tests.vala	2013-08-11 12:01:05 +0000
+++ src/Tests/Tests.vala	2013-08-24 21:40:34 +0000
@@ -1,3 +1,22 @@
+/***
+    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.
+***/
+
 namespace Cable.Tests {
 
     public int run (string[] args) {

=== modified file 'src/Tests/Utils.vala'
--- src/Tests/Utils.vala	2013-08-07 00:56:30 +0000
+++ src/Tests/Utils.vala	2013-08-24 21:40:34 +0000
@@ -1,3 +1,22 @@
+/***
+    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.
+***/
+
 using Cable.Utils;
 
 namespace Cable.Tests.Utils {

=== modified file 'src/View/Channel.vala'
--- src/View/Channel.vala	2013-08-12 22:09:44 +0000
+++ src/View/Channel.vala	2013-08-24 21:40:34 +0000
@@ -1,3 +1,22 @@
+/***
+    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 interface Cable.View.Channel : GLib.Object {
 
     public abstract int unread_messages { get; set; }

=== modified file 'src/View/Server.vala'
--- src/View/Server.vala	2013-08-06 15:32:12 +0000
+++ src/View/Server.vala	2013-08-24 21:40:34 +0000
@@ -1,3 +1,22 @@
+/***
+    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 interface Cable.View.Server : GLib.Object {
 
     // TODO parent-tier reference (i.e. window tier)

=== modified file 'src/View/Window.vala'
--- src/View/Window.vala	2013-08-06 15:32:12 +0000
+++ src/View/Window.vala	2013-08-24 21:40:34 +0000
@@ -1,3 +1,22 @@
+/***
+    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 interface Cable.View.Window : GLib.Object {
 
     public abstract bool welcome_shown { get; set; }

=== modified file 'src/Widgets/ChatDisplay.vala'
--- src/Widgets/ChatDisplay.vala	2013-08-06 15:32:12 +0000
+++ src/Widgets/ChatDisplay.vala	2013-08-24 21:40:34 +0000
@@ -24,13 +24,15 @@
     SUGGESTION,
     NICK,
     AWAY,
-    PING;
+    PING,
+    ACTION;
     /* QUIT, KICK, BAN, MODE(?), ACTION
     */
     
     public string color () {
         switch (this) {
             case NORMAL:
+            case ACTION:
                 return "#333";
             case ENTER:
                 return "#9a9";