psyc-mirrors/psyced
1
0
Fork 0
mirror of git://git.psyced.org/git/psyced synced 2024-08-15 03:25:10 +00:00
Code Issues 2 Releases Wiki Activity

death the query_server_unl()

Browse source
This commit is contained in:
psyc://psyced.org/~lynX 2009-01-29 17:31:32 +01:00
parent 14c65f90a8
commit 821fb55b20
23 changed files with 54 additions and 62 deletions
Download patch file Download diff file Expand all files Collapse all files

2
world/net/irc/decode.c
View file

@ -47,7 +47,7 @@ version(text, target, req, srcnick, source) {
"[_nick] requests your version.",
([ "_nick" : srcnick ]), source );
#ifndef _flag_disable_request_version_IRC
} else if (target == query_server_unl()) {
} else if (target == SERVER_UNIFORM) {
if (text) vSet("agent", text);
#endif
} else {

6
world/net/irc/gatebot.c
View file

@ -48,12 +48,8 @@ inherit IRC_PATH "decode";
// message queueing and automatic reconnect mgmt
inherit NET_PATH "circuit";
#ifndef _uniform_node
# define _uniform_node query_server_unl()
#endif
#ifdef RELAY
# define IRCER_UNIFORM(NICK) (_uniform_node +"~"+ NICK)
# define IRCER_UNIFORM(NICK) (SERVER_UNIFORM +"~"+ NICK)
#else
// will upgrade to irc: syntax..
# define IRCER_UNIFORM(NICK) (MYLOWERNICK +":"+ NICK)

14
world/net/irc/user.c
View file

@ -360,7 +360,7 @@ w(string mc, string data, mapping vars, mixed source) {
// give away your own nickname. i think that is unnecessary geek pride.
// so be it!
vars["_nick_me"] = aliases[MYLOWERNICK]
? query_server_unl() +"~"+ MYNICK
? SERVER_UNIFORM +"~"+ MYNICK
: MYNICK;
#else
vars["_nick_me"] = MYNICK;
@ -379,7 +379,7 @@ w(string mc, string data, mapping vars, mixed source) {
// source == 0 msgs.
// those might be simple w()s... hm.
#ifndef UNSAFE_LASTLOG
|| abbrev(query_server_unl() +"~", source)
|| abbrev(SERVER_UNIFORM +"~", source)
#endif
) {
#ifdef GHOST //{{{
@ -665,10 +665,10 @@ w(string mc, string data, mapping vars, mixed source) {
// psyctext ist an dieser stelle in der tat ohne vorteil
// aber auch kein performancefaktor.. also egal
emit(":"+ vars["_alias"] +" NICK "+
query_server_unl() +"~"+ vars["_alias"] + "\n");
SERVER_UNIFORM +"~"+ vars["_alias"] + "\n");
emit(psyctext(":[_nick_old] NICK [_nick_new]",
([ "_nick_old" : aliases[lower_case(vars["_address"])]
? query_server_unl() +"~"+
? SERVER_UNIFORM +"~"+
vars["_address"]
: uniform2irc(vars["_address"]),
"_nick_new" : vars["_alias"] ])) + "\n");
@ -677,11 +677,11 @@ w(string mc, string data, mapping vars, mixed source) {
emit(psyctext(":[_nick_old] NICK [_nick_new]",
([ "_nick_old" : vars["_alias"],
"_nick_new" : aliases[lower_case(vars["_address"])]
? query_server_unl() +"~"+ vars["_address"]
? SERVER_UNIFORM +"~"+ vars["_address"]
: uniform2irc(vars["_address"])
])) + "\n");
emit(psyctext(":[_nick_old] NICK [_nick_new]",
([ "_nick_old" : query_server_unl() +"~"+ vars["_alias"],
([ "_nick_old" : SERVER_UNIFORM +"~"+ vars["_alias"],
"_nick_new" : vars["_alias"] ])) + "\n");
break;
#endif
@ -890,7 +890,7 @@ logon() {
// version strings, only IRC makes it terribly complicated and
// even political. oh of course, that's because on irc the server
// admin isn't necessarily a person of your trusting.
w("_request_version", 0, 0, query_server_unl());
w("_request_version", 0, 0, SERVER_UNIFORM);
# endif
#endif
return rc;