slidge-whatsapp 0.2.2__cp312-cp312-manylinux_2_36_aarch64.whl → 0.2.5__cp312-cp312-manylinux_2_36_aarch64.whl

slidge_whatsapp/__init__.py

@@ -1,17 +1,35 @@
-"""
-WhatsApp gateway using the multi-device API.
-"""
+# DO NOT EDIT
+# Generated from .copier-answers.yml
+
+import sys
+from importlib.metadata import PackageNotFoundError, version
 
 from slidge import entrypoint
-from slidge.util.util import get_version  # noqa: F401
 
-from . import command, config, contact, group, session
-from .gateway import Gateway
+# import everything for automatic subclasses discovery by slidge core
+from . import command, config, contact, gateway, group, session
+
+try:
+    __version__ = version("slidge-whatsapp")
+except PackageNotFoundError:
+    # package is not installed
+    __version__ = "dev"
 
 
 def main():
+    if len(sys.argv) == 2 and sys.argv[1] == "--version":
+        print("slidge-whatsapp version", __version__)
+        exit(0)
     entrypoint("slidge_whatsapp")
 
 
-__version__ = "v0.2.2"
-__all__ = "Gateway", "session", "command", "contact", "config", "group", "main"
+__all__ = (
+    "__version__",
+    "command",
+    "config",
+    "contact",
+    "gateway",
+    "group",
+    "main",
+    "session",
+)

slidge_whatsapp/__main__.py

@@ -1,3 +1,6 @@
+# DO NOT EDIT
+# Generated from .copier-answers.yml
+
 from slidge_whatsapp import main
 
 main()

slidge_whatsapp/contact.py

@@ -57,7 +57,7 @@ class Roster(LegacyRoster[str, Contact]):
             avatar = self.session.whatsapp.GetAvatar(data.JID, contact.avatar or "")
             if avatar.URL and contact.avatar != avatar.ID:
                 await contact.set_avatar(avatar.URL, avatar.ID)
-            elif avatar.URL == "":
+            elif avatar.URL == "" and avatar.ID == "":
                 await contact.set_avatar(None)
         except RuntimeError as err:
             self.session.log.error(

slidge_whatsapp/event.go

@@ -145,6 +145,7 @@ const (
 	MessageRevoke
 	MessageReaction
 	MessageAttachment
+	MessagePoll
 )
 
 // A Message represents one of many kinds of bidirectional communication payloads, for example, a
@@ -165,6 +166,8 @@ type Message struct {
 	Attachments []Attachment // The list of file (image, video, etc.) attachments contained in this message.
 	Preview     Preview      // A short description for the URL provided in the message body, if any.
 	Location    Location     // The location metadata for messages, if any.
+	Poll        Poll         // The multiple-choice poll contained in the message, if any.
+	Album       Album        // The image album message, if any.
 	MentionJIDs []string     // A list of JIDs mentioned in this message, if any.
 	Receipts    []Receipt    // The receipt statuses for the message, typically provided alongside historical messages.
 	Reactions   []Message    // Reactions attached to message, typically provided alongside historical messages.
@@ -228,6 +231,25 @@ type Location struct {
 	URL     string
 }
 
+// A Poll represents a multiple-choice question, on which each choice might be voted for one or more
+// times.
+type Poll struct {
+	Title   string       // The human-readable name of this poll.
+	Options []PollOption // The list of choices to vote on in the poll.
+}
+
+// A PollOption represents an individual choice within a broader poll.
+type PollOption struct {
+	Title string // The human-readable name for the poll option.
+}
+
+// A Album message represents a collection of media files, typically images and videos.
+type Album struct {
+	IsAlbum    bool // Whether or not the message is an album, regardless of calculated media counts.
+	ImageCount int  // The calculated amount of images in the album, might not be accurate.
+	VideoCount int  // The calculated amount of videos in the album, might not be accurate.
+}
+
 // NewMessageEvent returns event data meant for [Session.propagateEvent] for the primive message
 // event given. Unknown or invalid messages will return an [EventUnknown] event with nil data.
 func newMessageEvent(client *whatsmeow.Client, evt *events.Message) (EventKind, *EventPayload) {
@@ -306,6 +328,35 @@ func newMessageEvent(client *whatsmeow.Client, evt *events.Message) (EventKind,
 		return EventMessage, &EventPayload{Message: message}
 	}
 
+	// Handle poll messages.
+	for _, p := range []*waE2E.PollCreationMessage{
+		evt.Message.GetPollCreationMessageV3(),
+		evt.Message.GetPollCreationMessageV2(),
+		evt.Message.GetPollCreationMessage(),
+	} {
+		if p == nil {
+			continue
+		}
+		message.Kind = MessagePoll
+		message.Poll = Poll{Title: p.GetName()}
+		for _, o := range p.GetOptions() {
+			message.Poll.Options = append(message.Poll.Options, PollOption{
+				Title: o.GetOptionName(),
+			})
+		}
+		return EventMessage, &EventPayload{Message: message}
+	}
+
+	// Handle "album" messages, denoting a grouping of media messages to follow.
+	if a := evt.Message.GetAlbumMessage(); a != nil {
+		message.Album = Album{
+			IsAlbum:    true,
+			ImageCount: int(a.GetExpectedImageCount()),
+			VideoCount: int(a.GetExpectedVideoCount()),
+		}
+		return EventMessage, &EventPayload{Message: message}
+	}
+
 	// Handle message attachments, if any.
 	if attach, context, err := getMessageAttachments(client, evt.Message); err != nil {
 		client.Log.Errorf("Failed getting message attachments: %s", err)
@@ -578,6 +629,7 @@ func convertAttachment(attach *Attachment) error {
 			// these are some times misdetected as such.
 			if s.VideoWidth == 0 && s.VideoHeight == 0 && s.AudioSampleRate > 0 && s.Duration > 0 {
 				spec = voiceMessageSpec
+				spec.SourceMIME = media.TypeM4A
 			}
 		}
 	default:
@@ -586,6 +638,10 @@ func convertAttachment(attach *Attachment) error {
 	}
 
 	// Convert attachment between file-types, if source MIME matches the known list of convertable types.
+	if spec.SourceMIME == "" {
+		spec.SourceMIME = detectedMIME
+	}
+
 	data, err := media.Convert(ctx, attach.Data, &spec)
 	if err != nil {
 		return fmt.Errorf("failed converting attachment: %w", err)

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

@@ -333,6 +333,15 @@ extern long long int Slice_whatsapp_Message_subslice(long long int handle, GoInt
 extern void Slice_whatsapp_Message_set(long long int handle, GoInt _idx, long long int _vl);
 extern void Slice_whatsapp_Message_append(long long int handle, long long int _vl);
 
+// --- wrapping slice: []whatsapp.PollOption ---
+//
+extern long long int Slice_whatsapp_PollOption_CTor();
+extern GoInt Slice_whatsapp_PollOption_len(long long int handle);
+extern long long int Slice_whatsapp_PollOption_elem(long long int handle, GoInt _idx);
+extern long long int Slice_whatsapp_PollOption_subslice(long long int handle, GoInt _st, GoInt _ed);
+extern void Slice_whatsapp_PollOption_set(long long int handle, GoInt _idx, long long int _vl);
+extern void Slice_whatsapp_PollOption_append(long long int handle, long long int _vl);
+
 // --- wrapping slice: []whatsapp.Receipt ---
 //
 extern long long int Slice_whatsapp_Receipt_CTor();
@@ -352,72 +361,86 @@ extern void whatsapp_GroupSubject_SetAt_Set(long long int handle, long long int
 extern char* whatsapp_GroupSubject_SetByJID_Get(long long int handle);
 extern void whatsapp_GroupSubject_SetByJID_Set(long long int handle, char* val);
 
-// --- wrapping struct: whatsapp.LinkedDevice ---
+// --- wrapping struct: whatsapp.Message ---
 //
-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_Message_CTor();
+extern long long int whatsapp_Message_Kind_Get(long long int handle);
+extern void whatsapp_Message_Kind_Set(long long int handle, long long int val);
+extern char* whatsapp_Message_ID_Get(long long int handle);
+extern void whatsapp_Message_ID_Set(long long int handle, char* val);
+extern char* whatsapp_Message_JID_Get(long long int handle);
+extern void whatsapp_Message_JID_Set(long long int handle, char* val);
+extern char* whatsapp_Message_GroupJID_Get(long long int handle);
+extern void whatsapp_Message_GroupJID_Set(long long int handle, char* val);
+extern char* whatsapp_Message_OriginJID_Get(long long int handle);
+extern void whatsapp_Message_OriginJID_Set(long long int handle, char* val);
+extern char* whatsapp_Message_Body_Get(long long int handle);
+extern void whatsapp_Message_Body_Set(long long int handle, char* val);
+extern long long int whatsapp_Message_Timestamp_Get(long long int handle);
+extern void whatsapp_Message_Timestamp_Set(long long int handle, long long int val);
+extern char whatsapp_Message_IsCarbon_Get(long long int handle);
+extern void whatsapp_Message_IsCarbon_Set(long long int handle, char val);
+extern char whatsapp_Message_IsForwarded_Get(long long int handle);
+extern void whatsapp_Message_IsForwarded_Set(long long int handle, char val);
+extern char* whatsapp_Message_ReplyID_Get(long long int handle);
+extern void whatsapp_Message_ReplyID_Set(long long int handle, char* val);
+extern char* whatsapp_Message_ReplyBody_Get(long long int handle);
+extern void whatsapp_Message_ReplyBody_Set(long long int handle, char* val);
+extern long long int whatsapp_Message_Attachments_Get(long long int handle);
+extern void whatsapp_Message_Attachments_Set(long long int handle, long long int val);
+extern long long int whatsapp_Message_Preview_Get(long long int handle);
+extern void whatsapp_Message_Preview_Set(long long int handle, long long int val);
+extern long long int whatsapp_Message_Location_Get(long long int handle);
+extern void whatsapp_Message_Location_Set(long long int handle, long long int val);
+extern long long int whatsapp_Message_Poll_Get(long long int handle);
+extern void whatsapp_Message_Poll_Set(long long int handle, long long int val);
+extern long long int whatsapp_Message_Album_Get(long long int handle);
+extern void whatsapp_Message_Album_Set(long long int handle, long long int val);
+extern long long int whatsapp_Message_MentionJIDs_Get(long long int handle);
+extern void whatsapp_Message_MentionJIDs_Set(long long int handle, long long int val);
+extern long long int whatsapp_Message_Receipts_Get(long long int handle);
+extern void whatsapp_Message_Receipts_Set(long long int handle, long long int val);
+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);
 
-// --- wrapping struct: whatsapp.Preview ---
+// --- wrapping struct: whatsapp.Poll ---
 //
-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_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.Session ---
+// --- wrapping struct: whatsapp.Group ---
 //
-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_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);
 
-// --- wrapping struct: whatsapp.Attachment ---
+// --- wrapping struct: whatsapp.LinkedDevice ---
 //
-extern long long int whatsapp_Attachment_CTor();
-extern char* whatsapp_Attachment_MIME_Get(long long int handle);
-extern void whatsapp_Attachment_MIME_Set(long long int handle, char* val);
-extern char* whatsapp_Attachment_Filename_Get(long long int handle);
-extern void whatsapp_Attachment_Filename_Set(long long int handle, char* val);
-extern char* whatsapp_Attachment_Caption_Get(long long int handle);
-extern void whatsapp_Attachment_Caption_Set(long long int handle, char* val);
-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);
+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.Connect ---
+// --- wrapping struct: whatsapp.Presence ---
 //
-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_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.Receipt ---
 //
@@ -435,29 +458,26 @@ extern void whatsapp_Receipt_Timestamp_Set(long long int handle, long long int v
 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.Group ---
+// --- wrapping struct: whatsapp.Attachment ---
 //
-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 long long int whatsapp_Attachment_CTor();
+extern char* whatsapp_Attachment_MIME_Get(long long int handle);
+extern void whatsapp_Attachment_MIME_Set(long long int handle, char* val);
+extern char* whatsapp_Attachment_Filename_Get(long long int handle);
+extern void whatsapp_Attachment_Filename_Set(long long int handle, char* val);
+extern char* whatsapp_Attachment_Caption_Get(long long int handle);
+extern void whatsapp_Attachment_Caption_Set(long long int handle, char* val);
+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.Presence ---
+// --- wrapping struct: whatsapp.Contact ---
 //
-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);
+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);
 
 // --- wrapping struct: whatsapp.EventPayload ---
 //
@@ -498,33 +518,23 @@ 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.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 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.Avatar ---
+// --- wrapping struct: whatsapp.ChatState ---
 //
-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_ChatState_CTor();
+extern long long int whatsapp_ChatState_Kind_Get(long long int handle);
+extern void whatsapp_ChatState_Kind_Set(long long int handle, long long int val);
+extern char* whatsapp_ChatState_JID_Get(long long int handle);
+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.Call ---
+// --- wrapping struct: whatsapp.Connect ---
 //
-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);
+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.Location ---
 //
@@ -544,61 +554,88 @@ 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.Message ---
+// --- wrapping struct: whatsapp.PollOption ---
 //
-extern long long int whatsapp_Message_CTor();
-extern long long int whatsapp_Message_Kind_Get(long long int handle);
-extern void whatsapp_Message_Kind_Set(long long int handle, long long int val);
-extern char* whatsapp_Message_ID_Get(long long int handle);
-extern void whatsapp_Message_ID_Set(long long int handle, char* val);
-extern char* whatsapp_Message_JID_Get(long long int handle);
-extern void whatsapp_Message_JID_Set(long long int handle, char* val);
-extern char* whatsapp_Message_GroupJID_Get(long long int handle);
-extern void whatsapp_Message_GroupJID_Set(long long int handle, char* val);
-extern char* whatsapp_Message_OriginJID_Get(long long int handle);
-extern void whatsapp_Message_OriginJID_Set(long long int handle, char* val);
-extern char* whatsapp_Message_Body_Get(long long int handle);
-extern void whatsapp_Message_Body_Set(long long int handle, char* val);
-extern long long int whatsapp_Message_Timestamp_Get(long long int handle);
-extern void whatsapp_Message_Timestamp_Set(long long int handle, long long int val);
-extern char whatsapp_Message_IsCarbon_Get(long long int handle);
-extern void whatsapp_Message_IsCarbon_Set(long long int handle, char val);
-extern char whatsapp_Message_IsForwarded_Get(long long int handle);
-extern void whatsapp_Message_IsForwarded_Set(long long int handle, char val);
-extern char* whatsapp_Message_ReplyID_Get(long long int handle);
-extern void whatsapp_Message_ReplyID_Set(long long int handle, char* val);
-extern char* whatsapp_Message_ReplyBody_Get(long long int handle);
-extern void whatsapp_Message_ReplyBody_Set(long long int handle, char* val);
-extern long long int whatsapp_Message_Attachments_Get(long long int handle);
-extern void whatsapp_Message_Attachments_Set(long long int handle, long long int val);
-extern long long int whatsapp_Message_Preview_Get(long long int handle);
-extern void whatsapp_Message_Preview_Set(long long int handle, long long int val);
-extern long long int whatsapp_Message_Location_Get(long long int handle);
-extern void whatsapp_Message_Location_Set(long long int handle, long long int val);
-extern long long int whatsapp_Message_MentionJIDs_Get(long long int handle);
-extern void whatsapp_Message_MentionJIDs_Set(long long int handle, long long int val);
-extern long long int whatsapp_Message_Receipts_Get(long long int handle);
-extern void whatsapp_Message_Receipts_Set(long long int handle, long long int val);
-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 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.ChatState ---
+// --- wrapping struct: whatsapp.Preview ---
 //
-extern long long int whatsapp_ChatState_CTor();
-extern long long int whatsapp_ChatState_Kind_Get(long long int handle);
-extern void whatsapp_ChatState_Kind_Set(long long int handle, long long int val);
-extern char* whatsapp_ChatState_JID_Get(long long int handle);
-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);
+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);
 
-// --- wrapping struct: whatsapp.Contact ---
+// --- wrapping struct: whatsapp.Session ---
 //
-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_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.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.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.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 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);
 extern long long int whatsapp_NewGateway();
 
 #ifdef __cplusplus