Skip to content

Commit 771f343

Browse files
BilbBilb
committed
fix: windows build
1 parent 1911a48 commit 771f343

File tree

1 file changed

+33
-33
lines changed

1 file changed

+33
-33
lines changed

‎src/groups/meta_group_wrapper.cpp‎

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -409,7 +409,7 @@ Napi::Value MetaGroupWrapper::memberGet(const Napi::CallbackInfo& info) {
409409
assertInfoLength(info, 1);
410410
assertIsString(info[0]);
411411

412-
auto pubkeyHex = toCppString(info[0], __PRETTY_FUNCTION__);
412+
auto pubkeyHex = toCppString(info[0], "memberGet");
413413
return meta_group->members->get(pubkeyHex);
414414
});
415415
}
@@ -419,7 +419,7 @@ Napi::Value MetaGroupWrapper::memberGetOrConstruct(const Napi::CallbackInfo& inf
419419
assertInfoLength(info, 1);
420420
assertIsString(info[0]);
421421

422-
auto pubkeyHex = toCppString(info[0], __PRETTY_FUNCTION__);
422+
auto pubkeyHex = toCppString(info[0], "memberGetOrConstruct");
423423
return meta_group->members->get_or_construct(pubkeyHex);
424424
});
425425
}
@@ -429,7 +429,7 @@ Napi::Value MetaGroupWrapper::memberConstructAndSet(const Napi::CallbackInfo& in
429429
assertInfoLength(info, 1);
430430
assertIsString(info[0]);
431431

432-
auto pubkeyHex = toCppString(info[0], __PRETTY_FUNCTION__);
432+
auto pubkeyHex = toCppString(info[0], "memberConstructAndSet");
433433
auto created = meta_group->members->get_or_construct(pubkeyHex);
434434
meta_group->members->set(created);
435435
return created;
@@ -441,8 +441,8 @@ void MetaGroupWrapper::memberSetNameTruncated(const Napi::CallbackInfo& info) {
441441
assertIsString(info[0]);
442442
assertIsString(info[1]);
443443

444-
auto pubkeyHex = toCppString(info[0], __PRETTY_FUNCTION__);
445-
auto newName = toCppString(info[1], __PRETTY_FUNCTION__);
444+
auto pubkeyHex = toCppString(info[0], "memberSetNameTruncated pubkeyHex");
445+
auto newName = toCppString(info[1], "memberSetNameTruncated newName");
446446
auto m = this->meta_group->members->get(pubkeyHex);
447447
if (m) {
448448
m->set_name(newName);
@@ -455,8 +455,8 @@ void MetaGroupWrapper::memberSetInvited(const Napi::CallbackInfo& info) {
455455
wrapExceptions(info, [&] {
456456
assertIsString(info[0]);
457457
assertIsBoolean(info[1]);
458-
auto pubkeyHex = toCppString(info[0], __PRETTY_FUNCTION__);
459-
auto failed = toCppBoolean(info[1], __PRETTY_FUNCTION__);
458+
auto pubkeyHex = toCppString(info[0], "memberSetInvited");
459+
auto failed = toCppBoolean(info[1], "memberSetInvited");
460460

461461
auto m = this->meta_group->members->get(pubkeyHex);
462462
if (m) {
@@ -471,7 +471,7 @@ void MetaGroupWrapper::memberSetAccepted(const Napi::CallbackInfo& info) {
471471
assertInfoLength(info, 1);
472472
assertIsString(info[0]);
473473

474-
auto pubkeyHex = toCppString(info[0], __PRETTY_FUNCTION__);
474+
auto pubkeyHex = toCppString(info[0], "memberSetAccepted");
475475
auto m = this->meta_group->members->get(pubkeyHex);
476476
if (m) {
477477
m->set_accepted();
@@ -484,7 +484,7 @@ void MetaGroupWrapper::memberSetPromoted(const Napi::CallbackInfo& info) {
484484
wrapExceptions(info, [&] {
485485
assertInfoLength(info, 1);
486486
assertIsString(info[0]);
487-
auto pubkeyHex = toCppString(info[0], __PRETTY_FUNCTION__);
487+
auto pubkeyHex = toCppString(info[0], "memberSetPromoted");
488488
auto m = this->meta_group->members->get(pubkeyHex);
489489
if (m) {
490490
m->set_promoted();
@@ -497,7 +497,7 @@ void MetaGroupWrapper::memberSetPromotionSent(const Napi::CallbackInfo& info) {
497497
wrapExceptions(info, [&] {
498498
assertInfoLength(info, 1);
499499
assertIsString(info[0]);
500-
auto pubkeyHex = toCppString(info[0], __PRETTY_FUNCTION__);
500+
auto pubkeyHex = toCppString(info[0], "memberSetPromotionSent");
501501
auto m = this->meta_group->members->get(pubkeyHex);
502502
if (m) {
503503
m->set_promotion_sent();
@@ -510,7 +510,7 @@ void MetaGroupWrapper::memberSetPromotionFailed(const Napi::CallbackInfo& info)
510510
wrapExceptions(info, [&] {
511511
assertInfoLength(info, 1);
512512
assertIsString(info[0]);
513-
auto pubkeyHex = toCppString(info[0], __PRETTY_FUNCTION__);
513+
auto pubkeyHex = toCppString(info[0], "memberSetPromotionFailed");
514514
auto m = this->meta_group->members->get(pubkeyHex);
515515
if (m) {
516516
m->set_promotion_failed();
@@ -523,7 +523,7 @@ void MetaGroupWrapper::memberSetPromotionAccepted(const Napi::CallbackInfo& info
523523
wrapExceptions(info, [&] {
524524
assertInfoLength(info, 1);
525525
assertIsString(info[0]);
526-
auto pubkeyHex = toCppString(info[0], __PRETTY_FUNCTION__);
526+
auto pubkeyHex = toCppString(info[0], "memberSetPromotionAccepted");
527527
auto m = this->meta_group->members->get(pubkeyHex);
528528
if (m) {
529529
m->set_promotion_accepted();
@@ -538,7 +538,7 @@ void MetaGroupWrapper::memberSetProfilePicture(const Napi::CallbackInfo& info) {
538538
assertIsString(info[0]);
539539
assertIsObject(info[1]);
540540

541-
auto pubkeyHex = toCppString(info[0], __PRETTY_FUNCTION__);
541+
auto pubkeyHex = toCppString(info[0], "memberSetProfilePicture");
542542
auto profilePicture = profile_pic_from_object(info[1]);
543543

544544
auto m = this->meta_group->members->get(pubkeyHex);
@@ -557,11 +557,11 @@ void MetaGroupWrapper::membersMarkPendingRemoval(const Napi::CallbackInfo& info)
557557

558558
assertIsArray(toUpdateJSValue);
559559
assertIsBoolean(withMessageJSValue);
560-
bool withMessages = toCppBoolean(withMessageJSValue, __PRETTY_FUNCTION__);
560+
bool withMessages = toCppBoolean(withMessageJSValue, "membersMarkPendingRemoval");
561561

562562
auto toUpdateJS = toUpdateJSValue.As<Napi::Array>();
563563
for (uint32_t i = 0; i < toUpdateJS.Length(); i++) {
564-
auto pubkeyHex = toCppString(toUpdateJS[i], __PRETTY_FUNCTION__);
564+
auto pubkeyHex = toCppString(toUpdateJS[i], "membersMarkPendingRemoval");
565565
auto existing = this->meta_group->members->get(pubkeyHex);
566566
if (existing) {
567567
existing->set_removed(withMessages);
@@ -581,7 +581,7 @@ Napi::Value MetaGroupWrapper::memberEraseAndRekey(const Napi::CallbackInfo& info
581581
auto toRemoveJS = toRemoveJSValue.As<Napi::Array>();
582582
auto rekeyed = false;
583583
for (uint32_t i = 0; i < toRemoveJS.Length(); i++) {
584-
auto pubkeyHex = toCppString(toRemoveJS[i], __PRETTY_FUNCTION__);
584+
auto pubkeyHex = toCppString(toRemoveJS[i], "memberEraseAndRekey");
585585
rekeyed |= this->meta_group->members->erase(pubkeyHex);
586586
}
587587

@@ -614,12 +614,12 @@ Napi::Value MetaGroupWrapper::loadKeyMessage(const Napi::CallbackInfo& info) {
614614
return wrapResult(info, [&] {
615615
assertInfoLength(info, 3);
616616
assertIsString(info[0]);
617-
assertIsUInt8Array(info[1], __PRETTY_FUNCTION__);
618-
assertIsNumber(info[2], __PRETTY_FUNCTION__);
617+
assertIsUInt8Array(info[1], "loadKeyMessage");
618+
assertIsNumber(info[2], "loadKeyMessage");
619619

620-
auto hash = toCppString(info[0], __PRETTY_FUNCTION__);
621-
auto data = toCppBuffer(info[1], __PRETTY_FUNCTION__);
622-
auto timestamp_ms = toCppInteger(info[2], __PRETTY_FUNCTION__);
620+
auto hash = toCppString(info[0], "loadKeyMessage");
621+
auto data = toCppBuffer(info[1], "loadKeyMessage");
622+
auto timestamp_ms = toCppInteger(info[2], "loadKeyMessage");
623623

624624
return meta_group->keys->load_key_message(
625625
hash, data, timestamp_ms, *(this->meta_group->info), *(this->meta_group->members));
@@ -657,7 +657,7 @@ Napi::Value MetaGroupWrapper::encryptMessages(const Napi::CallbackInfo& info) {
657657
encryptedMessages.reserve(arrayLength);
658658

659659
for (uint32_t i = 0; i < plaintextsJS.Length(); i++) {
660-
auto plaintext = toCppBuffer(plaintextsJS[i], __PRETTY_FUNCTION__);
660+
auto plaintext = toCppBuffer(plaintextsJS[i], "encryptMessages");
661661

662662
encryptedMessages.push_back(this->meta_group->keys->encrypt_message(plaintext));
663663
}
@@ -668,9 +668,9 @@ Napi::Value MetaGroupWrapper::encryptMessages(const Napi::CallbackInfo& info) {
668668
Napi::Value MetaGroupWrapper::decryptMessage(const Napi::CallbackInfo& info) {
669669
return wrapResult(info, [&] {
670670
assertInfoLength(info, 1);
671-
assertIsUInt8Array(info[0], __PRETTY_FUNCTION__);
671+
assertIsUInt8Array(info[0], "decryptMessage");
672672

673-
auto ciphertext = toCppBuffer(info[0], __PRETTY_FUNCTION__);
673+
auto ciphertext = toCppBuffer(info[0], "decryptMessage");
674674
auto decrypted = this->meta_group->keys->decrypt_message(ciphertext);
675675

676676
return decrypt_result_to_JS(info.Env(), decrypted);
@@ -682,7 +682,7 @@ Napi::Value MetaGroupWrapper::makeSwarmSubAccount(const Napi::CallbackInfo& info
682682
assertInfoLength(info, 1);
683683
assertIsString(info[0]);
684684

685-
auto memberPk = toCppString(info[0], __PRETTY_FUNCTION__);
685+
auto memberPk = toCppString(info[0], "makeSwarmSubAccount");
686686
ustring subaccount = this->meta_group->keys->swarm_make_subaccount(memberPk);
687687

688688
session::nodeapi::checkOrThrow(
@@ -697,7 +697,7 @@ Napi::Value MetaGroupWrapper::swarmSubAccountToken(const Napi::CallbackInfo& inf
697697
assertInfoLength(info, 1);
698698
assertIsString(info[0]);
699699

700-
auto memberPk = toCppString(info[0], __PRETTY_FUNCTION__);
700+
auto memberPk = toCppString(info[0], "swarmSubAccountToken");
701701
ustring subaccount = this->meta_group->keys->swarm_subaccount_token(memberPk);
702702

703703
session::nodeapi::checkOrThrow(
@@ -710,19 +710,19 @@ Napi::Value MetaGroupWrapper::swarmSubAccountToken(const Napi::CallbackInfo& inf
710710
Napi::Value MetaGroupWrapper::swarmVerifySubAccount(const Napi::CallbackInfo& info) {
711711
return wrapResult(info, [&] {
712712
assertInfoLength(info, 1);
713-
assertIsUInt8Array(info[0], __PRETTY_FUNCTION__);
713+
assertIsUInt8Array(info[0], "swarmVerifySubAccount");
714714

715-
auto signingValue = toCppBuffer(info[0], __PRETTY_FUNCTION__);
715+
auto signingValue = toCppBuffer(info[0], "swarmVerifySubAccount");
716716
return this->meta_group->keys->swarm_verify_subaccount(signingValue);
717717
});
718718
}
719719

720720
Napi::Value MetaGroupWrapper::loadAdminKeys(const Napi::CallbackInfo& info) {
721721
return wrapResult(info, [&] {
722722
assertInfoLength(info, 1);
723-
assertIsUInt8Array(info[0], __PRETTY_FUNCTION__);
723+
assertIsUInt8Array(info[0], "loadAdminKeys");
724724

725-
auto secret = toCppBuffer(info[0], __PRETTY_FUNCTION__);
725+
auto secret = toCppBuffer(info[0], "loadAdminKeys");
726726
this->meta_group->keys->load_admin_key(
727727
secret, *(this->meta_group->info), *(this->meta_group->members));
728728
return info.Env().Null();
@@ -750,7 +750,7 @@ Napi::Value MetaGroupWrapper::generateSupplementKeys(const Napi::CallbackInfo& i
750750
membersCpp.reserve(arrayLength);
751751

752752
for (uint32_t i = 0; i < membersJS.Length(); i++) {
753-
auto memberPk = toCppString(membersJS[i], __PRETTY_FUNCTION__);
753+
auto memberPk = toCppString(membersJS[i], "generateSupplementKeys");
754754
membersCpp.push_back(memberPk);
755755
}
756756
return this->meta_group->keys->key_supplement(membersCpp);
@@ -763,8 +763,8 @@ Napi::Value MetaGroupWrapper::swarmSubaccountSign(const Napi::CallbackInfo& info
763763
assertIsUInt8Array(info[0], "swarmSubaccountSign 0");
764764
assertIsUInt8Array(info[1], "swarmSubaccountSign 1");
765765

766-
auto message = toCppBuffer(info[0], __PRETTY_FUNCTION__);
767-
auto authdata = toCppBuffer(info[1], __PRETTY_FUNCTION__);
766+
auto message = toCppBuffer(info[0], "swarmSubaccountSign message");
767+
auto authdata = toCppBuffer(info[1], "swarmSubaccountSign authdata");
768768
auto subaccountSign = this->meta_group->keys->swarm_subaccount_sign(message, authdata);
769769

770770
return subaccountSign;

0 commit comments

Comments
 (0)