X-Git-Url: http://git.silcnet.org/gitweb/?a=blobdiff_plain;f=apps%2Firssi%2Fsrc%2Ffe-common%2Fsilc%2Fmodule-formats.c;h=367702286edf0a26d78673a2eb526c0402b0c40a;hb=413da0f8686910f5e627393157566ae729ca99c4;hp=108f96e8c84e1a1d14889a012fc3ec149ea124e8;hpb=57706f9277ac228886672b64638db755ba1384d7;p=silc.git diff --git a/apps/irssi/src/fe-common/silc/module-formats.c b/apps/irssi/src/fe-common/silc/module-formats.c index 108f96e8..36770228 100644 --- a/apps/irssi/src/fe-common/silc/module-formats.c +++ b/apps/irssi/src/fe-common/silc/module-formats.c @@ -1,16 +1,15 @@ /* - modules-formats.c + module-formats.c - Author: Pekka Riikonen + Author: Pekka Riikonen - Copyright (C) 2001 Pekka Riikonen + Copyright (C) 2001 - 2003 Pekka Riikonen This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - + the Free Software Foundation; version 2 of the License. + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the @@ -38,16 +37,51 @@ FORMAT_REC fecommon_silc_formats[] = { { "notice", "{notice $0-}", 2, { 0, 0 } }, { "ownaction", "{ownaction $0-}", 2, { 0, 0 } }, { "ownnotice", "{ownnotice $0-}", 2, { 0, 0 } }, - { "invite_list", "channel {channel $0} invite list: $1", 2, { 0, 0 } }, - { "no_invite_list", "channel {channel $0} invite list not set", 1, { 0 } }, - { "ban_list", "channel {channel $0} ban list: $1", 2, { 0, 0 } }, - { "no_ban_list", "channel {channel $0} ban list not set", 1, { 0 } }, + { "inviteban_list", "channel {channel $0} $1 list:", 2, { 0, 0 } }, + { "inviteban_string", "$0 - {channel $1}: $2 {ban $3}", 4, { 1, 0, 0, 0 } }, + { "inviteban_pubkey", "$0 - {channel $1}: $2 Fingerprint (SHA1) {ban $3} (Babbleprint (SHA1) {ban $4})", 5, { 1, 0, 0, 0, 0 } }, + { "inviteban_reget", "Resolving incomplete information found in the $0 list for {channel $1}.", 2, { 0, 0 } }, + { "no_inviteban_list", "channel {channel $0} $1 list not set", 2, { 0, 0 } }, { "inviting", "Inviting {nick $0} to channel {channel $1}", 2, { 0, 0 } }, { "kicked_you", "You have been kicked off channel {channel $0} by {nick $1} ($2)", 3, { 0, 0, 0 } }, { "kicked", "{nick $0} has been kicked off channel {channel $1} by {nick $2} ($3)", 4, { 0, 0, 0, 0 } }, { "killed_you", "You have been killed from the SILC Network by {nick $0} ($1)", 2, { 0, 0 } }, { "killed", "{nick $0} has been killed from the SILC Network by {nick $1} ($2)", 3, { 0, 0, 0 } }, { "quieted", "You have been queited and cannot talk on {channel $0}", 1, { 0 } }, + { "appears", "{channick $0} now appears as {channick_hilight $1}", 4, { 0, 0, 0, 0 } }, + { "pubmsg_hilight_signed", "{pubmsghinick_signed $0 $3 $1}$2", 4, { 0, 0, 0, 0 } }, + { "pubmsg_hilight_unknown", "{pubmsghinick_unknown $0 $3 $1}$2", 4, { 0, 0, 0, 0 } }, + { "pubmsg_hilight_failed", "{pubmsghinick_failed $0 $3 $1}$2", 4, { 0, 0, 0, 0 } }, + { "pubmsg_me_signed", "{pubmsgmenick_signed $2 {menick $0}}$1", 3, { 0, 0, 0 } }, + { "pubmsg_me_unknown", "{pubmsgmenick_unknown $2 {menick $0}}$1", 3, { 0, 0, 0 } }, + { "pubmsg_me_failed", "{pubmsgmenick_failed $2 {menick $0}}$1", 3, { 0, 0, 0 } }, + { "pubmsg_signed", "{pubmsgnick_signed $2 {pubnick $0}}$1", 3, { 0, 0, 0 } }, + { "pubmsg_unknown", "{pubmsgnick_unknown $2 {pubnick $0}}$1", 3, { 0, 0, 0 } }, + { "pubmsg_failed", "{pubmsgnick_failed $2 {pubnick $0}}$1", 3, { 0, 0, 0 } }, + { "pubmsg_hilight_channel_signed", "{pubmsghinick_signed $0 $4 $1{msgchannel $2}}$3", 5, { 0, 0, 0, 0, 0 } }, + { "pubmsg_hilight_channel_unknown", "{pubmsghinick_unknown $0 $4 $1{msgchannel $2}}$3", 5, { 0, 0, 0, 0, 0 } }, + { "pubmsg_hilight_channel_failed", "{pubmsghinick_failed $0 $4 $1{msgchannel $2}}$3", 5, { 0, 0, 0, 0, 0 } }, + { "pubmsg_me_channel_signed", "{pubmsgmenick_signed $3 {menick $0}{msgchannel $1}}$2", 4, { 0, 0, 0, 0 } }, + { "pubmsg_me_channel_unknown", "{pubmsgmenick_unknown $3 {menick $0}{msgchannel $1}}$2", 4, { 0, 0, 0, 0 } }, + { "pubmsg_me_channel_failed", "{pubmsgmenick_failed $3 {menick $0}{msgchannel $1}}$2", 4, { 0, 0, 0, 0 } }, + { "pubmsg_channel_signed", "{pubmsgnick_signed $3 {pubnick $0}{msgchannel $1}}$2", 4, { 0, 0, 0, 0 } }, + { "pubmsg_channel_unknown", "{pubmsgnick_unknown $3 {pubnick $0}{msgchannel $1}}$2", 4, { 0, 0, 0, 0 } }, + { "pubmsg_channel_failed", "{pubmsgnick_failed $3 {pubnick $0}{msgchannel $1}}$2", 4, { 0, 0, 0, 0 } }, + { "msg_private_signed", "{privmsg_signed $0 $1}$2", 3, { 0, 0, 0 } }, + { "msg_private_unknown", "{privmsg_unknown $0 $1}$2", 3, { 0, 0, 0 } }, + { "msg_private_failed", "{privmsg_failed $0 $1}$2", 3, { 0, 0, 0 } }, + { "msg_private_query_signed", "{privmsgnick_signed $0}$2", 3, { 0, 0, 0 } }, + { "msg_private_query_unknown", "{privmsgnick_unknown $0}$2", 3, { 0, 0, 0 } }, + { "msg_private_query_failed", "{privmsgnick_failed $0}$2", 3, { 0, 0, 0 } }, + { "own_msg_signed", "{ownmsgnick_signed $2 {ownnick $0}}$1", 3, { 0, 0, 0 } }, + { "own_msg_channel_signed", "{ownmsgnick_signed $3 {ownnick $0}{msgchannel $1}}$2", 4, { 0, 0, 0, 0 } }, + { "no_msgs_got", "You have not received a message from anyone yet", 0 }, + { "no_msgs_sent", "You have not sent a message to anyone yet", 0 }, + { "own_msg_private_signed", "{ownprivmsg_signed msg $0}$1", 2, { 0, 0 } }, + { "own_msg_private_query_signed", "{ownprivmsgnick_signed {ownprivnick $2}}$1", 3, { 0, 0, 0 } }, + { "channel_pk_list", "Channel {channel $0} Public Key List:", 1, { 0 } }, + { "channel_pk_list_entry", "$0 - {channel $1}: $2 $3: Fingerprint (SHA1) {ban $4} (Babbleprint (SHA1) {ban $5})", 6, { 1, 0, 0, 0, 0, 0 } }, + { "channel_pk_no_list", "No Channel Public Key List for {channel $0}", 1, { 0 } }, /* WHOIS, WHOWAS and USERS (alias WHO) messages */ { NULL, "Who Queries", 0 }, @@ -96,9 +130,9 @@ FORMAT_REC fecommon_silc_formats[] = { { "pubkey_no_match", "{hilight $0} key does not match with your local copy", 1, { 0 } }, { "pubkey_maybe_expired", "It is possible that the key has expired or changed", 0 }, { "pubkey_mitm_attack", "It is also possible that someone is performing a man-in-the-middle attack", 0 }, - { "getkey_notkey", "Server did not return any public key", 0 }, - { "getkey_verified", "Verified successfully $0 {hilight $1}'s cached public key", 2, { 0, 0 } }, - { "getkey_discard", "Could not verify $0 {hilight $1}'s public key", 2, { 0, 0 } }, + { "pubkey_notkey", "Server did not return any public key", 0 }, + { "pubkey_verified", "Verified successfully $0 {hilight $1}'s cached public key", 2, { 0, 0 } }, + { "pubkey_notverified", "Could not verify $0 {hilight $1}'s public key", 2, { 0, 0 } }, /* Misc messages */ { NULL, "Misc", 0 }, @@ -128,6 +162,7 @@ FORMAT_REC fecommon_silc_formats[] = { { "watch_umode_change", "Watch: {nick $0} is now {hilight $1}", 2, { 0, 0 } }, { "watch_nick_change", "Watch: {nick $0} changed nickname to {nick $1}", 2, { 0, 0 } }, { "message_data", "{nick $0} sent \"{hilight $1}\" data message: cannot display", 2, { 0, 0 } }, + { "stats", "$[25]0: {hilight $1}", 2, { 0, 0 } }, /* File transfer messages */ { NULL, "FileTransfer", 0 }, @@ -150,5 +185,34 @@ FORMAT_REC fecommon_silc_formats[] = { { "file_error_permission_denied", "Error during file transfer with {nick $0}: Permission denied", 1, { 0 } }, { "file_close", "File transfer closed with {nick $0} - $1", 2, { 0, 0 } }, + /* Requested Attributes */ + { NULL, "Requested Attributes", 0 }, + + { "attr_header", "Requested Attributes", 0 }, + { "attr_footer", "End of Requested Attributes", 0 }, + { "attr_allow", " Sending allowed : $0", 1, { 0 } }, + { "attr_vcard_file", " Business card : $0", 1, { 0 } }, + { "attr_services", " Services used : $0", 1, { 0 } }, + { "attr_service", " Service : port [$0] address [$1] logged in [$2] login time [$3] idle [$4]", 5, { 0, 0, 0, 0, 0 } }, + { "attr_status_mood", " User's mood : $0", 1, { 0 } }, + { "attr_status_text", " User's message : $0", 1, { 0 } }, + { "attr_status_message", " User's message : $0", 1, { 0 } }, + { "attr_status_message_file", " Message file : $0", 1, { 0 } }, + { "attr_preferred_language", " Preferred language : $0", 1, { 0 } }, + { "attr_preferred_contact", " Preferred contact : $0", 1, { 0 } }, + { "attr_geolocation", " Geolocation : $0", 1, { 0 } }, + { "attr_device_info", " Device Info : $0", 1, { 0 } }, + { "attr_public_keys", " Public keys : $0", 1, { 0 } }, + { "attr_timezone", " Timezone : $0", 1, { 0 } }, + { "attr_timezone_allow", " Sending timezone : $0", 1, { 0 } }, + { "attr_user_sign_verified", " User's signature : verified successfully", 0 }, + { "attr_user_sign_failed", " User's signature : {hilight signature failed}", 0 }, + { "attr_user_sign_not_present", " User's signature : not available", 0 }, + { "attr_server_sign_verified", " Server's signature : verified successfully", 0 }, + { "attr_server_sign_failed", " Server's signature : {hilight signature failed}", 0 }, + { "attr_extension", " Extension : $0", 1, { 0 } }, + { "attr_save", "Would you like to save the attributes (y/n)?", 0 }, + { "attr_saved", "Requested Attributes located in {hilight $0}", 1, { 0 } }, + { NULL, NULL, 0 } };