From 49702c621eed54caee6a45c0518d68a33bca8f92 Mon Sep 17 00:00:00 2001
From: Sadie Powell
Date: Tue, 30 Mar 2021 17:52:02 +0100
Subject: Convert various mode methods to take Mode::Change.

- AccessCheck
- AfterMode
- BeforeMode
- OnModeChange
- OnRawMode
---
 src/channels.cpp | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'src/channels.cpp')

diff --git a/src/channels.cpp b/src/channels.cpp
index a33ea03db..8dc67ad52 100644
--- a/src/channels.cpp
+++ b/src/channels.cpp
@@ -153,7 +153,8 @@ void Channel::SetDefaultModes()
 			if ((mode->NeedsParam(true)) && (parameter.empty()))
 				continue;
 
-			mode->OnModeChange(ServerInstance->FakeClient, ServerInstance->FakeClient, this, parameter, true);
+			Modes::Change modechange(mode, true, parameter);
+			mode->OnModeChange(ServerInstance->FakeClient, ServerInstance->FakeClient, this, modechange);
 		}
 	}
 }
@@ -264,9 +265,9 @@ Membership* Channel::ForceJoin(User* user, const std::string* privs, bool bursti
 			PrefixMode* mh = ServerInstance->Modes.FindPrefixMode(*i);
 			if (mh)
 			{
-				std::string nick = user->nick;
-				// Set the mode on the user
-				mh->OnModeChange(ServerInstance->FakeClient, NULL, this, nick, true);
+				// Set the mode on the user.
+				Modes::Change modechange(mh, true, user->nick);
+				mh->OnModeChange(ServerInstance->FakeClient, NULL, this, modechange);
 			}
 		}
 	}
-- 
cgit v1.3.1-10-gc9f91