X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fnetsplit.h;h=6e96fd4e52c55bc004a114b25032942cdedbf270;hp=d9b2cf2264129fede75580539f916d4965a6ae11;hb=393ac8b4bca9db98f297cb4756ef2e79364bf6f0;hpb=1489728cd358f6bf7151bcdd87b9ea2cbdff7bec

diff --git a/src/core/netsplit.h b/src/core/netsplit.h
index d9b2cf22..6e96fd4e 100644
--- a/src/core/netsplit.h
+++ b/src/core/netsplit.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-09 by the Quassel Project                          *
+ *   Copyright (C) 2005-2010 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -21,16 +21,20 @@
 #ifndef NETSPLIT_H
 #define NETSPLIT_H
 
-#include <QObject>
 #include <QTimer>
 #include <QHash>
+#include <QPair>
 #include <QStringList>
 
+class Network;
+
 class Netsplit : public QObject
 {
   Q_OBJECT
 public:
-  Netsplit();
+  Netsplit(Network *network, QObject *parent = 0);
+
+  inline Network *network() const { return _network; }
 
   //! Add a user to the netsplit
   /** Call this method if you noticed a netsplit.
@@ -45,14 +49,32 @@ public:
 
   //! Remove a user from the netsplit
   /** Call this method if a user joined after a netsplit occured.
-
     *
     * \param sender   The sender string of the joined user
-    * \param channels The channels that user shares with us
+    * \param channel The channel that user shares with us
     * \return true if user was found in the netsplit
     */
   bool userJoined(const QString &sender, const QString &channel);
 
+  //! Check if user has joined since netsplit
+  /** This method shows if a user has already joined after being hit by netsplit
+    * \note The method doesn't check if the user was recorded in the netsplit!
+    *
+    * \param sender   The sender string of the user
+    * \param channel  The channel the user shares with us
+    * \return true if user joined after a netsplit
+    */
+  bool userAlreadyJoined(const QString &sender, const QString &channel);
+
+  //! Add mode to user
+  /** Use this method to buffer userspecific channel modes until netsplitJoin is emitted.
+    *
+    * \param sender   The sender string of the user
+    * \param channel  The channel the user shares with us
+    * \return true if user joined after a netsplit
+    */
+  void addMode(const QString &sender, const QString &channel, const QString &mode);
+
   //! Check if a string matches the criteria for a netsplit
   /** \param quitMessage The message to be checked
     * \return true if the message is a netsplit
@@ -61,22 +83,34 @@ public:
 
 signals:
   //! A bulk-join of netsplitted users timed out
-  /** Whenever _joinTimer() times out, we consider the bulk-join to be finished and emit that signal
-    * for every channel
+  /** Whenever the internal join-timer times out, we consider the bulk-join to be finished and emit that signal
+    * for every channel. This is the end of a netsplit.
+    * \param net     The network
     * \param channel The IRC channel
     * \param users   A list of all users that joined that channel
+    * \param modes   A list of all modes the users got set after joining again
     * \param quitMessage The Quitmessage and thus the servers that got split
     */
-  void netsplitJoin(const QString &channel, const QStringList &users, const QString &quitMessage);
+  void netsplitJoin(Network *net, const QString &channel, const QStringList &users, const QStringList &modes, const QString &quitMessage);
+
+  //! A (probably bulk-) join of netsplitted users.
+  /** If users hit by the split joined before the netsplit is considered over, join the users with a normal join.
+    * \param net     The network
+    * \param channel The IRC channel
+    * \param users   A list of all users that joined that channel
+    * \param modes   A list of all modes the users got set after joining again
+    */
+  void earlyJoin(Network *net, const QString &channel, const QStringList &users, const QStringList &modes);
 
   //! A bulk-quit of netsplitted users timed out
-  /** Whenever _quitTimer() times out, we consider the bulk-quit to be finished and emit that signal
-    * for every channel
+  /** Whenever the internal quit-timer times out, we consider the bulk-quit to be finished and emit that signal
+    * for every channel.
+    * \param net     The network
     * \param channel The IRC channel
     * \param users   A list of all users that quitted in that channel
     * \param quitMessage The Quitmessage and thus the servers that got split
     */
-  void netsplitQuit(const QString &channel, const QStringList &users, const QString &quitMessage);
+  void netsplitQuit(Network *net, const QString &channel, const QStringList &users, const QString &quitMessage);
 
   //! The Netsplit is considered finished
   /** This signal is emitted right after all netsplitJoin signals have been sent or whenever the
@@ -90,13 +124,19 @@ private slots:
   void quitTimeout();
 
 private:
+  Network *_network;
   QString _quitMsg;
-  QHash<QString, QStringList> _joins;
+  // key: channel name
+  // value: senderstring, list of modes
+  QHash<QString, QPair<QStringList, QStringList> > _joins;
   QHash<QString, QStringList> _quits;
+  QHash<QString, QStringList> _quitsWithMessageSent;
   bool _sentQuit;
   QTimer _joinTimer;
   QTimer _quitTimer;
   QTimer _discardTimer;
+  int _joinCounter;
+  int _quitCounter;
 };
 
 #endif // NETSPLIT_H