Refactor port binding, warning not yet tested fully

[user/henk/code/inspircd.git] / include / channels.h

diff --git a/include/channels.h b/include/channels.h
index 7daab2167c72509a43f18000d49186c1567bf6f0..f68f838894e8defb9460763bd09f99c1bc10f049 100644 (file)
--- a/include/channels.h
+++ b/include/channels.h
@@ -69,7 +69,7 @@ typedef std::vector<BanItem>  BanList;
 
 /** A list of users on a channel
  */
-typedef std::map<userrec*,userrec*> CUList;
+typedef std::map<userrec*,std::string> CUList;
 
 /** Shorthand for CUList::iterator
  */
@@ -352,7 +352,7 @@ class chanrec : public Extensible
         * been created if the channel did not exist before the user was joined to it.
         * If the user could not be joined to a channel, the return value may be NULL.
         */
-       static chanrec* JoinUser(InspIRCd* ServerInstance, userrec *user, const char* cn, bool override, const char* key = "");
+       static chanrec* JoinUser(InspIRCd* ServerInstance, userrec *user, const char* cn, bool override, const char* key, time_t TS = 0);
 
        /** Write to a channel, from a user, using va_args for text
         * @param user User whos details to prefix the line with
@@ -436,8 +436,10 @@ class chanrec : public Extensible
 
        /** Spool the NAMES list for this channel to the given user
         * @param user The user to spool the NAMES list to
+        * @param ulist The user list to send, NULL to use the
+        * channel's default names list of everyone
         */
-       void UserList(userrec *user);
+       void UserList(userrec *user, CUList* ulist = NULL);
 
        /** Get the number of invisible users on this channel
         * @return Number of invisible users