psyc-mirrors
/
psyced
mirror of git://git.psyced.org/git/psyced
1
0
Fork 0
Code Issues 2 Releases Wiki Activity

Merge remote-tracking branch 've/master'

This commit is contained in:
psyc://loupsycedyglgamf.onion/~lynX 2016-06-19 16:24:10 +02:00
parent fb3748221d a68a84b924
commit 27bb5e294f
6 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
world/default/de/plain.textdb
View File

@ -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

4
world/default/en/plain.textdb
View File

@ -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].

2
world/default/it/plain.textdb
View File

@ -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

8
world/net/http/server.c
View File

@ -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;
}
}
}

5
world/net/irc/user.c
View File

@ -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?

5
world/net/usercmd.i
View File

@ -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