circo

commit 1e1a6f72d40cb56cb874267efe6f4e7f59a0d3fc
parent ae6ad8a04b9e9e5ea7393be640ac28f57c3c2a65
Author: Claudio Alessi <smoppy@gmail.com>
Date:   Fri, 23 Jun 2023 00:04:06 +0200

Partially strip IRC formatting to fix broken text.

Support may be added in future but for now let's strip formats to prevent text
to be broken or characters to be missing.

Colors and hex colors are not stripped yet.

Diffstat:
M
circo.c
 | 
36
++++++++++++++++++++++++++++++++++++

1 file changed, 36 insertions(+), 0 deletions(-)
diff --git a/circo.c b/circo.c
@@ -222,6 +222,7 @@ void sigwinch(int unused);
 char *skip(char *s, char c);
 void sout(char *fmt, ...);
 void spawn(const char **cmd);
+void stripformats(char *s);
 void trim(char *s);
 int uiset(char *buf, int index);
 void usage(void);
@@ -1265,8 +1266,14 @@ parsesrv(void) {
 	skip(cmd, '\r');
 	par = skip(cmd, ' ');
 	txt = skip(par, ':');
+
 	trim(txt);
 	trim(par);
+
+	/* IRC formatting may be supported at some point in the future. For now
+	 * just strip that out to keep things simple. */
+	stripformats(txt);
+
 	for(int i = 0; i < LENGTH(messages); ++i) {
 		if(!strcmp(messages[i].name, cmd)) {
 			if(messages[i].func)
@@ -1543,6 +1550,8 @@ run(void) {
 		}
 		else {
 			if(srv && FD_ISSET(fileno(srv), &rd)) {
+				/* TODO: we should keep reading until CRLF is found. Only at that
+				 * point parsesrv(), sendident(), etc. should be called. */
 				if(fgets(bufin, sizeof bufin, srv) == NULL) {
 					for(b = buffers; b; b = b->next)
 						bprintf_prefixed(b, "%s.\n", online
@@ -1670,6 +1679,33 @@ spawn(const char **cmd) {
 	}
 }
 
+/* https://modern.ircdocs.horse/formatting.html */
+void
+stripformats(char *s) {
+	char *p = s;
+
+	while(*p) {
+		switch(*p) {
+		case 0x02: /* bold */
+		case 0x1D: /* italic */
+		case 0x1F: /* underline */
+		case 0x1E: /* strikethrough */
+		case 0x11: /* monospace */
+		case 0x16: /* reverse */
+			++p;
+			break;
+		case 0x03: /* colors */
+		case 0x04: /* hex colors */
+			/* TODO: these need actual parsing. To be implemented soon. */
+			break;
+		}
+
+		*s = *p;
+		++p;
+		++s;
+	}
+}
+
 void
 trim(char *s) {
 	char *e;