From 8cf148e717adea9bba93aeec4e07ca0848434013 Mon Sep 17 00:00:00 2001 From: "psyc://psyced.org/~lynX" <@> Date: Fri, 26 Aug 2011 11:19:35 +0200 Subject: [PATCH] + --- install.sh | 3 ++- world/default/de/plain.textdb | 3 +++ world/net/library.i | 5 +++-- world/net/root.c | 3 ++- world/net/twitter/client.c | 3 +++ 5 files changed, 13 insertions(+), 4 deletions(-) diff --git a/install.sh b/install.sh index 243c77b..d61dbb0 100755 --- a/install.sh +++ b/install.sh @@ -1130,7 +1130,8 @@ echo "Extracting psyced data..." if test -d .git then - if ! test `realpath .` = $BASE_DIR + # eh? what was 'realpath' supposed to be? + if ! test `pwd` = $BASE_DIR then if git clone . $BASE_DIR && cp -a .git/config $BASE_DIR/.git then diff --git a/world/default/de/plain.textdb b/world/default/de/plain.textdb index 74f4db2..ae63243 100644 --- a/world/default/de/plain.textdb +++ b/world/default/de/plain.textdb @@ -1,6 +1,9 @@ ## vim:syntax=mail ## Check utf-8: Praise Atatürk! +_warning_server_shutdown_temporary +|Serverneustart: [_reason] + _status_circuit_encryption_cipher |Gratuliere! Deine Verbindung ist mit Folgenlosigkeit verschlüsselt. diff --git a/world/net/library.i b/world/net/library.i index 024fa2b..f5f6a5b 100644 --- a/world/net/library.i +++ b/world/net/library.i @@ -666,7 +666,7 @@ int xmpp_sendmsg(mixed target, string mc, mixed data, mapping vars, // need to have a different domain name } else if (is_localhost(u[UHost])) { unless (u[UUser]) { - P0(("Intercepted %O to %O from %O\n", mc, target, source)) + P1(("Intercepted %O to %O from %O\n", mc, target, source)) // 0 makes sendmsg try to relay via xmpp.scheme.psyced.org // but fippo doesn't like that return -4; @@ -1053,7 +1053,8 @@ int bignum_cmp(string a, string b) { // allocating a local variable to "cache" it if (strlen(a) > strlen(b)) return 1; if (strlen(a) < strlen(b)) return -1; - for (i=0; i b[i]) return 1; return -1; } diff --git a/world/net/root.c b/world/net/root.c index f3467e6..59ff037 100644 --- a/world/net/root.c +++ b/world/net/root.c @@ -139,7 +139,8 @@ msg(source, mc, data, vars, showingLog, target) { case "_failure_unsuccessful_delivery": case "_failure_unsuccessful_delivery_resolve": case "_failure_unsupported_function_root": - unless (abbrev("_notice_forward", vars["_method_relay"])) { + unless (stringp(vars["_method_relay"]) + && abbrev("_notice_forward", vars["_method_relay"])) { t = "Root got "+ (vars["_method_relay"] || mc || "missing method"); if (vars["_target_relay"]) t += " to "+ to_string(vars["_target_relay"]); if (vars["_source_relay"]) t += " from "+ to_string(vars["_source_relay"]); diff --git a/world/net/twitter/client.c b/world/net/twitter/client.c index 0bc6f60..9ee24a4 100644 --- a/world/net/twitter/client.c +++ b/world/net/twitter/client.c @@ -138,6 +138,9 @@ parse_statuses(string data) { o = send_to_user ? user : find_place(nick); + // show tweets on driver console.. + P1(("<%O> %O\n", o || nick, d["text"])) + // _message_twitter ? not so convincing.. a lot of the // things are converted rss newsfeeds, and when private // people are "chatting" over twitter, they are still