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

_nick_me turns into _INTERNAL_nick_me

Browse source
This commit is contained in:
psyc://psyced.org/~lynX 2009-03-05 11:42:45 +01:00
parent 87d444e1a5
commit b90ca9e426
5 changed files with 68 additions and 68 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -265,7 +265,7 @@ render(string mc, string data, mapping vars, mixed source) {
// since irc ALWAYS needs to have a namreply, we
// simply give it one that only contains ourselves
w(mc[..<8], 0, ([ "_nick_place" : vars["_nick_place"],
"_members" : vars["_nick_me"] ]));
"_members" : vars["_INTERNAL_nick_me"] ]));
w(mc[..<8] + "_end", 0, vars);
}
P4(("calling emit(%O)\n", output));

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

@ -331,7 +331,7 @@ case "privmsg":
render("_error_necessary_registration",
"Sorry, you cannot use this without prior registration.", ([
"_INTERNAL_source_IRC": IRCGATE_NICK,
"_nick_me" : joe_nick,
"_INTERNAL_nick_me" : joe_nick,
]));
return 1;
}
@ -822,7 +822,7 @@ msg(source, mc, data, mapping vars, showingLog, target) {
#else
// TODO: remove 'pm' logic?
vars["_INTERNAL_source_IRC"] = source;
vars["_nick_me"] = ni;
vars["_INTERNAL_nick_me"] = ni;
//send(source, psyctext(t, vars, data, source));
render(mca, data, vars, source);
#endif

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

@ -138,7 +138,7 @@ static int namreply(mapping vars) {
render("_status_place_members", 0, ([
"_nick_place" : vars["_nick_place"],
"_members" : u,
"_nick_me" : MYNICK ]) );
"_INTERNAL_nick_me" : MYNICK ]) );
render("_status_place_members_end", 0, vars);
return 1;
}
@ -340,19 +340,19 @@ w(string mc, string data, mapping vars, mixed source) {
vars["_prefix"] = prefix || "";
D2(
if (vars["_nick_me"] && source)
D(S("COLLISION: msg arrived in irc:w had _nick_me with "
"value: %O\n", vars["_nick_me"]));
if (vars["_INTERNAL_nick_me"] && source)
D(S("COLLISION: msg arrived in irc:w had _INTERNAL_nick_me with "
"value: %O\n", vars["_INTERNAL_nick_me"]));
)
#if !defined(PRO_PATH) && defined(ALIASES)
// heldensaga thinks nickspaces are perfect only when you can
// give away your own nickname. i think that is unnecessary geek pride.
// so be it!
vars["_nick_me"] = aliases[MYLOWERNICK]
vars["_INTERNAL_nick_me"] = aliases[MYLOWERNICK]
? SERVER_UNIFORM +"~"+ MYNICK
: MYNICK;
#else
vars["_nick_me"] = MYNICK;
vars["_INTERNAL_nick_me"] = MYNICK;
#endif
if (vars["_nick"] && places[source] && vars["_time_place"]) {
P3(("%O glaubt dem _relay von %O jetz mal, gell?\n",
@ -560,7 +560,7 @@ w(string mc, string data, mapping vars, mixed source) {
"_list_friends_channel" // _tab
# endif
, 0, ([ "_friends": u,
"_nick_me" : MYNICK ]) );
"_INTERNAL_nick_me" : MYNICK ]) );
} else {
P1(("%O irc/user:w() got %O without friends list in %O\n",
ME, mc, vars))
@ -872,7 +872,7 @@ logon() {
# ifndef _flag_disable_query_server
sendmsg("/", "_request_user_amount", 0, ([]));
// reply.h says RPL_LUSERME is mandatory.. huh.. FIXME?
// #255 [_nick_me] :I have 4404 clients and 4404 servers
// #255 [_INTERNAL_nick_me] :I have 4404 clients and 4404 servers
# endif
# endif
# ifndef _flag_disable_request_version_IRC