A free and open source instant messaging and VoIP chat app built for friends, groups, and communities.
fix(api): refine voice regions, pin notices and request limits (#3890)
Hampus9748c3a706d8
diff --git a/fluxer_api/src/api/channel/services/message/MessageGatewayDispatch.ts b/fluxer_api/src/api/channel/services/message/MessageGatewayDispatch.tsindex e68ac4f12..29bd57be6 100644--- a/fluxer_api/src/api/channel/services/message/MessageGatewayDispatch.ts+++ b/fluxer_api/src/api/channel/services/message/MessageGatewayDispatch.ts@@ -8,7 +8,7 @@ import {getUserRepository} from '@app/api/middleware/ServiceSingletons';import type {Channel} from '@app/api/models/Channel';import type {Message} from '@app/api/models/Message';import {isContentHidden} from '@app/api/user/UserHelpers';-import {ChannelTypes} from '@fluxer/constants/src/ChannelConstants';+import {ChannelTypes, MessageTypes} from '@fluxer/constants/src/ChannelConstants';import type {MessageResponse} from '@fluxer/schema/src/domains/message/MessageResponseSchemas';interface BuildBroadcastMessageDataParams {@@ -53,6 +53,9 @@ async function buildBroadcastMessageCreateData(params: BuildBroadcastMessageCreateDataParams,): Promise<MessageCreateBroadcastData> {const messageResponse = await buildBroadcastMessageData(params);+ if (params.message.type === MessageTypes.CHANNEL_PINNED_MESSAGE) {+ delete messageResponse.referenced_message;+ }const groupDmNicks = serializeGroupDmNicks(params.channel);return {...messageResponse,diff --git a/fluxer_api/src/api/channel/tests/MessagePinPermissions.test.ts b/fluxer_api/src/api/channel/tests/MessagePinPermissions.test.tsindex c4b478d96..58a8b18ec 100644--- a/fluxer_api/src/api/channel/tests/MessagePinPermissions.test.ts+++ b/fluxer_api/src/api/channel/tests/MessagePinPermissions.test.ts@@ -6,12 +6,13 @@ import {sendChannelMessage,setupTestGuildWithMembers,} from '@app/api/channel/tests/ChannelTestUtils';+import {getGatewayService} from '@app/api/middleware/ServiceRegistry';import {type ApiTestHarness, createApiTestHarness} from '@app/api/test/ApiTestHarness';import {HTTP_STATUS} from '@app/api/test/TestConstants';import {createBuilder} from '@app/api/test/TestRequestBuilder';-import {Permissions} from '@fluxer/constants/src/ChannelConstants';-import type {ChannelPinsResponse} from '@fluxer/schema/src/domains/message/MessageResponseSchemas';-import {afterAll, beforeAll, beforeEach, describe, expect, it} from 'vitest';+import {MessageTypes, Permissions} from '@fluxer/constants/src/ChannelConstants';+import type {ChannelPinsResponse, MessageResponse} from '@fluxer/schema/src/domains/message/MessageResponseSchemas';+import {afterAll, beforeAll, beforeEach, describe, expect, it, vi} from 'vitest';describe('Message pin permissions', () => {let harness: ApiTestHarness;@@ -69,4 +70,29 @@ describe('Message pin permissions', () => {expect(await listPinnedMessageIds(owner.token, systemChannel.id)).toEqual([message.id]);});++ it('omits the pinned message body from the pin notice event', async () => {+ const {owner, members, systemChannel} = await setupTestGuildWithMembers(harness, 1);+ const member = members[0]!;+ const message = await sendChannelMessage(harness, owner.token, systemChannel.id, 'hidden history');+ await createPermissionOverwrite(harness, owner.token, systemChannel.id, member.userId, {+ type: 1,+ allow: (Permissions.VIEW_CHANNEL | Permissions.PIN_MESSAGES).toString(),+ deny: Permissions.READ_MESSAGE_HISTORY.toString(),+ });+ const dispatchGuild = vi.spyOn(getGatewayService(), 'dispatchGuild');+ try {+ await pinMessage(harness, member.token, systemChannel.id, message.id);+ const notice = dispatchGuild.mock.calls+ .map(([params]) => params)+ .filter((params) => params.event === 'MESSAGE_CREATE')+ .map((params) => params.data as MessageResponse)+ .find((data) => data.type === MessageTypes.CHANNEL_PINNED_MESSAGE);+ expect(notice?.message_reference?.message_id).toBe(message.id);+ expect(notice).toBeDefined();+ expect('referenced_message' in notice!).toBe(false);+ } finally {+ dispatchGuild.mockRestore();+ }+ });});diff --git a/fluxer_api/src/api/user/controllers/UserAccountController.ts b/fluxer_api/src/api/user/controllers/UserAccountController.tsindex 35f5ffbe7..2b5e51fed 100644--- a/fluxer_api/src/api/user/controllers/UserAccountController.ts+++ b/fluxer_api/src/api/user/controllers/UserAccountController.ts@@ -106,6 +106,8 @@ import {} from '@fluxer/schema/src/domains/user/UserResponseSchemas';import {uint8ArrayToBase64} from 'uint8array-extras';+const GUILD_SETTINGS_BODY_LIMIT = 4 * 1024 * 1024;+export function UserAccountController(app: HonoApp) {app.get('/users/@me',@@ -867,6 +869,7 @@ export function UserAccountController(app: HonoApp) {);app.patch('/users/@me/guilds/@me/settings',+ RequestBodyLimit(GUILD_SETTINGS_BODY_LIMIT),RateLimitMiddleware(RateLimitConfigs.USER_GUILD_SETTINGS_UPDATE),LoginRequired,DefaultUserOnly,@@ -892,6 +895,7 @@ export function UserAccountController(app: HonoApp) {);app.patch('/users/@me/guilds/:guild_id/settings',+ RequestBodyLimit(GUILD_SETTINGS_BODY_LIMIT),RateLimitMiddleware(RateLimitConfigs.USER_GUILD_SETTINGS_UPDATE),LoginRequired,DefaultUserOnly,diff --git a/fluxer_api/src/api/user/repositories/PushSubscriptionRepository.ts b/fluxer_api/src/api/user/repositories/PushSubscriptionRepository.tsindex 199b5ce44..804fafdfc 100644--- a/fluxer_api/src/api/user/repositories/PushSubscriptionRepository.ts+++ b/fluxer_api/src/api/user/repositories/PushSubscriptionRepository.ts@@ -6,6 +6,7 @@ import type {PushSubscriptionRow} from '@app/api/database/types/UserTypes';import {PushSubscription} from '@app/api/models/PushSubscription';import {PushSubscriptions} from '@app/api/Tables';import {awaitAll} from '@app/api/utils/ConcurrencyUtils';+import {MAX_PUSH_SUBSCRIPTIONS_PER_USER} from '@fluxer/constants/src/LimitConstants';const FETCH_PUSH_SUBSCRIPTIONS_CQL = PushSubscriptions.selectCql({where: PushSubscriptions.where.eq('user_id'),@@ -74,9 +75,9 @@ export class PushSubscriptionRepository {const rows = await fetchMany<PushSubscriptionRow>(FETCH_BULK_PUSH_SUBSCRIPTIONS_CQL, {user_ids: userIds});const map = new Map<UserID, Array<PushSubscription>>();for (const row of rows) {- const sub = new PushSubscription(row);const existing = map.get(row.user_id) ?? [];- existing.push(sub);+ if (existing.length >= MAX_PUSH_SUBSCRIPTIONS_PER_USER) continue;+ existing.push(new PushSubscription(row));map.set(row.user_id, existing);}return map;diff --git a/fluxer_api/src/api/user/repositories/RecentMentionRepository.ts b/fluxer_api/src/api/user/repositories/RecentMentionRepository.tsindex 1428bc3b5..18d378826 100644--- a/fluxer_api/src/api/user/repositories/RecentMentionRepository.ts+++ b/fluxer_api/src/api/user/repositories/RecentMentionRepository.ts@@ -18,6 +18,7 @@ const createFetchRecentMentionsQuery = (limit: number) =>limit,});const BULK_RECENT_MENTION_BATCH_QUERY_LIMIT = 50;+const MAX_RECENT_MENTION_SCAN_PAGES = 20;export class RecentMentionRepository {async getRecentMention(userId: UserID, messageId: MessageID): Promise<RecentMention | null> {@@ -36,11 +37,12 @@ export class RecentMentionRepository {limit: number = 25,before?: MessageID,): Promise<Array<RecentMention>> {+ if (!includeGuilds) return [];const fetchLimit = Math.max(limit * 2, 50);const query = createFetchRecentMentionsQuery(fetchLimit);let beforeMessageId = before || createMessageID(generateSnowflake());const filteredMentions: Array<RecentMentionRow> = [];- while (filteredMentions.length < limit) {+ for (let page = 0; page < MAX_RECENT_MENTION_SCAN_PAGES && filteredMentions.length < limit; page++) {const allMentions = await fetchMany<RecentMentionRow>(query.bind({user_id: userId,@@ -49,7 +51,7 @@ export class RecentMentionRepository {);if (allMentions.length === 0) break;filteredMentions.push(- ...allMentions.filter((mention) => this.matchesFilters(mention, includeEveryone, includeRole, includeGuilds)),+ ...allMentions.filter((mention) => this.matchesFilters(mention, includeEveryone, includeRole)),);beforeMessageId = allMentions[allMentions.length - 1].message_id;if (allMentions.length < fetchLimit) break;@@ -57,15 +59,9 @@ export class RecentMentionRepository {return filteredMentions.slice(0, limit).map((mention) => new RecentMention(mention));}- private matchesFilters(- mention: RecentMentionRow,- includeEveryone: boolean,- includeRole: boolean,- includeGuilds: boolean,- ): boolean {+ private matchesFilters(mention: RecentMentionRow, includeEveryone: boolean, includeRole: boolean): boolean {if (!includeEveryone && mention.is_everyone) return false;if (!includeRole && mention.is_role) return false;- if (!includeGuilds && mention.guild_id != null) return false;return true;}diff --git a/fluxer_api/src/api/user/services/UserAccountSettingsService.ts b/fluxer_api/src/api/user/services/UserAccountSettingsService.tsindex 69c581627..70477d5f5 100644--- a/fluxer_api/src/api/user/services/UserAccountSettingsService.ts+++ b/fluxer_api/src/api/user/services/UserAccountSettingsService.ts@@ -12,6 +12,7 @@ import {import type {ChannelOverride, UserGuildSettingsRow} from '@app/api/database/types/UserTypes';import {type ThreadViewer, viewerActive} from '@app/api/experiment/ChannelThreadsGate';import type {GuildRepository} from '@app/api/guild/repositories/GuildRepository';+import {guildVisitRepository} from '@app/api/guild/visits/GuildVisitorAccess';import type {IGatewayService} from '@app/api/infrastructure/IGatewayService';import type {UserCacheService} from '@app/api/infrastructure/UserCacheService';import type {LimitConfigService} from '@app/api/limits/LimitConfigService';@@ -41,6 +42,7 @@ import {} from '@fluxer/constants/src/UserConstants';import {ValidationErrorCodes} from '@fluxer/constants/src/ValidationErrorCodes';import {InputValidationError} from '@fluxer/errors/src/domains/core/InputValidationError';+import {UnknownGuildError} from '@fluxer/errors/src/domains/guild/UnknownGuildError';import {SyncedPreferencesConflictError} from '@fluxer/errors/src/domains/user/SyncedPreferencesConflictError';import {UnknownUserError} from '@fluxer/errors/src/domains/user/UnknownUserError';import {ValidationError} from '@fluxer/errors/src/ValidationError';@@ -322,6 +324,10 @@ export class UserAccountSettingsService {}): Promise<UserGuildSettings> {const {userId, guildId, data} = params;const currentSettings = await this.deps.userAccountRepository.findGuildSettings(userId, guildId);+ if (guildId !== null && !currentSettings) {+ if (!(await this.canCreateGuildSettings(userId, guildId))) throw new UnknownGuildError();+ await this.deleteGuildSettingsOutsideCurrentGuilds(userId, guildId);+ }const resolvedGuildId = guildId ?? createGuildID(0n);const baseRow: UserGuildSettingsRow = currentSettings? {@@ -396,6 +402,25 @@ export class UserAccountSettingsService {return updatedSettings;}+ private async canCreateGuildSettings(userId: UserID, guildId: GuildID): Promise<boolean> {+ if (await this.deps.guildRepository.getMember(guildId, userId)) return true;+ return (await guildVisitRepository().get(userId, guildId)) !== null;+ }++ private async deleteGuildSettingsOutsideCurrentGuilds(userId: UserID, guildId: GuildID): Promise<void> {+ const [rows, memberGuildIds, visits] = await Promise.all([+ this.deps.userAccountRepository.findAllGuildSettings(userId),+ this.deps.userAccountRepository.getUserGuildIds(userId),+ guildVisitRepository().list(userId),+ ]);+ const keep = new Set<GuildID>([createGuildID(0n), guildId, ...memberGuildIds, ...visits.map((v) => v.guild_id)]);+ await Promise.all(+ rows+ .filter((row) => !keep.has(row.guildId))+ .map((row) => this.deps.userAccountRepository.deleteGuildSettings(userId, row.guildId)),+ );+ }+private normalizeIncomingCallFlags(flags: number): number {let normalizedFlags = flags;const modifierFlags = flags & IncomingCallFlags.SILENT_EVERYONE;diff --git a/fluxer_api/src/api/user/services/UserContentService.ts b/fluxer_api/src/api/user/services/UserContentService.tsindex a6b960b84..6486914b7 100644--- a/fluxer_api/src/api/user/services/UserContentService.ts+++ b/fluxer_api/src/api/user/services/UserContentService.ts@@ -45,7 +45,7 @@ import {UserHarvestRepository} from '@app/api/user/UserHarvestRepository';import {dispatchUserUpdate} from '@app/api/user/UserMappers';import {serializeSelfMessageFilter} from '@app/api/worker/utils/SelfMessageFilterPayload';import type {WorkerTaskName} from '@app/api/worker/WorkerLaneConfig';-import {MAX_BOOKMARKS_NON_PREMIUM} from '@fluxer/constants/src/LimitConstants';+import {MAX_BOOKMARKS_NON_PREMIUM, MAX_PUSH_SUBSCRIPTIONS_PER_USER} from '@fluxer/constants/src/LimitConstants';import {THREAD_CHANNEL_TYPES} from '@fluxer/constants/src/ThreadConstants';import {UserFlags} from '@fluxer/constants/src/UserConstants';import {ValidationErrorCodes} from '@fluxer/constants/src/ValidationErrorCodes';@@ -485,6 +485,7 @@ export class UserContentService {if (originKind === 'legacy' && (await this.isLegacyWebPushReplaced(data, installedApp))) {return new PushSubscription(data);}+ await this.makeRoomForPushSubscription(data);const subscription = await this.userRepository.createPushSubscription(data);if (originKind === 'legacy' && installedApp) {await this.bestEffortPushOriginWrite(() => markInstalledLegacyPushSubscription(this.kv, data.subscription_id));@@ -621,10 +622,27 @@ export class UserContentService {provider_environment: providerEnvironment,...(threadChannels === true ? {thread_channels: true} : {}),};+ await this.makeRoomForPushSubscription(data);const subscription = await this.userRepository.createPushSubscription(data);return subscription;}+ private async makeRoomForPushSubscription(data: PushSubscriptionRow): Promise<void> {+ const others = (await this.userRepository.listPushSubscriptions(data.user_id)).filter(+ (subscription) => subscription.subscriptionId !== data.subscription_id,+ );+ const excess = others.length - (MAX_PUSH_SUBSCRIPTIONS_PER_USER - 1);+ if (excess <= 0) return;+ const sessionIdHash = data.auth_session_id_hash;+ const evictionOrder = [+ ...others.filter((subscription) => sessionIdHash !== null && subscription.authSessionIdHash === sessionIdHash),+ ...others.filter((subscription) => sessionIdHash === null || subscription.authSessionIdHash !== sessionIdHash),+ ];+ for (const subscription of evictionOrder.slice(0, excess)) {+ await this.userRepository.deletePushSubscription(data.user_id, subscription.subscriptionId);+ }+ }+async listMobileDevices(userId: UserID): Promise<Array<PushSubscription>> {const subscriptions = await this.userRepository.listPushSubscriptions(userId);return subscriptions.filter((subscription) => subscription.platform !== WEB_PUSH_PLATFORM);diff --git a/fluxer_api/src/api/voice/VoiceAvailabilityService.ts b/fluxer_api/src/api/voice/VoiceAvailabilityService.tsindex 93f9f458a..70e72de0b 100644--- a/fluxer_api/src/api/voice/VoiceAvailabilityService.ts+++ b/fluxer_api/src/api/voice/VoiceAvailabilityService.ts@@ -146,7 +146,9 @@ export class VoiceAvailabilityService {context: VoiceAccessContext,accessibleRegions: Array<VoiceRegionAvailability>,): {regionId: string; server: VoiceServerRecord} | null {- const initialServer = this.selectServer(regionId, context);+ const initialServer = accessibleRegions.some((region) => region.id === regionId)+ ? this.selectServer(regionId, context)+ : null;if (initialServer && this.isServerPlaceable(initialServer)) {return {regionId, server: initialServer};}diff --git a/fluxer_api/src/api/voice/VoiceRegionSelection.ts b/fluxer_api/src/api/voice/VoiceRegionSelection.tsindex 9185e7163..6a25088e6 100644--- a/fluxer_api/src/api/voice/VoiceRegionSelection.ts+++ b/fluxer_api/src/api/voice/VoiceRegionSelection.ts@@ -14,12 +14,10 @@ const DISTANCE_TIE_EPSILON_KM = 0.000001;export function resolveVoiceRegionPreference({preferredRegionId,accessibleRegions,- availableRegions,defaultRegionId,}: {preferredRegionId: string | null;accessibleRegions: Array<VoiceRegionAvailability>;- availableRegions: Array<VoiceRegionAvailability>;defaultRegionId: string | null;}): VoiceRegionPreference {const accessibleRegionIds = new Set(accessibleRegions.map((region) => region.id));@@ -32,12 +30,7 @@ export function resolveVoiceRegionPreference({if (defaultRegionId && accessibleRegionIds.has(defaultRegionId)) {return {regionId: defaultRegionId, mode: 'automatic'};}- const defaultRegion =- accessibleRegions.find((region) => region.isDefault) ?? availableRegions.find((region) => region.isDefault) ?? null;- if (defaultRegion) {- return {regionId: defaultRegion.id, mode: 'automatic'};- }- const fallbackRegion = accessibleRegions[0] ?? availableRegions[0] ?? null;+ const fallbackRegion = accessibleRegions.find((region) => region.isDefault) ?? accessibleRegions[0] ?? null;return {regionId: fallbackRegion ? fallbackRegion.id : null, mode: 'automatic'};}@@ -45,7 +38,6 @@ export function selectVoiceRegionId({preferredRegionId,mode,accessibleRegions,- availableRegions,latitude,longitude,selectionKey,@@ -53,7 +45,6 @@ export function selectVoiceRegionId({preferredRegionId: string | null;mode: VoiceRegionPreference['mode'];accessibleRegions: Array<VoiceRegionAvailability>;- availableRegions: Array<VoiceRegionAvailability>;latitude?: string;longitude?: string;selectionKey: string;@@ -68,11 +59,7 @@ export function selectVoiceRegionId({if (preferredRegionId) {return preferredRegionId;}- const accessibleFallback = accessibleRegions[0];- if (accessibleFallback) {- return accessibleFallback.id;- }- return availableRegions[0]?.id ?? null;+ return accessibleRegions[0]?.id ?? null;}export function selectClosestPseudoRegionServer({diff --git a/fluxer_api/src/api/voice/VoiceService.ts b/fluxer_api/src/api/voice/VoiceService.tsindex 7a55d6a61..333864111 100644--- a/fluxer_api/src/api/voice/VoiceService.ts+++ b/fluxer_api/src/api/voice/VoiceService.ts@@ -141,14 +141,14 @@ export class VoiceService {guildId,guildFeatures,};- const availableRegions = this.voiceAvailabilityService.getAvailableRegions(context);- const accessibleRegions = availableRegions.filter((region) => region.isAccessible);+ const accessibleRegions = this.voiceAvailabilityService+ .getAvailableRegions(context)+ .filter((region) => region.isAccessible);const defaultRegionId = this.liveKitService.getDefaultRegionId();const preferredRegionId = params.region ?? channel.rtcRegion ?? null;const regionPreference = resolveVoiceRegionPreference({preferredRegionId,accessibleRegions,- availableRegions,defaultRegionId,});const accessibleServers = this.getAccessibleServersForRegions(accessibleRegions, context);@@ -159,6 +159,7 @@ export class VoiceService {guildId,channelId,context,+ accessibleRegions,preferredRegionId: regionPreference.regionId,mode: regionPreference.mode,});@@ -185,7 +186,6 @@ export class VoiceService {preferredRegionId: regionPreference.regionId,mode: regionPreference.mode,accessibleRegions,- availableRegions,latitude: params.latitude,longitude: params.longitude,selectionKey,@@ -299,6 +299,7 @@ export class VoiceService {guildId,channelId,context,+ accessibleRegions,preferredRegionId,mode,}: {@@ -306,6 +307,7 @@ export class VoiceService {guildId?: GuildID;channelId: ChannelID;context: VoiceAccessContext;+ accessibleRegions: Array<VoiceRegionAvailability>;preferredRegionId: string | null;mode: 'explicit' | 'automatic';}): Promise<{@@ -323,6 +325,7 @@ export class VoiceService {const serverRecord = this.liveKitService.getServer(pinnedServer.regionId, pinnedServer.serverId);if (serverRecord &&+ accessibleRegions.some((region) => region.id === pinnedServer.regionId) &&this.voiceAvailabilityService.isServerAccessible(serverRecord, context) &&!this.voiceAvailabilityService.isServerDown(serverRecord)) {diff --git a/fluxer_api/src/api/voice/tests/VoiceAvailabilityService.test.ts b/fluxer_api/src/api/voice/tests/VoiceAvailabilityService.test.tsindex 86b860c20..cef797477 100644--- a/fluxer_api/src/api/voice/tests/VoiceAvailabilityService.test.ts+++ b/fluxer_api/src/api/voice/tests/VoiceAvailabilityService.test.ts@@ -1,6 +1,6 @@// SPDX-License-Identifier: AGPL-3.0-or-later-import {createGuildID, createUserID} from '@app/api/BrandedTypes';+import {createGuildID, createUserID, type GuildID, type UserID} from '@app/api/BrandedTypes';import {GatewayRpcClient} from '@app/api/infrastructure/GatewayRpcClient';import {GatewayService} from '@app/api/infrastructure/GatewayService';import type {GatewayVoiceStateCounts} from '@app/api/infrastructure/IGatewayService';@@ -9,6 +9,7 @@ import {FakeNatsConnectionManager} from '@app/api/test/mocks/FakeNatsConnectionMimport type {VoiceAccessContext} from '@app/api/voice/VoiceAvailabilityService';import {VoiceAvailabilityService} from '@app/api/voice/VoiceAvailabilityService';import type {VoiceRegionRecord, VoiceServerRecord} from '@app/api/voice/VoiceModel';+import {resolveVoiceRegionPreference, selectVoiceRegionId} from '@app/api/voice/VoiceRegionSelection';import {VoiceRepository} from '@app/api/voice/VoiceRepository';import {VoiceServerLoadTracker} from '@app/api/voice/VoiceServerLoad';import {VoiceTopology} from '@app/api/voice/VoiceTopology';@@ -532,4 +533,60 @@ describe('VoiceAvailabilityService', () => {expect(service.selectServer('us-default', context)?.serverId).toBe('server-2');});});+ describe('region placement for users outside region restrictions', () => {+ const vipOnlyRestrictions = {+ vipOnly: true,+ requiredGuildFeatures: new Set<string>(),+ allowedGuildIds: new Set<GuildID>(),+ allowedUserIds: new Set<UserID>(),+ };+ const context: VoiceAccessContext = {+ requestingUserId: createUserID(123n),+ guildId: createGuildID(456n),+ guildFeatures: new Set(),+ };+ function placeWithoutCoordinates(): {regionId: string; server: VoiceServerRecord} | null {+ const accessibleRegions = service.getAvailableRegions(context).filter((region) => region.isAccessible);+ const preference = resolveVoiceRegionPreference({+ preferredRegionId: null,+ accessibleRegions,+ defaultRegionId: null,+ });+ const regionId = selectVoiceRegionId({+ preferredRegionId: preference.regionId,+ mode: preference.mode,+ accessibleRegions,+ selectionKey: 'guild:456:channel:1',+ });+ if (regionId === null) {+ return null;+ }+ return service.selectServerOrFallback(regionId, context, accessibleRegions);+ }+ it('places the user in an open region instead of the VIP-only default region', async () => {+ const vipRegion = createRegion({id: 'vip', isDefault: true, restrictions: vipOnlyRestrictions});+ const openRegion = createRegion({id: 'open', isDefault: false});+ const topology = await createTopology(+ [vipRegion, openRegion],+ new Map([+ ['vip', [createServer({regionId: 'vip', serverId: 'vip-1'})]],+ ['open', [createServer({regionId: 'open', serverId: 'open-1'})]],+ ]),+ );+ service = new VoiceAvailabilityService(topology);+ const placement = placeWithoutCoordinates();+ expect(placement?.regionId).toBe('open');+ expect(placement?.server.serverId).toBe('open-1');+ expect(service.selectServerOrFallback('vip', context, [])).toBeNull();+ });+ it('places nobody when every region is restricted', async () => {+ const vipRegion = createRegion({id: 'vip', isDefault: true, restrictions: vipOnlyRestrictions});+ const topology = await createTopology(+ [vipRegion],+ new Map([['vip', [createServer({regionId: 'vip', serverId: 'vip-1'})]]]),+ );+ service = new VoiceAvailabilityService(topology);+ expect(placeWithoutCoordinates()).toBeNull();+ });+ });});diff --git a/fluxer_api/src/api/voice/tests/VoiceRegionSelection.test.ts b/fluxer_api/src/api/voice/tests/VoiceRegionSelection.test.tsindex 0b9472201..900a231c5 100644--- a/fluxer_api/src/api/voice/tests/VoiceRegionSelection.test.ts+++ b/fluxer_api/src/api/voice/tests/VoiceRegionSelection.test.ts@@ -91,14 +91,12 @@ describe('VoiceRegionSelection', () => {const preference = resolveVoiceRegionPreference({preferredRegionId: null,accessibleRegions: regions,- availableRegions: regions,defaultRegionId: null,});const selected = selectVoiceRegionId({preferredRegionId: preference.regionId,mode: preference.mode,accessibleRegions: regions,- availableRegions: regions,latitude: '49',longitude: '49',selectionKey: 'guild:1:channel:1',@@ -113,14 +111,12 @@ describe('VoiceRegionSelection', () => {const preference = resolveVoiceRegionPreference({preferredRegionId: 'a',accessibleRegions: regions,- availableRegions: regions,defaultRegionId: null,});const selected = selectVoiceRegionId({preferredRegionId: preference.regionId,mode: preference.mode,accessibleRegions: regions,- availableRegions: regions,latitude: '49',longitude: '49',selectionKey: 'guild:1:channel:1',@@ -195,7 +191,6 @@ describe('VoiceRegionSelection', () => {preferredRegionId: null,mode: 'automatic',accessibleRegions: [regions[1], regions[0]],- availableRegions: [regions[1], regions[0]],latitude: '50',longitude: '50',selectionKey: 'guild:1:channel:1',@@ -204,7 +199,6 @@ describe('VoiceRegionSelection', () => {preferredRegionId: null,mode: 'automatic',accessibleRegions: [regions[0], regions[1]],- availableRegions: [regions[0], regions[1]],latitude: '50',longitude: '50',selectionKey: 'guild:1:channel:1',@@ -213,7 +207,6 @@ describe('VoiceRegionSelection', () => {preferredRegionId: null,mode: 'automatic',accessibleRegions: [regions[1], regions[0]],- availableRegions: [regions[1], regions[0]],latitude: '50',longitude: '50',selectionKey: 'guild:1:channel:2',diff --git a/packages/constants/src/LimitConstants.ts b/packages/constants/src/LimitConstants.tsindex 3a117ec06..ae2826ac9 100644--- a/packages/constants/src/LimitConstants.ts+++ b/packages/constants/src/LimitConstants.ts@@ -4,6 +4,8 @@ import {ASSET_FORMAT_POLICY} from '@fluxer/constants/src/AssetFormatPolicy';export const MAX_GUILDS_PREMIUM = 200;export const MAX_GUILD_CHANNELS = 500;+export const MAX_CHANNEL_OVERRIDES = 10000;+export const MAX_PUSH_SUBSCRIPTIONS_PER_USER = 100;export const MAX_CHANNELS_PER_CATEGORY = 50;export const VOICE_CHANNEL_BITRATE_MIN = 8000;export const VOICE_CHANNEL_BITRATE_DEFAULT = 64000;diff --git a/packages/schema/src/domains/user/UserRequestSchemas.ts b/packages/schema/src/domains/user/UserRequestSchemas.tsindex f8b142ad3..38bbfad6a 100644--- a/packages/schema/src/domains/user/UserRequestSchemas.ts+++ b/packages/schema/src/domains/user/UserRequestSchemas.ts@@ -1,6 +1,10 @@// SPDX-License-Identifier: AGPL-3.0-or-later-import {MAX_GROUP_DM_OTHER_RECIPIENTS, MAX_GUILDS_PREMIUM} from '@fluxer/constants/src/LimitConstants';+import {+ MAX_CHANNEL_OVERRIDES,+ MAX_GROUP_DM_OTHER_RECIPIENTS,+ MAX_GUILDS_PREMIUM,+} from '@fluxer/constants/src/LimitConstants';import {StatusTypes} from '@fluxer/constants/src/StatusConstants';import {DEFAULT_GUILD_FOLDER_ICON,@@ -493,6 +497,9 @@ export const UserGuildSettingsUpdateRequest = zhide_muted_channels: z.boolean().describe('Hide muted channels'),channel_overrides: z.record(SnowflakeStringType, ChannelOverrideSchema)+ .refine((overrides) => Object.keys(overrides).length <= MAX_CHANNEL_OVERRIDES, {+ message: ValidationErrorCodes.TOO_LARGE,+ }).nullable().describe('Per-channel overrides'),unread_badges: withFieldDescription(UserNotificationSettingsSchema, 'Default unread badges level for the guild')diff --git a/packages/schema/src/primitives/SchemaPrimitives.ts b/packages/schema/src/primitives/SchemaPrimitives.tsindex b6d7f53ee..5c24f6a31 100644--- a/packages/schema/src/primitives/SchemaPrimitives.ts+++ b/packages/schema/src/primitives/SchemaPrimitives.ts@@ -92,6 +92,9 @@ export const UnsignedInt64StringType = zexport const SnowflakeStringType = z.string().regex(SNOWFLAKE_REGEX)+ .refine((value) => !SNOWFLAKE_REGEX.test(value) || BigInt(value) <= MAX_INT64_VALUE, {+ message: ValidationErrorCodes.SNOWFLAKE_OUT_OF_RANGE,+ }).register(schemaMetadata, {name: 'SnowflakeStringType', format: 'snowflake'});const BitflagStringType = z.string()