Change Group::ContainsUser to take user object

Author: negasora

binaryninjaapi.h

@@ -22480,7 +22480,7 @@ namespace BinaryNinja::Collaboration
 		std::string GetName();
 		void SetName(const std::string& name);
 		void SetUsernames(const std::vector<std::string>& usernames);
-		bool ContainsUser(const std::string& username);
+		bool ContainsUser(Ref<CollabUser> user);
 
 	};
 

binaryninjacore.h

@@ -8618,7 +8618,7 @@ extern "C"
 	BINARYNINJACOREAPI void BNCollaborationGroupSetName(BNCollaborationGroup* group, const char* name);
 	BINARYNINJACOREAPI bool BNCollaborationGroupGetUsers(BNCollaborationGroup* group, char*** userIds, char*** usernames, size_t* count);
 	BINARYNINJACOREAPI bool BNCollaborationGroupSetUsernames(BNCollaborationGroup* group, const char** names, size_t count);
-	BINARYNINJACOREAPI bool BNCollaborationGroupContainsUser(BNCollaborationGroup* group, const char* username);
+	BINARYNINJACOREAPI bool BNCollaborationGroupContainsUser(BNCollaborationGroup* group, BNCollaborationUser* user);
 
 	// CollabUser
 	BINARYNINJACOREAPI BNCollaborationUser* BNNewCollaborationUserReference(BNCollaborationUser* user);

collaboration.cpp

@@ -1089,9 +1089,9 @@ void CollabGroup::SetUsernames(const std::vector<std::string>& usernames)
 }
 
 
-bool CollabGroup::ContainsUser(const std::string& username)
+bool CollabGroup::ContainsUser(Ref<CollabUser> user)
 {
-	return BNCollaborationGroupContainsUser(m_object, username.c_str());
+	return BNCollaborationGroupContainsUser(m_object, user->m_object);
 }
 
 

python/collaboration/group.py

@@ -2,7 +2,7 @@
 from typing import List, Tuple
 
 from .. import _binaryninjacore as core
-from . import remote, util
+from . import remote, user, util
 
 
 class Group:
@@ -102,11 +102,11 @@ def users(self, usernames: List[str]):
 		if not core.BNCollaborationGroupSetUsernames(self._handle, array, len(usernames)):
 			raise RuntimeError(util._last_error())
 
-	def contains_user(self, username: str) -> bool:
+	def contains_user(self, user: user.User) -> bool:
 		"""
-		Test if a group has a user with the given username
+		Test if a group contains a user
 
-		:param username: Username of user to check membership
-		:return: If the user is in the group
+		:param user: User to check membership of
+		:return: If the group contains the user
 		"""
-		return core.BNCollaborationGroupContainsUser(self._handle, username)
+		return core.BNCollaborationGroupContainsUser(self._handle, user._handle)

rust/src/collaboration/group.rs

@@ -1,4 +1,5 @@
 use super::Remote;
+use crate::collaboration::RemoteUser;
 use crate::rc::{Array, CoreArrayProvider, CoreArrayProviderInner, Guard, Ref, RefCountable};
 use crate::string::{BnString, IntoCStr};
 use binaryninjacore_sys::*;
@@ -100,10 +101,9 @@ impl RemoteGroup {
         success.then_some(()).ok_or(())
     }
 
-    /// Test if a group has a user with the given username
-    pub fn contains_user(&self, username: &str) -> bool {
-        let username = username.to_cstr();
-        unsafe { BNCollaborationGroupContainsUser(self.handle.as_ptr(), username.as_ptr()) }
+    /// Test if a group contains a user
+    pub fn contains_user(&self, user: Ref<RemoteUser>) -> bool {
+        unsafe { BNCollaborationGroupContainsUser(self.handle.as_ptr(), user.handle.as_ptr()) }
     }
 }