diff options
| author | Attila Molnar <attilamolnar@hush.com> | 2012-06-27 16:29:21 -0700 |
|---|---|---|
| committer | Attila Molnar <attilamolnar@hush.com> | 2012-06-27 16:29:21 -0700 |
| commit | f89e68d78684dab66f9c99aaf8bd8a37ec62bfce (patch) | |
| tree | cdabc56abaf267f501308be387269bed655ac724 /include/users.h | |
| parent | b1dedaba2400b7ce7acfa98b9a63fd54ae674a41 (diff) | |
| parent | d2e189102b643f38418f3caf065dbb91f2ce4266 (diff) | |
Merge pull request #235 from attilamolnar/insp20+invitefix
Diffstat (limited to 'include/users.h')
| -rw-r--r-- | include/users.h | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/include/users.h b/include/users.h index cdc0d8078..66e867ad0 100644 --- a/include/users.h +++ b/include/users.h @@ -29,6 +29,7 @@ #include "inspsocket.h" #include "dns.h" #include "mode.h" +#include "membership.h" /** connect class types */ @@ -740,14 +741,8 @@ class CoreExport UserIOHandler : public StreamSocket typedef unsigned int already_sent_t; -class CoreExport LocalUser : public User +class CoreExport LocalUser : public User, public InviteBase { - /** A list of channels the user has a pending invite to. - * Upon INVITE channels are added, and upon JOIN, the - * channels are removed from this list. - */ - InvitedList invites; - public: LocalUser(int fd, irc::sockets::sockaddrs* client, irc::sockets::sockaddrs* server); CullResult cull(); @@ -835,7 +830,7 @@ class CoreExport LocalUser : public User /** Returns the list of channels this user has been invited to but has not yet joined. * @return A list of channels the user is invited to */ - InvitedList* GetInviteList(); + InviteList& GetInviteList(); /** Returns true if a user is invited to a channel. * @param channel A channel name to look up @@ -856,6 +851,8 @@ class CoreExport LocalUser : public User */ void RemoveInvite(const irc::string &channel); + void RemoveExpiredInvites(); + /** Returns true or false for if a user can execute a privilaged oper command. * This is done by looking up their oper type from User::oper, then referencing * this to their oper classes and checking the commands they can execute. |