parent
f104e9b6cc
commit
df71dbb024
|
@ -0,0 +1,20 @@
|
|||
import {MigrationInterface, QueryRunner} from "typeorm";
|
||||
|
||||
export class mutingNotificationTypes1600353287890 implements MigrationInterface {
|
||||
name = 'mutingNotificationTypes1600353287890'
|
||||
|
||||
public async up(queryRunner: QueryRunner): Promise<void> {
|
||||
await queryRunner.query(`ALTER TABLE "user_profile" DROP COLUMN "includingNotificationTypes"`);
|
||||
await queryRunner.query(`DROP TYPE "public"."user_profile_includingnotificationtypes_enum"`);
|
||||
await queryRunner.query(`CREATE TYPE "user_profile_mutingnotificationtypes_enum" AS ENUM('follow', 'mention', 'reply', 'renote', 'quote', 'reaction', 'pollVote', 'receiveFollowRequest', 'followRequestAccepted', 'groupInvited', 'app')`);
|
||||
await queryRunner.query(`ALTER TABLE "user_profile" ADD "mutingNotificationTypes" "user_profile_mutingnotificationtypes_enum" array NOT NULL DEFAULT '{}'`);
|
||||
}
|
||||
|
||||
public async down(queryRunner: QueryRunner): Promise<void> {
|
||||
await queryRunner.query(`ALTER TABLE "user_profile" DROP COLUMN "mutingNotificationTypes"`);
|
||||
await queryRunner.query(`DROP TYPE "user_profile_mutingnotificationtypes_enum"`);
|
||||
await queryRunner.query(`CREATE TYPE "public"."user_profile_includingnotificationtypes_enum" AS ENUM('follow', 'mention', 'reply', 'renote', 'quote', 'reaction', 'pollVote', 'receiveFollowRequest', 'followRequestAccepted', 'groupInvited', 'app')`);
|
||||
await queryRunner.query(`ALTER TABLE "user_profile" ADD "includingNotificationTypes" "user_profile_includingnotificationtypes_enum" array`);
|
||||
}
|
||||
|
||||
}
|
|
@ -328,8 +328,7 @@ export default Vue.extend({
|
|||
},
|
||||
|
||||
async onNotification(notification) {
|
||||
const t = this.$store.state.i.includingNotificationTypes;
|
||||
if (!!t && !t.includes(notification.type)) {
|
||||
if (this.$store.state.i.mutingNotificationTypes.includes(notification.type)) {
|
||||
return;
|
||||
}
|
||||
if (document.visibilityState === 'visible') {
|
||||
|
|
|
@ -58,7 +58,7 @@ export default Vue.extend({
|
|||
|
||||
computed: {
|
||||
allIncludeTypes() {
|
||||
return this.includeTypes ?? this.$store.state.i.includingNotificationTypes;
|
||||
return this.includeTypes ?? notificationTypes.filter(x => !this.$store.state.i.mutingNotificationTypes.includes(x));
|
||||
}
|
||||
},
|
||||
|
||||
|
@ -66,7 +66,7 @@ export default Vue.extend({
|
|||
includeTypes() {
|
||||
this.reload();
|
||||
},
|
||||
'$store.state.i.includingNotificationTypes'() {
|
||||
'$store.state.i.mutingNotificationTypes'() {
|
||||
if (this.includeTypes === null) {
|
||||
this.reload();
|
||||
}
|
||||
|
@ -84,8 +84,7 @@ export default Vue.extend({
|
|||
|
||||
methods: {
|
||||
onNotification(notification) {
|
||||
//
|
||||
const isMuted = !!this.allIncludeTypes && !this.allIncludeTypes.includes(notification.type);
|
||||
const isMuted = !this.allIncludeTypes.includes(notification.type);
|
||||
if (isMuted || document.visibilityState === 'visible') {
|
||||
this.$root.stream.send('readNotification', {
|
||||
id: notification.id
|
||||
|
|
|
@ -161,8 +161,7 @@ export default Vue.extend({
|
|||
},
|
||||
|
||||
async onNotification(notification) {
|
||||
const t = this.$store.state.i.includingNotificationTypes;
|
||||
if (!!t && !t.includes(notification.type)) {
|
||||
if (this.$store.state.i.mutingNotificationTypes.includes(notification.type)) {
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
|
@ -58,6 +58,7 @@ import XIntegration from './integration.vue';
|
|||
import XApi from './api.vue';
|
||||
import MkButton from '../../components/ui/button.vue';
|
||||
import MkSwitch from '../../components/ui/switch.vue';
|
||||
import { notificationTypes } from '../../../types';
|
||||
|
||||
export default Vue.extend({
|
||||
metaInfo() {
|
||||
|
@ -114,14 +115,15 @@ export default Vue.extend({
|
|||
},
|
||||
|
||||
async configure() {
|
||||
const includingTypes = notificationTypes.filter(x => !this.$store.state.i.mutingNotificationTypes.includes(x));
|
||||
this.$root.new(await import('../../components/notification-setting-window.vue').then(m => m.default), {
|
||||
includingTypes: this.$store.state.i.includingNotificationTypes,
|
||||
includingTypes,
|
||||
showGlobalToggle: false,
|
||||
}).$on('ok', async ({ includingTypes: value }: any) => {
|
||||
await this.$root.api('i/update', {
|
||||
includingNotificationTypes: value,
|
||||
mutingNotificationTypes: notificationTypes.filter(x => !value.includes(x)),
|
||||
}).then(i => {
|
||||
this.$store.state.i.includingNotificationTypes = i.includingNotificationTypes;
|
||||
this.$store.state.i.mutingNotificationTypes = i.mutingNotificationTypes;
|
||||
}).catch(err => {
|
||||
this.$root.dialog({
|
||||
type: 'error',
|
||||
|
|
|
@ -162,9 +162,9 @@ export class UserProfile {
|
|||
@Column('enum', {
|
||||
enum: notificationTypes,
|
||||
array: true,
|
||||
nullable: true,
|
||||
default: [],
|
||||
})
|
||||
public includingNotificationTypes: typeof notificationTypes[number][] | null;
|
||||
public mutingNotificationTypes: typeof notificationTypes[number][];
|
||||
|
||||
//#region Denormalized fields
|
||||
@Index()
|
||||
|
|
|
@ -248,7 +248,7 @@ export class UserRepository extends Repository<User> {
|
|||
hasPendingReceivedFollowRequest: this.getHasPendingReceivedFollowRequest(user.id),
|
||||
integrations: profile!.integrations,
|
||||
mutedWords: profile!.mutedWords,
|
||||
includingNotificationTypes: profile?.includingNotificationTypes,
|
||||
mutingNotificationTypes: profile?.mutingNotificationTypes,
|
||||
} : {}),
|
||||
|
||||
...(opts.includeSecrets ? {
|
||||
|
|
|
@ -149,7 +149,7 @@ export const meta = {
|
|||
validator: $.optional.arr($.arr($.str))
|
||||
},
|
||||
|
||||
includingNotificationTypes: {
|
||||
mutingNotificationTypes: {
|
||||
validator: $.optional.arr($.str.or(notificationTypes as unknown as string[]))
|
||||
},
|
||||
},
|
||||
|
@ -206,7 +206,7 @@ export default define(meta, async (ps, user, token) => {
|
|||
profileUpdates.mutedWords = ps.mutedWords;
|
||||
profileUpdates.enableWordMute = ps.mutedWords.length > 0;
|
||||
}
|
||||
if (ps.includingNotificationTypes !== undefined) profileUpdates.includingNotificationTypes = ps.includingNotificationTypes as typeof notificationTypes[number][];
|
||||
if (ps.mutingNotificationTypes !== undefined) profileUpdates.mutingNotificationTypes = ps.mutingNotificationTypes as typeof notificationTypes[number][];
|
||||
if (typeof ps.isLocked === 'boolean') updates.isLocked = ps.isLocked;
|
||||
if (typeof ps.isBot === 'boolean') updates.isBot = ps.isBot;
|
||||
if (typeof ps.carefulBot === 'boolean') profileUpdates.carefulBot = ps.carefulBot;
|
||||
|
|
|
@ -16,7 +16,7 @@ export async function createNotification(
|
|||
|
||||
const profile = await UserProfiles.findOne({ userId: notifieeId });
|
||||
|
||||
const isMuted = !(profile?.includingNotificationTypes == null || profile?.includingNotificationTypes.includes(type));
|
||||
const isMuted = profile?.mutingNotificationTypes.includes(type);
|
||||
|
||||
// Create notification
|
||||
const notification = await Notifications.save({
|
||||
|
|
Loading…
Reference in New Issue