summary refs log tree commit diff
diff options
context:
space:
mode:
authorJune McEnroe <june@causal.agency>2019-11-10 18:13:52 -0500
committerJune McEnroe <june@causal.agency>2019-11-10 18:13:52 -0500
commitdbfe19bb701fdef6e5a7d5d73c0856cac741d82e (patch)
tree08b59b4cd13bafa822bd006421d96ceea619e78b
parentRename listen to local (diff)
downloadpounce-dbfe19bb701fdef6e5a7d5d73c0856cac741d82e.tar.gz
pounce-dbfe19bb701fdef6e5a7d5d73c0856cac741d82e.zip
Filter ACCOUNT, AWAY, CHGHOST for incapable clients
-rw-r--r--client.c42
1 files changed, 42 insertions, 0 deletions
diff --git a/client.c b/client.c
index 40bba1c..ec07b91 100644
--- a/client.c
+++ b/client.c
@@ -275,10 +275,52 @@ size_t clientDiff(const struct Client *client) {
 	return ringDiff(client->consumer);
 }
 
+typedef const char *Filter(const char *line);
+
+static const char *cmd(const char *line) {
+	static char buf[512];
+	if (*line == ':') {
+		line += strcspn(line, " ");
+		if (*line) line++;
+	}
+	snprintf(buf, sizeof(buf), "%.*s", (int)strcspn(line, " "), line);
+	return buf;
+}
+
+static const char *filterAccountNotify(const char *line) {
+	return (strcmp(cmd(line), "ACCOUNT") ? line : NULL);
+}
+
+static const char *filterAwayNotify(const char *line) {
+	return (strcmp(cmd(line), "AWAY") ? line : NULL);
+}
+
+static const char *filterChghost(const char *line) {
+	return (strcmp(cmd(line), "CHGHOST") ? line : NULL);
+}
+
+static Filter *Filters[] = {
+	[CapAccountNotifyBit] = filterAccountNotify,
+	[CapAwayNotifyBit] = filterAwayNotify,
+	[CapChghostBit] = filterChghost,
+};
+
 void clientConsume(struct Client *client) {
 	time_t time;
 	const char *line = ringPeek(&time, client->consumer);
 	if (!line) return;
+
+	enum Cap diff = client->caps ^ stateCaps;
+	for (size_t i = 0; line && i < ARRAY_LEN(Filters); ++i) {
+		if (!Filters[i]) continue;
+		if (diff & (1 << i)) line = Filters[i](line);
+	}
+	if (!line) {
+		ringConsume(NULL, client->consumer);
+		return;
+	}
+
+	// TODO: Move into a filter?
 	if (client->caps & CapServerTime) {
 		char ts[sizeof("YYYY-MM-DDThh:mm:ss.sssZ")];
 		struct tm *tm = gmtime(&time);
light'> 2021-09-23Add quickJune McEnroe 2021-09-23Add The HobbitJune McEnroe Surprisingly good for something written by a man like a hundred years ago! 2021-09-22Remove PSF fontsJune McEnroe They were fun to make but I never actually used them. 2021-09-22Remove Linux-specific utilitiesJune McEnroe I haven't used these in ages. 2021-09-22Call sandbox in CGI modeJune McEnroe Otherwise upload won't actually work. 2021-09-22Support HTTP PUT in upJune McEnroe For use by Palaver[1]. Unfortunately, at least in the current App Store version of Palaver, this doesn't work correctly with basic auth. [1]: https://palaverapp.com/guides/commands/set.html#ui-image_service 2021-09-22Remove default faviconJune McEnroe I hate these things and also this one sucks. 2021-09-21Use Z_FILTERED strategyJune McEnroe 2021-09-21Recalculate various lengths only as neededJune McEnroe This actually speeds things up quite a bit, saving roughly a second on a big PNG screenshot. Almost all the remaining time is spent in deflate. 2021-09-21Rewrite pngo, add explicit optionsJune McEnroe Interesting to see how my code habits have changed. 2021-09-16Fix /* **/ comment matchingJune McEnroe 2021-09-15Remove typer, add downgrade to READMEJune McEnroe 2021-09-15Set bot mode on downgradeJune McEnroe 2021-09-15Enter capsicum in downgradeJune McEnroe 2021-09-15Factor out common parts of downgrade messagesJune McEnroe Also bump the message cap to 1024 because that is ostensibly useful for replying to older messages. 2021-09-14Add downgrade IRC botJune McEnroe 2021-09-14Sort by title if authors matchJune McEnroe There are probably better things to sort by but title definitely always exists. 2021-09-13Swap-remove tags as they're foundJune McEnroe This makes it even faster. From ~1s on a sqlite3.c amalgamation to ~0.85s. 2021-09-12Replace htagml regex with strncmpJune McEnroe Since ctags only ever produces regular expressions of the form /^re$/ or /^re/ with no other special characters, instead unescape the pattern and simply use strncmp. Running on a sqlite3.c amalgamation, the regex version takes ~37s while the strncmp version takes ~1s, producing identical output. Big win! 2021-09-11Also defer printing comment for lone close-parensJune McEnroe 2021-09-10Publish "git-comment"June McEnroe 2021-09-10Add git comment --pretty optionJune McEnroe 2021-09-08Defer printing comment if line is blank or closing braceJune McEnroe This fixes badly indented comments. 2021-09-08Up default min-repeat to 30 linesJune McEnroe 2021-09-08Handle dirty lines in git-commentJune McEnroe 2021-09-08Document and install git-commentJune McEnroe 2021-09-08Add repeat and all options to git-commentJune McEnroe 2021-09-08Add group threshold to git-commentJune McEnroe