slidge-whatsapp 0.3.7__cp312-cp312-manylinux_2_41_aarch64.whl → 0.3.8__cp312-cp312-manylinux_2_41_aarch64.whl

slidge_whatsapp/config.py

@@ -22,14 +22,19 @@ DB_PATH__DOC = (
 )
 
 DB_PARAMS = "?_foreign_keys=true"
-DB_PARAMS__DOC = "Additional parameters to pass to database connection string."
+DB_PARAMS__DOC = "Additional parameters to pass to database connection string"
 
 ALWAYS_SYNC_ROSTER = False
 ALWAYS_SYNC_ROSTER__DOC = (
-    "Whether or not to perform a full sync of the WhatsApp roster on startup."
+    "Whether or not to perform a full sync of the WhatsApp roster on startup"
 )
 
 ENABLE_LINK_PREVIEWS = True
 ENABLE_LINK_PREVIEWS__DOC = (
     "Whether or not previews for links (URLs) should be generated on outgoing messages"
 )
+
+ADD_GROUP_PARTICIPANTS_TO_ROSTER = True
+ADD_GROUP_PARTICIPANTS_TO_ROSTER__DOC = (
+    "Whether or not group participants will be added to the XMPP roster"
+)

slidge_whatsapp/contact.py

@@ -51,7 +51,7 @@ class Roster(LegacyRoster[str, Contact]):
         contacts = self.session.whatsapp.GetContacts(refresh=config.ALWAYS_SYNC_ROSTER)
         for contact in contacts:
             c = await self.add_whatsapp_contact(contact)
-            if c is not None:
+            if c is not None and c.is_friend:
                 yield c
 
     async def add_whatsapp_contact(self, data: whatsapp.Contact) -> Contact | None:
@@ -62,8 +62,9 @@ class Roster(LegacyRoster[str, Contact]):
         if data.JID == self.user_legacy_id:
             return None
         contact = await self.by_legacy_id(data.JID)
+        self.session.log.debug("User named %s, friend: %s", data.Name, data.IsFriend)
         contact.name = data.Name
-        contact.is_friend = True
+        contact.is_friend = data.IsFriend or config.ADD_GROUP_PARTICIPANTS_TO_ROSTER
         try:
             unique_id = ""
             if contact.avatar is not None:

slidge_whatsapp/event.go

@@ -81,8 +81,9 @@ type Avatar struct {
 // A Contact represents any entity that be communicated with directly in WhatsApp. This typically
 // represents people, but may represent a business or bot as well, but not a group-chat.
 type Contact struct {
-	JID  string // The WhatsApp JID for this contact.
-	Name string // The user-set, human-readable name for this contact.
+	JID      string // The WhatsApp JID for this contact.
+	Name     string // The user-set, human-readable name for this contact.
+	IsFriend bool   // Whether this contact is in the user's contact list.
 }
 
 // NewContactEvent returns event data meant for [Session.propagateEvent] for the contact information
@@ -104,10 +105,13 @@ func newContact(jid types.JID, info types.ContactInfo) Contact {
 		return Contact{}
 	}
 
-	// Find valid contact name from list of alternatives, or return empty contact if none could
-	// be found.
-	var contact = Contact{JID: jid.ToNonAD().String()}
-	for _, n := range []string{info.FullName, info.FirstName, info.BusinessName, info.PushName} {
+	var contact = Contact{
+		JID:      jid.ToNonAD().String(),
+		IsFriend: info.FullName != "", // Only trusted contacts have full names attached on WhatsApp.
+	}
+
+	// Find valid contact name from list of alternatives, or return empty contact if none could be found.
+	for _, n := range []string{info.FullName, info.FirstName, info.BusinessName, info.PushName, info.RedactedPhone} {
 		if n != "" {
 			contact.Name = n
 			break
@@ -199,6 +203,7 @@ type Message struct {
 	Receipts    []Receipt    // The receipt statuses for the message, typically provided alongside historical messages.
 	Reactions   []Message    // Reactions attached to message, typically provided alongside historical messages.
 	IsHistory   bool         // Whether or not the message is derived from message history.
+	ReferenceID string       // A message referenced in this message, for edits.
 }
 
 // A Attachment represents additional binary data (e.g. images, videos, documents) provided alongside
@@ -310,8 +315,8 @@ func newMessageEvent(ctx context.Context, client *whatsmeow.Client, evt *events.
 		case waE2E.ProtocolMessage_MESSAGE_EDIT:
 			if m := p.GetEditedMessage(); m != nil {
 				message.Kind = MessageEdit
-				message.ID = p.Key.GetID()
 				message.Body = m.GetConversation()
+				message.ReferenceID = p.Key.GetID()
 			} else {
 				return EventUnknown, nil
 			}
@@ -410,9 +415,9 @@ func newMessageEvent(ctx context.Context, client *whatsmeow.Client, evt *events.
 
 		// Handle group-chat invite link in text message.
 		if code, ok := strings.CutPrefix(e.GetMatchedText(), whatsmeow.InviteLinkPrefix); ok {
-			if info, err := client.GetGroupInfoFromLink(e.GetMatchedText()); err != nil {
+			if info, err := client.GetGroupInfoFromLink(ctx, e.GetMatchedText()); err != nil {
 				client.Log.Errorf("Failed getting group info from invite: %s", err)
-			} else if _, err := client.JoinGroupWithLink(code); err != nil {
+			} else if _, err := client.JoinGroupWithLink(ctx, code); err != nil {
 				client.Log.Errorf("Failed joining group with invite: %s", err)
 			} else {
 				message.GroupInvite = newGroup(ctx, client, info)

slidge_whatsapp/gateway.go

@@ -101,7 +101,13 @@ func (w *Gateway) Init() error {
 // NewSession returns a new [Session] for the LinkedDevice given. If the linked device does not have
 // a valid ID, a pair operation will be required, as described in [Session.Login].
 func (w *Gateway) NewSession(device LinkedDevice) *Session {
-	return &Session{device: device, gateway: w}
+	ctx, cancel := context.WithCancelCause(context.Background())
+	return &Session{
+		device:    device,
+		gateway:   w,
+		ctx:       ctx,
+		ctxCancel: cancel,
+	}
 }
 
 // CleanupSession will remove all invalid and obsolete references to the given device, and should be

slidge_whatsapp/generated/_whatsapp.cpython-312-aarch64-linux-gnu.h

@@ -351,39 +351,75 @@ extern long long int Slice_whatsapp_Receipt_subslice(long long int handle, GoInt
 extern void Slice_whatsapp_Receipt_set(long long int handle, GoInt _idx, long long int _vl);
 extern void Slice_whatsapp_Receipt_append(long long int handle, long long int _vl);
 
-// --- wrapping struct: whatsapp.Connect ---
+// --- wrapping struct: whatsapp.Call ---
 //
-extern long long int whatsapp_Connect_CTor();
-extern char* whatsapp_Connect_JID_Get(long long int handle);
-extern void whatsapp_Connect_JID_Set(long long int handle, char* val);
-extern char* whatsapp_Connect_Error_Get(long long int handle);
-extern void whatsapp_Connect_Error_Set(long long int handle, char* val);
+extern long long int whatsapp_Call_CTor();
+extern long long int whatsapp_Call_State_Get(long long int handle);
+extern void whatsapp_Call_State_Set(long long int handle, long long int val);
+extern char* whatsapp_Call_JID_Get(long long int handle);
+extern void whatsapp_Call_JID_Set(long long int handle, char* val);
+extern long long int whatsapp_Call_Timestamp_Get(long long int handle);
+extern void whatsapp_Call_Timestamp_Set(long long int handle, long long int val);
 
-// --- wrapping struct: whatsapp.EventPayload ---
+// --- wrapping struct: whatsapp.Contact ---
 //
-extern long long int whatsapp_EventPayload_CTor();
-extern char* whatsapp_EventPayload_QRCode_Get(long long int handle);
-extern void whatsapp_EventPayload_QRCode_Set(long long int handle, char* val);
-extern char* whatsapp_EventPayload_PairDeviceID_Get(long long int handle);
-extern void whatsapp_EventPayload_PairDeviceID_Set(long long int handle, char* val);
-extern long long int whatsapp_EventPayload_Connect_Get(long long int handle);
-extern void whatsapp_EventPayload_Connect_Set(long long int handle, long long int val);
-extern long long int whatsapp_EventPayload_LoggedOut_Get(long long int handle);
-extern void whatsapp_EventPayload_LoggedOut_Set(long long int handle, long long int val);
-extern long long int whatsapp_EventPayload_Contact_Get(long long int handle);
-extern void whatsapp_EventPayload_Contact_Set(long long int handle, long long int val);
-extern long long int whatsapp_EventPayload_Presence_Get(long long int handle);
-extern void whatsapp_EventPayload_Presence_Set(long long int handle, long long int val);
-extern long long int whatsapp_EventPayload_Message_Get(long long int handle);
-extern void whatsapp_EventPayload_Message_Set(long long int handle, long long int val);
-extern long long int whatsapp_EventPayload_ChatState_Get(long long int handle);
-extern void whatsapp_EventPayload_ChatState_Set(long long int handle, long long int val);
-extern long long int whatsapp_EventPayload_Receipt_Get(long long int handle);
-extern void whatsapp_EventPayload_Receipt_Set(long long int handle, long long int val);
-extern long long int whatsapp_EventPayload_Group_Get(long long int handle);
-extern void whatsapp_EventPayload_Group_Set(long long int handle, long long int val);
-extern long long int whatsapp_EventPayload_Call_Get(long long int handle);
-extern void whatsapp_EventPayload_Call_Set(long long int handle, long long int val);
+extern long long int whatsapp_Contact_CTor();
+extern char* whatsapp_Contact_JID_Get(long long int handle);
+extern void whatsapp_Contact_JID_Set(long long int handle, char* val);
+extern char* whatsapp_Contact_Name_Get(long long int handle);
+extern void whatsapp_Contact_Name_Set(long long int handle, char* val);
+extern char whatsapp_Contact_IsFriend_Get(long long int handle);
+extern void whatsapp_Contact_IsFriend_Set(long long int handle, char val);
+
+// --- wrapping struct: whatsapp.Group ---
+//
+extern long long int whatsapp_Group_CTor();
+extern char* whatsapp_Group_JID_Get(long long int handle);
+extern void whatsapp_Group_JID_Set(long long int handle, char* val);
+extern char* whatsapp_Group_Name_Get(long long int handle);
+extern void whatsapp_Group_Name_Set(long long int handle, char* val);
+extern long long int whatsapp_Group_Subject_Get(long long int handle);
+extern void whatsapp_Group_Subject_Set(long long int handle, long long int val);
+extern char* whatsapp_Group_Nickname_Get(long long int handle);
+extern void whatsapp_Group_Nickname_Set(long long int handle, char* val);
+extern long long int whatsapp_Group_Participants_Get(long long int handle);
+extern void whatsapp_Group_Participants_Set(long long int handle, long long int val);
+extern char* whatsapp_Group_InviteCode_Get(long long int handle);
+extern void whatsapp_Group_InviteCode_Set(long long int handle, char* val);
+
+// --- wrapping struct: whatsapp.GroupSubject ---
+//
+extern long long int whatsapp_GroupSubject_CTor();
+extern char* whatsapp_GroupSubject_Subject_Get(long long int handle);
+extern void whatsapp_GroupSubject_Subject_Set(long long int handle, char* val);
+extern long long int whatsapp_GroupSubject_SetAt_Get(long long int handle);
+extern void whatsapp_GroupSubject_SetAt_Set(long long int handle, long long int val);
+extern char* whatsapp_GroupSubject_SetBy_Get(long long int handle);
+extern void whatsapp_GroupSubject_SetBy_Set(long long int handle, char* val);
+
+// --- wrapping struct: whatsapp.Receipt ---
+//
+extern long long int whatsapp_Receipt_CTor();
+extern long long int whatsapp_Receipt_Kind_Get(long long int handle);
+extern void whatsapp_Receipt_Kind_Set(long long int handle, long long int val);
+extern long long int whatsapp_Receipt_MessageIDs_Get(long long int handle);
+extern void whatsapp_Receipt_MessageIDs_Set(long long int handle, long long int val);
+extern char* whatsapp_Receipt_JID_Get(long long int handle);
+extern void whatsapp_Receipt_JID_Set(long long int handle, char* val);
+extern char* whatsapp_Receipt_GroupJID_Get(long long int handle);
+extern void whatsapp_Receipt_GroupJID_Set(long long int handle, char* val);
+extern long long int whatsapp_Receipt_Timestamp_Get(long long int handle);
+extern void whatsapp_Receipt_Timestamp_Set(long long int handle, long long int val);
+extern char whatsapp_Receipt_IsCarbon_Get(long long int handle);
+extern void whatsapp_Receipt_IsCarbon_Set(long long int handle, char val);
+
+// --- wrapping struct: whatsapp.Avatar ---
+//
+extern long long int whatsapp_Avatar_CTor();
+extern char* whatsapp_Avatar_ID_Get(long long int handle);
+extern void whatsapp_Avatar_ID_Set(long long int handle, char* val);
+extern char* whatsapp_Avatar_URL_Get(long long int handle);
+extern void whatsapp_Avatar_URL_Set(long long int handle, char* val);
 
 // --- wrapping struct: whatsapp.Message ---
 //
@@ -430,41 +466,14 @@ extern long long int whatsapp_Message_Reactions_Get(long long int handle);
 extern void whatsapp_Message_Reactions_Set(long long int handle, long long int val);
 extern char whatsapp_Message_IsHistory_Get(long long int handle);
 extern void whatsapp_Message_IsHistory_Set(long long int handle, char val);
+extern char* whatsapp_Message_ReferenceID_Get(long long int handle);
+extern void whatsapp_Message_ReferenceID_Set(long long int handle, char* val);
 
-// --- wrapping struct: whatsapp.Presence ---
-//
-extern long long int whatsapp_Presence_CTor();
-extern char* whatsapp_Presence_JID_Get(long long int handle);
-extern void whatsapp_Presence_JID_Set(long long int handle, char* val);
-extern long long int whatsapp_Presence_Kind_Get(long long int handle);
-extern void whatsapp_Presence_Kind_Set(long long int handle, long long int val);
-extern long long int whatsapp_Presence_LastSeen_Get(long long int handle);
-extern void whatsapp_Presence_LastSeen_Set(long long int handle, long long int val);
-
-// --- wrapping struct: whatsapp.Session ---
+// --- wrapping struct: whatsapp.PollOption ---
 //
-extern long long int whatsapp_Session_CTor();
-extern char* whatsapp_Session_Login(long long int _handle);
-extern char* whatsapp_Session_Logout(long long int _handle);
-extern char* whatsapp_Session_Disconnect(long long int _handle);
-extern char* whatsapp_Session_PairPhone(long long int _handle, char* phone);
-extern char* whatsapp_Session_SendMessage(long long int _handle, long long int message);
-extern char* whatsapp_Session_GenerateMessageID(long long int _handle);
-extern char* whatsapp_Session_SendChatState(long long int _handle, long long int state);
-extern char* whatsapp_Session_SendReceipt(long long int _handle, long long int receipt);
-extern char* whatsapp_Session_SendPresence(long long int _handle, long long int presence, char* statusMessage);
-extern long long int whatsapp_Session_GetContacts(long long int _handle, char refresh);
-extern long long int whatsapp_Session_GetGroups(long long int _handle);
-extern long long int whatsapp_Session_CreateGroup(long long int _handle, char* name, long long int participants);
-extern char* whatsapp_Session_LeaveGroup(long long int _handle, char* resourceID);
-extern long long int whatsapp_Session_GetAvatar(long long int _handle, char* resourceID, char* avatarID);
-extern char* whatsapp_Session_SetAvatar(long long int _handle, char* resourceID, long long int avatar);
-extern char* whatsapp_Session_SetGroupName(long long int _handle, char* resourceID, char* name);
-extern char* whatsapp_Session_SetGroupTopic(long long int _handle, char* resourceID, char* topic);
-extern long long int whatsapp_Session_UpdateGroupParticipants(long long int _handle, char* resourceID, long long int participants);
-extern long long int whatsapp_Session_FindContact(long long int _handle, char* phone);
-extern char* whatsapp_Session_RequestMessageHistory(long long int _handle, char* resourceID, long long int oldestMessage);
-extern void whatsapp_Session_SetEventHandler(long long int _handle, PyObject* h, char goRun);
+extern long long int whatsapp_PollOption_CTor();
+extern char* whatsapp_PollOption_Title_Get(long long int handle);
+extern void whatsapp_PollOption_Title_Set(long long int handle, char* val);
 
 // --- wrapping struct: whatsapp.Attachment ---
 //
@@ -479,70 +488,6 @@ extern long long int whatsapp_Attachment_Data_Get(long long int handle);
 extern void whatsapp_Attachment_Data_Set(long long int handle, long long int val);
 extern long long int whatsapp_Attachment_GetSpec(long long int _handle, long long int ctx);
 
-// --- wrapping struct: whatsapp.Group ---
-//
-extern long long int whatsapp_Group_CTor();
-extern char* whatsapp_Group_JID_Get(long long int handle);
-extern void whatsapp_Group_JID_Set(long long int handle, char* val);
-extern char* whatsapp_Group_Name_Get(long long int handle);
-extern void whatsapp_Group_Name_Set(long long int handle, char* val);
-extern long long int whatsapp_Group_Subject_Get(long long int handle);
-extern void whatsapp_Group_Subject_Set(long long int handle, long long int val);
-extern char* whatsapp_Group_Nickname_Get(long long int handle);
-extern void whatsapp_Group_Nickname_Set(long long int handle, char* val);
-extern long long int whatsapp_Group_Participants_Get(long long int handle);
-extern void whatsapp_Group_Participants_Set(long long int handle, long long int val);
-extern char* whatsapp_Group_InviteCode_Get(long long int handle);
-extern void whatsapp_Group_InviteCode_Set(long long int handle, char* val);
-
-// --- wrapping struct: whatsapp.GroupParticipant ---
-//
-extern long long int whatsapp_GroupParticipant_CTor();
-extern char* whatsapp_GroupParticipant_JID_Get(long long int handle);
-extern void whatsapp_GroupParticipant_JID_Set(long long int handle, char* val);
-extern char* whatsapp_GroupParticipant_Nickname_Get(long long int handle);
-extern void whatsapp_GroupParticipant_Nickname_Set(long long int handle, char* val);
-extern long long int whatsapp_GroupParticipant_Affiliation_Get(long long int handle);
-extern void whatsapp_GroupParticipant_Affiliation_Set(long long int handle, long long int val);
-extern long long int whatsapp_GroupParticipant_Action_Get(long long int handle);
-extern void whatsapp_GroupParticipant_Action_Set(long long int handle, long long int val);
-
-// --- wrapping struct: whatsapp.Receipt ---
-//
-extern long long int whatsapp_Receipt_CTor();
-extern long long int whatsapp_Receipt_Kind_Get(long long int handle);
-extern void whatsapp_Receipt_Kind_Set(long long int handle, long long int val);
-extern long long int whatsapp_Receipt_MessageIDs_Get(long long int handle);
-extern void whatsapp_Receipt_MessageIDs_Set(long long int handle, long long int val);
-extern char* whatsapp_Receipt_JID_Get(long long int handle);
-extern void whatsapp_Receipt_JID_Set(long long int handle, char* val);
-extern char* whatsapp_Receipt_GroupJID_Get(long long int handle);
-extern void whatsapp_Receipt_GroupJID_Set(long long int handle, char* val);
-extern long long int whatsapp_Receipt_Timestamp_Get(long long int handle);
-extern void whatsapp_Receipt_Timestamp_Set(long long int handle, long long int val);
-extern char whatsapp_Receipt_IsCarbon_Get(long long int handle);
-extern void whatsapp_Receipt_IsCarbon_Set(long long int handle, char val);
-
-// --- wrapping struct: whatsapp.Album ---
-//
-extern long long int whatsapp_Album_CTor();
-extern char whatsapp_Album_IsAlbum_Get(long long int handle);
-extern void whatsapp_Album_IsAlbum_Set(long long int handle, char val);
-extern long long int whatsapp_Album_ImageCount_Get(long long int handle);
-extern void whatsapp_Album_ImageCount_Set(long long int handle, long long int val);
-extern long long int whatsapp_Album_VideoCount_Get(long long int handle);
-extern void whatsapp_Album_VideoCount_Set(long long int handle, long long int val);
-
-// --- wrapping struct: whatsapp.Call ---
-//
-extern long long int whatsapp_Call_CTor();
-extern long long int whatsapp_Call_State_Get(long long int handle);
-extern void whatsapp_Call_State_Set(long long int handle, long long int val);
-extern char* whatsapp_Call_JID_Get(long long int handle);
-extern void whatsapp_Call_JID_Set(long long int handle, char* val);
-extern long long int whatsapp_Call_Timestamp_Get(long long int handle);
-extern void whatsapp_Call_Timestamp_Set(long long int handle, long long int val);
-
 // --- wrapping struct: whatsapp.Gateway ---
 //
 extern long long int whatsapp_Gateway_CTor();
@@ -558,22 +503,17 @@ extern char* whatsapp_Gateway_Init(long long int _handle);
 extern long long int whatsapp_Gateway_NewSession(long long int _handle, long long int device);
 extern char* whatsapp_Gateway_CleanupSession(long long int _handle, long long int device);
 
-// --- wrapping struct: whatsapp.GroupSubject ---
-//
-extern long long int whatsapp_GroupSubject_CTor();
-extern char* whatsapp_GroupSubject_Subject_Get(long long int handle);
-extern void whatsapp_GroupSubject_Subject_Set(long long int handle, char* val);
-extern long long int whatsapp_GroupSubject_SetAt_Get(long long int handle);
-extern void whatsapp_GroupSubject_SetAt_Set(long long int handle, long long int val);
-extern char* whatsapp_GroupSubject_SetBy_Get(long long int handle);
-extern void whatsapp_GroupSubject_SetBy_Set(long long int handle, char* val);
-
-// --- wrapping struct: whatsapp.LinkedDevice ---
+// --- wrapping struct: whatsapp.GroupParticipant ---
 //
-extern long long int whatsapp_LinkedDevice_CTor();
-extern char* whatsapp_LinkedDevice_ID_Get(long long int handle);
-extern void whatsapp_LinkedDevice_ID_Set(long long int handle, char* val);
-extern long long int whatsapp_LinkedDevice_JID(long long int _handle);
+extern long long int whatsapp_GroupParticipant_CTor();
+extern char* whatsapp_GroupParticipant_JID_Get(long long int handle);
+extern void whatsapp_GroupParticipant_JID_Set(long long int handle, char* val);
+extern char* whatsapp_GroupParticipant_Nickname_Get(long long int handle);
+extern void whatsapp_GroupParticipant_Nickname_Set(long long int handle, char* val);
+extern long long int whatsapp_GroupParticipant_Affiliation_Get(long long int handle);
+extern void whatsapp_GroupParticipant_Affiliation_Set(long long int handle, long long int val);
+extern long long int whatsapp_GroupParticipant_Action_Get(long long int handle);
+extern void whatsapp_GroupParticipant_Action_Set(long long int handle, long long int val);
 
 // --- wrapping struct: whatsapp.Location ---
 //
@@ -593,25 +533,58 @@ extern void whatsapp_Location_Address_Set(long long int handle, char* val);
 extern char* whatsapp_Location_URL_Get(long long int handle);
 extern void whatsapp_Location_URL_Set(long long int handle, char* val);
 
-// --- wrapping struct: whatsapp.PollOption ---
+// --- wrapping struct: whatsapp.Poll ---
 //
-extern long long int whatsapp_PollOption_CTor();
-extern char* whatsapp_PollOption_Title_Get(long long int handle);
-extern void whatsapp_PollOption_Title_Set(long long int handle, char* val);
+extern long long int whatsapp_Poll_CTor();
+extern char* whatsapp_Poll_Title_Get(long long int handle);
+extern void whatsapp_Poll_Title_Set(long long int handle, char* val);
+extern long long int whatsapp_Poll_Options_Get(long long int handle);
+extern void whatsapp_Poll_Options_Set(long long int handle, long long int val);
 
-// --- wrapping struct: whatsapp.Preview ---
+// --- wrapping struct: whatsapp.Presence ---
 //
-extern long long int whatsapp_Preview_CTor();
-extern long long int whatsapp_Preview_Kind_Get(long long int handle);
-extern void whatsapp_Preview_Kind_Set(long long int handle, long long int val);
-extern char* whatsapp_Preview_URL_Get(long long int handle);
-extern void whatsapp_Preview_URL_Set(long long int handle, char* val);
-extern char* whatsapp_Preview_Title_Get(long long int handle);
-extern void whatsapp_Preview_Title_Set(long long int handle, char* val);
-extern char* whatsapp_Preview_Description_Get(long long int handle);
-extern void whatsapp_Preview_Description_Set(long long int handle, char* val);
-extern long long int whatsapp_Preview_Thumbnail_Get(long long int handle);
-extern void whatsapp_Preview_Thumbnail_Set(long long int handle, long long int val);
+extern long long int whatsapp_Presence_CTor();
+extern char* whatsapp_Presence_JID_Get(long long int handle);
+extern void whatsapp_Presence_JID_Set(long long int handle, char* val);
+extern long long int whatsapp_Presence_Kind_Get(long long int handle);
+extern void whatsapp_Presence_Kind_Set(long long int handle, long long int val);
+extern long long int whatsapp_Presence_LastSeen_Get(long long int handle);
+extern void whatsapp_Presence_LastSeen_Set(long long int handle, long long int val);
+
+// --- wrapping struct: whatsapp.Session ---
+//
+extern long long int whatsapp_Session_CTor();
+extern char* whatsapp_Session_Login(long long int _handle);
+extern char* whatsapp_Session_Logout(long long int _handle);
+extern char* whatsapp_Session_Disconnect(long long int _handle);
+extern char* whatsapp_Session_PairPhone(long long int _handle, char* phone);
+extern char* whatsapp_Session_SendMessage(long long int _handle, long long int message);
+extern char* whatsapp_Session_GenerateMessageID(long long int _handle);
+extern char* whatsapp_Session_SendChatState(long long int _handle, long long int state);
+extern char* whatsapp_Session_SendReceipt(long long int _handle, long long int receipt);
+extern char* whatsapp_Session_SendPresence(long long int _handle, long long int presence, char* statusMessage);
+extern long long int whatsapp_Session_GetContacts(long long int _handle, char refresh);
+extern long long int whatsapp_Session_GetGroups(long long int _handle);
+extern long long int whatsapp_Session_CreateGroup(long long int _handle, char* name, long long int participants);
+extern char* whatsapp_Session_LeaveGroup(long long int _handle, char* resourceID);
+extern long long int whatsapp_Session_GetAvatar(long long int _handle, char* resourceID, char* avatarID);
+extern char* whatsapp_Session_SetAvatar(long long int _handle, char* resourceID, long long int avatar);
+extern char* whatsapp_Session_SetGroupName(long long int _handle, char* resourceID, char* name);
+extern char* whatsapp_Session_SetGroupTopic(long long int _handle, char* resourceID, char* topic);
+extern long long int whatsapp_Session_UpdateGroupParticipants(long long int _handle, char* resourceID, long long int participants);
+extern long long int whatsapp_Session_FindContact(long long int _handle, char* phone);
+extern char* whatsapp_Session_RequestMessageHistory(long long int _handle, char* resourceID, long long int oldestMessage);
+extern void whatsapp_Session_SetEventHandler(long long int _handle, PyObject* h, char goRun);
+
+// --- wrapping struct: whatsapp.Album ---
+//
+extern long long int whatsapp_Album_CTor();
+extern char whatsapp_Album_IsAlbum_Get(long long int handle);
+extern void whatsapp_Album_IsAlbum_Set(long long int handle, char val);
+extern long long int whatsapp_Album_ImageCount_Get(long long int handle);
+extern void whatsapp_Album_ImageCount_Set(long long int handle, long long int val);
+extern long long int whatsapp_Album_VideoCount_Get(long long int handle);
+extern void whatsapp_Album_VideoCount_Set(long long int handle, long long int val);
 
 // --- wrapping struct: whatsapp.ChatState ---
 //
@@ -623,13 +596,46 @@ extern void whatsapp_ChatState_JID_Set(long long int handle, char* val);
 extern char* whatsapp_ChatState_GroupJID_Get(long long int handle);
 extern void whatsapp_ChatState_GroupJID_Set(long long int handle, char* val);
 
-// --- wrapping struct: whatsapp.Contact ---
+// --- wrapping struct: whatsapp.Connect ---
 //
-extern long long int whatsapp_Contact_CTor();
-extern char* whatsapp_Contact_JID_Get(long long int handle);
-extern void whatsapp_Contact_JID_Set(long long int handle, char* val);
-extern char* whatsapp_Contact_Name_Get(long long int handle);
-extern void whatsapp_Contact_Name_Set(long long int handle, char* val);
+extern long long int whatsapp_Connect_CTor();
+extern char* whatsapp_Connect_JID_Get(long long int handle);
+extern void whatsapp_Connect_JID_Set(long long int handle, char* val);
+extern char* whatsapp_Connect_Error_Get(long long int handle);
+extern void whatsapp_Connect_Error_Set(long long int handle, char* val);
+
+// --- wrapping struct: whatsapp.EventPayload ---
+//
+extern long long int whatsapp_EventPayload_CTor();
+extern char* whatsapp_EventPayload_QRCode_Get(long long int handle);
+extern void whatsapp_EventPayload_QRCode_Set(long long int handle, char* val);
+extern char* whatsapp_EventPayload_PairDeviceID_Get(long long int handle);
+extern void whatsapp_EventPayload_PairDeviceID_Set(long long int handle, char* val);
+extern long long int whatsapp_EventPayload_Connect_Get(long long int handle);
+extern void whatsapp_EventPayload_Connect_Set(long long int handle, long long int val);
+extern long long int whatsapp_EventPayload_LoggedOut_Get(long long int handle);
+extern void whatsapp_EventPayload_LoggedOut_Set(long long int handle, long long int val);
+extern long long int whatsapp_EventPayload_Contact_Get(long long int handle);
+extern void whatsapp_EventPayload_Contact_Set(long long int handle, long long int val);
+extern long long int whatsapp_EventPayload_Presence_Get(long long int handle);
+extern void whatsapp_EventPayload_Presence_Set(long long int handle, long long int val);
+extern long long int whatsapp_EventPayload_Message_Get(long long int handle);
+extern void whatsapp_EventPayload_Message_Set(long long int handle, long long int val);
+extern long long int whatsapp_EventPayload_ChatState_Get(long long int handle);
+extern void whatsapp_EventPayload_ChatState_Set(long long int handle, long long int val);
+extern long long int whatsapp_EventPayload_Receipt_Get(long long int handle);
+extern void whatsapp_EventPayload_Receipt_Set(long long int handle, long long int val);
+extern long long int whatsapp_EventPayload_Group_Get(long long int handle);
+extern void whatsapp_EventPayload_Group_Set(long long int handle, long long int val);
+extern long long int whatsapp_EventPayload_Call_Get(long long int handle);
+extern void whatsapp_EventPayload_Call_Set(long long int handle, long long int val);
+
+// --- wrapping struct: whatsapp.LinkedDevice ---
+//
+extern long long int whatsapp_LinkedDevice_CTor();
+extern char* whatsapp_LinkedDevice_ID_Get(long long int handle);
+extern void whatsapp_LinkedDevice_ID_Set(long long int handle, char* val);
+extern long long int whatsapp_LinkedDevice_JID(long long int _handle);
 
 // --- wrapping struct: whatsapp.LoggedOut ---
 //
@@ -637,21 +643,19 @@ extern long long int whatsapp_LoggedOut_CTor();
 extern char* whatsapp_LoggedOut_Reason_Get(long long int handle);
 extern void whatsapp_LoggedOut_Reason_Set(long long int handle, char* val);
 
-// --- wrapping struct: whatsapp.Poll ---
-//
-extern long long int whatsapp_Poll_CTor();
-extern char* whatsapp_Poll_Title_Get(long long int handle);
-extern void whatsapp_Poll_Title_Set(long long int handle, char* val);
-extern long long int whatsapp_Poll_Options_Get(long long int handle);
-extern void whatsapp_Poll_Options_Set(long long int handle, long long int val);
-
-// --- wrapping struct: whatsapp.Avatar ---
+// --- wrapping struct: whatsapp.Preview ---
 //
-extern long long int whatsapp_Avatar_CTor();
-extern char* whatsapp_Avatar_ID_Get(long long int handle);
-extern void whatsapp_Avatar_ID_Set(long long int handle, char* val);
-extern char* whatsapp_Avatar_URL_Get(long long int handle);
-extern void whatsapp_Avatar_URL_Set(long long int handle, char* val);
+extern long long int whatsapp_Preview_CTor();
+extern long long int whatsapp_Preview_Kind_Get(long long int handle);
+extern void whatsapp_Preview_Kind_Set(long long int handle, long long int val);
+extern char* whatsapp_Preview_URL_Get(long long int handle);
+extern void whatsapp_Preview_URL_Set(long long int handle, char* val);
+extern char* whatsapp_Preview_Title_Get(long long int handle);
+extern void whatsapp_Preview_Title_Set(long long int handle, char* val);
+extern char* whatsapp_Preview_Description_Get(long long int handle);
+extern void whatsapp_Preview_Description_Set(long long int handle, char* val);
+extern long long int whatsapp_Preview_Thumbnail_Get(long long int handle);
+extern void whatsapp_Preview_Thumbnail_Set(long long int handle, long long int val);
 extern long long int whatsapp_NewGateway();
 extern char whatsapp_IsAnonymousJID(char* id);