From ccf63004c839b7e18e4ba0b4acb5450641981db0 Mon Sep 17 00:00:00 2001 From: "psyc://psyced.org/~lynX" <@> Date: Sat, 28 Feb 2009 20:14:56 +0100 Subject: [PATCH] PREFIXES are never to come back --- world/net/applet/user.c | 7 +------ world/net/irc/common.c | 8 +------- world/net/irc/user.c | 13 ------------- world/net/jabber/active.c | 4 ---- world/net/jabber/component.c | 3 --- world/net/jabber/user.c | 5 ----- world/net/textc.c | 4 ---- world/net/user.c | 34 ++-------------------------------- 8 files changed, 4 insertions(+), 74 deletions(-) diff --git a/world/net/applet/user.c b/world/net/applet/user.c index b4cf607..21e0e9e 100644 --- a/world/net/applet/user.c +++ b/world/net/applet/user.c @@ -50,12 +50,7 @@ pr(mc, fmt, a,b,c,d,e,f,g,h,i,j,k) { // weil sonst die logout-meldung den bach runtergeht } #endif - if (!(abbrev("_message", mc) -# ifdef PREFIXES - || abbrev("_prefix", mc) -# endif - )) { - + if (!(abbrev("_message", mc))) { if (abbrev("_list", mc) || abbrev("_echo", mc)) fmt = "|* "+ fmt; else { diff --git a/world/net/irc/common.c b/world/net/irc/common.c index 98498f9..2561e5a 100644 --- a/world/net/irc/common.c +++ b/world/net/irc/common.c @@ -184,13 +184,7 @@ render(string mc, string data, mapping vars, mixed source) { #ifdef NEW_LINE output += "\n"; #else - if (template == "") { -# ifdef PREFIXES //{{{ - if (abbrev("_prefix", mc)) return prefix = output+" "; - else -# endif //}}} - output += "\n"; - } + if (template == "") output += "\n"; #endif if (output[0] == '#') output = SERVER_SOURCE + output[1 ..]; else if (output[0] != ':') { diff --git a/world/net/irc/user.c b/world/net/irc/user.c index 729395f..4bbc7b8 100644 --- a/world/net/irc/user.c +++ b/world/net/irc/user.c @@ -37,14 +37,6 @@ msg(source, mc, data, mapping vars, showingLog) { int special; mixed a, res; -#ifdef PREFIXES //{{{ - //ob das folgende so klug ist müssen wir (ich?) noch ergründen. - //aber da es temporär eh nicht genutzt wird... - //bis dahin erstmal jedesmal löschen. - if (prefix) { - prefix = 0; - } -#endif //}}} P4(("irc:msg (%O,%s,%O,%O)\n", source, mc, data, vars)) P2(("irc:msg (%O,%s,%O..)\n", source, mc, data)) @@ -238,11 +230,6 @@ w(string mc, string data, mapping vars, mixed source) { P3(("%O: irc:w(%O, %O, %O, %O) %O\n", ME, mc, data, 0, source, vars)) -#ifdef PREFIXES //{{{ - // completely skip these methods.. sagt fippo.. na ob das richtig ist!? - if (abbrev("_prefix", mc)) return 1; -#endif //}}} - #ifndef GHOST // should it be..? //unless (ONLINE) return; diff --git a/world/net/jabber/active.c b/world/net/jabber/active.c index ae1cf46..ec8b5da 100644 --- a/world/net/jabber/active.c +++ b/world/net/jabber/active.c @@ -546,10 +546,6 @@ int msg(string source, string mc, string data, * the output from emit (use the new net/outputb ?) * this avoids bugs with destructed objects */ -#ifdef PREFIXES - // completely skip these methods - if (abbrev("_prefix", mc)) return 1; -#endif #if 0 // !EXPERIMENTAL /* currently, we want _status_person_absent * this may change... diff --git a/world/net/jabber/component.c b/world/net/jabber/component.c index e1b6d05..39effa8 100644 --- a/world/net/jabber/component.c +++ b/world/net/jabber/component.c @@ -119,9 +119,6 @@ int msg(string source, string mc, string data, #else unless(vars["_language"]) vars["_language"] = "en"; #endif -#ifdef PREFIXES - if (abbrev("_prefix", mc)) return 1; -#endif #ifndef GAMMA // TODO: decide if this is good or bad else if (abbrev("_status_person_absent", mc)) { PT(("Intercepted absent from %O to %O\n", mc, source, ME)) diff --git a/world/net/jabber/user.c b/world/net/jabber/user.c index 801856e..fc8dcfc 100644 --- a/world/net/jabber/user.c +++ b/world/net/jabber/user.c @@ -1256,11 +1256,6 @@ w(string mc, string data, mapping vars, mixed source) { } vars["_list_item"] = t; break; -#ifdef PREFIXES - default: - // until we have a better way to deal with them.. - if (abbrev("_prefix", mc)) return; -#endif } if (source) diff --git a/world/net/textc.c b/world/net/textc.c index 19b8aad..3bf4a86 100644 --- a/world/net/textc.c +++ b/world/net/textc.c @@ -153,10 +153,6 @@ w(string mc, string data, mapping vars, mixed source) { #ifdef NEW_LINE output += "\n"; -#else -# ifdef PREFIXES - if (template == "") output += abbrev("_prefix", mc) ? " " : "\n"; -# endif #endif //PT(("textc:w(%O,%O,%O,%O) - %O\n", mc,data,vars,source, template)) diff --git a/world/net/user.c b/world/net/user.c index 398d8cb..7cb4bed 100644 --- a/world/net/user.c +++ b/world/net/user.c @@ -530,19 +530,6 @@ msg(source, mc, data, mapping vars, showingLog) { } P3(("%O time %O data %O from %O\n", ME, t, data, vars)) } -#ifdef PREFIXES - if (t && intp(t)) { - // similar to time_or_date() - if (time() - t > 24*60*60) - w("_prefix_time_date", isotime( t, 0 )); - else - w("_prefix_time", hhmm(ctime( t ))); - unless (showingLog) { - P0(("%O got _time_place w/out showingLog in %O\n", - ME, vars)) - } - } -#endif PSYC_TRY(mc) { case "_jabber_iq_error": // DONT reply P2(("%O got %O", ME, mc)) @@ -1182,18 +1169,13 @@ pr(mc, fmt, a,b,c,d,e,f,g,h,i,j,k) { w(string mc, string data, mapping vars, mixed source, int showingLog) { string template, output, type, loc; mapping di = printStyle(mc); // display infos -#ifdef PREFIXES - int isfix = abbrev("_prefix", mc); -#else int t; -#endif + unless (vars) vars = ([]); -#ifndef PREFIXES else t = vars["_time_log"] || vars["_time_place"]; // would be nicer to have _time_log in /log rather than showingLog if (!t && showingLog) t = vars["_time_INTERNAL"]; if (t && intp(t)) di["_prefix"] = time_or_date(t) +" "; -#endif #if 0 template = T(di["_method"] || mc, 0); #else @@ -1203,11 +1185,7 @@ w(string mc, string data, mapping vars, mixed source, int showingLog) { #ifndef _flag_enable_alternate_location_forward // why did it say.. if (mc != lastmc && ... - if (mappingp(v("locations")) && sizeof(v("locations")) -#ifdef PREFIXES - && !isfix -#endif - ) { + if (mappingp(v("locations")) && sizeof(v("locations"))) { string nudata = data; // this little thing enables languages for psyc clients etc. @@ -1336,18 +1314,10 @@ w(string mc, string data, mapping vars, mixed source, int showingLog) { if (!stringp(source)|| (vars["_INTERNAL_trust"] >5 || (vars["_nick"] && data && strlen(data) && strstr(data, "[_nick]") != -1))) -#ifdef PREFIXES - output += isfix ? " " : "\n"; -#else output += "\n"; -#endif else { //PT(("notemp %O %O %O\n", source, vars, data)) -#ifdef PREFIXES - output = "«"+source+"» "+output+( isfix ? " " : "\n" ); -#else output = "«"+source+"» "+ output +"\n"; -#endif } } if (output != "")