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

_nick_me turns into _INTERNAL_nick_me

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGESTODO
View File

@ -1813,7 +1813,7 @@ see also: http://about.psyc.eu/SPAM
sowas möglich (das sollte aber nicht schlimm sein):
place/irc caught zero source ("_notice_broadcast_garbage","Test 1.",([
"_INTERNAL_source_IRC": "c|h|a|o|s!c|h|a|o|s@ve.example.com",
"_nick_me": "example",
"_INTERNAL_nick_me": "example",
"_nick": "c|h|a|o|s",
"_prefix": ""
]))

112
world/default/en/irc.textdb
View File

@ -2,7 +2,7 @@
## Check utf-8: Praise Atatürk!
_status_AREYOUNUTS
|:[_INTERNAL_source_IRC] NOTICE [_nick_me] :[_data]
|:[_INTERNAL_source_IRC] NOTICE [_INTERNAL_nick_me] :[_data]
_MISC_character_command
|+
@ -11,7 +11,7 @@ _MISC_separator_list
|
_echo_invitation
|#341 [_nick_me] [_nick_target] #[_nick_place]
|#341 [_INTERNAL_nick_me] [_nick_target] #[_nick_place]
_echo_place_enter
|:[_INTERNAL_source_IRC] JOIN :#[_nick_place]
@ -43,49 +43,49 @@ _info_commands
|## not alone in this inappropriate behaviour so
|## let's just not use numeric codes here ... sigh
|##
|### #421 [_nick_me] [_command] :{_TEXT_page_help}
|### #421 [_INTERNAL_nick_me] [_command] :{_TEXT_page_help}
|##
|{_TEXT_page_help}
_info_commands_newbie
|## #421 [_nick_me] [_command] :{_TEXT_page_help}
|## #421 [_INTERNAL_nick_me] [_command] :{_TEXT_page_help}
|{_TEXT_page_help}
_list_alias
|Alias: [_short] = [_long]
_list_user_description_end
|#315 [_nick_me] * :End of WHO list.
|#315 [_INTERNAL_nick_me] * :End of WHO list.
_list_description_person_idle
|#317 [_nick_me] [_nick] [_time_alive_seconds] 0 :seconds idle, zero
|#317 [_INTERNAL_nick_me] [_nick] [_time_alive_seconds] 0 :seconds idle, zero
_list_description_person_on
|#311 [_nick_me] [_nick] [_nick] {_VAR_server} * :[_description_motto] [_action_motto]
|#311 [_INTERNAL_nick_me] [_nick] [_nick] {_VAR_server} * :[_description_motto] [_action_motto]
_list_description_person_off
|#318 [_nick_me] [_nick] :End of /WHOIS list.
|#318 [_INTERNAL_nick_me] [_nick] :End of /WHOIS list.
_list_description_person_places
|## #319 [_nick_me] [_nick] :(list places? to hell with privacy)
|## #319 [_INTERNAL_nick_me] [_nick] :(list places? to hell with privacy)
_list_description_person_protocol_agent
|#312 [_nick_me] [_nick] [_protocol_agent] :access protocol
|#312 [_INTERNAL_nick_me] [_nick] [_protocol_agent] :access protocol
_list_places_none
|#353 [_nick_me] * * :[_users_private]
|#353 [_INTERNAL_nick_me] * * :[_users_private]
_list_places_entered
|#322 [_nick_me] #[_nick_place] [_amount_members] :[_description_place]
|#322 [_INTERNAL_nick_me] #[_nick_place] [_amount_members] :[_description_place]
_list_places_public
|#322 [_nick_me] #[_nick_place] [_amount_members] :[_description_place]
|#322 [_INTERNAL_nick_me] #[_nick_place] [_amount_members] :[_description_place]
_list_places_members
|#353 [_nick_me] = #[_nick_place] :[_members]
|#353 [_INTERNAL_nick_me] = #[_nick_place] :[_members]
_list_places_end
|#366 [_nick_me] * :End of /NAMES list.
|#366 [_INTERNAL_nick_me] * :End of /NAMES list.
_echo_alias_added_NICEBUTCANTWORK
|:[_alias] NICK {_VAR_server_uniform}~[_alias]
@ -112,19 +112,19 @@ _echo_start_places_entered
|#321 Channel :Users Topic
_request_legacy_CTCP
|:[_INTERNAL_source_IRC] PRIVMSG [_nick_me] :%[_type] [_value]%
|:[_INTERNAL_source_IRC] PRIVMSG [_INTERNAL_nick_me] :%[_type] [_value]%
_status_legacy_CTCP
|:[_INTERNAL_source_IRC] NOTICE [_nick_me] :%[_type] [_value]%
|:[_INTERNAL_source_IRC] NOTICE [_INTERNAL_nick_me] :%[_type] [_value]%
_request_version
|:[_INTERNAL_source_IRC] PRIVMSG [_nick_me] :%VERSION%
|:[_INTERNAL_source_IRC] PRIVMSG [_INTERNAL_nick_me] :%VERSION%
_error_unknown_name_user
|#401 [_nick_me] [_nick_target] :{_error_unknown_name_user}
|#401 [_INTERNAL_nick_me] [_nick_target] :{_error_unknown_name_user}
_error_necessary_membership
|#403 [_nick_me] #[_nick_place] :{_error_necessary_membership}
|#403 [_INTERNAL_nick_me] #[_nick_place] :{_error_necessary_membership}
_error_status_place_matches
|## das lassen wir weg, weil manche clients unbedingt den join nochmal
@ -134,14 +134,14 @@ _error_status_place_matches
_error_place_enter
|## 471 is ERR_CHANISFULL
|#471 [_nick_me] #[_nick_place] :Error entering [_nick_place].
|#471 [_INTERNAL_nick_me] #[_nick_place] :Error entering [_nick_place].
_query_password
|## Please provide your password. (If your client isn't able to, use /quote pass «your-password» (which does not work in irssi) or use a syntax like /server {_VAR_server} «ircport» «your-password»)
|Please provide your password (Set it as the server password, or try /quote pass «your-password» or a syntax like /server {_VAR_server} «ircport» «your-password»)
_message_private
|:[_INTERNAL_source_IRC] PRIVMSG [_nick_me] :[_data]
|:[_INTERNAL_source_IRC] PRIVMSG [_INTERNAL_nick_me] :[_data]
_message_public
|:[_INTERNAL_source_IRC] PRIVMSG #[_nick_place] :[_data]
@ -156,7 +156,7 @@ _message_echo_private
_message_echo_private_NOT
|## without this format, "You tell.. " is generated
|## this is how BNC sends it instead:
|:[_INTERNAL_source_IRC] PRIVMSG [_nick_me] :<- <[_nick_me]> [_data]
|:[_INTERNAL_source_IRC] PRIVMSG [_INTERNAL_nick_me] :<- <[_INTERNAL_nick_me]> [_data]
|## which is just like _message_private with an extra that isn't tamper-proof
_message_echo_public
@ -184,46 +184,46 @@ _message_public_text_action
|:[_INTERNAL_source_IRC] PRIVMSG #[_nick_place] :%ACTION [_prefix][_action]: [_data]%
_message_private_annotate
|:[_INTERNAL_source_IRC] NOTICE [_nick_me] :[_data]
|:[_INTERNAL_source_IRC] NOTICE [_INTERNAL_nick_me] :[_data]
_message_private_action
|:[_INTERNAL_source_IRC] PRIVMSG [_nick_me] :%ACTION [_action].%
|:[_INTERNAL_source_IRC] PRIVMSG [_INTERNAL_nick_me] :%ACTION [_action].%
_message_private_question
|:[_INTERNAL_source_IRC] PRIVMSG [_nick_me] :%ACTION {_TEXT_action_asks}: [_data]%
|:[_INTERNAL_source_IRC] PRIVMSG [_INTERNAL_nick_me] :%ACTION {_TEXT_action_asks}: [_data]%
_message_private_ask
|:[_INTERNAL_source_IRC] PRIVMSG [_nick_me] :%ACTION {_TEXT_action_asks}: [_data]%
|:[_INTERNAL_source_IRC] PRIVMSG [_INTERNAL_nick_me] :%ACTION {_TEXT_action_asks}: [_data]%
_message_private_text_action
|:[_INTERNAL_source_IRC] PRIVMSG [_nick_me] :%ACTION [_action]: [_data]%
|:[_INTERNAL_source_IRC] PRIVMSG [_INTERNAL_nick_me] :%ACTION [_action]: [_data]%
_message_private_action_action
|:[_INTERNAL_source_IRC] PRIVMSG [_nick_me] :%ACTION [_action].%
|:[_INTERNAL_source_IRC] PRIVMSG [_INTERNAL_nick_me] :%ACTION [_action].%
_notice_switch_identity
|:[_nick_me] NICK [_nick_next]
|:[_INTERNAL_nick_me] NICK [_nick_next]
_notice_login
|## shut up
_notice_invitation
|:[_INTERNAL_source_IRC] INVITE [_nick_me] :#[_nick_place]
|:[_INTERNAL_source_IRC] INVITE [_INTERNAL_nick_me] :#[_nick_place]
_notice_typing_inactive
|:[_INTERNAL_source_IRC] PRIVMSG [_nick_me] :%TYPING INACTIVE%
|:[_INTERNAL_source_IRC] PRIVMSG [_INTERNAL_nick_me] :%TYPING INACTIVE%
_notice_typing_paused
|:[_INTERNAL_source_IRC] PRIVMSG [_nick_me] :%TYPING PAUSED%
|:[_INTERNAL_source_IRC] PRIVMSG [_INTERNAL_nick_me] :%TYPING PAUSED%
_notice_typing_composing
|:[_INTERNAL_source_IRC] PRIVMSG [_nick_me] :%TYPING COMPOSING%
|:[_INTERNAL_source_IRC] PRIVMSG [_INTERNAL_nick_me] :%TYPING COMPOSING%
_notice_typing_active
|:[_INTERNAL_source_IRC] PRIVMSG [_nick_me] :%TYPING ACTIVE%
|:[_INTERNAL_source_IRC] PRIVMSG [_INTERNAL_nick_me] :%TYPING ACTIVE%
_notice_typing_gone
|:[_INTERNAL_source_IRC] PRIVMSG [_nick_me] :%TYPING GONE%
|:[_INTERNAL_source_IRC] PRIVMSG [_INTERNAL_nick_me] :%TYPING GONE%
_notice_place_AREYOUNUTS
|:{_VAR_server} NOTICE #[_nick_place] :[_data]
@ -298,62 +298,62 @@ _notice_place_topic
|:[_INTERNAL_source_IRC] TOPIC #[_nick_place] :[_topic]
_notice_place_topic_official
|#332 [_nick_me] #[_nick_place] :[_topic]
|#332 [_INTERNAL_nick_me] #[_nick_place] :[_topic]
_echo_ping
|:[_INTERNAL_source_IRC] NOTICE [_nick_me] :%PING [_time_ping]%
|:[_INTERNAL_source_IRC] NOTICE [_INTERNAL_nick_me] :%PING [_time_ping]%
_failure_unsupported_ping
|## yes, this is a pong also...
|:[_INTERNAL_source_IRC] NOTICE [_nick_me] :%PING [_time_ping]%
|:[_INTERNAL_source_IRC] NOTICE [_INTERNAL_nick_me] :%PING [_time_ping]%
_info_server_version
|:[_host_server] 351 [_nick_me] [_version].[_degree_debug] [_host_server] :[_version_server] using [_version_driver] available from [_page_server_software]
|:[_host_server] 351 [_INTERNAL_nick_me] [_version].[_degree_debug] [_host_server] :[_version_server] using [_version_driver] available from [_page_server_software]
_status_version
|:[_INTERNAL_source_IRC] NOTICE [_nick_me] :%VERSION [_version_description] ([_version])%
|:[_INTERNAL_source_IRC] NOTICE [_INTERNAL_nick_me] :%VERSION [_version_description] ([_version])%
_status_version_agent
|:[_INTERNAL_source_IRC] NOTICE [_nick_me] :%VERSION [_version_description] ([_version])%
|:[_INTERNAL_source_IRC] NOTICE [_INTERNAL_nick_me] :%VERSION [_version_description] ([_version])%
_list_friends_channel
|#353 [_nick_me] = & :[_friends]
|#353 [_INTERNAL_nick_me] = & :[_friends]
_list_friends_present_channel
|#353 [_nick_me] = &HERE :[_friends]
|#353 [_INTERNAL_nick_me] = &HERE :[_friends]
_list_friends_away_channel
|#353 [_nick_me] = &AWAY :[_friends]
|#353 [_INTERNAL_nick_me] = &AWAY :[_friends]
_status_place_members_automatic
|#353 [_nick_me] = #[_nick_place] :[_members]
|#353 [_INTERNAL_nick_me] = #[_nick_place] :[_members]
_status_place_members
|#353 [_nick_me] = #[_nick_place] :[_members]
|#353 [_INTERNAL_nick_me] = #[_nick_place] :[_members]
_status_place_topic
|## traditional IRC would be to leave out the _nick here
|#332 [_nick_me] #[_nick_place] :[_topic] ([_nick])
|#332 [_INTERNAL_nick_me] #[_nick_place] :[_topic] ([_nick])
|## modern IRC is to send a semi-official 333 code
|## this entry is unused. the following two are used instead:
_status_place_topic_only
|#332 [_nick_me] #[_nick_place] :[_topic]
|#332 [_INTERNAL_nick_me] #[_nick_place] :[_topic]
_status_place_topic_author
|#333 [_nick_me] #[_nick_place] [_nick] [_INTERNAL_time_topic] :{_status_place_topic_author}
|#333 [_INTERNAL_nick_me] #[_nick_place] [_nick] [_INTERNAL_time_topic] :{_status_place_topic_author}
_status_place_topic_none
|#331 [_nick_me] :{_status_place_topic_none}
|#331 [_INTERNAL_nick_me] :{_status_place_topic_none}
_status_place_topic_official
|#332 [_nick_me] #[_nick_place] :[_topic]
|#332 [_INTERNAL_nick_me] #[_nick_place] :[_topic]
_status_place_members_end
|#366 [_nick_me] #[_nick_place] :End of /NAMES list.
|#366 [_INTERNAL_nick_me] #[_nick_place] :End of /NAMES list.
_status_place_members_each
|#352 [_nick_me] #[_nick_place] [_IRC_identified][_nick_login] [_identification_host] {_VAR_server} [_nick] [_IRC_away][_IRC_operator] :[_IRC_hops] [_identification] [_name]
|#352 [_INTERNAL_nick_me] #[_nick_place] [_IRC_identified][_nick_login] [_identification_host] {_VAR_server} [_nick] [_IRC_away][_IRC_operator] :[_IRC_hops] [_identification] [_name]
|## we don't put the away message into /who after all..
|## [_description_action]
|##
@ -363,7 +363,7 @@ _status_place_members_each
|## and show it instead of the first [_nick] .. hmm.. yeah
_status_place_members_end_verbose
|#315 [_nick_me] #[_nick_place] :End of /WHO list.
|#315 [_INTERNAL_nick_me] #[_nick_place] :End of /WHO list.
_status_user_amount
|#251 [_nick_me] :There are [_amount_users_online] users on [_source]'s server
|#251 [_INTERNAL_nick_me] :There are [_amount_users_online] users on [_source]'s server

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