mirror of
https://iceshrimp.dev/limepotato/jormungandr-bite.git
synced 2024-11-09 11:41:30 -07:00
[mastodon-client] Switch to numeric notification ids
This appears to be required for push notification handling in most apps
This commit is contained in:
parent
1cdf3c7097
commit
c60ff90557
6 changed files with 37 additions and 6 deletions
|
@ -0,0 +1,15 @@
|
|||
import { MigrationInterface, QueryRunner } from "typeorm";
|
||||
|
||||
export class AddNotificationMastoId1701546940248 implements MigrationInterface {
|
||||
name = 'AddNotificationMastoId1701546940248'
|
||||
|
||||
public async up(queryRunner: QueryRunner): Promise<void> {
|
||||
await queryRunner.query(`ALTER TABLE "notification" ADD "mastoId" SERIAL NOT NULL`);
|
||||
await queryRunner.query(`CREATE UNIQUE INDEX "IDX_0ee0c7254e5612a8129251997e" ON "notification" ("mastoId") `);
|
||||
}
|
||||
|
||||
public async down(queryRunner: QueryRunner): Promise<void> {
|
||||
await queryRunner.query(`DROP INDEX "public"."IDX_0ee0c7254e5612a8129251997e"`);
|
||||
await queryRunner.query(`ALTER TABLE "notification" DROP COLUMN "mastoId"`);
|
||||
}
|
||||
}
|
|
@ -4,7 +4,7 @@ import {
|
|||
JoinColumn,
|
||||
ManyToOne,
|
||||
Column,
|
||||
PrimaryColumn,
|
||||
PrimaryColumn, Generated,
|
||||
} from "typeorm";
|
||||
import { User } from "./user.js";
|
||||
import { id } from "../id.js";
|
||||
|
@ -181,4 +181,9 @@ export class Notification {
|
|||
})
|
||||
@JoinColumn()
|
||||
public appAccessToken: AccessToken | null;
|
||||
|
||||
@Index({ unique: true })
|
||||
@Column()
|
||||
@Generated("increment")
|
||||
public mastoId: number;
|
||||
}
|
||||
|
|
|
@ -24,7 +24,7 @@ export class NotificationConverter {
|
|||
: UserConverter.encode(localUser, ctx);
|
||||
|
||||
let result = {
|
||||
id: notification.id,
|
||||
id: notification.mastoId.toString(),
|
||||
account: account,
|
||||
created_at: notification.createdAt.toISOString(),
|
||||
type: this.encodeNotificationType(notification.type),
|
||||
|
|
|
@ -20,7 +20,7 @@ export function setupEndpointsNotifications(router: Router): void {
|
|||
auth(true, ['read:notifications']),
|
||||
filterContext('notifications'),
|
||||
async (ctx) => {
|
||||
const notification = await NotificationHelpers.getNotificationOr404(ctx.params.id, ctx);
|
||||
const notification = await NotificationHelpers.getPushNotificationOr404(Number.parseInt(ctx.params.id), ctx);
|
||||
ctx.body = await NotificationConverter.encode(notification, ctx);
|
||||
}
|
||||
);
|
||||
|
@ -36,7 +36,7 @@ export function setupEndpointsNotifications(router: Router): void {
|
|||
router.post("/v1/notifications/:id/dismiss",
|
||||
auth(true, ['write:notifications']),
|
||||
async (ctx) => {
|
||||
const notification = await NotificationHelpers.getNotificationOr404(ctx.params.id, ctx);
|
||||
const notification = await NotificationHelpers.getPushNotificationOr404(Number.parseInt(ctx.params.id), ctx);
|
||||
await NotificationHelpers.dismissNotification(notification.id, ctx);
|
||||
ctx.body = {};
|
||||
}
|
||||
|
|
|
@ -51,6 +51,18 @@ export class NotificationHelpers {
|
|||
});
|
||||
}
|
||||
|
||||
public static async getPushNotification(id: number, ctx: MastoContext): Promise<Notification | null> {
|
||||
const user = ctx.user as ILocalUser;
|
||||
return Notifications.findOneBy({ mastoId: id, notifieeId: user.id });
|
||||
}
|
||||
|
||||
public static async getPushNotificationOr404(id: number, ctx: MastoContext): Promise<Notification> {
|
||||
return this.getPushNotification(id, ctx).then(p => {
|
||||
if (p) return p;
|
||||
throw new MastoApiError(404);
|
||||
});
|
||||
}
|
||||
|
||||
public static async dismissNotification(id: string, ctx: MastoContext): Promise<void> {
|
||||
const user = ctx.user as ILocalUser;
|
||||
await Notifications.update({ id: id, notifieeId: user.id }, { isRead: true });
|
||||
|
|
|
@ -7,7 +7,6 @@ import { notificationTypes } from "@/types.js";
|
|||
|
||||
export class MastodonPushHandler {
|
||||
public static async sendPushNotification(n: Notification) {
|
||||
const id = n.id;
|
||||
const userId = n.notifieeId;
|
||||
const type = this.encodeType(n.type);
|
||||
if (type === null) return;
|
||||
|
@ -24,7 +23,7 @@ export class MastodonPushHandler {
|
|||
access_token: subscription.token?.token,
|
||||
title: meta.name ?? "Iceshrimp",
|
||||
body: "You have unread notifications",
|
||||
notification_id: id,
|
||||
notification_id: n.mastoId,
|
||||
notification_type: type,
|
||||
};
|
||||
|
||||
|
|
Loading…
Reference in a new issue