mirror of
https://github.com/mauriceboe/TREK.git
synced 2026-11-22 13:10:29 +00:00
fix: watch sync reads the roster through trip membership, image viewer on theme tokens, retry flaky release downloads in CI
This commit is contained in:
@@ -4,11 +4,11 @@ import { Notifications } from '../../db/entities/Notifications.entity';
|
||||
import { PushSubscriptions } from '../../db/entities/PushSubscriptions.entity';
|
||||
import { Settings } from '../../db/entities/Settings.entity';
|
||||
import { TodoItems } from '../../db/entities/TodoItems.entity';
|
||||
import { TripMembers } from '../../db/entities/TripMembers.entity';
|
||||
import { Trips } from '../../db/entities/Trips.entity';
|
||||
import { AddonsModule } from '../addons/addons.module';
|
||||
import { SchedulingModule } from '../scheduling/scheduling.module';
|
||||
import { StorageModule } from '../storage/storage.module';
|
||||
import { TripMembershipModule } from '../trip-membership/trip-membership.module';
|
||||
import { MailerModule } from './mailer/mailer.module';
|
||||
import { NotificationPreferencesService } from './notification-preferences.service';
|
||||
import { AdminNotificationPreferencesController, NotificationsController } from './notifications.controller';
|
||||
@@ -64,13 +64,13 @@ import { Module } from '@nestjs/common';
|
||||
Trips,
|
||||
TodoItems,
|
||||
PushSubscriptions,
|
||||
TripMembers,
|
||||
]),
|
||||
|
||||
AddonsModule,
|
||||
MailerModule,
|
||||
SchedulingModule,
|
||||
StorageModule,
|
||||
TripMembershipModule,
|
||||
],
|
||||
controllers: [NotificationsController, AdminNotificationPreferencesController, PushController],
|
||||
providers: [
|
||||
|
||||
@@ -1,11 +1,9 @@
|
||||
import { TripMembers } from '../../../db/entities/TripMembers.entity';
|
||||
import type { TripMembersRepository } from '../../../db/repositories/TripMembers.repository';
|
||||
import { logError } from '../../audit/audit-log.logger';
|
||||
import { withRequestContext } from '../../database/request-context';
|
||||
import { RealtimeService } from '../../realtime/realtime.service';
|
||||
import { TripMembershipService } from '../../trip-membership/trip-membership.service';
|
||||
import { WebPushService } from '../transports/web-push.service';
|
||||
import { MikroORM } from '@mikro-orm/core';
|
||||
import { InjectRepository } from '@mikro-orm/nestjs';
|
||||
import { Injectable, type OnModuleDestroy, type OnModuleInit } from '@nestjs/common';
|
||||
|
||||
/**
|
||||
@@ -46,7 +44,7 @@ export class WatchSyncPushService implements OnModuleInit, OnModuleDestroy {
|
||||
constructor(
|
||||
private readonly realtime: RealtimeService,
|
||||
private readonly push: WebPushService,
|
||||
@InjectRepository(TripMembers) private readonly members: TripMembersRepository,
|
||||
private readonly membership: TripMembershipService,
|
||||
private readonly orm: MikroORM,
|
||||
) {}
|
||||
|
||||
@@ -79,6 +77,17 @@ export class WatchSyncPushService implements OnModuleInit, OnModuleDestroy {
|
||||
else entry.users.add(onlyUserId);
|
||||
}
|
||||
|
||||
/** Everyone on the trip: the owner and the members. */
|
||||
private async roster(tripId: string): Promise<Set<number>> {
|
||||
const [owner, members] = await Promise.all([
|
||||
this.membership.getOwnerId(tripId),
|
||||
this.membership.listMemberUserIds(tripId),
|
||||
]);
|
||||
const users = new Set(members);
|
||||
if (owner != null) users.add(owner);
|
||||
return users;
|
||||
}
|
||||
|
||||
/** Sends one trip's gathered sync. */
|
||||
async flush(key: string): Promise<void> {
|
||||
const entry = this.pending.get(key);
|
||||
@@ -86,9 +95,7 @@ export class WatchSyncPushService implements OnModuleInit, OnModuleDestroy {
|
||||
this.pending.delete(key);
|
||||
clearTimeout(entry.timer);
|
||||
try {
|
||||
const users = entry.everyone
|
||||
? await withRequestContext(this.orm, () => this.members.rosterUserIds(key))
|
||||
: entry.users;
|
||||
const users = entry.everyone ? await withRequestContext(this.orm, () => this.roster(key)) : entry.users;
|
||||
await Promise.all([...users].map((userId) => this.push.sendWatchSync(userId)));
|
||||
} catch (err) {
|
||||
logError(`Watch sync failed trip=${key}: ${err instanceof Error ? err.message : err}`);
|
||||
|
||||
Reference in New Issue
Block a user