Skip to content

Commit 8870577

Browse files
BilbBilb
committed
fix: break down invite sent/failed method
1 parent 40359e0 commit 8870577

File tree

6 files changed

+45
-24
lines changed

6 files changed

+45
-24
lines changed

‎libsession-util‎

‎src/groups/meta_group_wrapper.cpp‎

Lines changed: 24 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,11 @@ void MetaGroupWrapper::Init(Napi::Env env, Napi::Object exports) {
4747
&MetaGroupWrapper::membersMarkPendingRemoval),
4848
InstanceMethod(
4949
"memberSetNameTruncated", &MetaGroupWrapper::memberSetNameTruncated),
50-
InstanceMethod("memberSetInvited", &MetaGroupWrapper::memberSetInvited),
51-
InstanceMethod("memberSetAccepted", &MetaGroupWrapper::memberSetAccepted),
50+
InstanceMethod("memberSetInviteSent", &MetaGroupWrapper::memberSetInviteSent),
51+
InstanceMethod(
52+
"memberSetInviteFailed", &MetaGroupWrapper::memberSetInviteFailed),
53+
InstanceMethod(
54+
"memberSetInviteAccepted", &MetaGroupWrapper::memberSetInviteAccepted),
5255
InstanceMethod("memberSetPromoted", &MetaGroupWrapper::memberSetPromoted),
5356
InstanceMethod(
5457
"memberSetPromotionSent", &MetaGroupWrapper::memberSetPromotionSent),
@@ -454,30 +457,41 @@ void MetaGroupWrapper::memberSetNameTruncated(const Napi::CallbackInfo& info) {
454457
});
455458
}
456459

457-
void MetaGroupWrapper::memberSetInvited(const Napi::CallbackInfo& info) {
460+
void MetaGroupWrapper::memberSetInviteFailed(const Napi::CallbackInfo& info) {
461+
wrapExceptions(info, [&] {
462+
assertIsString(info[0]);
463+
auto pubkeyHex = toCppString(info[0], "memberSetInviteFailed");
464+
465+
auto m = this->meta_group->members->get(pubkeyHex);
466+
if (m) {
467+
m->set_invite_failed();
468+
this->meta_group->members->set(*m);
469+
}
470+
});
471+
}
472+
473+
void MetaGroupWrapper::memberSetInviteSent(const Napi::CallbackInfo& info) {
458474
wrapExceptions(info, [&] {
459475
assertIsString(info[0]);
460-
assertIsBoolean(info[1]);
461-
auto pubkeyHex = toCppString(info[0], "memberSetInvited");
462-
auto failed = toCppBoolean(info[1], "memberSetInvited");
476+
auto pubkeyHex = toCppString(info[0], "memberSetInviteSent");
463477

464478
auto m = this->meta_group->members->get(pubkeyHex);
465479
if (m) {
466-
m->set_invited(failed);
480+
m->set_invite_sent();
467481
this->meta_group->members->set(*m);
468482
}
469483
});
470484
}
471485

472-
void MetaGroupWrapper::memberSetAccepted(const Napi::CallbackInfo& info) {
486+
void MetaGroupWrapper::memberSetInviteAccepted(const Napi::CallbackInfo& info) {
473487
wrapExceptions(info, [&] {
474488
assertInfoLength(info, 1);
475489
assertIsString(info[0]);
476490

477-
auto pubkeyHex = toCppString(info[0], "memberSetAccepted");
491+
auto pubkeyHex = toCppString(info[0], "memberSetInviteAccepted");
478492
auto m = this->meta_group->members->get(pubkeyHex);
479493
if (m) {
480-
m->set_accepted();
494+
m->set_invite_accepted();
481495
this->meta_group->members->set(*m);
482496
}
483497
});

‎src/groups/meta_group_wrapper.hpp‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,8 +124,9 @@ class MetaGroupWrapper : public Napi::ObjectWrap<MetaGroupWrapper> {
124124
Napi::Value memberConstructAndSet(const Napi::CallbackInfo& info);
125125

126126
void memberSetNameTruncated(const Napi::CallbackInfo& info);
127-
void memberSetInvited(const Napi::CallbackInfo& info);
128-
void memberSetAccepted(const Napi::CallbackInfo& info);
127+
void memberSetInviteFailed(const Napi::CallbackInfo& info);
128+
void memberSetInviteSent(const Napi::CallbackInfo& info);
129+
void memberSetInviteAccepted(const Napi::CallbackInfo& info);
129130
void memberSetPromoted(const Napi::CallbackInfo& info);
130131
void memberSetPromotionSent(const Napi::CallbackInfo& info);
131132
void memberSetPromotionFailed(const Napi::CallbackInfo& info);

‎src/user_groups_config.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ struct toJs_impl<group_info> {
7070
obj["authData"] = toJs(env, info.auth_data);
7171
obj["invitePending"] = toJs(env, info.invited);
7272
obj["kicked"] = toJs(env, info.kicked());
73-
obj["destroyed"] = toJs(env, info.isDestroyed());
73+
obj["destroyed"] = toJs(env, info.is_destroyed());
7474

7575
return obj;
7676
}
@@ -346,7 +346,7 @@ Napi::Value UserGroupsWrapper::markGroupKicked(const Napi::CallbackInfo& info) {
346346

347347
auto group = config.get_group(groupPk);
348348
if (group) {
349-
group->markKicked();
349+
group->mark_kicked();
350350
config.set(*group);
351351
}
352352
return config.get_or_construct_group(groupPk);
@@ -359,7 +359,7 @@ Napi::Value UserGroupsWrapper::markGroupInvited(const Napi::CallbackInfo& info)
359359

360360
auto group = config.get_group(groupPk);
361361
if (group) {
362-
group->markInvited();
362+
group->mark_invited();
363363
config.set(*group);
364364
}
365365
return config.get_or_construct_group(groupPk);
@@ -372,7 +372,7 @@ Napi::Value UserGroupsWrapper::markGroupDestroyed(const Napi::CallbackInfo& info
372372

373373
auto group = config.get_group(groupPk);
374374
if (group) {
375-
group->markDestroyed();
375+
group->mark_destroyed();
376376
config.set(*group);
377377
}
378378
return config.get_or_construct_group(groupPk);

‎types/groups/groupmembers.d.ts‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -78,10 +78,14 @@ declare module 'libsession_util_nodejs' {
7878
// setters
7979
memberSetNameTruncated: (pubkeyHex: PubkeyType, newName: string) => void;
8080

81-
/** A member's invite state defaults to invite-not-sent. Use this function to mark that you've sent one, or at least tried (failed: boolean)*/
82-
memberSetInvited: (pubkeyHex: PubkeyType, failed: boolean) => void;
81+
/** A member's invite state defaults to invite-not-sent.
82+
* Use this function to mark that you've sent one successfully. */
83+
memberSetInviteFailed: (pubkeyHex: PubkeyType) => void;
84+
/** A member's invite state defaults to invite-not-sent.
85+
* Use this function to mark that you've failed to send one successfully. */
86+
memberSetInviteSent: (pubkeyHex: PubkeyType) => void;
8387
/** User has accepted an invitation and is now a regular member of the group */
84-
memberSetAccepted: (pubkeyHex: PubkeyType) => void;
88+
memberSetInviteAccepted: (pubkeyHex: PubkeyType) => void;
8589

8690
/** Mark the member as waiting a promotion to be sent to them */
8791
memberSetPromoted: (pubkeyHex: PubkeyType) => void;

‎types/groups/metagroup.d.ts‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -92,13 +92,14 @@ declare module 'libsession_util_nodejs' {
9292
public memberConstructAndSet: MetaGroupWrapper['memberConstructAndSet'];
9393
public memberGetAll: MetaGroupWrapper['memberGetAll'];
9494
public memberGetAllPendingRemovals: MetaGroupWrapper['memberGetAllPendingRemovals'];
95-
public memberSetAccepted: MetaGroupWrapper['memberSetAccepted'];
95+
public memberSetInviteAccepted: MetaGroupWrapper['memberSetInviteAccepted'];
9696
public memberSetNameTruncated: MetaGroupWrapper['memberSetNameTruncated'];
9797
public memberSetPromoted: MetaGroupWrapper['memberSetPromoted'];
9898
public memberSetPromotionAccepted: MetaGroupWrapper['memberSetPromotionAccepted'];
9999
public memberSetPromotionSent: MetaGroupWrapper['memberSetPromotionSent'];
100100
public memberSetPromotionFailed: MetaGroupWrapper['memberSetPromotionFailed'];
101-
public memberSetInvited: MetaGroupWrapper['memberSetInvited'];
101+
public memberSetInviteSent: MetaGroupWrapper['memberSetInviteSent'];
102+
public memberSetInviteFailed: MetaGroupWrapper['memberSetInviteFailed'];
102103
public memberEraseAndRekey: MetaGroupWrapper['memberEraseAndRekey'];
103104
public membersMarkPendingRemoval: MetaGroupWrapper['membersMarkPendingRemoval'];
104105
public memberSetProfilePicture: MetaGroupWrapper['memberSetProfilePicture'];
@@ -139,13 +140,14 @@ declare module 'libsession_util_nodejs' {
139140
| MakeActionCall<MetaGroupWrapper, 'memberConstructAndSet'>
140141
| MakeActionCall<MetaGroupWrapper, 'memberGetAll'>
141142
| MakeActionCall<MetaGroupWrapper, 'memberGetAllPendingRemovals'>
142-
| MakeActionCall<MetaGroupWrapper, 'memberSetAccepted'>
143+
| MakeActionCall<MetaGroupWrapper, 'memberSetInviteAccepted'>
143144
| MakeActionCall<MetaGroupWrapper, 'memberSetNameTruncated'>
144145
| MakeActionCall<MetaGroupWrapper, 'memberSetPromoted'>
145146
| MakeActionCall<MetaGroupWrapper, 'memberSetPromotionFailed'>
146147
| MakeActionCall<MetaGroupWrapper, 'memberSetPromotionSent'>
147148
| MakeActionCall<MetaGroupWrapper, 'memberSetPromotionAccepted'>
148-
| MakeActionCall<MetaGroupWrapper, 'memberSetInvited'>
149+
| MakeActionCall<MetaGroupWrapper, 'memberSetInviteSent'>
150+
| MakeActionCall<MetaGroupWrapper, 'memberSetInviteFailed'>
149151
| MakeActionCall<MetaGroupWrapper, 'memberEraseAndRekey'>
150152
| MakeActionCall<MetaGroupWrapper, 'membersMarkPendingRemoval'>
151153
| MakeActionCall<MetaGroupWrapper, 'memberSetProfilePicture'>

0 commit comments

Comments
 (0)