From f2e3fd5952b23209b084bde4f464e6643c8a00ff Mon Sep 17 00:00:00 2001
From: Matt Schatz
Date: Tue, 8 Jan 2019 03:03:53 -0700
Subject: Improve X-line text consistency.

- Change any "-Line", ":Line", or "*line" to "-line" throughout
the X-line code, comments, and documentation.
- Add periods to the end of some notices.
- Correct a typo in the Q-line code comments.
- Update the filter module documentation (shun addition).

Co-authored-by: Robby <robby@chatbelgie.be>
---
 src/usermanager.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/usermanager.cpp')

diff --git a/src/usermanager.cpp b/src/usermanager.cpp
index 6f9d15502..a70a00085 100644
--- a/src/usermanager.cpp
+++ b/src/usermanager.cpp
@@ -132,7 +132,7 @@ void UserManager::AddUser(int socket, ListenSocket* via, irc::sockets::sockaddrs
 				New->WriteNumeric(ERR_YOUREBANNEDCREEP, ServerInstance->Config->XLineMessage);
 
 			if (ServerInstance->Config->HideBans)
-				this->QuitUser(New, b->Type + "-Lined", &b->Reason);
+				this->QuitUser(New, b->Type + "-lined", &b->Reason);
 			else
 				this->QuitUser(New, b->Reason);
 			return;
-- 
cgit v1.3.1-10-gc9f91


From 0a1f9bc59494a532a91bc9c8afcecb31ece656ee Mon Sep 17 00:00:00 2001
From: Peter Powell
Date: Sun, 20 Jan 2019 09:52:38 +0000
Subject: Call the OnUserInit hook from earlier in UserManager::AddUser.

This fixes messages being lost when sending them to a user who has
only just connected to the server.
---
 src/usermanager.cpp | 3 +--
 src/users.cpp       | 4 ++++
 2 files changed, 5 insertions(+), 2 deletions(-)

(limited to 'src/usermanager.cpp')

diff --git a/src/usermanager.cpp b/src/usermanager.cpp
index a70a00085..053a308cb 100644
--- a/src/usermanager.cpp
+++ b/src/usermanager.cpp
@@ -76,6 +76,7 @@ void UserManager::AddUser(int socket, ListenSocket* via, irc::sockets::sockaddrs
 	this->clientlist[New->nick] = New;
 	this->AddClone(New);
 	this->local_users.push_front(New);
+	FOREACH_MOD(OnUserInit, (New));
 
 	if (!SocketEngine::AddFd(eh, FD_WANT_FAST_READ | FD_WANT_EDGE_WRITE))
 	{
@@ -162,8 +163,6 @@ void UserManager::AddUser(int socket, ListenSocket* via, irc::sockets::sockaddrs
 	FOREACH_MOD(OnSetUserIP, (New));
 	if (New->quitting)
 		return;
-
-	FOREACH_MOD(OnUserInit, (New));
 }
 
 void UserManager::QuitUser(User* user, const std::string& quitreason, const std::string* operreason)
diff --git a/src/users.cpp b/src/users.cpp
index a0b9c9d03..eb87824fc 100644
--- a/src/users.cpp
+++ b/src/users.cpp
@@ -804,7 +804,11 @@ void LocalUser::Write(const ClientProtocol::SerializedMessage& text)
 void LocalUser::Send(ClientProtocol::Event& protoev)
 {
 	if (!serializer)
+	{
+		ServerInstance->Logs->Log("USERS", LOG_DEBUG, "BUG: LocalUser::Send() called on %s who does not have a serializer!",
+			GetFullRealHost().c_str());
 		return;
+	}
 
 	// In the most common case a static LocalUser field, sendmsglist, is passed to the event to be
 	// populated. The list is cleared before returning.
-- 
cgit v1.3.1-10-gc9f91