From d2e189102b643f38418f3caf065dbb91f2ce4266 Mon Sep 17 00:00:00 2001
From: attilamolnar <attilamolnar@hush.com>
Date: Sun, 17 Jun 2012 17:53:39 +0200
Subject: Fix pending invites not being removed when a channel was deleted or
 had its TS lowered

---
 src/channels.cpp | 88 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 88 insertions(+)

(limited to 'src/channels.cpp')

diff --git a/src/channels.cpp b/src/channels.cpp
index 4a927cedb..f1dba5315 100644
--- a/src/channels.cpp
+++ b/src/channels.cpp
@@ -172,6 +172,8 @@ void Channel::DelUser(User* user)
 			FOREACH_MOD(I_OnChannelDelete, OnChannelDelete(this));
 			ServerInstance->chanlist->erase(iter);
 		}
+
+		ClearInvites();
 		ServerInstance->GlobalCulls.AddItem(this);
 	}
 }
@@ -969,3 +971,89 @@ void Channel::RemoveAllPrefixes(User* user)
 		m->second->modes.clear();
 	}
 }
+
+void Invitation::Create(Channel* c, LocalUser* u, time_t timeout)
+{
+	if ((timeout != 0) && (ServerInstance->Time() >= timeout))
+		// Expired, don't bother
+		return;
+
+	ServerInstance->Logs->Log("INVITATION", DEBUG, "Invitation::Create chan=%s user=%s", c->name.c_str(), u->uuid.c_str());
+
+	Invitation* inv = Invitation::Find(c, u, false);
+	if (inv)
+	{
+		 if ((inv->expiry == 0) || (inv->expiry > timeout))
+			return;
+		inv->expiry = timeout;
+		ServerInstance->Logs->Log("INVITATION", DEBUG, "Invitation::Create changed expiry in existing invitation %p", (void*) inv);
+	}
+	else
+	{
+		inv = new Invitation(c, u, timeout);
+		c->invites.push_back(inv);
+		u->invites.push_back(inv);
+		ServerInstance->Logs->Log("INVITATION", DEBUG, "Invitation::Create created new invitation %p", (void*) inv);
+	}
+}
+
+Invitation* Invitation::Find(Channel* c, LocalUser* u, bool check_expired)
+{
+	ServerInstance->Logs->Log("INVITATION", DEBUG, "Invitation::Find chan=%s user=%s check_expired=%d", c ? c->name.c_str() : "NULL", u ? u->uuid.c_str() : "NULL", check_expired);
+	if (!u || u->invites.empty())
+		return NULL;
+
+	InviteList locallist;
+	locallist.swap(u->invites);
+
+	Invitation* result = NULL;
+	for (InviteList::iterator i = locallist.begin(); i != locallist.end(); )
+	{
+		Invitation* inv = *i;
+		if ((check_expired) && (inv->expiry != 0) && (inv->expiry <= ServerInstance->Time()))
+		{
+			/* Expired invite, remove it. */
+			ServerInstance->Logs->Log("INVITATION", DEBUG, "Invitation::Find ecountered expired entry: %p timed out at %lu", (void*) inv, inv->expiry);
+			i = locallist.erase(i);
+			inv->cull();
+			delete inv;
+		}
+		else
+		{
+			/* Is it what we're searching for? */
+			if (inv->chan == c)
+			{
+				result = inv;
+				break;
+			}
+			++i;
+		}
+	}
+
+	locallist.swap(u->invites);
+	ServerInstance->Logs->Log("INVITATION", DEBUG, "Invitation::Find result=%p", (void*) result);
+	return result;
+}
+
+Invitation::~Invitation()
+{
+	// Remove this entry from both lists
+	InviteList::iterator it = std::find(chan->invites.begin(), chan->invites.end(), this);
+	if (it != chan->invites.end())
+		chan->invites.erase(it);
+	it = std::find(user->invites.begin(), user->invites.end(), this);
+	if (it != user->invites.end())
+		user->invites.erase(it);
+}
+
+void InviteBase::ClearInvites()
+{
+	ServerInstance->Logs->Log("INVITEBASE", DEBUG, "InviteBase::ClearInvites %p", (void*) this);
+	InviteList locallist;
+	locallist.swap(invites);
+	for (InviteList::const_iterator i = locallist.begin(); i != locallist.end(); ++i)
+	{
+		(*i)->cull();
+		delete *i;
+	}
+}
-- 
cgit v1.2.3