(irc) Contact support

This commit is contained in:
Jaidyn Ann 2021-08-16 00:42:39 -05:00
parent 8d62ecca01
commit 03556d674e
2 changed files with 230 additions and 8 deletions

View File

@ -8,6 +8,8 @@
#include <iostream> #include <iostream>
#include <Catalog.h> #include <Catalog.h>
#include <Directory.h>
#include <FindDirectory.h>
#include <Font.h> #include <Font.h>
#include <Resources.h> #include <Resources.h>
#include <SecureSocket.h> #include <SecureSocket.h>
@ -16,6 +18,7 @@
#include <libinterface/BitmapUtils.h> #include <libinterface/BitmapUtils.h>
#include <AppConstants.h> #include <AppConstants.h>
#include <Cardie.h>
#include <ChatProtocolMessages.h> #include <ChatProtocolMessages.h>
#include <Flags.h> #include <Flags.h>
@ -64,6 +67,8 @@ IrcProtocol::Init(ChatProtocolMessengerInterface* interface)
status_t status_t
IrcProtocol::Shutdown() IrcProtocol::Shutdown()
{ {
_SaveContacts();
BString cmd = "QUIT :"; BString cmd = "QUIT :";
cmd << fPartText; cmd << fPartText;
_SendIrc(cmd); _SendIrc(cmd);
@ -159,6 +164,7 @@ IrcProtocol::Process(BMessage* msg)
created.AddString("chat_id", user_name); created.AddString("chat_id", user_name);
created.AddString("user_id", user_id); created.AddString("user_id", user_id);
_SendMsg(&created); _SendMsg(&created);
fChannels.Add(user_name);
break; break;
} }
// If it's not a known user, we need to get their ID/nick somehow // If it's not a known user, we need to get their ID/nick somehow
@ -196,6 +202,7 @@ IrcProtocol::Process(BMessage* msg)
left.AddInt32("im_what", IM_ROOM_LEFT); left.AddInt32("im_what", IM_ROOM_LEFT);
left.AddString("chat_id", chat_id); left.AddString("chat_id", chat_id);
_SendMsg(&left); _SendMsg(&left);
fChannels.Remove(chat_id);
} }
} }
break; break;
@ -250,6 +257,41 @@ IrcProtocol::Process(BMessage* msg)
} }
break; break;
} }
case IM_ROSTER_ADD_CONTACT:
{
BString user_nick;
if (msg->FindString("user_id", &user_nick) == B_OK)
_AddContact(user_nick);
break;
}
case IM_ROSTER_REMOVE_CONTACT:
{
BString user_id;
if (msg->FindString("user_id", &user_id) == B_OK)
_RemoveContact(_NickIdent(user_id));
break;
}
case IM_GET_CONTACT_INFO:
case IM_GET_EXTENDED_CONTACT_INFO:
{
BString user_id;
if (msg->FindString("user_id", &user_id) != B_OK)
break;
BMessage info(IM_MESSAGE);
if (im_what == IM_GET_CONTACT_INFO)
info.AddInt32("im_what", IM_CONTACT_INFO);
else
info.AddInt32("im_what", IM_EXTENDED_CONTACT_INFO);
info.AddString("user_id", user_id);
info.AddString("user_name", _IdentNick(user_id));
if (fOfflineContacts.HasString(_IdentNick(user_id)) == true)
info.AddInt32("status", (int32)STATUS_OFFLINE);
else
info.AddInt32("status", (int32)STATUS_ONLINE);
_SendMsg(&info);
break;
}
default: default:
std::cout << "Unhandled message for IRC:\n"; std::cout << "Unhandled message for IRC:\n";
msg->PrintToStream(); msg->PrintToStream();
@ -267,6 +309,8 @@ IrcProtocol::SettingsTemplate(const char* name)
settings = _AccountTemplate(); settings = _AccountTemplate();
else if (strcmp(name, "join_room") == 0 || strcmp(name, "create_room") == 0) else if (strcmp(name, "join_room") == 0 || strcmp(name, "create_room") == 0)
settings = _RoomTemplate(); settings = _RoomTemplate();
else if (strcmp(name, "roster") == 0)
settings = _RosterTemplate();
return settings; return settings;
} }
@ -362,6 +406,9 @@ IrcProtocol::_ProcessNumeric(int32 numeric, BString sender, BStringList params,
fIdentNicks.RemoveItemFor(ident); fIdentNicks.RemoveItemFor(ident);
fIdentNicks.AddItem(ident, nick); fIdentNicks.AddItem(ident, nick);
// If is a contact, let's go!
_UpdateContact(nick, ident, true);
// Contains the own user's contact info― protocol ready! // Contains the own user's contact info― protocol ready!
if (fReady == false && nick == fNick) { if (fReady == false && nick == fNick) {
fUser = user.String(); fUser = user.String();
@ -375,9 +422,10 @@ IrcProtocol::_ProcessNumeric(int32 numeric, BString sender, BStringList params,
created.AddString("chat_id", nick); created.AddString("chat_id", nick);
created.AddString("user_id", ident); created.AddString("user_id", ident);
_SendMsg(&created); _SendMsg(&created);
fChannels.Add(nick);
} }
// Used to populate a one-on-one chat's userlist… lol, I know. // Used to populate a one-on-one chat's userlist… lol, I know.
else if (fWhoIsRequested == false && nick != fNick) { else if (fWhoIsRequested == false && fChannels.HasString(nick)) {
BMessage user(IM_MESSAGE); BMessage user(IM_MESSAGE);
user.AddInt32("im_what", IM_ROOM_PARTICIPANTS); user.AddInt32("im_what", IM_ROOM_PARTICIPANTS);
user.AddString("chat_id", nick); user.AddString("chat_id", nick);
@ -489,15 +537,20 @@ IrcProtocol::_ProcessCommand(BString command, BString sender,
{ {
BString chat_id = params.First(); BString chat_id = params.First();
BString user_id = _SenderIdent(sender); BString user_id = _SenderIdent(sender);
BString user_name = _SenderNick(sender);
BString body = params.Last(); BString body = params.Last();
if (_IsChannelName(chat_id) == false) if (_IsChannelName(chat_id) == false)
chat_id = _SenderNick(sender); chat_id = _SenderNick(sender);
if (fChannels.HasString(chat_id) == false)
fChannels.Add(chat_id);
_UpdateContact(user_name, user_id, true);
BMessage chat(IM_MESSAGE); BMessage chat(IM_MESSAGE);
chat.AddInt32("im_what", IM_MESSAGE_RECEIVED); chat.AddInt32("im_what", IM_MESSAGE_RECEIVED);
chat.AddString("chat_id", chat_id); chat.AddString("chat_id", chat_id);
chat.AddString("user_id", user_id); chat.AddString("user_id", user_id);
chat.AddString("user_name", _SenderNick(sender)); chat.AddString("user_name", user_name);
_AddFormatted(&chat, "body", body); _AddFormatted(&chat, "body", body);
_SendMsg(&chat); _SendMsg(&chat);
} }
@ -509,6 +562,8 @@ IrcProtocol::_ProcessCommand(BString command, BString sender,
if (_IsChannelName(chat_id) == false) if (_IsChannelName(chat_id) == false)
chat_id = _SenderNick(sender); chat_id = _SenderNick(sender);
if (fChannels.HasString(chat_id) == false)
fChannels.Add(chat_id);
if (chat_id != "AUTH" || chat_id != "*") if (chat_id != "AUTH" || chat_id != "*")
send.AddString("chat_id", chat_id); send.AddString("chat_id", chat_id);
@ -534,6 +589,9 @@ IrcProtocol::_ProcessCommand(BString command, BString sender,
else if (command == "JOIN") else if (command == "JOIN")
{ {
BString chat_id = params.First(); BString chat_id = params.First();
BString user_id = _SenderIdent(sender);
BString user_name = _SenderNick(sender);
_UpdateContact(user_name, user_id, true);
BMessage joined(IM_MESSAGE); BMessage joined(IM_MESSAGE);
joined.AddString("chat_id", chat_id); joined.AddString("chat_id", chat_id);
@ -543,9 +601,9 @@ IrcProtocol::_ProcessCommand(BString command, BString sender,
} }
else { else {
joined.AddInt32("im_what", IM_ROOM_PARTICIPANT_JOINED); joined.AddInt32("im_what", IM_ROOM_PARTICIPANT_JOINED);
joined.AddString("user_id", _SenderIdent(sender)); joined.AddString("user_id", user_id);
joined.AddString("user_name", _SenderNick(sender)); joined.AddString("user_name", user_name);
fIdentNicks.AddItem(_SenderIdent(sender), _SenderNick(sender)); fIdentNicks.AddItem(user_id, user_name);
} }
_SendMsg(&joined); _SendMsg(&joined);
} }
@ -571,21 +629,27 @@ IrcProtocol::_ProcessCommand(BString command, BString sender,
} }
else if (command == "QUIT") else if (command == "QUIT")
{ {
BString user_id = _SenderIdent(sender);
BString user_name = _SenderNick(sender);
_UpdateContact(user_name, user_id, false);
BString body = B_TRANSLATE("quit: "); BString body = B_TRANSLATE("quit: ");
body << params.Last(); body << params.Last();
for (int i = 0; i < fChannels.CountStrings(); i++) { for (int i = 0; i < fChannels.CountStrings(); i++) {
if (_IsChannelName(fChannels.StringAt(i)) == false)
continue;
BMessage left(IM_MESSAGE); BMessage left(IM_MESSAGE);
left.AddInt32("im_what", IM_ROOM_PARTICIPANT_LEFT); left.AddInt32("im_what", IM_ROOM_PARTICIPANT_LEFT);
left.AddString("user_id", _SenderIdent(sender)); left.AddString("user_id", user_id);
left.AddString("user_name", _SenderNick(sender)); left.AddString("user_name", user_name);
left.AddString("chat_id", fChannels.StringAt(i)); left.AddString("chat_id", fChannels.StringAt(i));
_SendMsg(&left); _SendMsg(&left);
} }
BMessage status(IM_MESSAGE); BMessage status(IM_MESSAGE);
status.AddInt32("im_what", IM_USER_STATUS_SET); status.AddInt32("im_what", IM_USER_STATUS_SET);
status.AddString("user_id", _SenderIdent(sender)); status.AddString("user_id", user_id);
status.AddInt32("status", STATUS_OFFLINE); status.AddInt32("status", STATUS_OFFLINE);
_SendMsg(&status); _SendMsg(&status);
} }
@ -611,6 +675,8 @@ IrcProtocol::_ProcessCommand(BString command, BString sender,
else { else {
nick.AddInt32("im_what", IM_USER_NICKNAME_SET); nick.AddInt32("im_what", IM_USER_NICKNAME_SET);
nick.AddString("user_id", ident); nick.AddString("user_id", ident);
_RenameContact(ident, user_name);
fIdentNicks.RemoveItemFor(ident); fIdentNicks.RemoveItemFor(ident);
fIdentNicks.AddItem(ident, user_name); fIdentNicks.AddItem(ident, user_name);
} }
@ -637,6 +703,8 @@ IrcProtocol::_MakeReady(BString nick, BString ident)
_SendMsg(&self); _SendMsg(&self);
_SendIrc("MOTD\n"); _SendIrc("MOTD\n");
_LoadContacts();
} }
@ -744,6 +812,16 @@ IrcProtocol::_IdentNick(BString ident)
} }
BString
IrcProtocol::_NickIdent(BString nick)
{
for (int i = 0; i < fIdentNicks.CountItems(); i++)
if (fIdentNicks.ValueAt(i) == nick)
return fIdentNicks.KeyAt(i);
return nick;
}
bool bool
IrcProtocol::_IsChannelName(BString name) IrcProtocol::_IsChannelName(BString name)
{ {
@ -811,6 +889,119 @@ IrcProtocol::_ToggleAndAdd(BMessage* msg, uint16 face, int32* start,
} }
void
IrcProtocol::_UpdateContact(BString nick, BString ident, bool online)
{
if (fContacts.HasString(nick) == false)
return;
if (online == true && fOfflineContacts.HasString(nick) == true) {
_RemoveContact(nick);
_AddContact(ident);
fOfflineContacts.Remove(nick);
}
else if (online == false && fOfflineContacts.HasString(nick) == false) {
fOfflineContacts.Add(nick);
}
}
void
IrcProtocol::_AddContact(BString nick)
{
fContacts.Add(nick);
BString user_id = _NickIdent(nick);
BMessage added(IM_MESSAGE);
added.AddInt32("im_what", IM_ROSTER);
added.AddString("user_id", user_id);
_SendMsg(&added);
if (user_id == nick)
fOfflineContacts.Add(nick);
}
void
IrcProtocol::_RemoveContact(BString user_id)
{
BString nick = _IdentNick(user_id);
fContacts.Remove(nick);
fOfflineContacts.Remove(nick);
BMessage removed(IM_MESSAGE);
removed.AddInt32("im_what", IM_ROSTER_CONTACT_REMOVED);
removed.AddString("user_id", _NickIdent(user_id));
_SendMsg(&removed);
}
void
IrcProtocol::_RenameContact(BString user_id, BString newNick)
{
BString oldNick = _IdentNick(user_id);
if (fContacts.HasString(oldNick) == true) {
fContacts.Remove(_IdentNick(user_id));
fOfflineContacts.Remove(_IdentNick(user_id));
fContacts.Add(newNick);
}
}
void
IrcProtocol::_LoadContacts()
{
BMessage contacts;
BFile file(_ContactsCache(), B_READ_ONLY);
if (file.InitCheck() == B_OK)
contacts.Unflatten(&file);
int i = 0;
BString user_name;
while (contacts.FindString("user_name", i, &user_name) == B_OK) {
_AddContact(user_name);
i++;
}
}
void
IrcProtocol::_SaveContacts()
{
BMessage contacts;
for (int i = 0; i < fContacts.CountStrings(); i++)
contacts.AddString("user_name", fContacts.StringAt(i));
BFile file(_ContactsCache(), B_WRITE_ONLY | B_CREATE_FILE);
if (file.InitCheck() == B_OK)
contacts.Flatten(&file);
}
const char*
IrcProtocol::_CachePath()
{
BPath path;
if (find_directory(B_USER_SETTINGS_DIRECTORY, &path) != B_OK)
return NULL;
path.Append(APP_NAME "/Cache/Accounts");
path.Append(fName);
if (create_directory(path.Path(), 0755) != B_OK)
return NULL;
return path.Path();
}
const char*
IrcProtocol::_ContactsCache()
{
BPath path(_CachePath());
path.Append("contact_list");
return path.Path();
}
BString BString
IrcProtocol::_ReadUntilNewline(BDataIO* io, BString* extraBuffer) IrcProtocol::_ReadUntilNewline(BDataIO* io, BString* extraBuffer)
{ {
@ -933,3 +1124,19 @@ IrcProtocol::_RoomTemplate()
return settings; return settings;
} }
BMessage
IrcProtocol::_RosterTemplate()
{
BMessage settings;
BMessage nick;
nick.AddString("name", "user_id");
nick.AddString("description", B_TRANSLATE("Nick:"));
nick.AddString("error", B_TRANSLATE("How can someone be your friend if you don't know their name?"));
nick.AddInt32("type", B_STRING_TYPE);
settings.AddMessage("setting", &nick);
return settings;
}

View File

@ -78,6 +78,7 @@ private:
BString _SenderIdent(BString sender); BString _SenderIdent(BString sender);
BString _IdentNick(BString ident); BString _IdentNick(BString ident);
BString _NickIdent(BString nick);
bool _IsChannelName(BString name); bool _IsChannelName(BString name);
@ -86,6 +87,16 @@ private:
void _ToggleAndAdd(BMessage* msg, uint16 face, int32* start, void _ToggleAndAdd(BMessage* msg, uint16 face, int32* start,
int32 current); int32 current);
void _UpdateContact(BString nick, BString ident, bool online);
void _AddContact(BString nick);
void _RemoveContact(BString user_id);
void _RenameContact(BString user_id, BString newNick);
void _LoadContacts();
void _SaveContacts();
const char* _CachePath();
const char* _ContactsCache();
// Read a data stream until newline found; if data found past // Read a data stream until newline found; if data found past
// newline, append to given buffer for later use // newline, append to given buffer for later use
BString _ReadUntilNewline(BDataIO* data, BString* extraBuffer); BString _ReadUntilNewline(BDataIO* data, BString* extraBuffer);
@ -95,6 +106,7 @@ private:
// GUI templates // GUI templates
BMessage _AccountTemplate(); BMessage _AccountTemplate();
BMessage _RoomTemplate(); BMessage _RoomTemplate();
BMessage _RosterTemplate();
BSocket* fSocket; BSocket* fSocket;
BString fRemainingBuf; BString fRemainingBuf;
@ -123,6 +135,9 @@ private:
BStringList fChannels; BStringList fChannels;
BStringList fContacts;
BStringList fOfflineContacts;
BPath fAddOnPath; BPath fAddOnPath;
BString fName; BString fName;
ChatProtocolMessengerInterface* fMessenger; ChatProtocolMessengerInterface* fMessenger;