summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--catgirl.14
-rw-r--r--input.c7
2 files changed, 8 insertions, 3 deletions
diff --git a/catgirl.1 b/catgirl.1
index c7dd091..4d8176f 100644
--- a/catgirl.1
+++ b/catgirl.1
@@ -1,4 +1,4 @@
-.Dd February 26, 2019
+.Dd July 2, 2019
 .Dt CATGIRL 1
 .Os
 .
@@ -113,7 +113,7 @@ may be used to abbreviate a command.
 .
 .Ss Chat Commands
 .Bl -tag -width Ds
-.It Ic /join Ar chan
+.It Ic /join Ar chan Op Ar key
 Join a channel.
 .
 .It Ic /me Op Ar action
diff --git a/input.c b/input.c
index bbbc0d3..024941d 100644
--- a/input.c
+++ b/input.c
@@ -42,7 +42,12 @@ typedef void Handler(struct Tag tag, char *params);
 
 static void inputJoin(struct Tag tag, char *params) {
 	char *chan = strsep(&params, " ");
-	ircFmt("JOIN :%s\r\n", chan ? chan : tag.name);
+	char *key = strsep(&params, " ");
+	if (key) {
+		ircFmt("JOIN %s %s\r\n", chan, key);
+	} else {
+		ircFmt("JOIN %s\r\n", chan ? chan : tag.name);
+	}
 }
 
 static void inputMe(struct Tag tag, char *params) {
href='/catgirl/commit/ui.c?id=3b4ad30d9789e43d5f639f97fd4613b3edbf83fa&follow=1'>Remove unneeded includes in ui.cJune McEnroe 2022-02-19Reimplement tab completeJune McEnroe 2022-02-19Handle errors from editFn, etc.June McEnroe 2022-02-19Reimplement text macrosJune McEnroe 2022-02-19Factor out input handling to input.cJune McEnroe 2022-02-19Factor out window management to window.cJune McEnroe 2022-02-19Enable -Wmissing-prototypesJune McEnroe 2022-02-19Fix edit.[ch] license notice additional permissionsJune McEnroe 2022-02-19Run line editing testsJune McEnroe 2022-02-18Implement new line editing "library"June McEnroe 2022-02-18Simplify cursor positioning in inputJune McEnroe 2022-02-18Fix M-f orderingJune McEnroe 2022-02-12Move sandman build to scripts/MakefileJune McEnroe 2022-02-12Use compat_readpassphrase.c on LinuxJune McEnroe 2022-02-12Copy RPP defines from oconfigureJune McEnroe