diff --git a/world/default/en/jabber.textdb b/world/default/en/jabber.textdb index 1faf120..70bf913 100644 --- a/world/default/en/jabber.textdb +++ b/world/default/en/jabber.textdb @@ -204,10 +204,12 @@ _message_public_reduce |/me {_TEXT_action_says} {_TEXT_something}. _message_public_question -|/me {_TEXT_action_asks}: [_data] +|## /me {_TEXT_action_asks}: [_data] +|{_message_public} _message_public_ask -|/me {_TEXT_action_asks}: [_data] +|## /me {_TEXT_action_asks}: [_data] +|{_message_public} _message_public_text_action |[_data] diff --git a/world/net/jabber/mixin_render.c b/world/net/jabber/mixin_render.c index 79c1376..865c872 100644 --- a/world/net/jabber/mixin_render.c +++ b/world/net/jabber/mixin_render.c @@ -9,7 +9,8 @@ int msg(string source, string mc, string data, mapping vars, int showingLog, string target) { mixed t; - switch (mc){ + switch (mc) { + case "_status_description_time": case "_status_person_away": case "_status_person_present": case "_status_person_present_implied": diff --git a/world/net/jabber/user.c b/world/net/jabber/user.c index 32e02f0..805dcde 100644 --- a/world/net/jabber/user.c +++ b/world/net/jabber/user.c @@ -129,6 +129,7 @@ msg(source, mc, data, mapping vars, showingLog) { mc = "_notice_place_leave"; } switch (mc) { + case "_status_description_time": case "_status_person_present": case "_status_person_present_implied": case "_status_person_absent": diff --git a/world/net/library/profiles.html b/world/net/library/profiles.html index 62a1556..6d5854c 100644 --- a/world/net/library/profiles.html +++ b/world/net/library/profiles.html @@ -71,7 +71,7 @@ _flag_uniform_verbatimverbatimuniform _flag_visibilityvisibility _gendersexgendergender -_identificationidpsyc_idPSYCIDpsycID +_identificationidpsyc_idpsycID _identification_otherotherid _identification_scheme_AIMaimidaim_idaimChatID _identification_scheme_ICQicqidicq_idicqChatID diff --git a/world/net/library/profiles.i b/world/net/library/profiles.i index b523ad2..aa33926 100644 --- a/world/net/library/profiles.i +++ b/world/net/library/profiles.i @@ -94,7 +94,6 @@ volatile mapping psyc2jCard = ([ "_affiliation" : "%s", "_date_birth" : "%s", "_description_public" : "%s", - "_identification" : "%s", "_identification_scheme_XMPP" : "%s", "_identification_scheme_mailto" : "%s", "_name_family" : "%s", @@ -133,7 +132,6 @@ volatile mapping jCard2psyc = ([ "TEL/NUMBER" : "_contact_telephone", "BDAY" : "_date_birth", "DESC" : "_description_public", - "PSYCID" : "_identification", "JABBERID" : "_identification_scheme_XMPP", "EMAIL/USERID" : "_identification_scheme_mailto", "N/FAMILY" : "_name_family", diff --git a/world/net/library/profiles.pl b/world/net/library/profiles.pl index 7ecfbb8..3e00cd0 100644 --- a/world/net/library/profiles.pl +++ b/world/net/library/profiles.pl @@ -377,7 +377,8 @@ FOAF icqChatID PSYC _identification jProf psyc_id -jCard PSYCID +# I'm afraid adding a PSYCID field will not be well-recepted by some apps +#jCard PSYCID FOAF psycID PSYC _identification_other