Merge branch 'maint'

* maint:
  * Use consistent 'requested' for cmd_kick to match cmd_kickban
  * Fix bad grammar for update output

src/chanprog.c

@@ -276,7 +276,7 @@ void tell_verbose_uptime(int idx)
   if (restart_time) {
     daysdur(now, restart_time, s, sizeof(s));
     size_t olen = strlen(outbuf);
-    simple_snprintf(&outbuf[olen], sizeof(outbuf) - olen, " (%s %s)", restart_was_update ? "updated" : "restarted", s);
+    simple_snprintf(&outbuf[olen], sizeof(outbuf) - olen, " (%s %s ago)", restart_was_update ? "updated" : "restarted", s);
   }
 
 #if HAVE_GETRUSAGE

src/misc.c

@@ -362,12 +362,16 @@ void days(time_t mynow, time_t then, char *out, size_t outsiz)
 /* Convert an interval (in seconds) to one of:
  * "for 19 days", "for 1 day", "for 09:10"
  */
-void daysdur(time_t mynow, time_t then, char *out, size_t outsiz)
+void daysdur(time_t mynow, time_t then, char *out, size_t outsiz, bool useFor)
 {
   if (mynow - then > 86400) {
     int mydays = (mynow - then) / 86400;
 
-    simple_snprintf(out, outsiz, "for %d day%s", mydays, (mydays == 1) ? "" : "s");
+    if (useFor) {
+      simple_snprintf(out, outsiz, "for %d day%s", mydays, (mydays == 1) ? "" : "s");
+    } else {
+      simple_snprintf(out, outsiz, "%d day%s", mydays, (mydays == 1) ? "" : "s");
+    }
     return;
   }
 

src/misc.h

@@ -41,7 +41,7 @@ char *splitnick(char **);
 void stridx(char *, char *, int);
 void daysago(time_t, time_t, char *, size_t);
 void days(time_t, time_t, char *, size_t);
-void daysdur(time_t, time_t, char *, size_t);
+void daysdur(time_t, time_t, char *, size_t, bool = true);
 void show_motd(int);
 void show_channels(int, char *);
 void show_banner(int);

src/mod/irc.mod/cmdsirc.c

@@ -1070,7 +1070,7 @@ static void cmd_kick(int idx, char *par)
   char *nick = newsplit(&par);
 
   if (!par[0])
-    par = "request";
+    par = "requested";
   if (match_my_nick(nick)) {
     dprintf(idx, "I'm not going to kick myself.\n");
     return;