Mon Jan 12 13:01:10 CET 2004 Jochen Eisinger <jochen@penguin-breeder.org>

[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 ba8cdfcb319c00d06a4aaf32834d9c508f6d1856..85a24c4d25c3807f73f87e20099bdfc2c23c18b1 100644 (file)
--- a/apps/irssi/src/fe-common/silc/module-formats.c
+++ b/apps/irssi/src/fe-common/silc/module-formats.c
@@ -33,10 +33,6 @@ FORMAT_REC fecommon_silc_formats[] = {
        { "channel_topic_not_set", "Topic for {channel $0} not set", 1, { 0 } },
        { "cmode", "channel mode/{channel $0} {mode $1} by {nick $2}", 3, { 0, 0, 0 } },
        { "cumode", "channel user mode/{channel $0}/{nick $1} {mode $2} by {nick $3}", 4, { 0, 0, 0, 0 } },
-       { "action", "{action $0-}", 2, { 0, 0 } },
-       { "notice", "{notice $0-}", 2, { 0, 0 } },
-       { "ownaction", "{ownaction $0-}", 2, { 0, 0 } },
-       { "ownnotice", "{ownnotice $0-}", 2, { 0, 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 } },
@@ -82,6 +78,36 @@ FORMAT_REC fecommon_silc_formats[] = {
        { "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 } },
+       { "own_action", "{ownaction $0}$1", 3, { 0, 0, 0 } },
+       { "own_action_signed", "{ownaction {flag_signed}$0}$1", 3, { 0, 0, 0 } },
+       { "own_action_target", "{ownaction_target $0 $2}$1", 3, { 0, 0, 0 } },
+       { "own_action_target_signed", "{ownaction_target {flag_signed}$0 $2}$1", 3, { 0, 0, 0 } },
+       { "action_public", "{pubaction $0}$2", 3, { 0, 0, 0 } },
+       { "action_public_signed", "{pubaction {flag_signed}$0}$2", 3, { 0, 0, 0 } },
+       { "action_public_unknown", "{pubaction {flag_unknown}$0}$2", 3, { 0, 0, 0 } },
+       { "action_public_failed", "{pubaction {flag_failed}$0}$2", 3, { 0, 0, 0 } },
+       { "action_public_channel", "{pubaction $0{msgchannel $1}}$2", 3, { 0, 0, 0 } },
+       { "action_public_channel_signed", "{pubaction {flag_signed}$0{msgchannel $1}}$2", 3, { 0, 0, 0 } },
+       { "action_public_channel_unknown", "{pubaction {flag_unknown}$0{msgchannel $1}}$2", 3, { 0, 0, 0 } },
+       { "action_public_channel_failed", "{pubaction {flag_failed}$0{msgchannel $1}}$2", 3, { 0, 0, 0 } },
+       { "action_private", "{pvtaction $0}$2", 3, { 0, 0, 0 } },
+       { "action_private_signed", "{pvtaction {flag_signed}$0}$2", 3, { 0, 0, 0 } },
+       { "action_private_unknown", "{pvtaction {flag_unknown}$0}$2", 3, { 0, 0, 0 } },
+       { "action_private_failed", "{pvtaction {flag_failed}$0}$2", 3, { 0, 0, 0 } },
+       { "action_private_query", "{pvtaction_query $0}$2", 3, { 0, 0, 0 } },
+       { "action_private_query_signed", "{pvtaction_query {flag_signed}$0}$2", 3, { 0, 0, 0 } },
+       { "action_private_query_unknown", "{pvtaction_query {flag_unknown}$0}$2", 3, { 0, 0, 0 } },
+       { "action_private_query_failed", "{pvtaction_query {flag_failed}$0}$2", 3, { 0, 0, 0 } },
+       { "own_notice", "{ownnotice notice $0}$1", 2, { 0, 0 } },
+       { "own_notice_signed", "{ownnotice notice {flag_signed}$0}$1", 2, { 0, 0 } },
+       { "notice_public", "{notice $0{pubnotice_channel $1}}$2", 3, { 0, 0, 0 } },
+       { "notice_public_signed", "{notice {flag_signed}$0{pubnotice_channel $1}}$2", 3, { 0, 0, 0 } },
+       { "notice_public_unknown", "{notice {flag_unknown}$0{pubnotice_channel $1}}$2", 3, { 0, 0, 0 } },
+       { "notice_public_failed", "{notice {flag_failed}$0{pubnotice_channel $1}}$2", 3, { 0, 0, 0 } },
+       { "notice_private", "{notice $0{pvtnotice_host $1}}$2", 3, { 0, 0, 0 } },
+       { "notice_private_signed", "{notice {flag_signed}$0{pvtnotice_host $1}}$2", 3, { 0, 0, 0 } },
+       { "notice_private_unknown", "{notice {flag_unknown}$0{pvtnotice_host $1}}$2", 3, { 0, 0, 0 } },
+       { "notice_private_failed", "{notice {flag_failed}$0{pvtnotice_host $1}}$2", 3, { 0, 0, 0 } },
 
        /* WHOIS, WHOWAS and USERS (alias WHO) messages */
        { NULL, "Who Queries", 0 },
@@ -163,6 +189,8 @@ FORMAT_REC fecommon_silc_formats[] = {
        { "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 } },
+       { "reattach", "Resuming old session on {hilight $0}, may take a while ...", 1, { 0 } },
+       { "reattach_failed", "Resuming session failed, you may want to remove {hilight $0} before the next connection attempt", 1, { 0 } },
 
        /* File transfer messages */
        { NULL, "FileTransfer", 0 },
@@ -230,5 +258,15 @@ FORMAT_REC fecommon_silc_formats[] = {
         { "lstkey_loadpub", "Could not load public key file `$0'", 1, { 0 } },
        { "lstkey_list", "Stored {hilight $0} public keys:", 1, { 0 } },
 
+       /* Network */
+       { NULL, "Network", 0},
+
+       { "silcnet_added", "SILCNet $0 saved", 1, { 0 } },
+       { "silcnet_removed", "SILCNet $0 removed", 1, { 0 } },
+       { "silcnet_not_found", "SILCNet $0 not found", 1, { 0 } },
+       { "silcnet_header", "%#SILCNets:", 0 },
+       { "silcnet_line", "%#$0: $1", 2, { 0, 0 } },
+       { "silcnet_footer", "", 0 },
+
        { NULL, NULL, 0 }
 };