slidge-whatsapp 0.3.1__cp313-cp313-manylinux_2_36_aarch64.whl → 0.3.4__cp313-cp313-manylinux_2_36_aarch64.whl
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Potentially problematic release.
This version of slidge-whatsapp might be problematic. Click here for more details.
- slidge_whatsapp/generated/_whatsapp.cpython-313-aarch64-linux-gnu.h +175 -175
- slidge_whatsapp/generated/_whatsapp.cpython-313-aarch64-linux-gnu.so +0 -0
- slidge_whatsapp/generated/build.py +141 -141
- slidge_whatsapp/generated/go.py +1 -1
- slidge_whatsapp/generated/whatsapp.c +1423 -1423
- slidge_whatsapp/generated/whatsapp.go +1230 -1230
- slidge_whatsapp/generated/whatsapp.py +1337 -1337
- slidge_whatsapp/generated/whatsapp_go.h +175 -175
- slidge_whatsapp/go.mod +9 -9
- slidge_whatsapp/go.sum +18 -18
- slidge_whatsapp/vendor/go.mau.fi/libsignal/session/SessionCipher.go +7 -2
- slidge_whatsapp/vendor/go.mau.fi/util/dbutil/module.go +2 -1
- slidge_whatsapp/vendor/go.mau.fi/util/dbutil/upgradetable.go +3 -0
- slidge_whatsapp/vendor/go.mau.fi/util/exsync/syncmap.go +48 -7
- slidge_whatsapp/vendor/go.mau.fi/util/exsync/syncset.go +13 -0
- slidge_whatsapp/vendor/go.mau.fi/util/jsontime/helpers.go +16 -5
- slidge_whatsapp/vendor/go.mau.fi/util/jsontime/integer.go +27 -12
- slidge_whatsapp/vendor/go.mau.fi/whatsmeow/appstate/encode.go +39 -28
- slidge_whatsapp/vendor/go.mau.fi/whatsmeow/appstate.go +17 -2
- slidge_whatsapp/vendor/go.mau.fi/whatsmeow/armadillomessage.go +2 -1
- slidge_whatsapp/vendor/go.mau.fi/whatsmeow/internals.go +18 -6
- slidge_whatsapp/vendor/go.mau.fi/whatsmeow/message.go +40 -16
- slidge_whatsapp/vendor/go.mau.fi/whatsmeow/pair.go +24 -21
- slidge_whatsapp/vendor/go.mau.fi/whatsmeow/prekeys.go +21 -0
- slidge_whatsapp/vendor/go.mau.fi/whatsmeow/proto/waE2E/WAWebProtobufsE2E.pb.go +3213 -2851
- slidge_whatsapp/vendor/go.mau.fi/whatsmeow/proto/waE2E/WAWebProtobufsE2E.proto +108 -74
- slidge_whatsapp/vendor/go.mau.fi/whatsmeow/proto/waStatusAttributions/WAStatusAttributions.pb.go +7 -3
- slidge_whatsapp/vendor/go.mau.fi/whatsmeow/proto/waStatusAttributions/WAStatusAttributions.proto +1 -0
- slidge_whatsapp/vendor/go.mau.fi/whatsmeow/proto/waSyncAction/WASyncAction.pb.go +7 -3
- slidge_whatsapp/vendor/go.mau.fi/whatsmeow/proto/waSyncAction/WASyncAction.proto +1 -0
- slidge_whatsapp/vendor/go.mau.fi/whatsmeow/proto/waWeb/WAWebProtobufsWeb.pb.go +35 -23
- slidge_whatsapp/vendor/go.mau.fi/whatsmeow/proto/waWeb/WAWebProtobufsWeb.proto +5 -3
- slidge_whatsapp/vendor/go.mau.fi/whatsmeow/receipt.go +47 -16
- slidge_whatsapp/vendor/go.mau.fi/whatsmeow/retry.go +4 -10
- slidge_whatsapp/vendor/go.mau.fi/whatsmeow/send.go +28 -42
- slidge_whatsapp/vendor/go.mau.fi/whatsmeow/sendfb.go +33 -32
- slidge_whatsapp/vendor/go.mau.fi/whatsmeow/store/clientpayload.go +1 -1
- slidge_whatsapp/vendor/go.mau.fi/whatsmeow/store/noop.go +5 -1
- slidge_whatsapp/vendor/go.mau.fi/whatsmeow/store/sessioncache.go +125 -0
- slidge_whatsapp/vendor/go.mau.fi/whatsmeow/store/signal.go +8 -0
- slidge_whatsapp/vendor/go.mau.fi/whatsmeow/store/sqlstore/store.go +34 -11
- slidge_whatsapp/vendor/go.mau.fi/whatsmeow/store/store.go +5 -3
- slidge_whatsapp/vendor/go.mau.fi/whatsmeow/types/jid.go +24 -9
- slidge_whatsapp/vendor/go.mau.fi/whatsmeow/user.go +12 -1
- slidge_whatsapp/vendor/golang.org/x/crypto/curve25519/curve25519.go +7 -4
- slidge_whatsapp/vendor/golang.org/x/net/http2/config.go +11 -6
- slidge_whatsapp/vendor/golang.org/x/net/http2/config_go125.go +15 -0
- slidge_whatsapp/vendor/golang.org/x/net/http2/config_go126.go +15 -0
- slidge_whatsapp/vendor/golang.org/x/net/http2/frame.go +24 -1
- slidge_whatsapp/vendor/golang.org/x/net/http2/http2.go +0 -1
- slidge_whatsapp/vendor/golang.org/x/net/http2/server.go +35 -26
- slidge_whatsapp/vendor/golang.org/x/net/http2/transport.go +4 -2
- slidge_whatsapp/vendor/golang.org/x/net/http2/writesched.go +2 -0
- slidge_whatsapp/vendor/golang.org/x/net/http2/{writesched_priority.go → writesched_priority_rfc7540.go} +52 -52
- slidge_whatsapp/vendor/golang.org/x/net/http2/writesched_priority_rfc9128.go +209 -0
- slidge_whatsapp/vendor/golang.org/x/net/http2/writesched_roundrobin.go +1 -1
- slidge_whatsapp/vendor/golang.org/x/net/internal/httpcommon/request.go +2 -2
- slidge_whatsapp/vendor/golang.org/x/net/internal/socks/socks.go +1 -1
- slidge_whatsapp/vendor/golang.org/x/sys/unix/affinity_linux.go +9 -0
- slidge_whatsapp/vendor/golang.org/x/sys/unix/fdset.go +1 -3
- slidge_whatsapp/vendor/golang.org/x/sys/unix/ifreq_linux.go +1 -3
- slidge_whatsapp/vendor/golang.org/x/sys/unix/mkall.sh +1 -0
- slidge_whatsapp/vendor/golang.org/x/sys/unix/syscall_linux.go +1 -3
- slidge_whatsapp/vendor/golang.org/x/sys/unix/syscall_netbsd.go +17 -0
- slidge_whatsapp/vendor/golang.org/x/sys/windows/syscall_windows.go +2 -0
- slidge_whatsapp/vendor/golang.org/x/sys/windows/types_windows.go +16 -0
- slidge_whatsapp/vendor/golang.org/x/sys/windows/zsyscall_windows.go +18 -0
- slidge_whatsapp/vendor/golang.org/x/text/unicode/bidi/core.go +2 -9
- slidge_whatsapp/vendor/modules.txt +10 -10
- {slidge_whatsapp-0.3.1.dist-info → slidge_whatsapp-0.3.4.dist-info}/METADATA +1 -1
- {slidge_whatsapp-0.3.1.dist-info → slidge_whatsapp-0.3.4.dist-info}/RECORD +74 -70
- {slidge_whatsapp-0.3.1.dist-info → slidge_whatsapp-0.3.4.dist-info}/WHEEL +0 -0
- {slidge_whatsapp-0.3.1.dist-info → slidge_whatsapp-0.3.4.dist-info}/entry_points.txt +0 -0
- {slidge_whatsapp-0.3.1.dist-info → slidge_whatsapp-0.3.4.dist-info}/licenses/LICENSE +0 -0
|
@@ -351,6 +351,109 @@ extern long long int Slice_whatsapp_Receipt_subslice(long long int handle, GoInt
|
|
|
351
351
|
extern void Slice_whatsapp_Receipt_set(long long int handle, GoInt _idx, long long int _vl);
|
|
352
352
|
extern void Slice_whatsapp_Receipt_append(long long int handle, long long int _vl);
|
|
353
353
|
|
|
354
|
+
// --- wrapping struct: whatsapp.Receipt ---
|
|
355
|
+
//
|
|
356
|
+
extern long long int whatsapp_Receipt_CTor();
|
|
357
|
+
extern long long int whatsapp_Receipt_Kind_Get(long long int handle);
|
|
358
|
+
extern void whatsapp_Receipt_Kind_Set(long long int handle, long long int val);
|
|
359
|
+
extern long long int whatsapp_Receipt_MessageIDs_Get(long long int handle);
|
|
360
|
+
extern void whatsapp_Receipt_MessageIDs_Set(long long int handle, long long int val);
|
|
361
|
+
extern char* whatsapp_Receipt_JID_Get(long long int handle);
|
|
362
|
+
extern void whatsapp_Receipt_JID_Set(long long int handle, char* val);
|
|
363
|
+
extern char* whatsapp_Receipt_GroupJID_Get(long long int handle);
|
|
364
|
+
extern void whatsapp_Receipt_GroupJID_Set(long long int handle, char* val);
|
|
365
|
+
extern long long int whatsapp_Receipt_Timestamp_Get(long long int handle);
|
|
366
|
+
extern void whatsapp_Receipt_Timestamp_Set(long long int handle, long long int val);
|
|
367
|
+
extern char whatsapp_Receipt_IsCarbon_Get(long long int handle);
|
|
368
|
+
extern void whatsapp_Receipt_IsCarbon_Set(long long int handle, char val);
|
|
369
|
+
|
|
370
|
+
// --- wrapping struct: whatsapp.Session ---
|
|
371
|
+
//
|
|
372
|
+
extern long long int whatsapp_Session_CTor();
|
|
373
|
+
extern char* whatsapp_Session_Login(long long int _handle);
|
|
374
|
+
extern char* whatsapp_Session_Logout(long long int _handle);
|
|
375
|
+
extern char* whatsapp_Session_Disconnect(long long int _handle);
|
|
376
|
+
extern char* whatsapp_Session_PairPhone(long long int _handle, char* phone);
|
|
377
|
+
extern char* whatsapp_Session_SendMessage(long long int _handle, long long int message);
|
|
378
|
+
extern char* whatsapp_Session_GenerateMessageID(long long int _handle);
|
|
379
|
+
extern char* whatsapp_Session_SendChatState(long long int _handle, long long int state);
|
|
380
|
+
extern char* whatsapp_Session_SendReceipt(long long int _handle, long long int receipt);
|
|
381
|
+
extern char* whatsapp_Session_SendPresence(long long int _handle, long long int presence, char* statusMessage);
|
|
382
|
+
extern long long int whatsapp_Session_GetContacts(long long int _handle, char refresh);
|
|
383
|
+
extern long long int whatsapp_Session_GetGroups(long long int _handle);
|
|
384
|
+
extern long long int whatsapp_Session_CreateGroup(long long int _handle, char* name, long long int participants);
|
|
385
|
+
extern char* whatsapp_Session_LeaveGroup(long long int _handle, char* resourceID);
|
|
386
|
+
extern long long int whatsapp_Session_GetAvatar(long long int _handle, char* resourceID, char* avatarID);
|
|
387
|
+
extern char* whatsapp_Session_SetAvatar(long long int _handle, char* resourceID, long long int avatar);
|
|
388
|
+
extern char* whatsapp_Session_SetGroupName(long long int _handle, char* resourceID, char* name);
|
|
389
|
+
extern char* whatsapp_Session_SetGroupTopic(long long int _handle, char* resourceID, char* topic);
|
|
390
|
+
extern long long int whatsapp_Session_UpdateGroupParticipants(long long int _handle, char* resourceID, long long int participants);
|
|
391
|
+
extern long long int whatsapp_Session_FindContact(long long int _handle, char* phone);
|
|
392
|
+
extern char* whatsapp_Session_RequestMessageHistory(long long int _handle, char* resourceID, long long int oldestMessage);
|
|
393
|
+
extern void whatsapp_Session_SetEventHandler(long long int _handle, PyObject* h, char goRun);
|
|
394
|
+
|
|
395
|
+
// --- wrapping struct: whatsapp.Avatar ---
|
|
396
|
+
//
|
|
397
|
+
extern long long int whatsapp_Avatar_CTor();
|
|
398
|
+
extern char* whatsapp_Avatar_ID_Get(long long int handle);
|
|
399
|
+
extern void whatsapp_Avatar_ID_Set(long long int handle, char* val);
|
|
400
|
+
extern char* whatsapp_Avatar_URL_Get(long long int handle);
|
|
401
|
+
extern void whatsapp_Avatar_URL_Set(long long int handle, char* val);
|
|
402
|
+
|
|
403
|
+
// --- wrapping struct: whatsapp.GroupParticipant ---
|
|
404
|
+
//
|
|
405
|
+
extern long long int whatsapp_GroupParticipant_CTor();
|
|
406
|
+
extern char* whatsapp_GroupParticipant_JID_Get(long long int handle);
|
|
407
|
+
extern void whatsapp_GroupParticipant_JID_Set(long long int handle, char* val);
|
|
408
|
+
extern char* whatsapp_GroupParticipant_Nickname_Get(long long int handle);
|
|
409
|
+
extern void whatsapp_GroupParticipant_Nickname_Set(long long int handle, char* val);
|
|
410
|
+
extern long long int whatsapp_GroupParticipant_Affiliation_Get(long long int handle);
|
|
411
|
+
extern void whatsapp_GroupParticipant_Affiliation_Set(long long int handle, long long int val);
|
|
412
|
+
extern long long int whatsapp_GroupParticipant_Action_Get(long long int handle);
|
|
413
|
+
extern void whatsapp_GroupParticipant_Action_Set(long long int handle, long long int val);
|
|
414
|
+
|
|
415
|
+
// --- wrapping struct: whatsapp.Location ---
|
|
416
|
+
//
|
|
417
|
+
extern long long int whatsapp_Location_CTor();
|
|
418
|
+
extern double whatsapp_Location_Latitude_Get(long long int handle);
|
|
419
|
+
extern void whatsapp_Location_Latitude_Set(long long int handle, double val);
|
|
420
|
+
extern double whatsapp_Location_Longitude_Get(long long int handle);
|
|
421
|
+
extern void whatsapp_Location_Longitude_Set(long long int handle, double val);
|
|
422
|
+
extern long long int whatsapp_Location_Accuracy_Get(long long int handle);
|
|
423
|
+
extern void whatsapp_Location_Accuracy_Set(long long int handle, long long int val);
|
|
424
|
+
extern char whatsapp_Location_IsLive_Get(long long int handle);
|
|
425
|
+
extern void whatsapp_Location_IsLive_Set(long long int handle, char val);
|
|
426
|
+
extern char* whatsapp_Location_Name_Get(long long int handle);
|
|
427
|
+
extern void whatsapp_Location_Name_Set(long long int handle, char* val);
|
|
428
|
+
extern char* whatsapp_Location_Address_Get(long long int handle);
|
|
429
|
+
extern void whatsapp_Location_Address_Set(long long int handle, char* val);
|
|
430
|
+
extern char* whatsapp_Location_URL_Get(long long int handle);
|
|
431
|
+
extern void whatsapp_Location_URL_Set(long long int handle, char* val);
|
|
432
|
+
|
|
433
|
+
// --- wrapping struct: whatsapp.Poll ---
|
|
434
|
+
//
|
|
435
|
+
extern long long int whatsapp_Poll_CTor();
|
|
436
|
+
extern char* whatsapp_Poll_Title_Get(long long int handle);
|
|
437
|
+
extern void whatsapp_Poll_Title_Set(long long int handle, char* val);
|
|
438
|
+
extern long long int whatsapp_Poll_Options_Get(long long int handle);
|
|
439
|
+
extern void whatsapp_Poll_Options_Set(long long int handle, long long int val);
|
|
440
|
+
|
|
441
|
+
// --- wrapping struct: whatsapp.PollOption ---
|
|
442
|
+
//
|
|
443
|
+
extern long long int whatsapp_PollOption_CTor();
|
|
444
|
+
extern char* whatsapp_PollOption_Title_Get(long long int handle);
|
|
445
|
+
extern void whatsapp_PollOption_Title_Set(long long int handle, char* val);
|
|
446
|
+
|
|
447
|
+
// --- wrapping struct: whatsapp.Presence ---
|
|
448
|
+
//
|
|
449
|
+
extern long long int whatsapp_Presence_CTor();
|
|
450
|
+
extern char* whatsapp_Presence_JID_Get(long long int handle);
|
|
451
|
+
extern void whatsapp_Presence_JID_Set(long long int handle, char* val);
|
|
452
|
+
extern long long int whatsapp_Presence_Kind_Get(long long int handle);
|
|
453
|
+
extern void whatsapp_Presence_Kind_Set(long long int handle, long long int val);
|
|
454
|
+
extern long long int whatsapp_Presence_LastSeen_Get(long long int handle);
|
|
455
|
+
extern void whatsapp_Presence_LastSeen_Set(long long int handle, long long int val);
|
|
456
|
+
|
|
354
457
|
// --- wrapping struct: whatsapp.Call ---
|
|
355
458
|
//
|
|
356
459
|
extern long long int whatsapp_Call_CTor();
|
|
@@ -361,31 +464,6 @@ extern void whatsapp_Call_JID_Set(long long int handle, char* val);
|
|
|
361
464
|
extern long long int whatsapp_Call_Timestamp_Get(long long int handle);
|
|
362
465
|
extern void whatsapp_Call_Timestamp_Set(long long int handle, long long int val);
|
|
363
466
|
|
|
364
|
-
// --- wrapping struct: whatsapp.Contact ---
|
|
365
|
-
//
|
|
366
|
-
extern long long int whatsapp_Contact_CTor();
|
|
367
|
-
extern char* whatsapp_Contact_JID_Get(long long int handle);
|
|
368
|
-
extern void whatsapp_Contact_JID_Set(long long int handle, char* val);
|
|
369
|
-
extern char* whatsapp_Contact_Name_Get(long long int handle);
|
|
370
|
-
extern void whatsapp_Contact_Name_Set(long long int handle, char* val);
|
|
371
|
-
|
|
372
|
-
// --- wrapping struct: whatsapp.GroupSubject ---
|
|
373
|
-
//
|
|
374
|
-
extern long long int whatsapp_GroupSubject_CTor();
|
|
375
|
-
extern char* whatsapp_GroupSubject_Subject_Get(long long int handle);
|
|
376
|
-
extern void whatsapp_GroupSubject_Subject_Set(long long int handle, char* val);
|
|
377
|
-
extern long long int whatsapp_GroupSubject_SetAt_Get(long long int handle);
|
|
378
|
-
extern void whatsapp_GroupSubject_SetAt_Set(long long int handle, long long int val);
|
|
379
|
-
extern char* whatsapp_GroupSubject_SetBy_Get(long long int handle);
|
|
380
|
-
extern void whatsapp_GroupSubject_SetBy_Set(long long int handle, char* val);
|
|
381
|
-
|
|
382
|
-
// --- wrapping struct: whatsapp.LinkedDevice ---
|
|
383
|
-
//
|
|
384
|
-
extern long long int whatsapp_LinkedDevice_CTor();
|
|
385
|
-
extern char* whatsapp_LinkedDevice_ID_Get(long long int handle);
|
|
386
|
-
extern void whatsapp_LinkedDevice_ID_Set(long long int handle, char* val);
|
|
387
|
-
extern long long int whatsapp_LinkedDevice_JID(long long int _handle);
|
|
388
|
-
|
|
389
467
|
// --- wrapping struct: whatsapp.Message ---
|
|
390
468
|
//
|
|
391
469
|
extern long long int whatsapp_Message_CTor();
|
|
@@ -432,69 +510,67 @@ extern void whatsapp_Message_Reactions_Set(long long int handle, long long int v
|
|
|
432
510
|
extern char whatsapp_Message_IsHistory_Get(long long int handle);
|
|
433
511
|
extern void whatsapp_Message_IsHistory_Set(long long int handle, char val);
|
|
434
512
|
|
|
435
|
-
// --- wrapping struct: whatsapp.
|
|
513
|
+
// --- wrapping struct: whatsapp.Album ---
|
|
436
514
|
//
|
|
437
|
-
extern long long int
|
|
438
|
-
extern char
|
|
439
|
-
extern void
|
|
440
|
-
extern long long int
|
|
441
|
-
extern void
|
|
515
|
+
extern long long int whatsapp_Album_CTor();
|
|
516
|
+
extern char whatsapp_Album_IsAlbum_Get(long long int handle);
|
|
517
|
+
extern void whatsapp_Album_IsAlbum_Set(long long int handle, char val);
|
|
518
|
+
extern long long int whatsapp_Album_ImageCount_Get(long long int handle);
|
|
519
|
+
extern void whatsapp_Album_ImageCount_Set(long long int handle, long long int val);
|
|
520
|
+
extern long long int whatsapp_Album_VideoCount_Get(long long int handle);
|
|
521
|
+
extern void whatsapp_Album_VideoCount_Set(long long int handle, long long int val);
|
|
442
522
|
|
|
443
|
-
// --- wrapping struct: whatsapp.
|
|
523
|
+
// --- wrapping struct: whatsapp.Attachment ---
|
|
444
524
|
//
|
|
445
|
-
extern long long int
|
|
446
|
-
extern char*
|
|
447
|
-
extern void
|
|
525
|
+
extern long long int whatsapp_Attachment_CTor();
|
|
526
|
+
extern char* whatsapp_Attachment_MIME_Get(long long int handle);
|
|
527
|
+
extern void whatsapp_Attachment_MIME_Set(long long int handle, char* val);
|
|
528
|
+
extern char* whatsapp_Attachment_Filename_Get(long long int handle);
|
|
529
|
+
extern void whatsapp_Attachment_Filename_Set(long long int handle, char* val);
|
|
530
|
+
extern char* whatsapp_Attachment_Caption_Get(long long int handle);
|
|
531
|
+
extern void whatsapp_Attachment_Caption_Set(long long int handle, char* val);
|
|
532
|
+
extern long long int whatsapp_Attachment_Data_Get(long long int handle);
|
|
533
|
+
extern void whatsapp_Attachment_Data_Set(long long int handle, long long int val);
|
|
534
|
+
extern long long int whatsapp_Attachment_GetSpec(long long int _handle, long long int ctx);
|
|
448
535
|
|
|
449
|
-
// --- wrapping struct: whatsapp.
|
|
536
|
+
// --- wrapping struct: whatsapp.Contact ---
|
|
450
537
|
//
|
|
451
|
-
extern long long int
|
|
452
|
-
extern
|
|
453
|
-
extern void
|
|
454
|
-
extern
|
|
455
|
-
extern void
|
|
456
|
-
extern char* whatsapp_Receipt_JID_Get(long long int handle);
|
|
457
|
-
extern void whatsapp_Receipt_JID_Set(long long int handle, char* val);
|
|
458
|
-
extern char* whatsapp_Receipt_GroupJID_Get(long long int handle);
|
|
459
|
-
extern void whatsapp_Receipt_GroupJID_Set(long long int handle, char* val);
|
|
460
|
-
extern long long int whatsapp_Receipt_Timestamp_Get(long long int handle);
|
|
461
|
-
extern void whatsapp_Receipt_Timestamp_Set(long long int handle, long long int val);
|
|
462
|
-
extern char whatsapp_Receipt_IsCarbon_Get(long long int handle);
|
|
463
|
-
extern void whatsapp_Receipt_IsCarbon_Set(long long int handle, char val);
|
|
538
|
+
extern long long int whatsapp_Contact_CTor();
|
|
539
|
+
extern char* whatsapp_Contact_JID_Get(long long int handle);
|
|
540
|
+
extern void whatsapp_Contact_JID_Set(long long int handle, char* val);
|
|
541
|
+
extern char* whatsapp_Contact_Name_Get(long long int handle);
|
|
542
|
+
extern void whatsapp_Contact_Name_Set(long long int handle, char* val);
|
|
464
543
|
|
|
465
|
-
// --- wrapping struct: whatsapp.
|
|
544
|
+
// --- wrapping struct: whatsapp.LinkedDevice ---
|
|
466
545
|
//
|
|
467
|
-
extern long long int
|
|
468
|
-
extern char*
|
|
469
|
-
extern void
|
|
470
|
-
extern
|
|
471
|
-
extern void whatsapp_Avatar_URL_Set(long long int handle, char* val);
|
|
546
|
+
extern long long int whatsapp_LinkedDevice_CTor();
|
|
547
|
+
extern char* whatsapp_LinkedDevice_ID_Get(long long int handle);
|
|
548
|
+
extern void whatsapp_LinkedDevice_ID_Set(long long int handle, char* val);
|
|
549
|
+
extern long long int whatsapp_LinkedDevice_JID(long long int _handle);
|
|
472
550
|
|
|
473
|
-
// --- wrapping struct: whatsapp.
|
|
551
|
+
// --- wrapping struct: whatsapp.LoggedOut ---
|
|
474
552
|
//
|
|
475
|
-
extern long long int
|
|
476
|
-
extern char*
|
|
477
|
-
extern void
|
|
478
|
-
extern char* whatsapp_Group_Name_Get(long long int handle);
|
|
479
|
-
extern void whatsapp_Group_Name_Set(long long int handle, char* val);
|
|
480
|
-
extern long long int whatsapp_Group_Subject_Get(long long int handle);
|
|
481
|
-
extern void whatsapp_Group_Subject_Set(long long int handle, long long int val);
|
|
482
|
-
extern char* whatsapp_Group_Nickname_Get(long long int handle);
|
|
483
|
-
extern void whatsapp_Group_Nickname_Set(long long int handle, char* val);
|
|
484
|
-
extern long long int whatsapp_Group_Participants_Get(long long int handle);
|
|
485
|
-
extern void whatsapp_Group_Participants_Set(long long int handle, long long int val);
|
|
486
|
-
extern char* whatsapp_Group_InviteCode_Get(long long int handle);
|
|
487
|
-
extern void whatsapp_Group_InviteCode_Set(long long int handle, char* val);
|
|
553
|
+
extern long long int whatsapp_LoggedOut_CTor();
|
|
554
|
+
extern char* whatsapp_LoggedOut_Reason_Get(long long int handle);
|
|
555
|
+
extern void whatsapp_LoggedOut_Reason_Set(long long int handle, char* val);
|
|
488
556
|
|
|
489
|
-
// --- wrapping struct: whatsapp.
|
|
557
|
+
// --- wrapping struct: whatsapp.ChatState ---
|
|
490
558
|
//
|
|
491
|
-
extern long long int
|
|
492
|
-
extern
|
|
493
|
-
extern void
|
|
494
|
-
extern
|
|
495
|
-
extern void
|
|
496
|
-
extern
|
|
497
|
-
extern void
|
|
559
|
+
extern long long int whatsapp_ChatState_CTor();
|
|
560
|
+
extern long long int whatsapp_ChatState_Kind_Get(long long int handle);
|
|
561
|
+
extern void whatsapp_ChatState_Kind_Set(long long int handle, long long int val);
|
|
562
|
+
extern char* whatsapp_ChatState_JID_Get(long long int handle);
|
|
563
|
+
extern void whatsapp_ChatState_JID_Set(long long int handle, char* val);
|
|
564
|
+
extern char* whatsapp_ChatState_GroupJID_Get(long long int handle);
|
|
565
|
+
extern void whatsapp_ChatState_GroupJID_Set(long long int handle, char* val);
|
|
566
|
+
|
|
567
|
+
// --- wrapping struct: whatsapp.Connect ---
|
|
568
|
+
//
|
|
569
|
+
extern long long int whatsapp_Connect_CTor();
|
|
570
|
+
extern char* whatsapp_Connect_JID_Get(long long int handle);
|
|
571
|
+
extern void whatsapp_Connect_JID_Set(long long int handle, char* val);
|
|
572
|
+
extern char* whatsapp_Connect_Error_Get(long long int handle);
|
|
573
|
+
extern void whatsapp_Connect_Error_Set(long long int handle, char* val);
|
|
498
574
|
|
|
499
575
|
// --- wrapping struct: whatsapp.EventPayload ---
|
|
500
576
|
//
|
|
@@ -537,107 +613,31 @@ extern char* whatsapp_Gateway_Init(long long int _handle);
|
|
|
537
613
|
extern long long int whatsapp_Gateway_NewSession(long long int _handle, long long int device);
|
|
538
614
|
extern char* whatsapp_Gateway_CleanupSession(long long int _handle, long long int device);
|
|
539
615
|
|
|
540
|
-
// --- wrapping struct: whatsapp.
|
|
541
|
-
//
|
|
542
|
-
extern long long int whatsapp_LoggedOut_CTor();
|
|
543
|
-
extern char* whatsapp_LoggedOut_Reason_Get(long long int handle);
|
|
544
|
-
extern void whatsapp_LoggedOut_Reason_Set(long long int handle, char* val);
|
|
545
|
-
|
|
546
|
-
// --- wrapping struct: whatsapp.Session ---
|
|
547
|
-
//
|
|
548
|
-
extern long long int whatsapp_Session_CTor();
|
|
549
|
-
extern char* whatsapp_Session_Login(long long int _handle);
|
|
550
|
-
extern char* whatsapp_Session_Logout(long long int _handle);
|
|
551
|
-
extern char* whatsapp_Session_Disconnect(long long int _handle);
|
|
552
|
-
extern char* whatsapp_Session_PairPhone(long long int _handle, char* phone);
|
|
553
|
-
extern char* whatsapp_Session_SendMessage(long long int _handle, long long int message);
|
|
554
|
-
extern char* whatsapp_Session_GenerateMessageID(long long int _handle);
|
|
555
|
-
extern char* whatsapp_Session_SendChatState(long long int _handle, long long int state);
|
|
556
|
-
extern char* whatsapp_Session_SendReceipt(long long int _handle, long long int receipt);
|
|
557
|
-
extern char* whatsapp_Session_SendPresence(long long int _handle, long long int presence, char* statusMessage);
|
|
558
|
-
extern long long int whatsapp_Session_GetContacts(long long int _handle, char refresh);
|
|
559
|
-
extern long long int whatsapp_Session_GetGroups(long long int _handle);
|
|
560
|
-
extern long long int whatsapp_Session_CreateGroup(long long int _handle, char* name, long long int participants);
|
|
561
|
-
extern char* whatsapp_Session_LeaveGroup(long long int _handle, char* resourceID);
|
|
562
|
-
extern long long int whatsapp_Session_GetAvatar(long long int _handle, char* resourceID, char* avatarID);
|
|
563
|
-
extern char* whatsapp_Session_SetAvatar(long long int _handle, char* resourceID, long long int avatar);
|
|
564
|
-
extern char* whatsapp_Session_SetGroupName(long long int _handle, char* resourceID, char* name);
|
|
565
|
-
extern char* whatsapp_Session_SetGroupTopic(long long int _handle, char* resourceID, char* topic);
|
|
566
|
-
extern long long int whatsapp_Session_UpdateGroupParticipants(long long int _handle, char* resourceID, long long int participants);
|
|
567
|
-
extern long long int whatsapp_Session_FindContact(long long int _handle, char* phone);
|
|
568
|
-
extern char* whatsapp_Session_RequestMessageHistory(long long int _handle, char* resourceID, long long int oldestMessage);
|
|
569
|
-
extern void whatsapp_Session_SetEventHandler(long long int _handle, PyObject* h, char goRun);
|
|
570
|
-
|
|
571
|
-
// --- wrapping struct: whatsapp.Album ---
|
|
572
|
-
//
|
|
573
|
-
extern long long int whatsapp_Album_CTor();
|
|
574
|
-
extern char whatsapp_Album_IsAlbum_Get(long long int handle);
|
|
575
|
-
extern void whatsapp_Album_IsAlbum_Set(long long int handle, char val);
|
|
576
|
-
extern long long int whatsapp_Album_ImageCount_Get(long long int handle);
|
|
577
|
-
extern void whatsapp_Album_ImageCount_Set(long long int handle, long long int val);
|
|
578
|
-
extern long long int whatsapp_Album_VideoCount_Get(long long int handle);
|
|
579
|
-
extern void whatsapp_Album_VideoCount_Set(long long int handle, long long int val);
|
|
580
|
-
|
|
581
|
-
// --- wrapping struct: whatsapp.Attachment ---
|
|
582
|
-
//
|
|
583
|
-
extern long long int whatsapp_Attachment_CTor();
|
|
584
|
-
extern char* whatsapp_Attachment_MIME_Get(long long int handle);
|
|
585
|
-
extern void whatsapp_Attachment_MIME_Set(long long int handle, char* val);
|
|
586
|
-
extern char* whatsapp_Attachment_Filename_Get(long long int handle);
|
|
587
|
-
extern void whatsapp_Attachment_Filename_Set(long long int handle, char* val);
|
|
588
|
-
extern char* whatsapp_Attachment_Caption_Get(long long int handle);
|
|
589
|
-
extern void whatsapp_Attachment_Caption_Set(long long int handle, char* val);
|
|
590
|
-
extern long long int whatsapp_Attachment_Data_Get(long long int handle);
|
|
591
|
-
extern void whatsapp_Attachment_Data_Set(long long int handle, long long int val);
|
|
592
|
-
extern long long int whatsapp_Attachment_GetSpec(long long int _handle, long long int ctx);
|
|
593
|
-
|
|
594
|
-
// --- wrapping struct: whatsapp.ChatState ---
|
|
595
|
-
//
|
|
596
|
-
extern long long int whatsapp_ChatState_CTor();
|
|
597
|
-
extern long long int whatsapp_ChatState_Kind_Get(long long int handle);
|
|
598
|
-
extern void whatsapp_ChatState_Kind_Set(long long int handle, long long int val);
|
|
599
|
-
extern char* whatsapp_ChatState_JID_Get(long long int handle);
|
|
600
|
-
extern void whatsapp_ChatState_JID_Set(long long int handle, char* val);
|
|
601
|
-
extern char* whatsapp_ChatState_GroupJID_Get(long long int handle);
|
|
602
|
-
extern void whatsapp_ChatState_GroupJID_Set(long long int handle, char* val);
|
|
603
|
-
|
|
604
|
-
// --- wrapping struct: whatsapp.Connect ---
|
|
605
|
-
//
|
|
606
|
-
extern long long int whatsapp_Connect_CTor();
|
|
607
|
-
extern char* whatsapp_Connect_JID_Get(long long int handle);
|
|
608
|
-
extern void whatsapp_Connect_JID_Set(long long int handle, char* val);
|
|
609
|
-
extern char* whatsapp_Connect_Error_Get(long long int handle);
|
|
610
|
-
extern void whatsapp_Connect_Error_Set(long long int handle, char* val);
|
|
611
|
-
|
|
612
|
-
// --- wrapping struct: whatsapp.GroupParticipant ---
|
|
616
|
+
// --- wrapping struct: whatsapp.Group ---
|
|
613
617
|
//
|
|
614
|
-
extern long long int
|
|
615
|
-
extern char*
|
|
616
|
-
extern void
|
|
617
|
-
extern char*
|
|
618
|
-
extern void
|
|
619
|
-
extern long long int
|
|
620
|
-
extern void
|
|
621
|
-
extern
|
|
622
|
-
extern void
|
|
618
|
+
extern long long int whatsapp_Group_CTor();
|
|
619
|
+
extern char* whatsapp_Group_JID_Get(long long int handle);
|
|
620
|
+
extern void whatsapp_Group_JID_Set(long long int handle, char* val);
|
|
621
|
+
extern char* whatsapp_Group_Name_Get(long long int handle);
|
|
622
|
+
extern void whatsapp_Group_Name_Set(long long int handle, char* val);
|
|
623
|
+
extern long long int whatsapp_Group_Subject_Get(long long int handle);
|
|
624
|
+
extern void whatsapp_Group_Subject_Set(long long int handle, long long int val);
|
|
625
|
+
extern char* whatsapp_Group_Nickname_Get(long long int handle);
|
|
626
|
+
extern void whatsapp_Group_Nickname_Set(long long int handle, char* val);
|
|
627
|
+
extern long long int whatsapp_Group_Participants_Get(long long int handle);
|
|
628
|
+
extern void whatsapp_Group_Participants_Set(long long int handle, long long int val);
|
|
629
|
+
extern char* whatsapp_Group_InviteCode_Get(long long int handle);
|
|
630
|
+
extern void whatsapp_Group_InviteCode_Set(long long int handle, char* val);
|
|
623
631
|
|
|
624
|
-
// --- wrapping struct: whatsapp.
|
|
632
|
+
// --- wrapping struct: whatsapp.GroupSubject ---
|
|
625
633
|
//
|
|
626
|
-
extern long long int
|
|
627
|
-
extern
|
|
628
|
-
extern void
|
|
629
|
-
extern
|
|
630
|
-
extern void
|
|
631
|
-
extern
|
|
632
|
-
extern void
|
|
633
|
-
extern char whatsapp_Location_IsLive_Get(long long int handle);
|
|
634
|
-
extern void whatsapp_Location_IsLive_Set(long long int handle, char val);
|
|
635
|
-
extern char* whatsapp_Location_Name_Get(long long int handle);
|
|
636
|
-
extern void whatsapp_Location_Name_Set(long long int handle, char* val);
|
|
637
|
-
extern char* whatsapp_Location_Address_Get(long long int handle);
|
|
638
|
-
extern void whatsapp_Location_Address_Set(long long int handle, char* val);
|
|
639
|
-
extern char* whatsapp_Location_URL_Get(long long int handle);
|
|
640
|
-
extern void whatsapp_Location_URL_Set(long long int handle, char* val);
|
|
634
|
+
extern long long int whatsapp_GroupSubject_CTor();
|
|
635
|
+
extern char* whatsapp_GroupSubject_Subject_Get(long long int handle);
|
|
636
|
+
extern void whatsapp_GroupSubject_Subject_Set(long long int handle, char* val);
|
|
637
|
+
extern long long int whatsapp_GroupSubject_SetAt_Get(long long int handle);
|
|
638
|
+
extern void whatsapp_GroupSubject_SetAt_Set(long long int handle, long long int val);
|
|
639
|
+
extern char* whatsapp_GroupSubject_SetBy_Get(long long int handle);
|
|
640
|
+
extern void whatsapp_GroupSubject_SetBy_Set(long long int handle, char* val);
|
|
641
641
|
|
|
642
642
|
// --- wrapping struct: whatsapp.Preview ---
|
|
643
643
|
//
|
slidge_whatsapp/go.mod
CHANGED
|
@@ -9,9 +9,9 @@ require (
|
|
|
9
9
|
github.com/go-python/gopy v0.4.11-0.20241206185020-5f285b890023
|
|
10
10
|
github.com/h2non/filetype v1.1.3
|
|
11
11
|
github.com/mattn/go-sqlite3 v1.14.32
|
|
12
|
-
go.mau.fi/libsignal v0.2.
|
|
13
|
-
go.mau.fi/whatsmeow v0.0.0-
|
|
14
|
-
golang.org/x/image v0.
|
|
12
|
+
go.mau.fi/libsignal v0.2.1
|
|
13
|
+
go.mau.fi/whatsmeow v0.0.0-20251016095441-02c50743e601
|
|
14
|
+
golang.org/x/image v0.32.0
|
|
15
15
|
)
|
|
16
16
|
|
|
17
17
|
require (
|
|
@@ -27,11 +27,11 @@ require (
|
|
|
27
27
|
github.com/petermattis/goid v0.0.0-20250904145737-900bdf8bb490 // indirect
|
|
28
28
|
github.com/rs/zerolog v1.34.0 // indirect
|
|
29
29
|
github.com/vektah/gqlparser/v2 v2.5.30 // indirect
|
|
30
|
-
go.mau.fi/util v0.9.
|
|
31
|
-
golang.org/x/crypto v0.
|
|
32
|
-
golang.org/x/exp v0.0.0-
|
|
33
|
-
golang.org/x/net v0.
|
|
34
|
-
golang.org/x/sys v0.
|
|
35
|
-
golang.org/x/text v0.
|
|
30
|
+
go.mau.fi/util v0.9.2 // indirect
|
|
31
|
+
golang.org/x/crypto v0.43.0 // indirect
|
|
32
|
+
golang.org/x/exp v0.0.0-20251017212417-90e834f514db // indirect
|
|
33
|
+
golang.org/x/net v0.46.0 // indirect
|
|
34
|
+
golang.org/x/sys v0.37.0 // indirect
|
|
35
|
+
golang.org/x/text v0.30.0 // indirect
|
|
36
36
|
google.golang.org/protobuf v1.36.10 // indirect
|
|
37
37
|
)
|
slidge_whatsapp/go.sum
CHANGED
|
@@ -53,27 +53,27 @@ github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu
|
|
|
53
53
|
github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
|
|
54
54
|
github.com/vektah/gqlparser/v2 v2.5.30 h1:EqLwGAFLIzt1wpx1IPpY67DwUujF1OfzgEyDsLrN6kE=
|
|
55
55
|
github.com/vektah/gqlparser/v2 v2.5.30/go.mod h1:D1/VCZtV3LPnQrcPBeR/q5jkSQIPti0uYCP/RI0gIeo=
|
|
56
|
-
go.mau.fi/libsignal v0.2.
|
|
57
|
-
go.mau.fi/libsignal v0.2.
|
|
58
|
-
go.mau.fi/util v0.9.
|
|
59
|
-
go.mau.fi/util v0.9.
|
|
60
|
-
go.mau.fi/whatsmeow v0.0.0-
|
|
61
|
-
go.mau.fi/whatsmeow v0.0.0-
|
|
62
|
-
golang.org/x/crypto v0.
|
|
63
|
-
golang.org/x/crypto v0.
|
|
64
|
-
golang.org/x/exp v0.0.0-
|
|
65
|
-
golang.org/x/exp v0.0.0-
|
|
66
|
-
golang.org/x/image v0.
|
|
67
|
-
golang.org/x/image v0.
|
|
68
|
-
golang.org/x/net v0.
|
|
69
|
-
golang.org/x/net v0.
|
|
56
|
+
go.mau.fi/libsignal v0.2.1 h1:vRZG4EzTn70XY6Oh/pVKrQGuMHBkAWlGRC22/85m9L0=
|
|
57
|
+
go.mau.fi/libsignal v0.2.1/go.mod h1:iVvjrHyfQqWajOUaMEsIfo3IqgVMrhWcPiiEzk7NgoU=
|
|
58
|
+
go.mau.fi/util v0.9.2 h1:+S4Z03iCsGqU2WY8X2gySFsFjaLlUHFRDVCYvVwynKM=
|
|
59
|
+
go.mau.fi/util v0.9.2/go.mod h1:055elBBCJSdhRsmub7ci9hXZPgGr1U6dYg44cSgRgoU=
|
|
60
|
+
go.mau.fi/whatsmeow v0.0.0-20251016095441-02c50743e601 h1:6tytDOaqizeBVG3OdEojIiJtZXY3DWMvFKNkjbxq4tI=
|
|
61
|
+
go.mau.fi/whatsmeow v0.0.0-20251016095441-02c50743e601/go.mod h1:VJq+D05Fe5EroZxs2StEYD/AsWJO2aQ7Niucz7lCvao=
|
|
62
|
+
golang.org/x/crypto v0.43.0 h1:dduJYIi3A3KOfdGOHX8AVZ/jGiyPa3IbBozJ5kNuE04=
|
|
63
|
+
golang.org/x/crypto v0.43.0/go.mod h1:BFbav4mRNlXJL4wNeejLpWxB7wMbc79PdRGhWKncxR0=
|
|
64
|
+
golang.org/x/exp v0.0.0-20251017212417-90e834f514db h1:by6IehL4BH5k3e3SJmcoNbOobMey2SLpAF79iPOEBvw=
|
|
65
|
+
golang.org/x/exp v0.0.0-20251017212417-90e834f514db/go.mod h1:j/pmGrbnkbPtQfxEe5D0VQhZC6qKbfKifgD0oM7sR70=
|
|
66
|
+
golang.org/x/image v0.32.0 h1:6lZQWq75h7L5IWNk0r+SCpUJ6tUVd3v4ZHnbRKLkUDQ=
|
|
67
|
+
golang.org/x/image v0.32.0/go.mod h1:/R37rrQmKXtO6tYXAjtDLwQgFLHmhW+V6ayXlxzP2Pc=
|
|
68
|
+
golang.org/x/net v0.46.0 h1:giFlY12I07fugqwPuWJi68oOnpfqFnJIJzaIIm2JVV4=
|
|
69
|
+
golang.org/x/net v0.46.0/go.mod h1:Q9BGdFy1y4nkUwiLvT5qtyhAnEHgnQ/zd8PfU6nc210=
|
|
70
70
|
golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
|
71
71
|
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
|
72
72
|
golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
|
|
73
|
-
golang.org/x/sys v0.
|
|
74
|
-
golang.org/x/sys v0.
|
|
75
|
-
golang.org/x/text v0.
|
|
76
|
-
golang.org/x/text v0.
|
|
73
|
+
golang.org/x/sys v0.37.0 h1:fdNQudmxPjkdUTPnLn5mdQv7Zwvbvpaxqs831goi9kQ=
|
|
74
|
+
golang.org/x/sys v0.37.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
|
|
75
|
+
golang.org/x/text v0.30.0 h1:yznKA/E9zq54KzlzBEAWn1NXSQ8DIp/NYMy88xJjl4k=
|
|
76
|
+
golang.org/x/text v0.30.0/go.mod h1:yDdHFIX9t+tORqspjENWgzaCVXgk0yYnYuSZ8UzzBVM=
|
|
77
77
|
google.golang.org/protobuf v1.36.10 h1:AYd7cD/uASjIL6Q9LiTjz8JLcrh/88q5UObnmY3aOOE=
|
|
78
78
|
google.golang.org/protobuf v1.36.10/go.mod h1:HTf+CrKn2C3g5S8VImy6tdcUvCska2kB7j23XfzDpco=
|
|
79
79
|
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
|
|
@@ -2,6 +2,7 @@ package session
|
|
|
2
2
|
|
|
3
3
|
import (
|
|
4
4
|
"context"
|
|
5
|
+
"errors"
|
|
5
6
|
"fmt"
|
|
6
7
|
|
|
7
8
|
"go.mau.fi/libsignal/cipher"
|
|
@@ -253,12 +254,16 @@ func (d *Cipher) DecryptWithRecord(ctx context.Context, sessionRecord *record.Se
|
|
|
253
254
|
|
|
254
255
|
// If we received an error using the current session state, loop
|
|
255
256
|
// through all previous states.
|
|
256
|
-
if err
|
|
257
|
+
if errors.Is(err, signalerror.ErrOldCounter) {
|
|
258
|
+
return nil, nil, err
|
|
259
|
+
} else if err != nil {
|
|
257
260
|
logger.Warning(err)
|
|
258
261
|
for i, state := range previousStates {
|
|
259
262
|
// Try decrypting the message with previous states
|
|
260
263
|
plaintext, messageKeys, err = d.DecryptWithState(ctx, state, ciphertext)
|
|
261
|
-
if err
|
|
264
|
+
if errors.Is(err, signalerror.ErrOldCounter) {
|
|
265
|
+
return nil, nil, err
|
|
266
|
+
} else if err != nil {
|
|
262
267
|
continue
|
|
263
268
|
}
|
|
264
269
|
|
|
@@ -114,5 +114,6 @@
|
|
|
114
114
|
// whole file is limited to that dialect.
|
|
115
115
|
//
|
|
116
116
|
// If the filter ends with `(lines commented)`, then ALL lines chosen
|
|
117
|
-
// by the filter will be uncommented.
|
|
117
|
+
// by the filter will be uncommented. The `--` comment prefix must be
|
|
118
|
+
// at the beginning of the line with no whitespace ahead of it.
|
|
118
119
|
package dbutil
|
|
@@ -173,6 +173,9 @@ func (db *Database) filterSQLUpgrade(lines [][]byte) (string, error) {
|
|
|
173
173
|
}
|
|
174
174
|
if dialect == db.Dialect {
|
|
175
175
|
if uncomment {
|
|
176
|
+
if !bytes.HasPrefix(lines[i], []byte("--")) {
|
|
177
|
+
return "", fmt.Errorf("line %d isn't commented even though the dialect filter claimed it is (-- must be at beginning of line)", i+1)
|
|
178
|
+
}
|
|
176
179
|
output = append(output, bytes.TrimPrefix(lines[i], []byte("--")))
|
|
177
180
|
} else {
|
|
178
181
|
output = append(output, lines[i])
|
|
@@ -6,7 +6,11 @@
|
|
|
6
6
|
|
|
7
7
|
package exsync
|
|
8
8
|
|
|
9
|
-
import
|
|
9
|
+
import (
|
|
10
|
+
"iter"
|
|
11
|
+
"maps"
|
|
12
|
+
"sync"
|
|
13
|
+
)
|
|
10
14
|
|
|
11
15
|
// Map is a simple map with a built-in mutex.
|
|
12
16
|
type Map[Key comparable, Value any] struct {
|
|
@@ -15,8 +19,13 @@ type Map[Key comparable, Value any] struct {
|
|
|
15
19
|
}
|
|
16
20
|
|
|
17
21
|
func NewMap[Key comparable, Value any]() *Map[Key, Value] {
|
|
22
|
+
return NewMapWithData(make(map[Key]Value))
|
|
23
|
+
}
|
|
24
|
+
|
|
25
|
+
// NewMapWithData constructs a Map with the given map as data. Accessing the map directly after passing it here is not safe.
|
|
26
|
+
func NewMapWithData[Key comparable, Value any](data map[Key]Value) *Map[Key, Value] {
|
|
18
27
|
return &Map[Key, Value]{
|
|
19
|
-
data:
|
|
28
|
+
data: data,
|
|
20
29
|
}
|
|
21
30
|
}
|
|
22
31
|
|
|
@@ -77,18 +86,50 @@ func (sm *Map[Key, Value]) GetOrSet(key Key, value Value) (actual Value, wasGet
|
|
|
77
86
|
return
|
|
78
87
|
}
|
|
79
88
|
|
|
89
|
+
// Clear removes all items from the map.
|
|
90
|
+
func (sm *Map[Key, Value]) Clear() {
|
|
91
|
+
sm.lock.Lock()
|
|
92
|
+
clear(sm.data)
|
|
93
|
+
sm.lock.Unlock()
|
|
94
|
+
}
|
|
95
|
+
|
|
96
|
+
// Len returns the number of items in the map.
|
|
97
|
+
func (sm *Map[Key, Value]) Len() int {
|
|
98
|
+
sm.lock.RLock()
|
|
99
|
+
l := len(sm.data)
|
|
100
|
+
sm.lock.RUnlock()
|
|
101
|
+
return l
|
|
102
|
+
}
|
|
103
|
+
|
|
104
|
+
// CopyFrom copies all key/value pairs from the given map into this map, overriding any existing keys.
|
|
105
|
+
// Keys present in this map but not in the given map are not removed.
|
|
106
|
+
func (sm *Map[Key, Value]) CopyFrom(other map[Key]Value) {
|
|
107
|
+
sm.lock.Lock()
|
|
108
|
+
maps.Copy(sm.data, other)
|
|
109
|
+
sm.lock.Unlock()
|
|
110
|
+
}
|
|
111
|
+
|
|
80
112
|
// Clone returns a copy of the map.
|
|
81
113
|
func (sm *Map[Key, Value]) Clone() *Map[Key, Value] {
|
|
82
|
-
return
|
|
114
|
+
return NewMapWithData(sm.CopyData())
|
|
83
115
|
}
|
|
84
116
|
|
|
85
117
|
// CopyData returns a copy of the data in the map as a normal (non-atomic) map.
|
|
86
118
|
func (sm *Map[Key, Value]) CopyData() map[Key]Value {
|
|
87
119
|
sm.lock.RLock()
|
|
88
|
-
copied :=
|
|
89
|
-
for key, value := range sm.data {
|
|
90
|
-
copied[key] = value
|
|
91
|
-
}
|
|
120
|
+
copied := maps.Clone(sm.data)
|
|
92
121
|
sm.lock.RUnlock()
|
|
93
122
|
return copied
|
|
94
123
|
}
|
|
124
|
+
|
|
125
|
+
func (sm *Map[Key, Value]) Iter() iter.Seq2[Key, Value] {
|
|
126
|
+
return func(yield func(Key, Value) bool) {
|
|
127
|
+
sm.lock.RLock()
|
|
128
|
+
defer sm.lock.RUnlock()
|
|
129
|
+
for k, v := range sm.data {
|
|
130
|
+
if !yield(k, v) {
|
|
131
|
+
return
|
|
132
|
+
}
|
|
133
|
+
}
|
|
134
|
+
}
|
|
135
|
+
}
|
|
@@ -7,6 +7,7 @@
|
|
|
7
7
|
package exsync
|
|
8
8
|
|
|
9
9
|
import (
|
|
10
|
+
"iter"
|
|
10
11
|
"sync"
|
|
11
12
|
)
|
|
12
13
|
|
|
@@ -134,3 +135,15 @@ func (s *Set[T]) AsList() []T {
|
|
|
134
135
|
s.l.RUnlock()
|
|
135
136
|
return list
|
|
136
137
|
}
|
|
138
|
+
|
|
139
|
+
func (s *Set[T]) Iter() iter.Seq[T] {
|
|
140
|
+
return func(yield func(T) bool) {
|
|
141
|
+
s.l.RLock()
|
|
142
|
+
defer s.l.RUnlock()
|
|
143
|
+
for item := range s.m {
|
|
144
|
+
if !yield(item) {
|
|
145
|
+
return
|
|
146
|
+
}
|
|
147
|
+
}
|
|
148
|
+
}
|
|
149
|
+
}
|