jadedctrl/Chat-O-Matic
jadedctrl/ Chat-O-Matic
1
0
Disbranĉigi 0
Fontkodo Issues 20 Tirpetoj Actions Packages Projects Eldonoj 2 Wiki Activity

(irc) Send MOTD and other system messages to account buffer

This commit is contained in:
Jaidyn Ann 2021-08-12 15:47:06 -05:00
parent 057e7fba9b
commit a26c33e5f3
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
protocols/irc/IrcProtocol.cpp
View File

@ -331,7 +331,6 @@ IrcProtocol::_ProcessNumeric(int32 numeric, BString sender, BStringList params,
body = "――MOTD end――"; body = "――MOTD end――";
BMessage send(IM_MESSAGE); BMessage send(IM_MESSAGE);
send.AddInt32("im_what", IM_MESSAGE_RECEIVED); send.AddInt32("im_what", IM_MESSAGE_RECEIVED);
send.AddString("chat_id", "*server*");
send.AddString("body", body); send.AddString("body", body);
_SendMsg(&send); _SendMsg(&send);
break; break;
@ -357,7 +356,6 @@ IrcProtocol::_ProcessNumericError(int32 numeric, BString sender,
{ {
BMessage err(IM_MESSAGE); BMessage err(IM_MESSAGE);
err.AddInt32("im_what", IM_MESSAGE_RECEIVED); err.AddInt32("im_what", IM_MESSAGE_RECEIVED);
err.AddString("chat_id", "*server*");
err.AddString("body", line); err.AddString("body", line);
_SendMsg(&err); _SendMsg(&err);
} }
@ -397,13 +395,12 @@ IrcProtocol::_ProcessCommand(BString command, BString sender,
else if (command == "NOTICE") else if (command == "NOTICE")
{ {
BString chat_id = params.First(); BString chat_id = params.First();
if (chat_id == "AUTH" || chat_id == "*") {
chat_id = "*server*";
sender = "";
}
BMessage send(IM_MESSAGE); BMessage send(IM_MESSAGE);
send.AddInt32("im_what", IM_MESSAGE_RECEIVED); send.AddInt32("im_what", IM_MESSAGE_RECEIVED);
send.AddString("chat_id", chat_id); if (chat_id != "AUTH" && chat_id != "*") {
send.AddString("chat_id", chat_id);
sender = "";
}
if (sender.IsEmpty() == false) if (sender.IsEmpty() == false)
send.AddString("user_id", sender); send.AddString("user_id", sender);
send.AddString("body", params.Last()); send.AddString("body", params.Last());
@ -522,14 +519,12 @@ IrcProtocol::_MakeReady(BString nick, BString ident)
fReady = true; fReady = true;
BMessage ready(IM_MESSAGE); BMessage ready(IM_MESSAGE);
ready.AddInt32("im_what", IM_PROTOCOL_READY); ready.AddInt32("im_what", IM_PROTOCOL_READY);
ready.PrintToStream();
_SendMsg(&ready); _SendMsg(&ready);
BMessage self(IM_MESSAGE); BMessage self(IM_MESSAGE);
self.AddInt32("im_what", IM_OWN_CONTACT_INFO); self.AddInt32("im_what", IM_OWN_CONTACT_INFO);
self.AddString("user_id", fIdent); self.AddString("user_id", fIdent);
self.AddString("user_name", fNick); self.AddString("user_name", fNick);
self.PrintToStream();
_SendMsg(&self); _SendMsg(&self);
_SendIrc("MOTD\n"); _SendIrc("MOTD\n");