@ -262,7 +262,7 @@ void KviServerParser::parseLiteralJoin(KviIrcMessage *msg)
}
}
// MODE %s b MUST BE THE LAST AUTOMATIC CHANNEL T QUERY
// MODE %s b MUST BE THE LAST AUTOMATIC CHANNEL QUERY
// so we get RPL_ENDOFBANLIST as the last reply
// and we know that the channel is in sync
@ -326,7 +326,7 @@ void KviServerParser::parseLiteralJoin(KviIrcMessage *msg)
{
if ( KVI_OPTION_BOOL ( KviOption_boolEnableQueryTracing ) )
{
q - > output ( KVI_OUT_ T QUERYTRACE,
q - > output ( KVI_OUT_ QUERYTRACE,
__tr2qs ( " \r !n \r %Q \r [%Q@ \r !h \r %Q \r ] has just joined \r !c \r %Q \r " ) , & szNick , & szUser ,
& szHost , & channel ) ;
q - > notifyCommonChannels ( szNick , szUser , szHost , iChans , szChans ) ;
@ -422,11 +422,11 @@ void KviServerParser::parseLiteralPart(KviIrcMessage *msg)
if ( q )
{
if ( ! partMsg . isEmpty ( ) )
q - > output ( KVI_OUT_ T QUERYTRACE,
q - > output ( KVI_OUT_ QUERYTRACE,
__tr2qs ( " \r !nc \r %Q \r [%Q@ \r !h \r %Q \r ] has just left \r !c \r %Q \r : %Q " ) ,
& szNick , & szUser , & szHost , & szChan , & partMsg ) ;
else
q - > output ( KVI_OUT_ T QUERYTRACE,
q - > output ( KVI_OUT_ QUERYTRACE,
__tr2qs ( " \r !nc \r %Q \r [%Q@ \r !h \r %Q \r ] has just left \r !c \r %Q \r " ) ,
& szNick , & szUser , & szHost , & szChan ) ;
q - > notifyCommonChannels ( szNick , szUser , szHost , iChans , szChans ) ;
@ -437,14 +437,14 @@ void KviServerParser::parseLiteralPart(KviIrcMessage *msg)
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////
//
// T QUIT
// QUIT
//
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////
void KviServerParser : : parseLiteralQuit ( KviIrcMessage * msg )
{
// T QUIT
// :<source_mask> T QUIT :<quit message>
// QUIT
// :<source_mask> QUIT :<quit message>
TQString szNick , szUser , szHost ;
msg - > decodeAndSplitPrefix ( szNick , szUser , szHost ) ;
@ -548,7 +548,7 @@ void KviServerParser::parseLiteralQuit(KviIrcMessage *msg)
quitMsg . prepend ( " NETSPLIT " ) ;
}
if ( ! msg - > haltOutput ( ) ) c - > output ( KVI_OUT_ T QUIT,
if ( ! msg - > haltOutput ( ) ) c - > output ( KVI_OUT_ QUIT,
__tr2qs ( " \r !n \r %Q \r [%Q@ \r !h \r %Q \r ] has quit IRC: %Q " ) ,
& szNick , & szUser , & szHost , & quitMsg ) ;
}
@ -565,7 +565,7 @@ void KviServerParser::parseLiteralQuit(KviIrcMessage *msg)
{
quitMsg . prepend ( " NETSPLIT " ) ;
}
q - > output ( KVI_OUT_ T QUIT, __tr2qs ( " \r !n \r %Q \r [%Q@ \r !h \r %Q \r ] has quit IRC: %Q " ) ,
q - > output ( KVI_OUT_ QUIT, __tr2qs ( " \r !n \r %Q \r [%Q@ \r !h \r %Q \r ] has quit IRC: %Q " ) ,
& szNick , & szUser , & szHost , & quitMsg ) ;
}
}
@ -684,7 +684,7 @@ void KviServerParser::parseLiteralKick(KviIrcMessage *msg)
{
TQString szChans ;
int iChans = console - > connection ( ) - > getCommonChannels ( victim , szChans ) ;
q - > output ( KVI_OUT_ T QUERYTRACE,
q - > output ( KVI_OUT_ QUERYTRACE,
__tr2qs ( " \r !n \r %Q \r [%Q@ \r !h \r %Q \r ] has just been kicked from \r !c \r %Q \r by \r !n \r %Q \r [%Q@ \r !h \r %Q \r ]: %Q " ) ,
& victim , & szVUser , & szVHost , & szChan ,
& szNick , & szUser , & szHost , & szKickMsg ) ;
@ -886,7 +886,7 @@ void KviServerParser::parseLiteralPrivmsg(KviIrcMessage *msg)
query - > userAction ( szNick , szUser , szHost , KVI_USERACTION_PRIVMSG ) ;
// decrypt the message if needed
KviStr szBuffer ; const char * txtptr ; int msgtype ;
DECRYPT_IF_NEEDED ( query , msg - > safeTrailing ( ) , KVI_OUT_ T QUERYPRIVMSG, KVI_OUT_ T QUERYPRIVMSGCRYPTED, szBuffer , txtptr , msgtype )
DECRYPT_IF_NEEDED ( query , msg - > safeTrailing ( ) , KVI_OUT_ QUERYPRIVMSG, KVI_OUT_ QUERYPRIVMSGCRYPTED, szBuffer , txtptr , msgtype )
// trigger the script event and eventually kill the output
TQString szMsgText = query - > decodeText ( txtptr ) ;
if ( KVS_TRIGGER_EVENT_4_HALTED ( KviEvent_OnQueryMessage , query , szNick , szUser , szHost , szMsgText ) )
@ -922,7 +922,7 @@ void KviServerParser::parseLiteralPrivmsg(KviIrcMessage *msg)
TQString szMsg = TQStyleSheet : : escape ( szMsgText ) ;
# endif
//debug("kvi_sp_literal.cpp:908 debug: %s",szMsg.data());
g_pApp - > notifierMessage ( query , KVI_SMALLICON_ T QUERYPRIVMSG, szMsg , 1800 ) ;
g_pApp - > notifierMessage ( query , KVI_SMALLICON_ QUERYPRIVMSG, szMsg , 1800 ) ;
}
}
console - > outputPrivmsg ( query , msgtype , szNick , szUser , szHost , szMsgText , iFlags ) ;
@ -963,7 +963,7 @@ void KviServerParser::parseLiteralPrivmsg(KviIrcMessage *msg)
}
}
pOut - > output ( KVI_OUT_ T QUERYPRIVMSG, " [PRIVMSG \r !nc \r %Q \r ]: %Q " , & szNick , & szMsgText ) ;
pOut - > output ( KVI_OUT_ QUERYPRIVMSG, " [PRIVMSG \r !nc \r %Q \r ]: %Q " , & szNick , & szMsgText ) ;
}
}
} else {
@ -1252,7 +1252,7 @@ void KviServerParser::parseLiteralNotice(KviIrcMessage *msg)
query - > userAction ( szNick , szUser , szHost , KVI_USERACTION_NOTICE ) ;
// decrypt it if needed
KviStr szBuffer ; const char * txtptr ; int msgtype ;
DECRYPT_IF_NEEDED ( query , msg - > safeTrailing ( ) , KVI_OUT_ T QUERYNOTICE, KVI_OUT_ T QUERYNOTICECRYPTED, szBuffer , txtptr , msgtype )
DECRYPT_IF_NEEDED ( query , msg - > safeTrailing ( ) , KVI_OUT_ QUERYNOTICE, KVI_OUT_ QUERYNOTICECRYPTED, szBuffer , txtptr , msgtype )
TQString szMsgText = query - > decodeText ( txtptr ) ;
// trigger the script event and eventually kill the output
if ( KVS_TRIGGER_EVENT_4_HALTED ( KviEvent_OnQueryNotice , query , szNick , szUser , szHost , szMsgText ) )
@ -1280,7 +1280,7 @@ void KviServerParser::parseLiteralNotice(KviIrcMessage *msg)
TQString szMsg = TQStyleSheet : : escape ( szMsgText ) ;
# endif
//debug("kvi_sp_literal.cpp:908 debug: %s",szMsg.data());
g_pApp - > notifierMessage ( query , KVI_SMALLICON_ T QUERYNOTICE, szMsg , 1800 ) ;
g_pApp - > notifierMessage ( query , KVI_SMALLICON_ QUERYNOTICE, szMsg , 1800 ) ;
}
}
@ -1313,7 +1313,7 @@ void KviServerParser::parseLiteralNotice(KviIrcMessage *msg)
}
}
pOut - > output ( KVI_OUT_ T QUERYNOTICE, " * \r !n \r %Q \r * %Q " , & szNick , & szMsgText ) ;
pOut - > output ( KVI_OUT_ QUERYNOTICE, " * \r !n \r %Q \r * %Q " , & szNick , & szMsgText ) ;
}
}
return ;
@ -1465,15 +1465,15 @@ void KviServerParser::parseLiteralNick(KviIrcMessage *msg)
}
KviQuery * q = console - > connection ( ) - > findQuery ( szNick ) ;
// It CAN happen that szNewNick first queries us without being
// on any channel then he T QUITS , he reconnects , he joins
// on any channel then he QUITS , he reconnects , he joins
// a channel with szNick , queries us and changes nick to szNewNick : gotcha!
// should merge the queries!
KviQuery * old = console - > connection ( ) - > findQuery ( szNewNick ) ;
if ( old & & ( old ! = q ) )
{
if ( KVI_OPTION_BOOL ( KviOption_boolEnableQueryTracing ) & & ( ! _OUTPUT_ T QUIET) )
if ( KVI_OPTION_BOOL ( KviOption_boolEnableQueryTracing ) & & ( ! _OUTPUT_ QUIET) )
{
old - > output ( KVI_OUT_ T QUERYTRACE,
old - > output ( KVI_OUT_ QUERYTRACE,
__tr2qs ( " The target of this query was lost and has been found when \r !n \r %Q \r [%Q@ \r !h \r %Q \r ] changed his nickname to \r !n \r %Q \r " ) ,
& szNick , & szUser , & szHost , & szNewNick ) ;
}
Darrell Anderson
13 years ago