Skip to content

Commit c1d8966

Browse files
committed
unconfuse "subscribed" boolean vs "unsubscribed", fixing the log message about subscription change claiming the opposite change of what happened
1 parent 2b29f92 commit c1d8966

File tree

3 files changed

+10
-8
lines changed

3 files changed

+10
-8
lines changed

api.go

+6-4
Original file line numberDiff line numberDiff line change
@@ -890,20 +890,22 @@ func (API) SubscribeSet(ctx context.Context, meta, subscribed bool) {
890890
err := tx.Get(&u)
891891
xcheckf(err, "get user")
892892

893+
unsub := !subscribed
894+
893895
var kind string
894896
if meta {
895897
kind = "service messages"
896-
if u.MetaUnsubscribed == subscribed {
898+
if u.MetaUnsubscribed == unsub {
897899
xusererrorf("already set")
898900
} else {
899-
u.MetaUnsubscribed = subscribed
901+
u.MetaUnsubscribed = unsub
900902
}
901903
} else {
902904
kind = "module update messages"
903-
if u.UpdatesUnsubscribed == subscribed {
905+
if u.UpdatesUnsubscribed == unsub {
904906
xusererrorf("already set")
905907
} else {
906-
u.UpdatesUnsubscribed = subscribed
908+
u.UpdatesUnsubscribed = unsub
907909
}
908910
}
909911

index.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -1238,13 +1238,13 @@ const overview = async () => {
12381238
const render = () => {
12391239
let elem = dom.div(dom.p('Change the kind of email messages you will receive:'), dom.table(dom.tr(dom.th('Kind'), dom.th('Status'), dom.th('Action')), dom.tr(dom.td('Service messages', attr.title('Like password reset and announcements.')), dom.td(overview.MetaUnsubscribed ? 'Unsubscribed' : 'Subscribed'), dom.clickbutton(overview.MetaUnsubscribed ? 'Resubscribe' : 'Unsubscribe', async function click(e) {
12401240
await check(e.target, async () => {
1241-
await client.SubscribeSet(true, !overview.MetaUnsubscribed);
1241+
await client.SubscribeSet(true, overview.MetaUnsubscribed);
12421242
overview.MetaUnsubscribed = !overview.MetaUnsubscribed;
12431243
elem.replaceWith(render());
12441244
});
12451245
})), dom.tr(dom.td('Module updates'), dom.td(overview.UpdatesUnsubscribed ? 'Unsubscribed' : 'Subscribed'), dom.clickbutton(overview.UpdatesUnsubscribed ? 'Resubscribe' : 'Unsubscribe', async function click(e) {
12461246
await check(e.target, async () => {
1247-
await client.SubscribeSet(false, !overview.UpdatesUnsubscribed);
1247+
await client.SubscribeSet(false, overview.UpdatesUnsubscribed);
12481248
overview.UpdatesUnsubscribed = !overview.UpdatesUnsubscribed;
12491249
elem.replaceWith(render());
12501250
});

index.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -696,7 +696,7 @@ const overview = async () => {
696696
dom.td(overview.MetaUnsubscribed ? 'Unsubscribed' : 'Subscribed'),
697697
dom.clickbutton(overview.MetaUnsubscribed ? 'Resubscribe' : 'Unsubscribe', async function click(e: MouseEvent) {
698698
await check(e.target! as HTMLButtonElement, async () => {
699-
await client.SubscribeSet(true, !overview.MetaUnsubscribed)
699+
await client.SubscribeSet(true, overview.MetaUnsubscribed)
700700
overview.MetaUnsubscribed = !overview.MetaUnsubscribed
701701
elem.replaceWith(render())
702702
})
@@ -707,7 +707,7 @@ const overview = async () => {
707707
dom.td(overview.UpdatesUnsubscribed ? 'Unsubscribed' : 'Subscribed'),
708708
dom.clickbutton(overview.UpdatesUnsubscribed ? 'Resubscribe' : 'Unsubscribe', async function click(e: MouseEvent) {
709709
await check(e.target! as HTMLButtonElement, async () => {
710-
await client.SubscribeSet(false, !overview.UpdatesUnsubscribed)
710+
await client.SubscribeSet(false, overview.UpdatesUnsubscribed)
711711
overview.UpdatesUnsubscribed = !overview.UpdatesUnsubscribed
712712
elem.replaceWith(render())
713713
})

0 commit comments

Comments
 (0)