enhance: Implement the toggle to (or not to) close push notifications when notifications or messages are read (#9219)

* create file

* wip

* fix

* wip

* tabun dekita

* ✌️

* implement subscribe push notification button to tutorial

* check-exists→show-registration

* add column sendReadMessage

* fix migration file

* sw api

* change PushNotificationService

* wip

* ✌️

* fix tutorial footer flex
This commit is contained in:
tamaina
2022-12-18 01:59:59 +09:00
committed by GitHub
parent 96dda253b0
commit 4ecc42744c
14 changed files with 483 additions and 106 deletions

View File

@ -25,6 +25,18 @@ export const meta = {
type: 'string',
optional: false, nullable: true,
},
userId: {
type: 'string',
optional: false, nullable: false,
},
endpoint: {
type: 'string',
optional: false, nullable: false,
},
sendReadMessage: {
type: 'boolean',
optional: false, nullable: false,
},
},
},
} as const;
@ -35,6 +47,7 @@ export const paramDef = {
endpoint: { type: 'string' },
auth: { type: 'string' },
publickey: { type: 'string' },
sendReadMessage: { type: 'boolean', default: false },
},
required: ['endpoint', 'auth', 'publickey'],
} as const;
@ -64,6 +77,9 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
return {
state: 'already-subscribed' as const,
key: instance.swPublicKey,
userId: me.id,
endpoint: exist.endpoint,
sendReadMessage: exist.sendReadMessage,
};
}
@ -74,11 +90,15 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
endpoint: ps.endpoint,
auth: ps.auth,
publickey: ps.publickey,
sendReadMessage: ps.sendReadMessage,
});
return {
state: 'subscribed' as const,
key: instance.swPublicKey,
userId: me.id,
endpoint: ps.endpoint,
sendReadMessage: ps.sendReadMessage,
};
});
}

View File

@ -0,0 +1,66 @@
import { Inject, Injectable } from '@nestjs/common';
import type { SwSubscriptionsRepository } from '@/models/index.js';
import { Endpoint } from '@/server/api/endpoint-base.js';
import { DI } from '@/di-symbols.js';
export const meta = {
tags: ['account'],
requireCredential: true,
description: 'Check push notification registration exists.',
res: {
type: 'object',
optional: false, nullable: true,
properties: {
userId: {
type: 'string',
optional: false, nullable: false,
},
endpoint: {
type: 'string',
optional: false, nullable: false,
},
sendReadMessage: {
type: 'boolean',
optional: false, nullable: false,
},
},
},
} as const;
export const paramDef = {
type: 'object',
properties: {
endpoint: { type: 'string' },
},
required: ['endpoint'],
} as const;
// eslint-disable-next-line import/no-default-export
@Injectable()
export default class extends Endpoint<typeof meta, typeof paramDef> {
constructor(
@Inject(DI.swSubscriptionsRepository)
private swSubscriptionsRepository: SwSubscriptionsRepository,
) {
super(meta, paramDef, async (ps, me) => {
// if already subscribed
const exist = await this.swSubscriptionsRepository.findOneBy({
userId: me.id,
endpoint: ps.endpoint,
});
if (exist != null) {
return {
userId: exist.userId,
endpoint: exist.endpoint,
sendReadMessage: exist.sendReadMessage,
};
}
return null;
});
}
}

View File

@ -6,7 +6,7 @@ import { DI } from '@/di-symbols.js';
export const meta = {
tags: ['account'],
requireCredential: true,
requireCredential: false,
description: 'Unregister from receiving push notifications.',
} as const;
@ -28,7 +28,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
) {
super(meta, paramDef, async (ps, me) => {
await this.swSubscriptionsRepository.delete({
userId: me.id,
...(me ? { userId: me.id } : {}),
endpoint: ps.endpoint,
});
});

View File

@ -0,0 +1,82 @@
import { Inject, Injectable } from '@nestjs/common';
import type { SwSubscriptionsRepository } from '@/models/index.js';
import { Endpoint } from '@/server/api/endpoint-base.js';
import { DI } from '@/di-symbols.js';
import { ApiError } from '../../error.js';
export const meta = {
tags: ['account'],
requireCredential: true,
description: 'Update push notification registration.',
res: {
type: 'object',
optional: false, nullable: false,
properties: {
userId: {
type: 'string',
optional: false, nullable: false,
},
endpoint: {
type: 'string',
optional: false, nullable: false,
},
sendReadMessage: {
type: 'boolean',
optional: false, nullable: false,
},
},
},
errors: {
noSuchRegistration: {
message: 'No such registration.',
code: 'NO_SUCH_REGISTRATION',
id: ' b09d8066-8064-5613-efb6-0e963b21d012',
},
}
} as const;
export const paramDef = {
type: 'object',
properties: {
endpoint: { type: 'string' },
sendReadMessage: { type: 'boolean' },
},
required: ['endpoint'],
} as const;
// eslint-disable-next-line import/no-default-export
@Injectable()
export default class extends Endpoint<typeof meta, typeof paramDef> {
constructor(
@Inject(DI.swSubscriptionsRepository)
private swSubscriptionsRepository: SwSubscriptionsRepository,
) {
super(meta, paramDef, async (ps, me) => {
const swSubscription = await this.swSubscriptionsRepository.findOneBy({
userId: me.id,
endpoint: ps.endpoint,
});
if (swSubscription === null) {
throw new ApiError(meta.errors.noSuchRegistration);
}
if (ps.sendReadMessage !== undefined) {
swSubscription.sendReadMessage = ps.sendReadMessage;
}
await this.swSubscriptionsRepository.update(swSubscription.id, {
sendReadMessage: swSubscription.sendReadMessage,
});
return {
userId: swSubscription.userId,
endpoint: swSubscription.endpoint,
sendReadMessage: swSubscription.sendReadMessage,
};
});
}
}