From c3b7b4f6648ffad6bf86e1bf11988ac7f40d06c1 Mon Sep 17 00:00:00 2001
From: "psyc://psyced.org/~lynX" <@>
Date: Sat, 21 May 2016 17:38:54 +0200
Subject: [PATCH 1/2] ACME letsencrypt support, more /help

---
 world/default/de/plain.textdb | 2 +-
 world/default/en/plain.textdb | 4 ++++
 world/default/it/plain.textdb | 2 +-
 world/net/http/server.c       | 8 ++++++++
 world/net/usercmd.i           | 5 ++---
 5 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/world/default/de/plain.textdb b/world/default/de/plain.textdb
index f9cc60f..9fb34a4 100644
--- a/world/default/de/plain.textdb
+++ b/world/default/de/plain.textdb
@@ -469,7 +469,7 @@ _echo_friendship_removed
 |Freundschaft mit [_nick_target] gekündigt.
 
 _info_commands
-|Befehle: tell, reply, go, me, [_nick], who, p(eople), log.
+|Befehle: t(ell), talk, go, me, [_nick], who, p(eople), log, r(eply), g(reet), bye.
 |{_URL_help} bietet Hilfe.
 
 _info_set
diff --git a/world/default/en/plain.textdb b/world/default/en/plain.textdb
index 2d4c8f7..b8f0983 100644
--- a/world/default/en/plain.textdb
+++ b/world/default/en/plain.textdb
@@ -714,6 +714,10 @@ _failure_exceeded_limit_users
 _failure_unsupported_execute_person
 |Sorry, [_nick] hasn't defined any commands for you.
 
+_info_commands
+|Commands: t(ell), talk, go, me, [_nick], who, p(eople), log, r(eply), g(reet), bye.
+|Help and manuals available at <{_URL_help}>.
+
 _info_location
 |[_nick] has location [_location].
 
diff --git a/world/default/it/plain.textdb b/world/default/it/plain.textdb
index ac293b5..2e34c7d 100644
--- a/world/default/it/plain.textdb
+++ b/world/default/it/plain.textdb
@@ -404,7 +404,7 @@ _echo_friendship_removed
 |rimossa l'amicizia con [_nick_target].
 
 _info_commands
-|comandi base: tell, reply, go, me, [_nick], who, p(eople), log.
+|comandi: t(ell), talk, go, me, [_nick], who, p(eople), log, r(eply), g(reet), bye.
 |manuali ed aiuti al sito <{_URL_help}>.
 
 _info_set
diff --git a/world/net/http/server.c b/world/net/http/server.c
index 2f5bdb8..96d50c0 100644
--- a/world/net/http/server.c
+++ b/world/net/http/server.c
@@ -279,6 +279,14 @@ case "/oauth":
 		      T("_HTML_tail", "</td></tr></table></center></body>"));
 		quit();
 		return 1;
+	    } else if (abbrev("/.well-known/", item)) {
+		P0(("ACME domain ownership check %O\n", item))
+		if (file_size(item) > 0) {
+		    http_ok(prot, "application/x-letsencrypt-acme", 0);
+		    binary_message(read_file(item));
+		    quit();
+		    return 1;
+		}
 	    }
     }
 
diff --git a/world/net/usercmd.i b/world/net/usercmd.i
index c7b4b5c..1c8fd34 100644
--- a/world/net/usercmd.i
+++ b/world/net/usercmd.i
@@ -1578,9 +1578,8 @@ cmd(a, args, dest, command) {
 Commands: go, me, who, p(eople), bye.\n" MYTEMP,
 			    ([ "_nick": MYLOWERNICK, "_command": a,
 			       "_page_help" : t ]) );
-		else w("_info_commands", "\
-Commands: tell, talk, go, me, [_nick], who, p(eople), log, reply, greet, bye.\n"
-		    MYTEMP, ([ "_nick": MYLOWERNICK, "_command": a,
+		else w("_info_commands", 0,
+			    ([ "_nick": MYLOWERNICK, "_command": a,
 			       "_page_help" : t ]) );
 		break;
 # else

From a68a84b9248ac3865d98c86397df3d4451905f61 Mon Sep 17 00:00:00 2001
From: "psyc://psyced.org/~lynX" <@>
Date: Sun, 19 Jun 2016 16:21:17 +0200
Subject: [PATCH 2/2] defanor reported Circe client needs to be able to send
 single word messages without colon as suggested somewhere in the IRC RFC

---
 world/net/irc/user.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/world/net/irc/user.c b/world/net/irc/user.c
index c6ac557..b136fe9 100644
--- a/world/net/irc/user.c
+++ b/world/net/irc/user.c
@@ -1189,8 +1189,9 @@ static privmsg(args, text, req) {
 	string person,room;
 	mixed t;
 
-	unless (stringp(text) && strlen(text)) return;
-
+	unless (stringp(text) && strlen(text)) {
+		unless (sscanf(args, "%s %s", args, text)) return;
+	}
 #ifdef GAMMA
 	// fippoism typing indicator.. but shouldn't it *do* something
 	// after detecting this CTCP-like "typing" flag hack?