summaryrefslogtreecommitdiff
path: root/src/fe-common/irc/module-formats.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/fe-common/irc/module-formats.c')
-rw-r--r--src/fe-common/irc/module-formats.c148
1 files changed, 74 insertions, 74 deletions
diff --git a/src/fe-common/irc/module-formats.c b/src/fe-common/irc/module-formats.c
index b8e330ae..01197397 100644
--- a/src/fe-common/irc/module-formats.c
+++ b/src/fe-common/irc/module-formats.c
@@ -27,16 +27,16 @@ FORMAT_REC fecommon_irc_formats[] = {
/* ---- */
{ NULL, "Server", 0 },
- { "netsplit", "%RNetsplit%n %_$0%_ %_$1%_ quits: $2", 3, { 0, 0, 0 } },
- { "netsplit_more", "%RNetsplit%n %_$0%_ %_$1%_ quits: $2 (+$3 more, use /NETSPLIT to show all of them)", 4, { 0, 0, 0, 1 } },
- { "netsplit_join", "%CNetsplit%n over, joins: $0", 1, { 0 } },
- { "netsplit_join_more", "%CNetsplit%n over, joins: $0 (+$1 more)", 2, { 0, 1 } },
+ { "netsplit", "{netsplit Netsplit} {server $0} {server $1} quits: $2", 3, { 0, 0, 0 } },
+ { "netsplit_more", "{netsplit Netsplit} {server $0} {server $1} quits: $2 (+$3 more, use /NETSPLIT to show all of them)", 4, { 0, 0, 0, 1 } },
+ { "netsplit_join", "{netjoin Netsplit} over, joins: $0", 1, { 0 } },
+ { "netsplit_join_more", "{netjoin Netsplit} over, joins: $0 (+$1 more)", 2, { 0, 1 } },
{ "no_netsplits", "There are no net splits", 0 },
{ "netsplits_header", "Nick Channel Server Splitted server", 0 },
- { "netsplits_line", "$[9]0 $[10]1 $[20]2 $3", 4, { 0, 0, 0, 0 } },
+ { "netsplits_line", "$[9]0 {[10]1 $[20]2 $3", 4, { 0, 0, 0, 0 } },
{ "netsplits_footer", "", 0 },
{ "ircnet_added", "Ircnet $0 saved", 1, { 0 } },
- { "ircnet_removed", "Ircnet $0 removed", 1, { 0 } },
+ { "ircnet_removed", "Ircnet $0} removed", 1, { 0 } },
{ "ircnet_not_found", "Ircnet $0 not found", 1, { 0 } },
{ "ircnet_header", "Ircnets:", 0 },
{ "ircnet_line", "$0: $1", 2, { 0, 0 } },
@@ -48,115 +48,115 @@ FORMAT_REC fecommon_irc_formats[] = {
/* ---- */
{ NULL, "Channels", 0 },
- { "joinerror_toomany", "Cannot join to channel %_$0%_ %K(%nYou have joined to too many channels%K)", 1, { 0 } },
- { "joinerror_full", "Cannot join to channel %_$0%_ %K(%nChannel is full%K)", 1, { 0 } },
- { "joinerror_invite", "Cannot join to channel %_$0%_ %K(%nYou must be invited%K)", 1, { 0 } },
- { "joinerror_banned", "Cannot join to channel %_$0%_ %K(%nYou are banned%K)", 1, { 0 } },
- { "joinerror_bad_key", "Cannot join to channel %_$0%_ %K(%nBad channel key%K)", 1, { 0 } },
- { "joinerror_bad_mask", "Cannot join to channel %_$0%_ %K(%nBad channel mask%K)", 1, { 0 } },
- { "joinerror_unavail", "Cannot join to channel %_$0%_ %K(%nChannel is temporarily unavailable%K)", 1, { 0 } },
- { "joinerror_duplicate", "Channel %_$0%_ already exists - cannot create it", 1, { 0 } },
- { "channel_rejoin", "Channel %_$0%_ is temporarily unavailable, this is normally because of netsplits. Irssi will now automatically try to rejoin back to this channel until the join is successful. Use /RMREJOINS command if you wish to abort this.", 1, { 0 } },
- { "inviting", "Inviting $0 to %_$1", 2, { 0, 0 } },
+ { "joinerror_toomany", "Cannot join to channel {channel $0} (You have joined to too many channels)", 1, { 0 } },
+ { "joinerror_full", "Cannot join to channel {channel $0} (Channel is full)", 1, { 0 } },
+ { "joinerror_invite", "Cannot join to channel {channel $0} (You must be invited)", 1, { 0 } },
+ { "joinerror_banned", "Cannot join to channel {channel $0} (You are banned)", 1, { 0 } },
+ { "joinerror_bad_key", "Cannot join to channel {channel $0} (Bad channel key)", 1, { 0 } },
+ { "joinerror_bad_mask", "Cannot join to channel {channel $0} (Bad channel mask)", 1, { 0 } },
+ { "joinerror_unavail", "Cannot join to channel {channel $0} (Channel is temporarily unavailable)", 1, { 0 } },
+ { "joinerror_duplicate", "Channel {channel $0} already exists - cannot create it", 1, { 0 } },
+ { "channel_rejoin", "Channel {channel $0} is temporarily unavailable, this is normally because of netsplits. Irssi will now automatically try to rejoin back to this channel until the join is successful. Use /RMREJOINS command if you wish to abort this.", 1, { 0 } },
+ { "inviting", "Inviting {nick $0} to {channel $1}", 2, { 0, 0 } },
{ "not_invited", "You have not been invited to a channel!", 0 },
- { "names", "%K[%g%_Users%_%K(%g$0%K)]%n $1", 2, { 0, 0 } },
- { "names_nick", "%K[%n%_$0%_$1%K] ", 2, { 0, 0 } },
- { "endofnames", "%g%_$0%_%K:%n Total of %_$1%_ nicks %K[%n%_$2%_ ops, %_$3%_ voices, %_$4%_ normal%K]", 5, { 0, 1, 1, 1, 1 } },
- { "channel_created", "Channel %_$0%_ created $1", 2, { 0, 0 } },
- { "url", "Home page for %c$0%K:%n $1", 2, { 0, 0 } },
- { "topic", "Topic for %c$0%K:%n $1", 2, { 0, 0 } },
- { "no_topic", "No topic set for %c$0", 1, { 0 } },
- { "topic_info", "Topic set by %_$0%_ %K[%n$1%K]", 2, { 0, 0 } },
- { "chanmode_change", "mode/%c$0 %K[%n$1%K]%n by %_$2", 3, { 0, 0, 0 } },
- { "server_chanmode_change", "%RServerMode/%c$0 %K[%n$1%K]%n by %_$2", 3, { 0, 0, 0 } },
- { "channel_mode", "mode/%c$0 %K[%n$1%K]", 2, { 0, 0 } },
- { "bantype", "Ban type changed to %_$0", 1, { 0 } },
- { "no_bans", "No bans in channel %_$0%_", 1, { 0 } },
- { "banlist", "%_$0%_: ban %c$1", 2, { 0, 0 } },
- { "banlist_long", "%_$0%_: ban %c$1 %K[%nby %_$2%_, $3 secs ago%K]", 4, { 0, 0, 0, 1 } },
- { "ebanlist", "%_$0%_: ban exception %c$1", 2, { 0, 0 } },
- { "ebanlist_long", "%_$0%_: ban exception %c$1 %K[%nby %_$2%_, $3 secs ago%K]", 4, { 0, 0, 0, 1 } },
- { "invitelist", "%_$0%_: invite %c$1", 2, { 0, 0 } },
- { "no_such_channel", "$0: No such channel", 1, { 0 } },
- { "channel_synced", "Join to %_$0%_ was synced in %_$1%_ secs", 2, { 0, 2 } },
+ { "names", "{names_users Users {names_channel $0}}$1", 2, { 0, 0 } },
+ { "names_nick", "[{names_nickstat $0}$1] ", 2, { 0, 0 } },
+ { "endofnames", "{channel $0}: Total of {hilight $1} nicks [{hilight $2} ops, {hilight $3} voices, {hilight $4} normal]", 5, { 0, 1, 1, 1, 1 } },
+ { "channel_created", "Channel {channelhilight $0} created $1", 2, { 0, 0 } },
+ { "url", "Home page for {channelhilight $0}: $1", 2, { 0, 0 } },
+ { "topic", "Topic for {channelhilight $0}: $1", 2, { 0, 0 } },
+ { "no_topic", "No topic set for {channelhilight $0}", 1, { 0 } },
+ { "topic_info", "Topic set by {nick $0} [$1]", 2, { 0, 0 } },
+ { "chanmode_change", "mode/{channelhilight $0} [$1] by {nick $2}", 3, { 0, 0, 0 } },
+ { "server_chanmode_change", "{netsplit ServerMode}/{channelhilight $0} [$1] by {nick $2}", 3, { 0, 0, 0 } },
+ { "channel_mode", "mode/{channelhilight $0} [$1]", 2, { 0, 0 } },
+ { "bantype", "Ban type changed to {channel $0}", 1, { 0 } },
+ { "no_bans", "No bans in channel {channel $0}", 1, { 0 } },
+ { "banlist", "{channel $0}: ban {ban $1}", 2, { 0, 0 } },
+ { "banlist_long", "{channel $0}: ban {ban $1} [by {nick $2}, $3 secs ago]", 4, { 0, 0, 0, 1 } },
+ { "ebanlist", "{channel $0}: ban exception {ban $1}", 2, { 0, 0 } },
+ { "ebanlist_long", "{channel $0}: ban exception {ban $1} [by {nick $2}, $3 secs ago]", 4, { 0, 0, 0, 1 } },
+ { "invitelist", "{channel $0}: invite {ban $1}", 2, { 0, 0 } },
+ { "no_such_channel", "{channel $0}: No such channel", 1, { 0 } },
+ { "channel_synced", "Join to {channel $0} was synced in {hilight $1} secs", 2, { 0, 2 } },
/* ---- */
{ NULL, "Nick", 0 },
- { "usermode_change", "Mode change %K[%n%_$0%_%K]%n for user %c$1", 2, { 0, 0 } },
- { "user_mode", "Your user mode is %K[%n%_$0%_%K]", 1, { 0 } },
+ { "usermode_change", "Mode change [{hilight $0}] for user {nick $1}", 2, { 0, 0 } },
+ { "user_mode", "Your user mode is [{hilight $0}]", 1, { 0 } },
{ "away", "You have been marked as being away", 0 },
{ "unaway", "You are no longer marked as being away", 0 },
- { "nick_away", "$0 is away: $1", 2, { 0, 0 } },
- { "no_such_nick", "$0: No such nick/channel", 1, { 0 } },
- { "your_nick", "Your nickname is $0", 1, { 0 } },
- { "nick_in_use", "Nick %_$0%_ is already in use", 1, { 0 } },
- { "nick_unavailable", "Nick %_$0%_ is temporarily unavailable", 1, { 0 } },
- { "your_nick_owned", "Your nick is owned by %_$3%_ %K[%n$1@$2%K]", 4, { 0, 0, 0, 0 } },
+ { "nick_away", "{nick $0} is away: $1", 2, { 0, 0 } },
+ { "no_such_nick", "{nick $0}: No such nick/channel", 1, { 0 } },
+ { "your_nick", "Your nickname is {nick $0}", 1, { 0 } },
+ { "nick_in_use", "Nick {nick $0} is already in use", 1, { 0 } },
+ { "nick_unavailable", "Nick {nick $0} is temporarily unavailable", 1, { 0 } },
+ { "your_nick_owned", "Your nick is owned by {nick $3} [$1@$2]", 4, { 0, 0, 0, 0 } },
/* ---- */
{ NULL, "Who queries", 0 },
- { "whois", "%_$0%_ %K[%n$1@$2%K]%n%: ircname : $3", 4, { 0, 0, 0, 0 } },
- { "whowas", "%_$0%_ %K[%n$1@$2%K]%n%: ircname : $3", 4, { 0, 0, 0, 0 } },
+ { "whois", "{nick $0} [$1@$2]%: ircname : $3", 4, { 0, 0, 0, 0 } },
+ { "whowas", "{nick $0} [$1@$2]%: ircname : $3", 4, { 0, 0, 0, 0 } },
{ "whois_idle", " idle : $1 days $2 hours $3 mins $4 secs", 5, { 0, 1, 1, 1, 1 } },
- { "whois_idle_signon", " idle : $1 days $2 hours $3 mins $4 secs %K[%nsignon: $5%K]", 6, { 0, 1, 1, 1, 1, 0 } },
- { "whois_server", " server : $1 %K[%n$2%K]", 3, { 0, 0, 0 } },
- { "whois_oper", " : %_IRC operator%_", 1, { 0 } },
+ { "whois_idle_signon", " idle : $1 days $2 hours $3 mins $4 secs [signon: $5]", 6, { 0, 1, 1, 1, 1, 0 } },
+ { "whois_server", " server : $1 [$2]", 3, { 0, 0, 0 } },
+ { "whois_oper", " : {hilight IRC operator}", 1, { 0 } },
{ "whois_registered", " : has registered this nick", 1, { 0 } },
{ "whois_channels", " channels : $1", 2, { 0, 0 } },
{ "whois_away", " away : $1", 2, { 0, 0 } },
{ "end_of_whois", "End of WHOIS", 1, { 0 } },
{ "end_of_whowas", "End of WHOWAS", 1, { 0 } },
{ "whois_not_found", "There is no such nick $0", 1, { 0 } },
- { "who", "$[-10]0 %|%_$[!9]1%_ $[!3]2 $[!2]3 $4@$5 %K(%W$6%K)", 7, { 0, 0, 0, 0, 0, 0, 0 } },
+ { "who", "{channelhilight $[-10]0} %|{nick $[!9]1} $[!3]2 $[!2]3 $4@$5 [{hilight $6}]", 7, { 0, 0, 0, 0, 0, 0, 0 } },
{ "end_of_who", "End of /WHO list", 1, { 0 } },
/* ---- */
{ NULL, "Your messages", 0 },
- { "own_notice", "%K[%rnotice%K(%R$0%K)]%n $1", 2, { 0, 0 } },
- { "own_action", "%W * $0%n $1", 2, { 0, 0 } },
- { "own_ctcp", "%K[%rctcp%K(%R$0%K)]%n $1 $2", 3, { 0, 0, 0 } },
- { "own_wall", "%K[%WWall%K/%c$0%K]%n $1", 2, { 0, 0 } },
+ { "own_notice", "{ownnotice notice{ownnotice_target $0}}$1", 2, { 0, 0 } },
+ { "own_action", "{ownaction $0}$1", 2, { 0, 0 } },
+ { "own_ctcp", "{ownctcp ctcp{ownctcp_target $0}}$1 $2", 3, { 0, 0, 0 } },
+ { "own_wall", "{ownwall Wall{ownwall_channel}}$1", 2, { 0, 0 } },
/* ---- */
{ NULL, "Received messages", 0 },
- { "notice_server", "%g!$0%n $1", 2, { 0, 0 } },
- { "notice_public", "%K-%M$0%K:%m$1%K-%n $2", 3, { 0, 0, 0 } },
- { "notice_public_ops", "%K-%M$0%K:%m@$1%K-%n $2", 3, { 0, 0, 0 } },
- { "notice_private", "%K-%M$0%K(%m$1%K)-%n $2", 3, { 0, 0, 0 } },
- { "action_private", "%W (*) $0%n $2", 3, { 0, 0, 0 } },
- { "action_private_query", "%W * $0%n $2", 3, { 0, 0, 0 } },
- { "action_public", "%W * $0%n $1", 2, { 0, 0 } },
- { "action_public_channel", "%W * $0%K:%c$1%n $2", 3, { 0, 0, 0 } },
+ { "notice_server", "{servernotice $0}$1", 2, { 0, 0 } },
+ { "notice_public", "{notice $0{pubnotice_channel $1}$2", 3, { 0, 0, 0 } },
+ { "notice_public_ops", "{notice $0{pubnotice_channel @$1}$2", 3, { 0, 0, 0 } },
+ { "notice_private", "{notice $0{pvtnotice_nick $1}}$2", 3, { 0, 0, 0 } },
+ { "action_private", "{pvtaction $0}$2", 3, { 0, 0, 0 } },
+ { "action_private_query", "{pvtaction_query $0}$2", 3, { 0, 0, 0 } },
+ { "action_public", "{pubaction $0}$1", 2, { 0, 0 } },
+ { "action_public_channel", "{pubaction $0{msgchannel $1}}$2", 3, { 0, 0, 0 } },
/* ---- */
{ NULL, "CTCPs", 0 },
- { "ctcp_reply", "CTCP %_$0%_ reply from %_$1%_%K:%n $2", 3, { 0, 0, 0 } },
- { "ctcp_reply_channel", "CTCP %_$0%_ reply from %_$1%_ in channel %_$3%_%K:%n $2", 4, { 0, 0, 0, 0 } },
- { "ctcp_ping_reply", "CTCP %_PING%_ reply from %_$0%_: $1.$[-3.0]2 seconds", 3, { 0, 2, 2 } },
- { "ctcp_requested", "%g>>> %_$0%_ %K[%g$1%K] %grequested %_$2%_ from %_$3", 4, { 0, 0, 0, 0 } },
+ { "ctcp_reply", "CTCP {hilight $0} reply from {nick $1}: $2", 3, { 0, 0, 0 } },
+ { "ctcp_reply_channel", "CTCP {hilight $0} reply from {nick $1} in channel {channel $3}: $2", 4, { 0, 0, 0, 0 } },
+ { "ctcp_ping_reply", "CTCP {hilight PING} reply from {nick $0}: $1.$[-3.0]2 seconds", 3, { 0, 2, 2 } },
+ { "ctcp_requested", "{ctcp >>> {hilight $0} [$1] requested {hilight $2} from {nick $3}}", 4, { 0, 0, 0, 0 } },
/* ---- */
{ NULL, "Other server events", 0 },
- { "online", "Users online: %_$0", 1, { 0 } },
+ { "online", "Users online: {hilight $0}", 1, { 0 } },
{ "pong", "PONG received from $0: $1", 2, { 0, 0 } },
- { "wallops", "%WWALLOP%n $0: $1", 2, { 0, 0 } },
- { "action_wallops", "%WWALLOP * $0%n $1", 2, { 0, 0 } },
- { "error", "%_ERROR%_ $0", 1, { 0 } },
+ { "wallops", "{wallop WALLOP{wallop_nick $0}$1", 2, { 0, 0 } },
+ { "action_wallops", "{wallop WALLOP{wallop_action $0}}$1", 2, { 0, 0 } },
+ { "error", "{hilight ERROR} $0", 1, { 0 } },
{ "unknown_mode", "Unknown mode character $0", 1, { 0 } },
- { "not_chanop", "You're not channel operator in $0", 1, { 0 } },
+ { "not_chanop", "You're not channel operator in {channel $0}", 1, { 0 } },
/* ---- */
{ NULL, "Misc", 0 },
- { "silenced", "Silenced %_$0%_", 1, { 0 } },
- { "unsilenced", "Unsilenced %_$0%_", 1, { 0 } },
- { "silence_line", "%_$0%_: silence %c$1", 2, { 0, 0 } },
+ { "silenced", "Silenced {nick $0}", 1, { 0 } },
+ { "unsilenced", "Unsilenced {nick $0}", 1, { 0 } },
+ { "silence_line", "{nick $0}: silence {ban $1}", 2, { 0, 0 } },
{ NULL, NULL, 0 }
};