diff options
author | June McEnroe <june@causal.agency> | 2018-08-12 23:55:12 -0400 |
---|---|---|
committer | June McEnroe <june@causal.agency> | 2018-08-12 23:55:12 -0400 |
commit | 1232ce451de8372a54e477882ed9e7cfa129c4b9 (patch) | |
tree | c8f6c6e2a07c02f920128d28f29087dc84795ba3 /input.c | |
parent | Fix /open ranges by passing all URLs to open(1) (diff) | |
download | catgirl-1232ce451de8372a54e477882ed9e7cfa129c4b9.tar.gz catgirl-1232ce451de8372a54e477882ed9e7cfa129c4b9.zip |
Factor out input param and add tagFind
So that /view can't just invent tags.
Diffstat (limited to '')
-rw-r--r-- | input.c | 43 |
1 files changed, 25 insertions, 18 deletions
diff --git a/input.c b/input.c index c2599c1..9f7eddf 100644 --- a/input.c +++ b/input.c @@ -37,6 +37,13 @@ static void privmsg(struct Tag tag, bool action, const char *mesg) { free(line); } +static char *param(const char *command, char **params, const char *name) { + char *param = strsep(params, " "); + if (param) return param; + uiFmt(TAG_STATUS, "%s requires a %s", command, name); + return NULL; +} + typedef void (*Handler)(struct Tag tag, char *params); static void inputMe(struct Tag tag, char *params) { @@ -45,31 +52,25 @@ static void inputMe(struct Tag tag, char *params) { static void inputNick(struct Tag tag, char *params) { (void)tag; - char *nick = strsep(¶ms, " "); - if (nick) { - ircFmt("NICK %s\r\n", nick); - } else { - uiLog(TAG_STATUS, L"/nick requires a name"); - } + char *nick = param("/nick", ¶ms, "name"); + if (!nick) return; + ircFmt("NICK %s\r\n", nick); } static void inputJoin(struct Tag tag, char *params) { (void)tag; - char *chan = strsep(¶ms, " "); - if (chan) { - ircFmt("JOIN %s\r\n", chan); - } else { - uiLog(TAG_STATUS, L"/join requires a channel"); - } + char *chan = param("/join", ¶ms, "channel"); + if (!chan) return; + ircFmt("JOIN %s\r\n", chan); } static void inputWho(struct Tag tag, char *params) { - (void)params; // TODO + (void)params; ircFmt("WHO %s\r\n", tag.name); } static void inputTopic(struct Tag tag, char *params) { - if (params) { // TODO + if (params) { ircFmt("TOPIC %s :%s\r\n", tag.name, params); } else { ircFmt("TOPIC %s\r\n", tag.name); @@ -96,13 +97,19 @@ static void inputOpen(struct Tag tag, char *params) { } static void inputView(struct Tag tag, char *params) { - char *view = strsep(¶ms, " "); + (void)tag; + char *view = param("/view", ¶ms, "name or number"); if (!view) return; int num = strtol(view, &view, 0); - if (view[0]) { - uiViewTag(tagFor(view)); - } else { + if (!view[0]) { uiViewNum(num); + } else { + struct Tag tag = tagFind(view); + if (tag.id != TAG_NONE.id) { + uiViewTag(tag); + } else { + uiFmt(TAG_STATUS, "No view for %s", view); + } } } |