X-Git-Url: https://jfr.im/git/solanum.git/blobdiff_plain/9dd128b4da6e54ca9f97cfcd48e345a57790ffbe..1548c140218b956485b3fd5c386447a2add59864:/modules/core/m_join.c

diff --git a/modules/core/m_join.c b/modules/core/m_join.c
index b155677c..c5cac107 100644
--- a/modules/core/m_join.c
+++ b/modules/core/m_join.c
@@ -374,7 +374,7 @@ m_join(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p
 			sendto_one(source_p, form_str(RPL_TOPICWHOTIME),
 				   me.name, source_p->name, chptr->chname,
 				   chptr->topic_info,
-				   (unsigned long)chptr->topic_time);
+				   (long long)chptr->topic_time);
 		}
 
 		channel_member_names(chptr, source_p, 1);
@@ -1041,6 +1041,10 @@ send_join_error(struct Client *source_p, int numeric, const char *name)
 		NORMAL_NUMERIC(ERR_NEEDREGGEDNICK);
 		NORMAL_NUMERIC(ERR_THROTTLE);
 
+		case ERR_USERONCHANNEL:
+			sendto_one_numeric(source_p, ERR_USERONCHANNEL,
+					form_str(ERR_USERONCHANNEL), source_p->name, name);
+			break;
 		default:
 			sendto_one_numeric(source_p, numeric,
 					"%s :Cannot join channel", name);