Merge lp:~phablet-team/mfw-plugin-irc/dummy-branch into lp:mfw-plugin-irc

[Tiago Salem Herrmann]

Finish the basic implementation of an IRC plugin.

Finish the basic implementation of an IRC plugin.

[lp:~phablet-team/mfw-plugin-irc/dummy-branch]

2. By Tiago Salem Herrmann on 2016-12-17

fix control file

3. By Tiago Salem Herrmann on 2016-12-17

remove some build deps not needed by this package

4. By Tiago Salem Herrmann on 2017-01-05

enable return to send on messaging-app

5. By Tiago Salem Herrmann on 2017-01-09

Enable Attachments

6. By Tiago Salem Herrmann on 2017-01-10

Add EnableRejoin property

7. By Tiago Salem Herrmann on 2017-01-11

Fix leaving and rejoing channels

8. By Tiago Salem Herrmann on 2017-01-16

add property EnableTabCompletion

9. By Tiago Salem Herrmann on 2017-01-17

try different nicknames on collision

10. By Tiago Salem Herrmann on 2017-01-19

Add property: LeaveRoomsOnClose

11. By Tiago Salem Herrmann on 2017-01-26

Set self contact as remote

12. By Tiago Salem Herrmann on 2017-01-27

Force self contact to be always the last

13. By Tiago Salem Herrmann on 2017-01-27

If we just joined the channel, put our state as RemotePending

14. By Gustavo Pichorim Boiko on 2017-01-27

Keep the self contact as pending while reporting users.

15. By Tiago Salem Herrmann on 2017-01-27

Emit a separate signal to move self contact to the final members list

16. By Tiago Salem Herrmann on 2017-01-31

add random ids to messages

17. By Tiago Salem Herrmann on 2017-02-01

add fallback values

18. By Tiago Salem Herrmann on 2017-02-15

move self contact to pending list before removing other members

19. By Tiago Salem Herrmann on 2017-03-15

Add persistent property

20. By Ken VanDine on 2017-03-22

packaging cleanup

21. By Tiago Salem Herrmann on 2017-03-22

Move plugins to a separate directory

[Gustavo Pichorim Boiko (boiko)]

Looks good!

review: Approve

Unmerged revisions

21. By Tiago Salem Herrmann on 2017-03-22

Move plugins to a separate directory

20. By Ken VanDine on 2017-03-22

packaging cleanup

19. By Tiago Salem Herrmann on 2017-03-15

Add persistent property

18. By Tiago Salem Herrmann on 2017-02-15

move self contact to pending list before removing other members

17. By Tiago Salem Herrmann on 2017-02-01

add fallback values

16. By Tiago Salem Herrmann on 2017-01-31

add random ids to messages

15. By Tiago Salem Herrmann on 2017-01-27

Emit a separate signal to move self contact to the final members list

14. By Gustavo Pichorim Boiko on 2017-01-27

Keep the self contact as pending while reporting users.

13. By Tiago Salem Herrmann on 2017-01-27

If we just joined the channel, put our state as RemotePending

12. By Tiago Salem Herrmann on 2017-01-27

Force self contact to be always the last

=== added directory '.bzr-builddeb'
=== added file '.bzr-builddeb/default.conf'
--- .bzr-builddeb/default.conf	1970-01-01 00:00:00 +0000
+++ .bzr-builddeb/default.conf	2017-03-22 14:38:33 +0000
@@ -0,0 +1,2 @@
+[BUILDDEB]
+split = True
 
=== added file 'COPYING'
--- COPYING	1970-01-01 00:00:00 +0000
+++ COPYING	2017-03-22 14:38:33 +0000
@@ -0,0 +1,165 @@
+                   GNU LESSER GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+
+  This version of the GNU Lesser General Public License incorporates
+the terms and conditions of version 3 of the GNU General Public
+License, supplemented by the additional permissions listed below.
+
+  0. Additional Definitions.
+
+  As used herein, "this License" refers to version 3 of the GNU Lesser
+General Public License, and the "GNU GPL" refers to version 3 of the GNU
+General Public License.
+
+  "The Library" refers to a covered work governed by this License,
+other than an Application or a Combined Work as defined below.
+
+  An "Application" is any work that makes use of an interface provided
+by the Library, but which is not otherwise based on the Library.
+Defining a subclass of a class defined by the Library is deemed a mode
+of using an interface provided by the Library.
+
+  A "Combined Work" is a work produced by combining or linking an
+Application with the Library.  The particular version of the Library
+with which the Combined Work was made is also called the "Linked
+Version".
+
+  The "Minimal Corresponding Source" for a Combined Work means the
+Corresponding Source for the Combined Work, excluding any source code
+for portions of the Combined Work that, considered in isolation, are
+based on the Application, and not on the Linked Version.
+
+  The "Corresponding Application Code" for a Combined Work means the
+object code and/or source code for the Application, including any data
+and utility programs needed for reproducing the Combined Work from the
+Application, but excluding the System Libraries of the Combined Work.
+
+  1. Exception to Section 3 of the GNU GPL.
+
+  You may convey a covered work under sections 3 and 4 of this License
+without being bound by section 3 of the GNU GPL.
+
+  2. Conveying Modified Versions.
+
+  If you modify a copy of the Library, and, in your modifications, a
+facility refers to a function or data to be supplied by an Application
+that uses the facility (other than as an argument passed when the
+facility is invoked), then you may convey a copy of the modified
+version:
+
+   a) under this License, provided that you make a good faith effort to
+   ensure that, in the event an Application does not supply the
+   function or data, the facility still operates, and performs
+   whatever part of its purpose remains meaningful, or
+
+   b) under the GNU GPL, with none of the additional permissions of
+   this License applicable to that copy.
+
+  3. Object Code Incorporating Material from Library Header Files.
+
+  The object code form of an Application may incorporate material from
+a header file that is part of the Library.  You may convey such object
+code under terms of your choice, provided that, if the incorporated
+material is not limited to numerical parameters, data structure
+layouts and accessors, or small macros, inline functions and templates
+(ten or fewer lines in length), you do both of the following:
+
+   a) Give prominent notice with each copy of the object code that the
+   Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the object code with a copy of the GNU GPL and this license
+   document.
+
+  4. Combined Works.
+
+  You may convey a Combined Work under terms of your choice that,
+taken together, effectively do not restrict modification of the
+portions of the Library contained in the Combined Work and reverse
+engineering for debugging such modifications, if you also do each of
+the following:
+
+   a) Give prominent notice with each copy of the Combined Work that
+   the Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the Combined Work with a copy of the GNU GPL and this license
+   document.
+
+   c) For a Combined Work that displays copyright notices during
+   execution, include the copyright notice for the Library among
+   these notices, as well as a reference directing the user to the
+   copies of the GNU GPL and this license document.
+
+   d) Do one of the following:
+
+       0) Convey the Minimal Corresponding Source under the terms of this
+       License, and the Corresponding Application Code in a form
+       suitable for, and under terms that permit, the user to
+       recombine or relink the Application with a modified version of
+       the Linked Version to produce a modified Combined Work, in the
+       manner specified by section 6 of the GNU GPL for conveying
+       Corresponding Source.
+
+       1) Use a suitable shared library mechanism for linking with the
+       Library.  A suitable mechanism is one that (a) uses at run time
+       a copy of the Library already present on the user's computer
+       system, and (b) will operate properly with a modified version
+       of the Library that is interface-compatible with the Linked
+       Version.
+
+   e) Provide Installation Information, but only if you would otherwise
+   be required to provide such information under section 6 of the
+   GNU GPL, and only to the extent that such information is
+   necessary to install and execute a modified version of the
+   Combined Work produced by recombining or relinking the
+   Application with a modified version of the Linked Version. (If
+   you use option 4d0, the Installation Information must accompany
+   the Minimal Corresponding Source and Corresponding Application
+   Code. If you use option 4d1, you must provide the Installation
+   Information in the manner specified by section 6 of the GNU GPL
+   for conveying Corresponding Source.)
+
+  5. Combined Libraries.
+
+  You may place library facilities that are a work based on the
+Library side by side in a single library together with other library
+facilities that are not Applications and are not covered by this
+License, and convey such a combined library under terms of your
+choice, if you do both of the following:
+
+   a) Accompany the combined library with a copy of the same work based
+   on the Library, uncombined with any other library facilities,
+   conveyed under the terms of this License.
+
+   b) Give prominent notice with the combined library that part of it
+   is a work based on the Library, and explaining where to find the
+   accompanying uncombined form of the same work.
+
+  6. Revised Versions of the GNU Lesser General Public License.
+
+  The Free Software Foundation may publish revised and/or new versions
+of the GNU Lesser General Public License from time to time. Such new
+versions will be similar in spirit to the present version, but may
+differ in detail to address new problems or concerns.
+
+  Each version is given a distinguishing version number. If the
+Library as you received it specifies that a certain numbered version
+of the GNU Lesser General Public License "or any later version"
+applies to it, you have the option of following the terms and
+conditions either of that published version or of any later version
+published by the Free Software Foundation. If the Library as you
+received it does not specify a version number of the GNU Lesser
+General Public License, you may choose any version of the GNU Lesser
+General Public License ever published by the Free Software Foundation.
+
+  If the Library as you received it specifies that a proxy can decide
+whether future versions of the GNU Lesser General Public License shall
+apply, that proxy's public statement of acceptance of any version is
+permanent authorization for you to choose that version for the
+Library.
 
=== modified file 'data/irc.protocol.in'
--- data/irc.protocol.in	2016-12-16 18:58:01 +0000
+++ data/irc.protocol.in	2017-03-22 14:38:33 +0000
@@ -9,3 +9,8 @@
 ShowOnSelector=1
 ShowOnlineStatus=0
 JoinExistingChannels=1
+ReturnToSend=1
+EnableAttachments=0
+EnableRejoin=1
+EnableTabCompletion=1
+LeaveRoomsOnClose=1
 
=== modified file 'data/irc.service.in'
--- data/irc.service.in	2016-12-16 18:58:01 +0000
+++ data/irc.service.in	2017-03-22 14:38:33 +0000
@@ -1,3 +1,3 @@
 [D-BUS Service]
 Name=org.freedesktop.Telepathy.ConnectionManager.@CM@
-Exec=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@/messaging-framework-runner --connection-manager-name @CM@ --protocol-name @PROTOCOL@ --connector messaging::PluginConnector --PluginConnector::path=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@/libmfw-plugin-@CM@.so
+Exec=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@/messaging-framework-runner --connection-manager-name @CM@ --protocol-name @PROTOCOL@ --connector messaging::PluginConnector --PluginConnector::path=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@/messaging-framework/libmfw-plugin-@CM@.so
 
=== modified file 'debian/changelog'
--- debian/changelog	2016-12-16 18:58:01 +0000
+++ debian/changelog	2017-03-22 14:38:33 +0000
@@ -1,4 +1,4 @@
-mfw-plugin-irc (0.1) xenial; urgency=medium
+mfw-plugin-irc (0.1-0ubuntu1) xenial; urgency=medium
 
   * Initial release
 
 
=== modified file 'debian/control'
--- debian/control	2016-12-16 18:58:01 +0000
+++ debian/control	2017-03-22 14:38:33 +0000
@@ -1,11 +1,8 @@
 Source: mfw-plugin-irc
 Priority: optional
 Maintainer: Ubuntu Developers <[e-mail]>
-Build-Depends: astyle:native,
-               clang-format-3.5:native,
-               cmake,
+Build-Depends: cmake,
                debhelper (>= 9),
-               dos2unix:native,
                doxygen,
                gcovr,
                google-mock,
@@ -14,16 +11,16 @@
                libboost-filesystem-dev,
                libboost-program-options-dev,
                libboost-system-dev,
+               libcppnetlib-dev,
                libdbus-cpp-dev,
                libgoogle-glog-dev,
-               libircclient-dev
+               libircclient-dev,
                libmessaging-framework-dev,
                libprocess-cpp-dev,
-	       libtelepathy-qt5-dev,
+               libtelepathy-qt5-dev,
                pkg-config,
-               qtbase5-dev,
-	       libcppnetlib-dev,
-Standards-Version: 3.9.5
+               qtbase5-dev
+Standards-Version: 3.9.7
 Section: libs
 Homepage: https://launchpad.net/mfw-plugin-irc
 Vcs-Bzr: https://code.launchpad.net/
 
=== removed directory 'debian/source'
=== removed file 'debian/source/format'
--- debian/source/format	2016-12-16 18:58:01 +0000
+++ debian/source/format	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-3.0 (native)
 
=== modified file 'include/irc/connection.h'
--- include/irc/connection.h	2016-12-16 18:58:01 +0000
+++ include/irc/connection.h	2017-03-22 14:38:33 +0000
@@ -95,6 +95,7 @@
 
     std::string server_id;
     std::string nickname;
+    int nick_collision;
 
 private:
 
 
=== modified file 'include/irc/group_chat.h'
--- include/irc/group_chat.h	2016-12-16 18:58:01 +0000
+++ include/irc/group_chat.h	2017-03-22 14:38:33 +0000
@@ -39,6 +39,10 @@
     void mark_message_as_delivered(const std::string& message_token);
     std::string id();
 
+    void set_active(bool active);
+    bool active();
+
+
 private:
     /// @brief Creates a new instance translating the given recipient to a user.
     GroupChat(const std::shared_ptr<messaging::Group> &group,
@@ -46,6 +50,7 @@
 
     irc_session_t *irc_session;
     std::string channel_id;
+    bool is_active;
 
 };
 
 
=== modified file 'include/irc/group_manager.h'
--- include/irc/group_manager.h	2016-12-16 18:58:01 +0000
+++ include/irc/group_manager.h	2017-03-22 14:38:33 +0000
@@ -38,6 +38,7 @@
     std::string group_id() override;
     std::string group_title() override;
     std::string group_subject() override;
+    bool persistent() override;
     std::shared_ptr<messaging::Member> group_creator() override;
     std::set<std::string> group_admins() override;
     messaging::Members members() override;
@@ -72,8 +73,6 @@
     irc_session_t *irc_session;
     std::string creator;
 
-    /// @brief this valImClientImplue is created when chat is created and sent in any method call into the chat
-
 };
 
 }
 
=== modified file 'include/irc/messenger.h'
--- include/irc/messenger.h	2016-12-16 18:58:01 +0000
+++ include/irc/messenger.h	2017-03-22 14:38:33 +0000
@@ -14,6 +14,7 @@
 class Message;
 class File;
 class Connector;
+class Connection;
 class GroupManager;
 
 class IRC_PUBLIC Messenger
@@ -25,7 +26,7 @@
     DEFINE_PTRS(Messenger);
     /// @endcond
 
-    static std::shared_ptr<Messenger> create(const std::shared_ptr<Messenger::Observer>& messenger_observer, irc_session_t *irc_session);
+    static std::shared_ptr<Messenger> create(const std::shared_ptr<Messenger::Observer>& messenger_observer, const std::shared_ptr<irc::Connection> &connection, irc_session_t *irc_session);
 
     std::shared_ptr<messaging::Chat> create_chat_with(const messaging::Recipient::shared_ptr& recipient, const std::shared_ptr<messaging::Chat::Observer>& observer) override;
 
@@ -34,9 +35,11 @@
     std::shared_ptr<GroupManager> get_group_manager(const std::string &group_chat_id);
     void handle_join_new_channel(const std::string &channel);
     void handle_join_new_channel(const std::string &channel, const std::string &the_creator);
+    void remove_chat(const std::string &chat_id);
 
+    std::shared_ptr<irc::Connection> connection;
 private:
-    Messenger(const std::shared_ptr<messaging::Messenger::Observer>& observer, irc_session_t *irc_session);
+    Messenger(const std::shared_ptr<messaging::Messenger::Observer>& observer, const std::shared_ptr<irc::Connection> &connection, irc_session_t *irc_session);
 
     /// @brief identity provider to correlate msg_id with imdn unique identifier. First will be
     /// used internally for chat messages and the other used as message external unique id
 
=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2016-12-16 18:58:01 +0000
+++ src/CMakeLists.txt	2017-03-22 14:38:33 +0000
@@ -34,4 +34,4 @@
 
 install(
     TARGETS ${PLUGIN_NAME}
-    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
+    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}/messaging-framework)
 
=== modified file 'src/irc/connection.cpp'
--- src/irc/connection.cpp	2016-12-16 18:58:01 +0000
+++ src/irc/connection.cpp	2017-03-22 14:38:33 +0000
@@ -151,6 +151,15 @@
         std::string irc_channel(params[1]);
         ctx->channel_members_changed(irc_channel, channel_users[irc_channel]);
         channel_users.erase(irc_channel);
+    } else if (event == LIBIRC_RFC_ERR_NICKNAMEINUSE) {
+        if (ctx->nick_collision++ < 3) {
+            std::string irc_nick(params[1]);
+            irc_nick += "_";
+            irc_cmd_nick(session, irc_nick.c_str());
+        } else {
+            LOG(INFO) << "Could not connect. Nickname already in use";
+            ctx->disconnect(messaging::Connection::StatusChangedReason::name_in_use);
+        }
     }
 }
 
@@ -213,6 +222,7 @@
     , port(6667)
     , use_ssl(false)
     , verify_ssl_cert(true)
+    , nick_collision(0)
 {
     messaging::Parameter server_param{"server", "s", messaging::Parameter::Flags::required|messaging::Parameter::Flags::required_for_registration};
     messaging::Parameter port_param{"port", "q", messaging::Parameter::Flags::none};
@@ -253,6 +263,9 @@
         {
             throw std::runtime_error{"nickname could not be found"};
         }
+        if (username.empty()) {
+            username = nickname;
+        }
     }
     else
     {
@@ -269,6 +282,10 @@
         fullname = fullname_param.extract_from(dict).as_string();
     }
 
+    if (fullname.empty()) {
+        fullname = nickname;
+    }
+
     if (use_ssl_param.can_extract_from(dict))
     {
         use_ssl = use_ssl_param.extract_from(dict).as_bool();
@@ -361,7 +378,7 @@
     irc_set_ctx(irc_session, ctx);
 
     // initiate other components
-    messenger_ = Messenger::create(messenger_observer_, irc_session);
+    messenger_ = Messenger::create(messenger_observer_, shared_from_this(), irc_session);
     group_starter_ = irc::GroupStarter::create(messenger_, irc_session);
 
     // Initiate the IRC server connection
@@ -405,6 +422,7 @@
         switch (new_status)
         {
         case Status::connected:
+            nick_collision = 0;
             break;
         case Status::connecting:
             break;
@@ -459,9 +477,14 @@
 
     messaging::Members members;
     for (auto user: users) {
-        members.push_back(std::make_shared<messaging::Member>(user, messaging::PendingStatus::None, messaging::Role::Member));
+        if (user != self_identifier()) {
+            members.push_back(std::make_shared<messaging::Member>(user, messaging::PendingStatus::None, messaging::Role::Member));
+            continue;
+        }
     }
     group_manager->handle_members_changed(members);
+    members.push_back(std::make_shared<messaging::Member>(self_identifier(), messaging::PendingStatus::None, messaging::Role::Member));
+    group_manager->handle_members_changed(members);
 }
 
 void irc::Connection::channel_member_joined(const std::string &channel, const std::string &nick)
@@ -474,18 +497,18 @@
             return;
         }
     }
-    group_manager->handle_member_joined(std::make_shared<messaging::Member>(nick, messaging::PendingStatus::None, messaging::Role::Member));
+    messaging::PendingStatus pending_status = messaging::PendingStatus::None;
+    if (nick == self_identifier()) {
+        pending_status = messaging::PendingStatus::Remote;
+    }
+    group_manager->handle_member_joined(std::make_shared<messaging::Member>(nick, pending_status, messaging::Role::Member));
 }
 
 void irc::Connection::channel_member_left(const std::string &channel, const std::string &nick)
 {
     std::shared_ptr<irc::GroupManager> group_manager = messenger_->get_group_manager(channel);
     if (!group_manager) {
-        messenger_->handle_join_new_channel(channel, self_identifier());
-        group_manager = messenger_->get_group_manager(channel);
-        if (!group_manager) {
-            return;
-        }
+        return;
     }
 
     group_manager->handle_member_left(std::make_shared<messaging::Member>(nick, messaging::PendingStatus::None, messaging::Role::Member));
 
=== modified file 'src/irc/group_chat.cpp'
--- src/irc/group_chat.cpp	2016-12-16 18:58:01 +0000
+++ src/irc/group_chat.cpp	2017-03-22 14:38:33 +0000
@@ -30,11 +30,14 @@
         , irc_session(session)
         , channel_id(group->id())
 {
-    irc_cmd_join(session, channel_id.c_str(), "");
+    set_active(!irc_cmd_join(irc_session, channel_id.c_str(), ""));
 }
 
 std::string irc::GroupChat::send_message(const messaging::Message& message)
 {
+    if (!is_active) {
+        set_active(!irc_cmd_join(irc_session, channel_id.c_str(), ""));
+    }
     boost::uuids::uuid uuid = boost::uuids::random_generator()();
     messaging::DeliveryStatus status = messaging::DeliveryStatus::permanently_failed;
     std::string id(boost::lexical_cast<std::string>(uuid));
@@ -72,3 +75,8 @@
 {
     return channel_id;
 }
+
+void irc::GroupChat::set_active(bool active)
+{
+    is_active = active;
+}
 
=== modified file 'src/irc/group_manager.cpp'
--- src/irc/group_manager.cpp	2016-12-16 18:58:01 +0000
+++ src/irc/group_manager.cpp	2017-03-22 14:38:33 +0000
@@ -2,6 +2,7 @@
 
 #include <irc/messenger.h>
 #include <irc/group_chat.h>
+#include <irc/connection.h>
 
 
 #include <memory>
@@ -93,44 +94,92 @@
 
 void irc::GroupManager::add_members(const messaging::Members &members)
 {
-
 }
 
 void irc::GroupManager::remove_members(const messaging::Members &members)
 {
+    for (auto member : members) {
+        if (member->id() == messenger_.lock()->connection->self_identifier()) {
+            leave_group();
+        }
+    }
 }
 
 void irc::GroupManager::leave_group()
 {
     irc_cmd_part(irc_session, group_id().c_str());
+    std::string self_identifier = messenger_.lock()->connection->self_identifier();
+
+    // first move self contact to pending list
+    auto it = std::find_if(participants.begin(), participants.end(), [self_identifier](const std::shared_ptr<messaging::Member>& m) {
+        return m->id() == self_identifier;
+    });
+    if (it != participants.end()) {
+        participants.erase(it);
+        participants.push_back(std::make_shared<messaging::Member>(self_identifier, messaging::PendingStatus::Remote, messaging::Role::Member));
+    }
+    announce_members_updated(participants);
+
+    participants.clear();
+    announce_members_updated(participants);
+
+    announce_group_cancelled(messaging::CancelGroupReason::Leave, "");
+    chat_.lock()->set_active(false);
+    messenger_.lock()->remove_chat(group_id());
 }
 
 void irc::GroupManager::dissolve_group()
 {
-
+    // not supported on irc
 }
 
 void irc::GroupManager::handle_members_changed(messaging::Members new_participants)
 {
-    for (auto participant : new_participants) {
-        participants.push_back(participant);
+    for (auto new_participant : new_participants) {
+        auto it = std::find_if(participants.begin(), participants.end(), [new_participant](const std::shared_ptr<messaging::Member>& m) {
+            return m->id() == new_participant->id();
+        });
+        if (it != participants.end()) {
+            participants.erase(it);
+        }
+        participants.push_back(new_participant);
     }
     announce_members_updated(participants);
 }
 
 void irc::GroupManager::handle_member_joined(const std::shared_ptr<messaging::Member> &member)
 {
+    auto it = std::find_if(participants.begin(), participants.end(), [member](const std::shared_ptr<messaging::Member>& m) {
+        return m->id() == member->id();
+    });
+
+    if (it != participants.end()) {
+       return;
+    }
+
     participants.push_back(member);
     announce_members_updated(participants);
 }
 
 void irc::GroupManager::handle_member_left(const std::shared_ptr<messaging::Member> &member)
 {
+    if (member->id() == messenger_.lock()->connection->self_identifier()) {
+        leave_group();
+        return;
+    }
+
     auto it = std::find_if(participants.begin(), participants.end(), [member](const std::shared_ptr<messaging::Member>& m) {
         return m->id() == member->id();
     });
+
     if (it != participants.end()) {
         participants.erase(it);
         announce_members_updated(participants);
     }
 }
+
+bool irc::GroupManager::persistent()
+{
+    return false;
+}
+
 
=== modified file 'src/irc/messenger.cpp'
--- src/irc/messenger.cpp	2016-12-16 18:58:01 +0000
+++ src/irc/messenger.cpp	2017-03-22 14:38:33 +0000
@@ -2,6 +2,12 @@
 #include <irc/group_chat.h>
 #include <irc/contact_chat.h>
 #include <irc/group_manager.h>
+#include <irc/connection.h>
+
+#include <boost/lexical_cast.hpp>
+#include <boost/uuid/uuid.hpp>
+#include <boost/uuid/uuid_generators.hpp>
+#include <boost/uuid/uuid_io.hpp>
 
 #include <messaging/group.h>
 #include <messaging/user.h>
@@ -13,15 +19,16 @@
 
 using namespace std;
 
-irc::Messenger::Messenger(const std::shared_ptr<messaging::Messenger::Observer>& observer, irc_session_t *session)
+irc::Messenger::Messenger(const std::shared_ptr<messaging::Messenger::Observer>& observer, const std::shared_ptr<irc::Connection> &_connection, irc_session_t *session)
     : messaging::Messenger{observer}
+    , connection(_connection)
     , irc_session(session)
 {
 }
 
-std::shared_ptr<irc::Messenger> irc::Messenger::create(const std::shared_ptr<messaging::Messenger::Observer>& observer, irc_session_t *session)
+std::shared_ptr<irc::Messenger> irc::Messenger::create(const std::shared_ptr<messaging::Messenger::Observer>& observer, const std::shared_ptr<irc::Connection> &connection, irc_session_t *session)
 {
-    std::shared_ptr<Messenger> messenger(new Messenger{observer, session});
+    std::shared_ptr<Messenger> messenger(new Messenger{observer, connection, session});
     return messenger;
 }
 
@@ -48,6 +55,7 @@
     auto chat = get_chat(channel);
     if (!chat) {
         messaging::Members initial_invitees;
+        initial_invitees.push_back(std::make_shared<messaging::Member>(connection->self_identifier(), messaging::PendingStatus::Remote));
         std::string initial_title;
         announce_new_group_invitation_received(std::make_shared<messaging::Group>(channel, initial_invitees, initial_title, std::make_shared<messaging::Member>(the_creator)));
     }
@@ -58,6 +66,9 @@
     messaging::Message api_message;
     api_message.sender = sender;
     api_message.message = message;
+    boost::uuids::uuid uuid = boost::uuids::random_generator()();
+    api_message.id = boost::lexical_cast<std::string>(uuid);
+
     auto chat = get_chat(sender);
     if (chat) {
         dynamic_pointer_cast<irc::ContactChat>(chat)->handle_incoming_message(api_message);
@@ -71,6 +82,9 @@
     messaging::Message api_message;
     api_message.sender = sender;
     api_message.message = message;
+    boost::uuids::uuid uuid = boost::uuids::random_generator()();
+    api_message.id = boost::lexical_cast<std::string>(uuid);
+
     auto chat = get_chat(channel);
     if (chat) {
         dynamic_pointer_cast<irc::GroupChat>(chat)->handle_incoming_message(api_message);
@@ -101,3 +115,8 @@
 
     return std::dynamic_pointer_cast<irc::GroupManager>(group_manager);
 }
+    
+void irc::Messenger::remove_chat(const std::string &chat_id)
+{
+    chats().erase(chat_id); 
+}