MSN Plugin, initial avatars support added

protocols/msn/Jamfile

@@ -9,6 +9,7 @@ SubDirSysHdrs [ FDirName $(CAYA_INCLUDE_DIR) ] ;
 AddOn msn :
 	main.cpp
 	MSN.cpp
+	MSNContainer.cpp
 	: be root $(TARGET_LIBSTDC++) ssl crypto network bnetapi libmsn.a
 	: msn.rdef SettingsTemplate.rdef
 ;

protocols/msn/MSN.cpp

@@ -36,6 +36,7 @@
 #include <msn.h>
 
 #include "MSN.h"
+#include "MSNContainer.h"
 
 extern const char* kProtocolSignature = "msn";
 extern const char* kProtocolName = "MSN Protocol";
@@ -50,6 +51,9 @@ struct ssl {
 
 int kSocketsCount = 0;
 int kSocketsAvailable = 0;
+
+#define AVAT_PATH "/tmp/msnavatarbuddy"
+
 int32 StartPollThread(void* punt)
 {
 	MSNP* mainClass = (MSNP*) punt;
@@ -61,7 +65,7 @@ int32 StartPollThread(void* punt)
 		if (kPollSockets == NULL)
 			continue;
 
-		poll(kPollSockets, kSocketsCount, -1);
+		poll(kPollSockets, kSocketsCount, 3);
 
 		for (int i = 0; i < kSocketsCount; i++) {
 			if (kPollSockets[i].fd == -1) {
@@ -175,6 +179,8 @@ MSNP::Init(CayaProtocolMessengerInterface* msgr)
 	fClientID += MSN::SIPInvitations;
 	fClientID += MSN::SupportMultiPacketMessaging;
 
+	fID = 123456;
+
 	return B_OK;
 }
 
@@ -268,8 +274,9 @@ MSNP::Process(BMessage* msg)
 								Error("MSN Protocol: You are not logged!", NULL);
 							}
 							break;
+
 						case CAYA_OFFLINE:
-							if (fLogged) {
+							//if (fLogged) {
 								fMainConnection->disconnect();
 								delete fMainConnection;
 								int end = fBuddyList.CountItems();
@@ -288,32 +295,29 @@ MSNP::Process(BMessage* msg)
 								fLogged = false;
 								fSettings = true;
 								suspend_thread(fPollThread);
-							}
+							//}
-							break;
-						default:
-//							Error("Invalid", NULL);
-//							Log("caya msn plugin :
 							break;
 					}
 					break;
 				}
+
 				case IM_SEND_MESSAGE:
 				{
 					const char* buddy = msg->FindString("id");
 					const char* sms = msg->FindString("body");
-					const string rcpt_ = buddy;
+
-					const string msg_ = sms;
 					int x, y;
 					bool nouveau = true;
 					int count = 0;
 					count = fSwitchboardList.CountItems();
 					if (count != 0) {
 						for (x=0; x < count; x++) {
-							if (fSwitchboardList.ItemAt(x)->first == rcpt_) {
+							if (fSwitchboardList.ItemAt(x)->first == buddy) {
 								if (fSwitchboardList.ItemAt(x)->second->isConnected()) {
 									nouveau = false;
 									y = x;
 								} else {
+									
 									delete fSwitchboardList.ItemAt(x)->second;
 									fSwitchboardList.RemoveItemAt(x);
 								}
@@ -323,15 +327,17 @@ MSNP::Process(BMessage* msg)
 					}
 
 					if (nouveau) {
-						const pair<string, string> *ctx
+						/*const pair<string, string> *ctx
 							= new pair<string, string>(rcpt_, msg_);
 						// request a new switchboard connection
-						fMainConnection->requestSwitchboardConnection(ctx);
+						fMainConnection->requestSwitchboardConnection(ctx);*/
+						MSNContainer* container = new MSNContainer(string(sms), string(buddy));
+						fMainConnection->requestSwitchboardConnection(container);
 
 					} else {
 						MSN::SwitchboardServerConnection* conn = fSwitchboardList.ItemAt(y)->second;
 						conn->sendTypingNotification();
-						conn->sendMessage(msg_);
+						conn->sendMessage(string(sms));
 
 						BMessage msg(IM_MESSAGE);
 						msg.AddInt32("im_what", IM_MESSAGE_SENT);
@@ -504,6 +510,68 @@ MSNP::MessageFromBuddy(const char* mess, const char* id)
 }
 
 
+void
+MSNP::RequestBuddyIcon(string msnobject, MSN::Passport buddy)
+{
+	if (fAvatarSwitch != NULL) {
+		fID = fID++;
+		std::string fileName = AVAT_PATH;
+		fileName.append(buddy).append(".img");
+		fAvatarSwitch->requestDisplayPicture(fID++, fileName, msnobject);
+	} else {
+		MSNContainer* container = new MSNContainer(buddy);
+		container->SetObject(msnobject);
+		if (fMainConnection->switchboardWithOnlyUser(buddy) == NULL) {
+			fMainConnection->requestSwitchboardConnection(container);
+		} /*else {
+			//fMainConnection->switchboardWithOnlyUser(buddy);
+		}*/	
+	}
+}
+
+
+void
+MSNP::SendBuddyIcon(string filename, string passport)
+{
+	entry_ref ref;
+	if (get_ref_for_path(filename.c_str(), &ref) != B_OK)
+		return;
+
+	BMessage msg(IM_MESSAGE);
+	msg.AddInt32("im_what", IM_AVATAR_SET);
+	msg.AddString("id", passport.c_str());
+	msg.AddRef("ref", &ref);
+	fServerMsgr->SendMessage(&msg);
+}
+
+
+bool
+MSNP::CheckAvatar(string passport) {
+	string filename = AVAT_PATH;
+	filename.append(passport).append(".img");
+	BEntry entry = BEntry(filename.c_str(), true);
+	if (entry.Exists()) {
+		SendBuddyIcon(filename, passport);
+		return true;
+	}
+	//file.Close();
+	return false;
+}
+
+
+string*
+MSNP::Object(string passport) {
+	for (int32 i = 0; i < fAvatarDone.CountItems(); i++) {
+		if (fAvatarDone.ItemAt(i)->first == passport)
+			return &fAvatarDone.ItemAt(i)->second;
+	}
+	for (int32 i = 0; i < fAvatarQueue.CountItems(); i++) {
+		if (fAvatarQueue.ItemAt(i)->first == passport)
+			return &fAvatarQueue.ItemAt(i)->second;
+	}
+	return NULL;
+}
+
 /********************/
 /* libmsn callbacks */
 /********************/
@@ -824,12 +892,17 @@ void MSNP::buddyChangedStatus(MSN::NotificationServerConnection * conn, MSN::Pas
 	fServerMsgr->SendMessage(&msg);
 
 	// updating the user informations
-	BMessage mess(IM_MESSAGE);
+	/*BMessage mess(IM_MESSAGE);
 	mess.AddInt32("im_what", IM_CONTACT_INFO);
 	mess.AddString("protocol", kProtocolSignature);
 	msg.AddString("id", buddy.c_str());
 	msg.AddString("name", friendlyname.c_str());
-	fServerMsgr->SendMessage(&msg);
+	fServerMsgr->SendMessage(&msg);*/
+
+	if (!CheckAvatar(buddy))
+		fAvatarQueue.AddItem(new pair<string, string>(buddy, msnobject));
+	else
+		fAvatarDone.AddItem(new pair<string, string>(buddy, msnobject));
 }
 
 
@@ -838,6 +911,7 @@ void MSNP::buddyOffline(MSN::NotificationServerConnection * conn, MSN::Passport
 	int x;
 	int count = 0;
 	count = fSwitchboardList.CountItems();
+	// TODO use ns functions instead
 	if (count != 0) {
 		for (x = 0; x < count; x++) {
 			if (fSwitchboardList.ItemAt(x)->first == buddy) {
@@ -847,6 +921,7 @@ void MSNP::buddyOffline(MSN::NotificationServerConnection * conn, MSN::Passport
 			}
 		}
 	}
+
 	BMessage msg(IM_MESSAGE);
 	msg.AddInt32("im_what", IM_STATUS_SET);
 	msg.AddString("protocol", kProtocolSignature);
@@ -858,40 +933,56 @@ void MSNP::buddyOffline(MSN::NotificationServerConnection * conn, MSN::Passport
 
 void MSNP::gotSwitchboard(MSN::SwitchboardServerConnection* conn, const void* tag)
 {
-	if (tag) {
+	if (!tag)
-		const pair<string, string> *ctx = static_cast<const pair<string, string> *>(tag);
+		return;
-		conn->inviteUser(ctx->first);
+
+	MSNContainer* cont = (MSNContainer*) tag;
+
+	if (cont->IsMessage()) {
+		printf("%s\n", cont->Message().c_str());
+		conn->inviteUser(cont->Buddy());
+	}
+	if (cont->HasObject()) {
+		if (!fAvatarSwitch || !fAvatarSwitch->isConnected()) {
+			fAvatarSwitch = conn;
+			fID = fID++;
+			std::string fileName = AVAT_PATH;
+			fileName.append(cont->Buddy()).append(".img");
+			fAvatarSwitch->requestDisplayPicture(fID++, fileName, cont->Object());
+		} else {
+			delete conn;
+		}
 	}
 }
 
 
 void MSNP::buddyJoinedConversation(MSN::SwitchboardServerConnection* conn, MSN::Passport username, std::string friendlyname, int is_initial)
 {
-	if (conn->auth.tag) {
+	if (!conn->auth.tag)
-		const pair<string, string> *ctx = static_cast<const pair<string, string> *>(conn->auth.tag);
+		return;
+
+	MSNContainer* cont = (MSNContainer*) (conn->auth.tag);
+	if (cont->IsMessage()) {
 		conn->sendTypingNotification();
-		/*int trid = */conn->sendMessage(ctx->second);
 		fSwitchboardList.AddItem(new pair<string,
 			MSN::SwitchboardServerConnection*>(username, conn));
-		delete ctx;
+		int trid = conn->sendMessage(cont->Message());
-		conn->auth.tag = NULL;
+
+		string* obj = Object(username);
+		if (obj != NULL) {
+			std::string fileName = AVAT_PATH;
+			fileName.append(username).append(".img");
+			conn->requestDisplayPicture(fID++, fileName, *obj);
 		}
 	}
+	delete cont;
+	conn->auth.tag = NULL;
+}
 
 
 void MSNP::buddyLeftConversation(MSN::SwitchboardServerConnection* conn, MSN::Passport username)
 {
 	//printf("MSNP::buddyLeftConversation\n");
-/*	int x;
-	int count = 0;
-	count = fSwitchboardList.CountItems();
-	if (count != 0) {
-		for (x=0; x < count; x++) {
-			if (fSwitchboardList.ItemAt(x)->second == conn) {
-				break;
-			}
-		}
-	}*/
 }
 
 
@@ -950,6 +1041,7 @@ void MSNP::gotInk(MSN::SwitchboardServerConnection * conn, MSN::Passport usernam
 void MSNP::gotContactDisplayPicture(MSN::SwitchboardServerConnection* conn, MSN::Passport passport, std::string filename )
 {
 	printf("MSNP::gotContactDisplayPicture %s\n", filename.c_str());
+	SendBuddyIcon(filename, passport);
 }
 
 
@@ -1006,13 +1098,19 @@ void MSNP::gotNewConnection(MSN::Connection * conn)
 
 
 void MSNP::buddyChangedPersonalInfo(MSN::NotificationServerConnection* conn, MSN::Passport fromPassport, MSN::personalInfo pInfo)
-{
+{/*
+	int32 what = IM_CONTACT_INFO;
+	BMessage msg(IM_MESSAGE);
+	msg.AddInt32("im_what", what);
+	msg.AddString("id", fromPassport.c_str());
+	msg.AddString("message", pInfo.PSM.c_str());
+	fServerMsgr->SendMessage(&msg);	*/
 }
 
 
 void MSNP::closingConnection(MSN::Connection* conn)
 {
-//	printf ("MSNP::closingConnection : connection with socket %d\n", (int)conn->sock);
+	printf ("MSNP::closingConnection : connection with socket %d\n", (int)conn->sock);
 }
 
 
@@ -1113,7 +1211,7 @@ void MSNP::gotMessageSentACK(MSN::SwitchboardServerConnection * conn, int trID)
 
 void MSNP::askFileTransfer(MSN::SwitchboardServerConnection * conn, MSN::fileTransferInvite ft)
 {
-
+	printf("file transfer\n");
 }
 
 

protocols/msn/MSN.h

@@ -61,8 +61,10 @@ public:
 		void 	Progress(const char* id, const char* message, float progress);
 		void 	SendContactInfo(MSN::Buddy*);
 		void	MessageFromBuddy(const char* mess, const char* id);
-
+		void	RequestBuddyIcon(string msnobject, MSN::Passport buddy);
-;
+		void	SendBuddyIcon(string filename, string passport);
+		bool	CheckAvatar(string passport);
+		string*	Object(string passport);
 private:
 
 		thread_id   fPollThread;
@@ -74,11 +76,17 @@ private:
 		string		fNickname;
 
 		bool		fSettings;
-
+unsigned int		fID;
 		CayaProtocolMessengerInterface*	fServerMsgr;
+		MSN::NotificationServerConnection* fMainConnection;
+
 		List<MSN::Buddy*> fBuddyList;
 		List<pair<string, MSN::SwitchboardServerConnection*>*> fSwitchboardList;
-		MSN::NotificationServerConnection* fMainConnection;
+
+		MSN::SwitchboardServerConnection* fAvatarSwitch;
+		List<pair<string, string>*> fAvatarQueue;
+		List<pair<string, string>*> fAvatarDone;
+
 // LibMSN Callbacks :
 		virtual void registerSocket(void* s, int read, int write, bool isSSL);