Protocol version 1.2 integrations

[silc.git] / apps / irssi / src / fe-common / silc / module-formats.c

diff --git a/apps/irssi/src/fe-common/silc/module-formats.c b/apps/irssi/src/fe-common/silc/module-formats.c
index 108f96e8c84e1a1d14889a012fc3ec149ea124e8..ecd8fafd22c046461ec1316bad802a6cbb537d0f 100644 (file)
--- a/apps/irssi/src/fe-common/silc/module-formats.c
+++ b/apps/irssi/src/fe-common/silc/module-formats.c
@@ -96,9 +96,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 +128,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 +151,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 }
 };