Add more friend functions (#408)

libctru/include/3ds/services/frd.h

@@ -18,6 +18,13 @@ typedef struct
 	u64 localFriendCode;
 } FriendKey;
 
+/// Friend Title data
+typedef struct
+{
+	u64 tid;
+	u32 version;
+	u32 unk;
+} TitleData;
 /// Structure containing basic Mii information.
 typedef struct 
 {
@@ -50,12 +57,44 @@ typedef struct
 	u32 padding;
 } Profile;
 
+/// Game Description structure
+typedef struct
+{
+	TitleData data;
+	u16 desc[128];
+} GameDescription;
+
+/// Friend Notification Event structure
+typedef struct
+{
+	u8 type;
+	u8 padding3[3];
+	u32 padding;
+	FriendKey key;
+}NotificationEvent;
+
+/// Enum to use with FRD_GetNotificationEvent
+typedef enum 
+{
+	selfOnline = 1, // Self went online
+	selfOffline, // Self went offline
+	friendOnline, // Friend Went Online 
+	friendPresence, // Friend Presence changed
+	friendMii, // Friend Mii changed
+	friendProfile, // Friend Profile changed
+	friendOffline, // Friend went offline
+	friendBecameFriend, // Friend registered self as friend
+	friendInvitaton // Friend Sent invitation
+}NotificationTypes;
+
 /// Initializes FRD service.
 Result frdInit(void);
 
 /// Exists FRD.
 void frdExit(void);
 
+/// Get FRD handle.
+Handle *frdSessionGetHandle(void);
 /**
  * @brief Gets the login status of the current user.
  * @param state Pointer to write the current user's login status to.
@@ -71,6 +110,12 @@ Result FRDU_IsOnline(bool *state);
 /// Logs out of Nintendo's friend server.
 Result FRD_Logout(void);
 
+/**
+ * @brief Log in to Nintendo's friend server.
+ * @param event Event to signal when Login is done.
+ */
+Result FRD_Login(Handle event);
+
 /**
  * @brief Gets the current user's friend key.
  * @param key Pointer to write the current user's friend key to.
@@ -132,6 +177,38 @@ Result FRD_GetMyComment(char *comment, size_t max_size);
  */
 Result FRD_GetFriendKeyList(FriendKey *friendKeyList, size_t *num, size_t offset, size_t size);
 
+/**
+ * @brief Gets Friends Mii data.
+ * @param mii Pointer to write Mii data to.
+ * @param keys Pointer to FriendKeys.
+ * @param numberOfKeys Number of Friendkeys.
+ */
+Result FRD_GetFriendMii(MiiData *mii, const FriendKey *keys, size_t numberOfKeys);
+
+/**
+ * @brief Get a friend's profile data.
+ * @param profile Pointer to write profile data to.
+ * @param keys Pointer to FriendKeys.
+ * @param numberOfKeys Number of FriendKeys.
+ */
+Result FRD_GetFriendProfile(Profile *profile, const FriendKey *keys, size_t numberOfKeys);
+
+/**
+ * @brief Get a friend's playing Game.
+ * @param desc Pointer to write Game Description data to.
+ * @param keys Pointer to FriendKeys,
+ * @param numberOfKeys Number Of FriendKeys.
+ */
+Result FRD_GetFriendPlayingGame(GameDescription *desc, const FriendKey *keys, size_t numberOfKeys);
+
+/**
+ * @brief Get a friend's favourite Game.
+ * @param desc Pointer to write Game Description data to.
+ * @param keys Pointer to FriendKeys,
+ * @param numberOfKeys Number Of FriendKeys.
+ */
+Result FRD_GetFriendFavouriteGame(GameDescription *desc, const FriendKey *keys, size_t numberOfKeys);
+
 /**
  * @brief Determines if the application was started using the join game option in the friends applet.
  * @param friendKeyList Pointer to a list of friend keys.
@@ -145,6 +222,20 @@ Result FRD_IsFromFriendList(FriendKey *friendKeyList, bool *isFromList);
  */
 Result FRD_UpdateGameModeDescription(const char *desc);
 
+/**
+ * @brief Event which is signaled when friend login states change.
+ * @param event event which will be signaled.
+ */
+Result FRD_AttachToEventNotification(Handle event);
+
+/**
+ * @brief Get Latest Event Notification
+ * @param event Pointer to write recieved notification event struct to.
+ * @param size Number of events
+ * @param recievedNotifCount Number of notification reccieved.
+ */
+Result FRD_GetEventNotification(NotificationEvent *event, size_t size, u32 *recievedNotifCount); 
+
 /**
  * @brief Returns the friend code using the given principal ID.
  * @param principalId The principal ID being used.
@@ -171,3 +262,17 @@ Result FRD_IsValidFriendCode(u64 friendCode, bool *isValid);
  * @param sdkVer The SDK version needed to be used.
  */
 Result FRD_SetClientSdkVersion(u32 sdkVer);
+
+/**
+ * @brief Add a Friend online.
+ * @param event Event signaled when friend is registered.
+ * @param principalId PrincipalId of the friend to add.
+ */
+Result FRD_AddFriendOnline(Handle event, u32 principalId);
+
+/**
+ * @brief Remove a Friend.
+ * @param principalId PrinipalId of the friend code to remove.
+ * @param localFriendCode LocalFriendCode of the friend code to remove.
+ */
+Result FRD_RemoveFriend(u32 principalId, u64 localFriendCode);

libctru/source/services/frd.c

@@ -46,9 +46,9 @@ Result frdInit(void)
 
 	if (AtomicPostIncrement(&frdRefCount)) return 0;
 
-	ret = srvGetServiceHandle(&frdHandle, "frd:u");
+	ret = srvGetServiceHandle(&frdHandle, "frd:a");
 	if (R_FAILED(ret)) ret = srvGetServiceHandle(&frdHandle, "frd:n");
-	if (R_FAILED(ret)) ret = srvGetServiceHandle(&frdHandle, "frd:a");
+	if (R_FAILED(ret)) ret = srvGetServiceHandle(&frdHandle, "frd:u");
 	if (R_FAILED(ret)) AtomicDecrement(&frdRefCount);
 
 	return ret;
@@ -60,6 +60,11 @@ void frdExit(void)
 	svcCloseHandle(frdHandle);
 }
 
+Handle *frdGetSessionHandle(void)
+{
+	return &frdHandle;
+}
+
 Result FRDU_HasLoggedIn(bool *state)
 {
 	Result ret = 0;
@@ -88,6 +93,20 @@ Result FRDU_IsOnline(bool *state)
 	return (Result)cmdbuf[1];
 }
 
+Result FRD_Login(Handle event)
+{
+	Result ret = 0;
+	u32 *cmdbuf = getThreadCommandBuffer();
+
+	cmdbuf[0] = IPC_MakeHeader(0x03,0,2); // 0x30002
+	cmdbuf[1] = 0;
+	cmdbuf[2] = (u32)event;
+
+	if (R_FAILED(ret = svcSendSyncRequest(frdHandle))) return ret;
+
+	return (Result)cmdbuf[1];
+}
+
 Result FRD_Logout(void)
 {
 	Result ret = 0;
@@ -232,6 +251,79 @@ Result FRD_GetFriendKeyList(FriendKey *friendKeyList, size_t *num, size_t offset
 	return (Result)cmdbuf[1];
 }
 
+Result FRD_GetFriendMii(MiiData *mii, const FriendKey *keys, size_t numberOfKeys)
+{
+	Result ret = 0;
+	u32 *cmdbuf = getThreadCommandBuffer();
+
+	cmdbuf[0] = IPC_MakeHeader(0x14,1,4); //0x140044
+	cmdbuf[1] = numberOfKeys;
+	cmdbuf[2] = (numberOfKeys << 18)|2;
+	cmdbuf[3] = (u32)keys;
+	cmdbuf[4] = 0x600 * numberOfKeys | 0xC;
+	cmdbuf[5] = (u32)mii;
+
+	if(R_FAILED(ret = svcSendSyncRequest(frdHandle))) return ret;
+
+	return (Result)cmdbuf[1];
+}
+
+Result FRD_GetFriendProfile(Profile *profile, const FriendKey *keys, size_t numberOfKeys)
+{
+	Result ret = 0;
+	u32 *cmdbuf = getThreadCommandBuffer();
+
+	cmdbuf[0] = IPC_MakeHeader(0x15,1,2); // 0x150042
+	cmdbuf[1] = numberOfKeys;
+	cmdbuf[2] = (numberOfKeys << 18)|2;
+	cmdbuf[3] = (u32)keys;
+
+	u32 *staticbuf = getThreadStaticBuffers();
+	staticbuf[0] = (numberOfKeys << 17)|2;
+	staticbuf[1] = (u32)profile;
+
+	if(R_FAILED(ret = svcSendSyncRequest(frdHandle))) return ret;
+
+	return (Result)cmdbuf[1];
+}
+
+Result FRD_GetFriendPlayingGame(GameDescription *desc, const FriendKey *keys, size_t numberOfKeys)
+{
+	Result ret = 0;
+	u32 *cmdbuf = getThreadCommandBuffer();
+
+	cmdbuf[0] = IPC_MakeHeader(0x18,1,4); // 0x180044
+	cmdbuf[1] = numberOfKeys;
+	cmdbuf[2] = (numberOfKeys << 18) | 2;
+	cmdbuf[3] = (u32)keys;
+	cmdbuf[4] = 0x1100 * numberOfKeys | 0xC;
+	cmdbuf[5] = (u32)desc;
+
+	if (R_FAILED(ret = svcSendSyncRequest(frdHandle))) return ret;
+
+	return (Result)cmdbuf[1];
+}
+
+Result FRD_GetFriendFavouriteGame(GameDescription *desc, const FriendKey *keys, size_t numberOfKeys)
+{
+	Result ret = 0;
+	u32 *cmdbuf = getThreadCommandBuffer();
+
+	cmdbuf[0] = IPC_MakeHeader(0x19,1,2); // 0x190042
+	cmdbuf[1] = numberOfKeys;
+	cmdbuf[2] = (numberOfKeys << 18) | 2;
+	cmdbuf[3] = (u32)keys;
+
+	u32 *staticbuf = getThreadStaticBuffers();
+
+	staticbuf[0] = (numberOfKeys << 18) | 2;
+	staticbuf[1] = (u32)desc;
+
+	if(R_FAILED(svcSendSyncRequest(frdHandle))) return ret;
+
+	return (Result)cmdbuf[1];
+}
+
 Result FRD_IsFromFriendList(FriendKey *friendKeyList, bool *isFromList)
 {
 	Result ret = 0;
@@ -266,6 +358,40 @@ Result FRD_UpdateGameModeDescription(const char *desc)
 	return (Result)cmdbuf[1];
 }
 
+Result FRD_AttachToEventNotification(Handle event)
+{
+	Result ret = 0;
+	u32 *cmdbuf = getThreadCommandBuffer();
+
+	cmdbuf[0] =IPC_MakeHeader(0x20,0,2); //0x200002;
+	cmdbuf[1] = 0;
+	cmdbuf[2] = (u32)event;
+
+	if(R_FAILED(ret = svcSendSyncRequest(frdHandle))) return ret;
+
+	return (Result)cmdbuf[1];
+}
+
+Result FRD_GetEventNotification(NotificationEvent *event, size_t size, u32 *recievedNotifCount)
+{
+	Result ret = 0;
+
+	u32 *cmdbuf = getThreadCommandBuffer();
+	cmdbuf[0] = IPC_MakeHeader(0x22,1,0); //0x220040
+	cmdbuf[1] = (u32)size;
+
+	u32 *staticbuf = getThreadStaticBuffers();
+	staticbuf[0] = 0x60000 * size | 2;
+	staticbuf[1] = (u32)event;
+
+	if(R_FAILED(ret = svcSendSyncRequest(frdHandle)))
+		return ret;
+
+	*recievedNotifCount = cmdbuf[3];
+
+	return (Result)cmdbuf[1];
+}
+
 Result FRD_PrincipalIdToFriendCode(u32 principalId, u64 *friendCode)
 {
 	Result ret = 0;
@@ -326,3 +452,31 @@ Result FRD_SetClientSdkVersion(u32 sdkVer)
 
 	return (Result)cmdbuf[1];
 }
+
+Result FRD_AddFriendOnline(Handle event, u32 principalId)
+{
+	Result ret = 0;
+	u32 *cmdbuf = getThreadCommandBuffer();
+	cmdbuf[0] = IPC_MakeHeader(0x406,1,2); //0x4060042;
+	cmdbuf[1] = principalId;
+	cmdbuf[2] = 0;
+	cmdbuf[3] = (u32)event;
+
+	if(R_FAILED(ret = svcSendSyncRequest(frdHandle))) return ret;
+
+	return (Result)cmdbuf[1];
+}
+
+Result FRD_RemoveFriend(u32 principalId, u64 localFriendCode)
+{
+	Result ret = 0;
+	u32 *cmdbuf = getThreadCommandBuffer();
+	cmdbuf[0] = IPC_MakeHeader(0x409,4,0); //0x4090100;
+	cmdbuf[1] = principalId;
+	cmdbuf[2] = localFriendCode & 0xffffffff;
+	cmdbuf[3] = (localFriendCode >> 32) & 0xffffffff;
+
+	if(R_FAILED(ret = svcSendSyncRequest(frdHandle))) return ret;
+
+	return cmdbuf[1];
+}