summary refs log tree commit diff
diff options
context:
space:
mode:
authorJune McEnroe <june@causal.agency>2020-02-25 02:54:15 -0500
committerJune McEnroe <june@causal.agency>2020-02-25 02:54:15 -0500
commite9524b4af39e6b83acd2a54d67dfec3c3a41d8cc (patch)
tree12addbf469a1cbf814fdb6f7a34ef3d93be87137
parentFix handling EXCEPTS and INVEX without values (diff)
downloadcatgirl-e9524b4af39e6b83acd2a54d67dfec3c3a41d8cc.tar.gz
catgirl-e9524b4af39e6b83acd2a54d67dfec3c3a41d8cc.zip
Handle changing setParamModes, paramModes and other channel modes
-rw-r--r--handle.c42
1 files changed, 39 insertions, 3 deletions
diff --git a/handle.c b/handle.c
index 9a0be57..4cb0e94 100644
--- a/handle.c
+++ b/handle.c
@@ -488,6 +488,18 @@ static void handleTopic(struct Message *msg) {
 	}
 }
 
+static const char *ModeNames[256] = {
+	['i'] = "invite-only",
+	['k'] = "key",
+	['l'] = "client limit",
+	['m'] = "moderated",
+	['n'] = "no external messages",
+	['o'] = "operator",
+	['s'] = "secret",
+	['t'] = "protected topic",
+	['v'] = "voice",
+};
+
 static void handleMode(struct Message *msg) {
 	require(msg, true, 2);
 	if (!strchr(network.chanTypes, msg->params[0][0])) {
@@ -500,6 +512,8 @@ static void handleMode(struct Message *msg) {
 	uint param = 2;
 	char buf[1024] = "";
 	for (char *ch = msg->params[1]; *ch; ++ch) {
+		const char *name = ModeNames[(byte)*ch];
+		if (!name) name = (const char[]) { *ch, '\0' };
 		if (*ch == '+') {
 			set = true;
 		} else if (*ch == '-') {
@@ -541,11 +555,33 @@ static void handleMode(struct Message *msg) {
 			);
 
 		} else if (strchr(network.paramModes, *ch)) {
-			// TODO
+			assert(param < ParamCap);
+			catf(
+				buf, sizeof(buf), ", %ssets \3%02d%s\3 %s %s %s",
+				(set ? "" : "un"), hash(msg->params[0]), msg->params[0], name,
+				(set ? "to" : "from"), msg->params[param++]
+			);
+
 		} else if (strchr(network.setParamModes, *ch)) {
-			// TODO
+			if (set) {
+				assert(param < ParamCap);
+				catf(
+					buf, sizeof(buf), ", sets \3%02d%s\3 %s to %s",
+					hash(msg->params[0]), msg->params[0], name,
+					msg->params[param++]
+				);
+			} else {
+				catf(
+					buf, sizeof(buf), ", unsets \3%02d%s\3 %s",
+					hash(msg->params[0]), msg->params[0], name
+				);
+			}
+
 		} else {
-			// TODO
+			catf(
+				buf, sizeof(buf), ", %ssets \3%02d%s\3 %s",
+				(set ? "" : "un"), hash(msg->params[0]), msg->params[0], name
+			);
 		}
 	}
 	if (strlen(buf) < 2) return;
19-11-10 20:12:25 -0500'>2019-11-10Filter invite-notifyJune McEnroe 2019-11-10Add capsicum note to READMEJune McEnroe 2019-11-10Filter extended-joinJune McEnroe 2019-11-10Expand client configuration documentation and list capabilitiesJune McEnroe 2019-11-10Request all supported caps from serverJune McEnroe 2019-11-10Filter ACCOUNT, AWAY, CHGHOST for incapable clientsJune McEnroe 2019-11-10Rename listen to localJune McEnroe 2019-11-09Remove extended-join and invite-notifyJune McEnroe The remaining caps only generate new commands which can easily be filtered out when sending to clients so will be in the first pass of support. extended-join is probably safe to pass through unaltered, just causing extraneous parameters on JOIN commands, but maybe not. invite-notify reuses the INVITE command where the invited user is not self. 2019-11-09Maintain stateCaps and offer them to clientsJune McEnroe 2019-11-09Parse capabilitiesJune McEnroe The list that I've defined are the ones that I expect to be able to enable probably without any clients breaking... And of course server-time which pounce implements itself. 2019-11-09Avoid the reserved _A names with BIT macroJune McEnroe 2019-11-09Define macro for bit flag enumsJune McEnroe 2019-11-08Check that password is hashedJune McEnroe 2019-11-08Avoid calling getopt_long again after it returns -1June McEnroe On GNU, calling getopt_long again will reset optind back to the first non-option argument, which would cause an infinite loop of reading the same configurtion file forever. 2019-11-08Only change AWAY status for registered clientsJune McEnroe Turns out I did eventually fix this, because I may want to implement "passive clients" for logging or notification stuff, which wouldn't affect AWAY status either. 2019-11-07Just write the example normallyJune McEnroe 2019-11-07Include path in readlinkat errorJune McEnroe 2019-11-07Call clientConsume before clientRecvJune McEnroe This might reduce the frequency of a client getting its own message back because it was behind in the ring when it sent it. 2019-11-06Use -l:filename in Linux.mkJune McEnroe 2019-11-06Fix compat.h for #defined strlcpyJune McEnroe 2019-11-06Allow unsetting LIBRESSL_PREFIXJune McEnroe 2019-11-06Document calico service configurationJune McEnroe 2019-11-06Document SASL EXTERNAL configuration in more detailJune McEnroe 2019-11-06Document pounce service configurationJune McEnroe 2019-11-06Mention Darwin and GNU/Linux in READMEJune McEnroe 2019-11-06Assume LibreSSL from brew on DarwinJune McEnroe 2019-11-06Remove -DNO_EXPLICIT_BZERO from Darwin.mkJune McEnroe 2019-11-06Don't install rc scripts or dirs on LinuxJune McEnroe