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

PREFIXES are never to come back

This commit is contained in:
psyc://psyced.org/~lynX 2009-02-28 20:14:56 +01:00
parent 2dd7ef3178
commit ccf63004c8
8 changed files with 4 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
world/net/applet/user.c
View File

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

8
world/net/irc/common.c
View File

@ -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] != ':') {

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

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

4
world/net/jabber/active.c
View File

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

3
world/net/jabber/component.c
View File

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

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

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

4
world/net/textc.c
View File

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

34
world/net/user.c
View File

@ -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 != "")