summary refs log tree commit diff
diff options
context:
space:
mode:
authorJune McEnroe <june@causal.agency>2020-02-26 03:15:14 -0500
committerJune McEnroe <june@causal.agency>2020-02-26 03:15:14 -0500
commitfe0d18a3a9fe27d56f8551c5fe91aeca5e1b415b (patch)
tree0449eb94db7345c7356e4b4a218a2e92e80787bc
parentSupport batch (diff)
downloadpounce-fe0d18a3a9fe27d56f8551c5fe91aeca5e1b415b.tar.gz
pounce-fe0d18a3a9fe27d56f8551c5fe91aeca5e1b415b.zip
Support labeled-response
-rw-r--r--bounce.h7
-rw-r--r--client.c5
-rw-r--r--pounce.11
3 files changed, 12 insertions, 1 deletions
diff --git a/bounce.h b/bounce.h
index 4718cce..e87d7bb 100644
--- a/bounce.h
+++ b/bounce.h
@@ -73,6 +73,7 @@ static inline struct Message parse(char *line) {
 	X("chghost", CapChghost) \
 	X("extended-join", CapExtendedJoin) \
 	X("invite-notify", CapInviteNotify) \
+	X("labeled-response", CapLabeledResponse) \
 	X("message-tags", CapMessageTags) \
 	X("multi-prefix", CapMultiPrefix) \
 	X("sasl", CapSASL) \
@@ -84,7 +85,11 @@ enum Cap {
 #define X(name, id) BIT(id),
 	ENUM_CAP
 #undef X
-	TagCaps = CapAccountTag | CapBatch | CapMessageTags | CapServerTime,
+	TagCaps = CapAccountTag
+		| CapBatch
+		| CapLabeledResponse
+		| CapMessageTags
+		| CapServerTime,
 };
 
 static const char *CapNames[] = {
diff --git a/client.c b/client.c
index d890cb9..61cd7d0 100644
--- a/client.c
+++ b/client.c
@@ -437,6 +437,10 @@ static const char *filterInviteNotify(const char *line) {
 	return (wordcmp(line, 1, stateNick()) ? NULL : line);
 }
 
+static const char *filterLabeledResponse(const char *line) {
+	return (wordcmp(line, 0, "ACK") ? line : NULL);
+}
+
 static const char *filterMessageTags(const char *line) {
 	return (wordcmp(line, 0, "TAGMSG") ? line : NULL);
 }
@@ -483,6 +487,7 @@ static Filter *Filters[] = {
 	[CapChghostBit] = filterChghost,
 	[CapExtendedJoinBit] = filterExtendedJoin,
 	[CapInviteNotifyBit] = filterInviteNotify,
+	[CapLabeledResponseBit] = filterLabeledResponse,
 	[CapMessageTagsBit] = filterMessageTags,
 	[CapMultiPrefixBit] = filterMultiPrefix,
 	[CapUserhostInNamesBit] = filterUserhostInNames,
diff --git a/pounce.1 b/pounce.1
index 59e94b6..470324d 100644
--- a/pounce.1
+++ b/pounce.1
@@ -344,6 +344,7 @@ is supported:
 .Sy chghost ,
 .Sy extended-join ,
 .Sy invite-notify ,
+.Sy labeled-response ,
 .Sy message-tags ,
 .Sy multi-prefix ,
 .Sy server-time ,
der'>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