From aa0e794f1268c9e951f441c5ecedd75195e5768b Mon Sep 17 00:00:00 2001 From: ramiroaisen <52116153+ramiroaisen@users.noreply.github.com> Date: Sat, 27 Jan 2024 21:25:50 -0300 Subject: [PATCH 1/2] feat: relax social urls validations --- front/share/src/formy/validate.ts | 22 +++++++++++----------- rs/packages/validate/src/url.rs | 24 ++++++++++++------------ 2 files changed, 23 insertions(+), 23 deletions(-) diff --git a/front/share/src/formy/validate.ts b/front/share/src/formy/validate.ts index 7c76e4da..a70f332b 100644 --- a/front/share/src/formy/validate.ts +++ b/front/share/src/formy/validate.ts @@ -3,17 +3,17 @@ import { _get } from "$share/net.client"; import { get } from "svelte/store"; export const EMAIL = /^(?:[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*|"(?:[\x01-\x08\x0b\x0c\x0e-\x1f\x21\x23-\x5b\x5d-\x7f]|\\[\x01-\x09\x0b\x0c\x0e-\x7f])*")@(?:(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?|\[(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?|[a-z0-9-]*[a-z0-9]:(?:[\x01-\x08\x0b\x0c\x0e-\x1f\x21-\x5a\x53-\x7f]|\\[\x01-\x09\x0b\x0c\x0e-\x7f])+)\])$/i -export const TWITTER = /^https:\/\/twitter\.com\/.+/; -export const FACEBOOK = /^https:\/\/www\.facebook\.com\/.+/; -export const INSTAGRAM = /^https:\/\/www\.instagram\.com\/.+/; -export const THREADS = /^https:\/\/www\.threads\.net\/.+/; -export const YOUTUBE = /^https:\/\/www\.youtube\.com\/.+/; -export const TWITCH = /^https:\/\/www\.twitch\.tv\/.+/; -export const TIKTOK = /^https:\/\/www\.tiktok\.com\/.+/; -export const SPOTIFY = /^https:\/\/open\.spotify\.com\/.+/; -export const RADIOCUT = /^https:\/\/radiocut\.fm\/.+/; -export const GOOGLE_PLAY = /^https:\/\/play\.google\.com\/.+/; -export const APP_STORE = /^https:\/\/apps\.apple\.com\/.+/; +export const TWITTER = /^https?:\/\/(www\.)?twitter\.com\/.+/; +export const FACEBOOK = /^https?:\/\/(www\.)?facebook\.com\/.+/; +export const INSTAGRAM = /^https?:\/\/(www\.)?instagram\.com\/.+/; +export const THREADS = /^https?:\/\/(www\.)?threads\.net\/.+/; +export const YOUTUBE = /^https?:\/\/(www\.)?youtube\.com\/.+/; +export const TWITCH = /^https?:\/\/(www\.)?twitch\.tv\/.+/; +export const TIKTOK = /^https?:\/\/(www\.)?tiktok\.com\/.+/; +export const SPOTIFY = /^https?:\/\/((open|www)\.)?spotify\.com\/.+/; +export const RADIOCUT = /^https?:\/\/(www\.)?radiocut\.fm\/.+/; +export const GOOGLE_PLAY = /^https?:\/\/play\.google\.com\/.+/; +export const APP_STORE = /^https?:\/\/apps\.apple\.com\/.+/; export const is_valid_email = (str: string) => EMAIL.test(str); diff --git a/rs/packages/validate/src/url.rs b/rs/packages/validate/src/url.rs index 9b527929..392e4b53 100644 --- a/rs/packages/validate/src/url.rs +++ b/rs/packages/validate/src/url.rs @@ -2,16 +2,16 @@ pub mod patterns { use once_cell::sync::Lazy; use regex_static::{lazy_regex, Regex}; - pub static WEBSITE: Lazy = lazy_regex!(r"^https?://.+"); - pub static TWITTER: Lazy = lazy_regex!(r"^https://twitter\.com/.+"); - pub static FACEBOOK: Lazy = lazy_regex!(r"^https://www\.facebook\.com/.+"); - pub static INSTAGRAM: Lazy = lazy_regex!(r"^https://www\.instagram\.com/.+"); - pub static THREADS: Lazy = lazy_regex!(r"^https://www\.threads\.net/.+"); - pub static YOUTUBE: Lazy = lazy_regex!(r"^https://www\.youtube\.com/.+"); - pub static TWITCH: Lazy = lazy_regex!(r"^https://www\.twitch\.tv/.+"); - pub static TIKTOK: Lazy = lazy_regex!(r"^https://www\.tiktok\.com/.+"); - pub static SPOTIFY: Lazy = lazy_regex!(r"^https://open\.spotify\.com/.+"); - pub static RADIOCUT: Lazy = lazy_regex!(r"^https://radiocut\.fm/.+"); - pub static GOOGLE_PLAY: Lazy = lazy_regex!(r"^https://play\.google\.com/.+"); - pub static APP_STORE: Lazy = lazy_regex!(r"^https://apps\.apple\.com/.+"); + pub static WEBSITE: Lazy = lazy_regex!(r"^https?://(([a-z0-9-_]+)\.)+([a-z0-9-_]+)"); + pub static TWITTER: Lazy = lazy_regex!(r"^https?://(www\.)?twitter\.com/.+"); + pub static FACEBOOK: Lazy = lazy_regex!(r"^https?://(www\.)?facebook\.com/.+"); + pub static INSTAGRAM: Lazy = lazy_regex!(r"^https?://(www\.)?instagram\.com/.+"); + pub static THREADS: Lazy = lazy_regex!(r"^https?://(www\.)?threads\.net/.+"); + pub static YOUTUBE: Lazy = lazy_regex!(r"^https?://(www\.)?youtube\.com/.+"); + pub static TWITCH: Lazy = lazy_regex!(r"^https?://(www\.)?twitch\.tv/.+"); + pub static TIKTOK: Lazy = lazy_regex!(r"^https?://(www\.)?tiktok\.com/.+"); + pub static SPOTIFY: Lazy = lazy_regex!(r"^https?://((open|www)\.)?spotify\.com/.+"); + pub static RADIOCUT: Lazy = lazy_regex!(r"^https?://(www\.)?radiocut\.fm/.+"); + pub static GOOGLE_PLAY: Lazy = lazy_regex!(r"^https?://play\.google\.com/.+"); + pub static APP_STORE: Lazy = lazy_regex!(r"^https?://apps\.apple\.com/.+"); } From f714f0c3cadd6ccdd3494a4ede2d75cf825f21a4 Mon Sep 17 00:00:00 2001 From: ramiroaisen <52116153+ramiroaisen@users.noreply.github.com> Date: Sun, 28 Jan 2024 03:27:25 -0300 Subject: [PATCH 2/2] fix: minor validate improvements --- Cargo.lock | 2 + defs/AccountLimits.ts | 2 +- defs/AdminPublicAccount.ts | 2 +- defs/AdminPublicStation.ts | 2 +- defs/Device.ts | 4 +- defs/PublicAccount.ts | 4 +- defs/PublicAdmin.ts | 4 +- defs/PublicPaymentMethod.ts | 4 +- defs/PublicStation.ts | 4 +- defs/StationFrequency.ts | 2 +- defs/UserPublicAccount.ts | 6 +- defs/UserPublicStation.ts | 12 ++-- defs/analytics/Analytics.ts | 16 ++--- defs/analytics/AnalyticsItem.ts | 2 +- defs/analytics/AnalyticsQueryKind.ts | 2 +- defs/analytics/AnalyticsStation.ts | 2 +- defs/api/ApiKey.ts | 2 +- defs/api/Me.ts | 4 +- defs/api/PublicInvitation.ts | 12 ++-- defs/api/accounts/GET/Output.ts | 4 +- defs/api/accounts/GET/Query.ts | 4 +- defs/api/accounts/POST/Output.ts | 2 +- defs/api/accounts/POST/Payload.ts | 2 +- defs/api/accounts/[account]/DELETE/Output.ts | 2 +- defs/api/accounts/[account]/GET/Output.ts | 2 +- defs/api/accounts/[account]/PATCH/Output.ts | 2 +- defs/api/accounts/[account]/PATCH/Payload.ts | 2 +- .../accounts/[account]/members/GET/Member.ts | 2 +- .../accounts/[account]/members/GET/Output.ts | 2 +- .../members/[member]/DELETE/Output.ts | 2 +- .../members/[member]/set-role/POST/Output.ts | 2 +- .../members/[member]/set-role/POST/Payload.ts | 2 +- .../[account]/stream-stats/GET/Output.ts | 2 +- .../[last-unitvalue]/GET/Output.ts | 2 +- .../[account]/stream-stats/now/GET/Output.ts | 2 +- defs/api/admins/GET/Output.ts | 4 +- defs/api/admins/GET/Query.ts | 4 +- defs/api/admins/POST/Output.ts | 2 +- defs/api/admins/POST/Payload.ts | 2 +- defs/api/admins/[admin]/GET/Output.ts | 2 +- defs/api/admins/[admin]/PATCH/Output.ts | 2 +- defs/api/admins/[admin]/PATCH/Payload.ts | 2 +- .../[admin]/change-password/POST/Output.ts | 2 +- defs/api/analytics/GET/CountryCodeOrZZ.ts | 4 +- defs/api/analytics/GET/Output.ts | 2 +- defs/api/analytics/GET/Query.ts | 4 +- defs/api/app-analytics/GET/CountryCodeOrZZ.ts | 4 +- defs/api/app-analytics/GET/Output.ts | 2 +- defs/api/app-analytics/GET/Query.ts | 4 +- .../auth/admin/delegate/[user]/POST/Output.ts | 2 +- defs/api/auth/admin/login/POST/Output.ts | 2 +- defs/api/auth/admin/logout/POST/Output.ts | 2 +- .../send-code/POST/Output.ts | 2 +- defs/api/auth/user/login/POST/Output.ts | 2 +- defs/api/auth/user/logout/POST/Output.ts | 2 +- defs/api/auth/user/recover/POST/Output.ts | 2 +- defs/api/auth/user/register/POST/Output.ts | 4 +- defs/api/auth/user/register/POST/Payload.ts | 2 +- defs/api/invitations/GET/Output.ts | 4 +- defs/api/invitations/GET/Query.ts | 4 +- defs/api/invitations/POST/Output.ts | 2 +- .../invitations/[invitation]/DELETE/Output.ts | 2 +- .../invitations/[invitation]/GET/Output.ts | 2 +- defs/api/invitations/accept/POST/Payload.ts | 2 +- .../get-by-token/[token]/GET/Output.ts | 2 +- defs/api/me/GET/Output.ts | 2 +- defs/api/me/api-keys/GET/Output.ts | 4 +- defs/api/me/api-keys/GET/Query.ts | 4 +- defs/api/me/api-keys/POST/Output.ts | 2 +- defs/api/me/api-keys/[id]/DELETE/Output.ts | 2 +- defs/api/me/api-keys/[id]/PATCH/Output.ts | 2 +- defs/api/me/devices/GET/Output.ts | 4 +- defs/api/me/devices/GET/Query.ts | 4 +- defs/api/me/devices/[device]/DELETE/Output.ts | 2 +- defs/api/payment-methods/GET/Output.ts | 4 +- defs/api/payment-methods/GET/Query.ts | 4 +- defs/api/payment-methods/POST/Output.ts | 2 +- .../[payment-method]/GET/Output.ts | 2 +- defs/api/plans/GET/Output.ts | 4 +- defs/api/plans/GET/Query.ts | 4 +- defs/api/plans/POST/Output.ts | 2 +- defs/api/plans/[plan]/DELETE/Output.ts | 2 +- defs/api/plans/[plan]/GET/Output.ts | 2 +- defs/api/plans/[plan]/PATCH/Output.ts | 2 +- defs/api/plans/by-slug/[slug]/GET/Output.ts | 2 +- .../[station]/POST/Output.ts | 2 +- .../restart-playlist/[station]/POST/Output.ts | 2 +- .../[station]/POST/Output.ts | 2 +- .../station-deleted/[station]/POST/Output.ts | 2 +- defs/api/station-pictures/POST/Output.ts | 2 +- defs/api/stations/GET/Output.schema.json | 48 ++++++------- defs/api/stations/GET/Output.ts | 4 +- defs/api/stations/GET/Query.ts | 4 +- defs/api/stations/POST/Output.schema.json | 48 ++++++------- defs/api/stations/POST/Output.ts | 2 +- defs/api/stations/POST/Payload.schema.json | 52 +++++++------- defs/api/stations/POST/Payload.ts | 10 +-- defs/api/stations/[station]/DELETE/Output.ts | 2 +- .../stations/[station]/GET/Output.schema.json | 48 ++++++------- defs/api/stations/[station]/GET/Output.ts | 2 +- .../[station]/PATCH/Output.schema.json | 48 ++++++------- defs/api/stations/[station]/PATCH/Output.ts | 2 +- .../[station]/PATCH/Payload.schema.json | 52 +++++++------- defs/api/stations/[station]/PATCH/Payload.ts | 2 +- .../stations/[station]/files/GET/Output.ts | 4 +- .../api/stations/[station]/files/GET/Query.ts | 2 +- .../stations/[station]/files/POST/Output.ts | 2 +- .../[station]/files/[file]/DELETE/Output.ts | 2 +- .../[station]/files/[file]/GET/Output.ts | 2 +- .../files/[file]/metadata/PUT/Output.ts | 2 +- .../files/[file]/order/swap/POST/Output.ts | 2 +- .../[station]/files/suffle/POST/Output.ts | 2 +- .../[station]/files/unsuffle/POST/Output.ts | 2 +- .../[station]/restart-playlist/POST/Output.ts | 2 +- .../[station]/stream-stats/GET/Output.ts | 2 +- .../[last-unitvalue]/GET/Output.ts | 2 +- .../[station]/stream-stats/now/GET/Output.ts | 2 +- .../transfer/POST/Output.schema.json | 48 ++++++------- .../[station]/transfer/POST/Output.ts | 2 +- defs/api/stream-connections/GET/Output.ts | 4 +- defs/api/stream-connections/GET/Query.ts | 6 +- defs/api/stream-stats/GET/Output.ts | 2 +- .../[last-unitvalue]/GET/Output.ts | 2 +- defs/api/stream-stats/now/GET/Output.ts | 2 +- defs/api/users/GET/Output.ts | 4 +- defs/api/users/GET/Query.ts | 4 +- defs/api/users/POST/Output.ts | 2 +- defs/api/users/POST/Payload.ts | 2 +- defs/api/users/[user]/DELETE/Output.ts | 2 +- defs/api/users/[user]/GET/Output.ts | 2 +- defs/api/users/[user]/PATCH/Output.ts | 2 +- .../[user]/change-password/POST/Output.ts | 2 +- defs/app-analytics/Analytics.ts | 18 ++--- defs/app-analytics/AnalyticsItem.ts | 2 +- defs/app-analytics/AnalyticsQueryKind.ts | 2 +- defs/app-analytics/AnalyticsStation.ts | 2 +- defs/constants.ts | 4 +- defs/db/AccessTokenGeneratedBy.ts | 2 +- defs/db/Account.ts | 6 +- defs/db/AccountInvitationState.ts | 2 +- defs/db/Admin.ts | 4 +- defs/db/AdminPublicUser.ts | 4 +- defs/db/AudioChunk.ts | 2 +- defs/db/AudioFile.ts | 4 +- defs/db/AudioUploadOperation.ts | 4 +- defs/db/AudioUploadOperationState.ts | 2 +- defs/db/BaseAccessToken.ts | 6 +- defs/db/BaseEvent.ts | 4 +- defs/db/Config.ts | 2 +- defs/db/Deployment.ts | 4 +- defs/db/Document.ts | 2 +- defs/db/EmailVerificationCode.ts | 2 +- defs/db/EventVariant.ts | 4 +- defs/db/MediaSession.ts | 8 +-- defs/db/MediaSessionKind.ts | 4 +- defs/db/Metadata.ts | 2 +- defs/db/OwnerDeploymentInfo.ts | 2 +- defs/db/PaymentMethod.ts | 4 +- defs/db/Plan.ts | 4 +- defs/db/PlayHistoryItem.ts | 4 +- defs/db/Probe.ts | 4 +- defs/db/PublicUser.ts | 4 +- defs/db/RelaySession.ts | 4 +- defs/db/SentEmailBase.ts | 6 +- defs/db/Station.ts | 14 ++-- defs/db/StationFilesPreShuffleCheckpoint.ts | 2 +- defs/db/StationPicture.ts | 2 +- defs/db/StationPictureVariant.ts | 4 +- defs/db/StreamConnection.ts | 6 +- defs/db/StreamConnectionLite.ts | 4 +- defs/db/TokenUserRecovery.ts | 2 +- defs/db/TransferCheckpoint.ts | 2 +- defs/db/User.ts | 4 +- defs/db/UserAccountRelation.ts | 4 +- defs/db/UserPublicUser.ts | 4 +- defs/db/Value.ts | 2 +- defs/db/WsStatsConnection.ts | 4 +- defs/db/http/Request.ts | 14 ++-- defs/error/PublicError.ts | 2 +- defs/error/PublicErrorPayload.ts | 2 +- defs/ops/AccountPatch.ts | 2 +- defs/ops/AdminPatch.ts | 2 +- defs/ops/StationPatch.ts | 10 +-- defs/payments/api/PaymentsError.ts | 2 +- defs/payments/api/PaymentsErrorPayload.ts | 2 +- defs/qs/VisibilityQs.ts | 2 +- defs/stream-connection-stats/Stats.ts | 2 +- rs/config/constants/src/lib.rs | 6 +- rs/packages/api/Cargo.toml | 2 +- rs/packages/api/src/routes/accounts/mod.rs | 2 +- rs/packages/api/src/routes/admins/mod.rs | 6 +- .../api/src/routes/auth/user/register.rs | 12 ++-- .../api/src/routes/invitations/accept.rs | 6 +- rs/packages/api/src/routes/invitations/mod.rs | 2 +- rs/packages/api/src/routes/me/api_keys/id.rs | 2 +- rs/packages/api/src/routes/me/api_keys/mod.rs | 2 +- rs/packages/api/src/routes/plans/id.rs | 6 +- rs/packages/api/src/routes/plans/mod.rs | 6 +- .../api/src/routes/stations/files/metadata.rs | 12 ++-- rs/packages/api/src/routes/stations/mod.rs | 36 +++++----- rs/packages/api/src/routes/users/id.rs | 6 +- rs/packages/api/src/routes/users/mod.rs | 8 +-- rs/packages/db/Cargo.toml | 2 +- rs/packages/db/src/models/account/mod.rs | 2 +- rs/packages/db/src/models/admin/mod.rs | 4 +- rs/packages/db/src/models/station/mod.rs | 70 +++++++++---------- rs/packages/prex/Cargo.toml | 2 +- rs/patches/ts-rs/ts-rs/src/export.rs | 9 ++- 208 files changed, 570 insertions(+), 561 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index ce42357c..0ddbce77 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -6381,10 +6381,12 @@ checksum = "b92f40481c04ff1f4f61f304d61793c7b56ff76ac1469f1beb199b1445b253bd" dependencies = [ "idna 0.4.0", "lazy_static", + "phonenumber", "regex", "serde", "serde_derive", "serde_json", + "unic-ucd-common", "url", "validator_derive", ] diff --git a/defs/AccountLimits.ts b/defs/AccountLimits.ts index 36e3e338..04af49d9 100644 --- a/defs/AccountLimits.ts +++ b/defs/AccountLimits.ts @@ -1,5 +1,5 @@ // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { AccountLimit } from "./AccountLimit"; +import type { AccountLimit } from "./AccountLimit.js"; export type AccountLimits = { stations: AccountLimit; diff --git a/defs/AdminPublicAccount.ts b/defs/AdminPublicAccount.ts index 5995e7c7..d56d66f5 100644 --- a/defs/AdminPublicAccount.ts +++ b/defs/AdminPublicAccount.ts @@ -1,4 +1,4 @@ // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { Account } from "./db/Account"; +import type { Account } from "./db/Account.js"; export type AdminPublicAccount = Account; diff --git a/defs/AdminPublicStation.ts b/defs/AdminPublicStation.ts index 54f89123..199bfddd 100644 --- a/defs/AdminPublicStation.ts +++ b/defs/AdminPublicStation.ts @@ -1,4 +1,4 @@ // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { Station } from "./db/Station"; +import type { Station } from "./db/Station.js"; export type AdminPublicStation = Station; diff --git a/defs/Device.ts b/defs/Device.ts index ff82bf3d..6771c23d 100644 --- a/defs/Device.ts +++ b/defs/Device.ts @@ -1,6 +1,6 @@ // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { DateTime } from "./DateTime"; -import type { UserAgent } from "./UserAgent"; +import type { DateTime } from "./DateTime.js"; +import type { UserAgent } from "./UserAgent.js"; export type Device = { _id: string; diff --git a/defs/PublicAccount.ts b/defs/PublicAccount.ts index 17f10ab6..5a2003f6 100644 --- a/defs/PublicAccount.ts +++ b/defs/PublicAccount.ts @@ -1,5 +1,5 @@ // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { AdminPublicAccount } from "./AdminPublicAccount"; -import type { UserPublicAccount } from "./UserPublicAccount"; +import type { AdminPublicAccount } from "./AdminPublicAccount.js"; +import type { UserPublicAccount } from "./UserPublicAccount.js"; export type PublicAccount = AdminPublicAccount | UserPublicAccount; diff --git a/defs/PublicAdmin.ts b/defs/PublicAdmin.ts index 6dce3c73..1918cecf 100644 --- a/defs/PublicAdmin.ts +++ b/defs/PublicAdmin.ts @@ -1,6 +1,6 @@ // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { DateTime } from "./DateTime"; -import type { Metadata } from "./db/Metadata"; +import type { DateTime } from "./DateTime.js"; +import type { Metadata } from "./db/Metadata.js"; export type PublicAdmin = { _id: string; diff --git a/defs/PublicPaymentMethod.ts b/defs/PublicPaymentMethod.ts index e6ec680a..ea300b46 100644 --- a/defs/PublicPaymentMethod.ts +++ b/defs/PublicPaymentMethod.ts @@ -1,6 +1,6 @@ // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { DateTime } from "./DateTime"; -import type { PublicPaymentMethodKind } from "./PublicPaymentMethodKind"; +import type { DateTime } from "./DateTime.js"; +import type { PublicPaymentMethodKind } from "./PublicPaymentMethodKind.js"; export type PublicPaymentMethod = { _id: string; diff --git a/defs/PublicStation.ts b/defs/PublicStation.ts index 46d62187..d1fab70d 100644 --- a/defs/PublicStation.ts +++ b/defs/PublicStation.ts @@ -1,5 +1,5 @@ // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { AdminPublicStation } from "./AdminPublicStation"; -import type { UserPublicStation } from "./UserPublicStation"; +import type { AdminPublicStation } from "./AdminPublicStation.js"; +import type { UserPublicStation } from "./UserPublicStation.js"; export type PublicStation = AdminPublicStation | UserPublicStation; diff --git a/defs/StationFrequency.ts b/defs/StationFrequency.ts index 0b942ae6..4fbc3a49 100644 --- a/defs/StationFrequency.ts +++ b/defs/StationFrequency.ts @@ -1,4 +1,4 @@ // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { StationFrequencyKind } from "./StationFrequencyKind"; +import type { StationFrequencyKind } from "./StationFrequencyKind.js"; export type StationFrequency = { kind: StationFrequencyKind; freq: number }; diff --git a/defs/UserPublicAccount.ts b/defs/UserPublicAccount.ts index 44641c61..f345767e 100644 --- a/defs/UserPublicAccount.ts +++ b/defs/UserPublicAccount.ts @@ -1,7 +1,7 @@ // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { AccountLimits } from "./AccountLimits"; -import type { DateTime } from "./DateTime"; -import type { Metadata } from "./db/Metadata"; +import type { AccountLimits } from "./AccountLimits.js"; +import type { DateTime } from "./DateTime.js"; +import type { Metadata } from "./db/Metadata.js"; export type UserPublicAccount = { _id: string; diff --git a/defs/UserPublicStation.ts b/defs/UserPublicStation.ts index 00c4e355..caf554e5 100644 --- a/defs/UserPublicStation.ts +++ b/defs/UserPublicStation.ts @@ -1,10 +1,10 @@ // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { CountryCode } from "./CountryCode"; -import type { DateTime } from "./DateTime"; -import type { LangCode } from "./LangCode"; -import type { Metadata } from "./db/Metadata"; -import type { StationFrequency } from "./StationFrequency"; -import type { StationTypeOfContent } from "./db/StationTypeOfContent"; +import type { CountryCode } from "./CountryCode.js"; +import type { DateTime } from "./DateTime.js"; +import type { LangCode } from "./LangCode.js"; +import type { Metadata } from "./db/Metadata.js"; +import type { StationFrequency } from "./StationFrequency.js"; +import type { StationTypeOfContent } from "./db/StationTypeOfContent.js"; export type UserPublicStation = { _id: string; diff --git a/defs/analytics/Analytics.ts b/defs/analytics/Analytics.ts index 7e86783f..d367b93c 100644 --- a/defs/analytics/Analytics.ts +++ b/defs/analytics/Analytics.ts @@ -1,12 +1,12 @@ // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { AnalyticsItem } from "./AnalyticsItem"; -import type { AnalyticsQueryKind } from "./AnalyticsQueryKind"; -import type { AnalyticsStation } from "./AnalyticsStation"; -import type { CountryCode } from "../CountryCode"; -import type { DateTime } from "../DateTime"; -import type { TimezoneDateTime } from "../TimezoneDateTime"; -import type { YearMonthDay } from "./YearMonthDay"; -import type { YearMonthDayHour } from "./YearMonthDayHour"; +import type { AnalyticsItem } from "./AnalyticsItem.js"; +import type { AnalyticsQueryKind } from "./AnalyticsQueryKind.js"; +import type { AnalyticsStation } from "./AnalyticsStation.js"; +import type { CountryCode } from "../CountryCode.js"; +import type { DateTime } from "../DateTime.js"; +import type { TimezoneDateTime } from "../TimezoneDateTime.js"; +import type { YearMonthDay } from "./YearMonthDay.js"; +import type { YearMonthDayHour } from "./YearMonthDayHour.js"; export type Analytics = { is_now: boolean; diff --git a/defs/analytics/AnalyticsItem.ts b/defs/analytics/AnalyticsItem.ts index 377b1be3..a14c3a83 100644 --- a/defs/analytics/AnalyticsItem.ts +++ b/defs/analytics/AnalyticsItem.ts @@ -1,5 +1,5 @@ // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { DateTime } from "../DateTime"; +import type { DateTime } from "../DateTime.js"; export type AnalyticsItem = { key: K; diff --git a/defs/analytics/AnalyticsQueryKind.ts b/defs/analytics/AnalyticsQueryKind.ts index b3492474..b16a3ba1 100644 --- a/defs/analytics/AnalyticsQueryKind.ts +++ b/defs/analytics/AnalyticsQueryKind.ts @@ -1,5 +1,5 @@ // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { TimezoneDateTime } from "../TimezoneDateTime"; +import type { TimezoneDateTime } from "../TimezoneDateTime.js"; export type AnalyticsQueryKind = { now: { offset_date: TimezoneDateTime } } | { time_range: { since: TimezoneDateTime; until: TimezoneDateTime }; diff --git a/defs/analytics/AnalyticsStation.ts b/defs/analytics/AnalyticsStation.ts index 5f563ce5..aa989482 100644 --- a/defs/analytics/AnalyticsStation.ts +++ b/defs/analytics/AnalyticsStation.ts @@ -1,5 +1,5 @@ // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { DateTime } from "../DateTime"; +import type { DateTime } from "../DateTime.js"; export type AnalyticsStation = { _id: string; diff --git a/defs/api/ApiKey.ts b/defs/api/ApiKey.ts index eecaf0e0..40bcb595 100644 --- a/defs/api/ApiKey.ts +++ b/defs/api/ApiKey.ts @@ -1,5 +1,5 @@ // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { DateTime } from "../DateTime"; +import type { DateTime } from "../DateTime.js"; export type ApiKey = { _id: string; diff --git a/defs/api/Me.ts b/defs/api/Me.ts index 97ed2fa2..138f476c 100644 --- a/defs/api/Me.ts +++ b/defs/api/Me.ts @@ -1,6 +1,6 @@ // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { PublicAdmin } from "../PublicAdmin"; -import type { PublicUser } from "../db/PublicUser"; +import type { PublicAdmin } from "../PublicAdmin.js"; +import type { PublicUser } from "../db/PublicUser.js"; export type Me = | { scope: "global" } diff --git a/defs/api/PublicInvitation.ts b/defs/api/PublicInvitation.ts index 1a7f4cf8..bc391020 100644 --- a/defs/api/PublicInvitation.ts +++ b/defs/api/PublicInvitation.ts @@ -1,10 +1,10 @@ // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { AccountInvitationState } from "../db/AccountInvitationState"; -import type { DateTime } from "../DateTime"; -import type { InvitationAccount } from "./InvitationAccount"; -import type { InvitationAdminSender } from "./InvitationAdminSender"; -import type { InvitationReceiver } from "./InvitationReceiver"; -import type { InvitationUserSender } from "./InvitationUserSender"; +import type { AccountInvitationState } from "../db/AccountInvitationState.js"; +import type { DateTime } from "../DateTime.js"; +import type { InvitationAccount } from "./InvitationAccount.js"; +import type { InvitationAdminSender } from "./InvitationAdminSender.js"; +import type { InvitationReceiver } from "./InvitationReceiver.js"; +import type { InvitationUserSender } from "./InvitationUserSender.js"; export type PublicInvitation = { id: string; diff --git a/defs/api/accounts/GET/Output.ts b/defs/api/accounts/GET/Output.ts index 8e559208..efc428d2 100644 --- a/defs/api/accounts/GET/Output.ts +++ b/defs/api/accounts/GET/Output.ts @@ -1,5 +1,5 @@ // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { Paged } from "../../../Paged"; -import type { PublicAccount } from "../../../PublicAccount"; +import type { Paged } from "../../../Paged.js"; +import type { PublicAccount } from "../../../PublicAccount.js"; export type Output = Paged; diff --git a/defs/api/accounts/GET/Query.ts b/defs/api/accounts/GET/Query.ts index 9dd4d6b6..06d6bf8d 100644 --- a/defs/api/accounts/GET/Query.ts +++ b/defs/api/accounts/GET/Query.ts @@ -1,5 +1,5 @@ // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { PaginationQs } from "../../../qs/PaginationQs"; -import type { VisibilityQs } from "../../../qs/VisibilityQs"; +import type { PaginationQs } from "../../../qs/PaginationQs.js"; +import type { VisibilityQs } from "../../../qs/VisibilityQs.js"; export type Query = { user_id?: string } & PaginationQs & VisibilityQs; diff --git a/defs/api/accounts/POST/Output.ts b/defs/api/accounts/POST/Output.ts index 8883d4c4..e1b26afe 100644 --- a/defs/api/accounts/POST/Output.ts +++ b/defs/api/accounts/POST/Output.ts @@ -1,4 +1,4 @@ // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { PublicAccount } from "../../../PublicAccount"; +import type { PublicAccount } from "../../../PublicAccount.js"; export type Output = { account: PublicAccount }; diff --git a/defs/api/accounts/POST/Payload.ts b/defs/api/accounts/POST/Payload.ts index 3bd0e703..8ca82f4c 100644 --- a/defs/api/accounts/POST/Payload.ts +++ b/defs/api/accounts/POST/Payload.ts @@ -1,5 +1,5 @@ // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { Metadata } from "../../../db/Metadata"; +import type { Metadata } from "../../../db/Metadata.js"; export type Payload = { name: string; diff --git a/defs/api/accounts/[account]/DELETE/Output.ts b/defs/api/accounts/[account]/DELETE/Output.ts index 0772d2d5..fd569810 100644 --- a/defs/api/accounts/[account]/DELETE/Output.ts +++ b/defs/api/accounts/[account]/DELETE/Output.ts @@ -1,4 +1,4 @@ // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { PublicAccount } from "../../../../PublicAccount"; +import type { PublicAccount } from "../../../../PublicAccount.js"; export type Output = PublicAccount; diff --git a/defs/api/accounts/[account]/GET/Output.ts b/defs/api/accounts/[account]/GET/Output.ts index 29d51555..a28bcf9b 100644 --- a/defs/api/accounts/[account]/GET/Output.ts +++ b/defs/api/accounts/[account]/GET/Output.ts @@ -1,4 +1,4 @@ // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { PublicAccount } from "../../../../PublicAccount"; +import type { PublicAccount } from "../../../../PublicAccount.js"; export type Output = { is_owner: boolean; account: PublicAccount }; diff --git a/defs/api/accounts/[account]/PATCH/Output.ts b/defs/api/accounts/[account]/PATCH/Output.ts index 0772d2d5..fd569810 100644 --- a/defs/api/accounts/[account]/PATCH/Output.ts +++ b/defs/api/accounts/[account]/PATCH/Output.ts @@ -1,4 +1,4 @@ // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { PublicAccount } from "../../../../PublicAccount"; +import type { PublicAccount } from "../../../../PublicAccount.js"; export type Output = PublicAccount; diff --git a/defs/api/accounts/[account]/PATCH/Payload.ts b/defs/api/accounts/[account]/PATCH/Payload.ts index b9926778..ce5b036b 100644 --- a/defs/api/accounts/[account]/PATCH/Payload.ts +++ b/defs/api/accounts/[account]/PATCH/Payload.ts @@ -1,4 +1,4 @@ // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { AccountPatch } from "../../../../ops/AccountPatch"; +import type { AccountPatch } from "../../../../ops/AccountPatch.js"; export type Payload = {} & AccountPatch; diff --git a/defs/api/accounts/[account]/members/GET/Member.ts b/defs/api/accounts/[account]/members/GET/Member.ts index 62e1ee3c..8b1450f2 100644 --- a/defs/api/accounts/[account]/members/GET/Member.ts +++ b/defs/api/accounts/[account]/members/GET/Member.ts @@ -1,5 +1,5 @@ // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { UserAccountRelationKind } from "../../../../../db/UserAccountRelationKind"; +import type { UserAccountRelationKind } from "../../../../../db/UserAccountRelationKind.js"; export type Member = { _id: string; diff --git a/defs/api/accounts/[account]/members/GET/Output.ts b/defs/api/accounts/[account]/members/GET/Output.ts index 5045be24..9430614c 100644 --- a/defs/api/accounts/[account]/members/GET/Output.ts +++ b/defs/api/accounts/[account]/members/GET/Output.ts @@ -1,4 +1,4 @@ // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { Member } from "./Member"; +import type { Member } from "./Member.js"; export type Output = { members: Array }; diff --git a/defs/api/accounts/[account]/members/[member]/DELETE/Output.ts b/defs/api/accounts/[account]/members/[member]/DELETE/Output.ts index 26622e8a..f50164fe 100644 --- a/defs/api/accounts/[account]/members/[member]/DELETE/Output.ts +++ b/defs/api/accounts/[account]/members/[member]/DELETE/Output.ts @@ -1,4 +1,4 @@ // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { EmptyStruct } from "../../../../../../EmptyStruct"; +import type { EmptyStruct } from "../../../../../../EmptyStruct.js"; export type Output = EmptyStruct; diff --git a/defs/api/accounts/[account]/members/[member]/set-role/POST/Output.ts b/defs/api/accounts/[account]/members/[member]/set-role/POST/Output.ts index fe3ccd5b..77b0f55c 100644 --- a/defs/api/accounts/[account]/members/[member]/set-role/POST/Output.ts +++ b/defs/api/accounts/[account]/members/[member]/set-role/POST/Output.ts @@ -1,4 +1,4 @@ // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { EmptyStruct } from "../../../../../../../EmptyStruct"; +import type { EmptyStruct } from "../../../../../../../EmptyStruct.js"; export type Output = EmptyStruct; diff --git a/defs/api/accounts/[account]/members/[member]/set-role/POST/Payload.ts b/defs/api/accounts/[account]/members/[member]/set-role/POST/Payload.ts index 8e69f53b..9586a076 100644 --- a/defs/api/accounts/[account]/members/[member]/set-role/POST/Payload.ts +++ b/defs/api/accounts/[account]/members/[member]/set-role/POST/Payload.ts @@ -1,4 +1,4 @@ // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { AccessKind } from "./AccessKind"; +import type { AccessKind } from "./AccessKind.js"; export type Payload = { role: AccessKind }; diff --git a/defs/api/accounts/[account]/stream-stats/GET/Output.ts b/defs/api/accounts/[account]/stream-stats/GET/Output.ts index 34b2a675..a4f66b2c 100644 --- a/defs/api/accounts/[account]/stream-stats/GET/Output.ts +++ b/defs/api/accounts/[account]/stream-stats/GET/Output.ts @@ -1,4 +1,4 @@ // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { Stats } from "../../../../../stream-connection-stats/Stats"; +import type { Stats } from "../../../../../stream-connection-stats/Stats.js"; export type Output = { stats: Stats }; diff --git a/defs/api/accounts/[account]/stream-stats/[last-unitvalue]/GET/Output.ts b/defs/api/accounts/[account]/stream-stats/[last-unitvalue]/GET/Output.ts index 3f73cef2..58a8957b 100644 --- a/defs/api/accounts/[account]/stream-stats/[last-unitvalue]/GET/Output.ts +++ b/defs/api/accounts/[account]/stream-stats/[last-unitvalue]/GET/Output.ts @@ -1,4 +1,4 @@ // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { StatsItem } from "../../../../../../stream-connection-stats/StatsItem"; +import type { StatsItem } from "../../../../../../stream-connection-stats/StatsItem.js"; export type Output = { stats: StatsItem }; diff --git a/defs/api/accounts/[account]/stream-stats/now/GET/Output.ts b/defs/api/accounts/[account]/stream-stats/now/GET/Output.ts index 3f73cef2..58a8957b 100644 --- a/defs/api/accounts/[account]/stream-stats/now/GET/Output.ts +++ b/defs/api/accounts/[account]/stream-stats/now/GET/Output.ts @@ -1,4 +1,4 @@ // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { StatsItem } from "../../../../../../stream-connection-stats/StatsItem"; +import type { StatsItem } from "../../../../../../stream-connection-stats/StatsItem.js"; export type Output = { stats: StatsItem }; diff --git a/defs/api/admins/GET/Output.ts b/defs/api/admins/GET/Output.ts index 0618fbaf..07a2ea85 100644 --- a/defs/api/admins/GET/Output.ts +++ b/defs/api/admins/GET/Output.ts @@ -1,5 +1,5 @@ // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { Paged } from "../../../Paged"; -import type { PublicAdmin } from "../../../PublicAdmin"; +import type { Paged } from "../../../Paged.js"; +import type { PublicAdmin } from "../../../PublicAdmin.js"; export type Output = Paged; diff --git a/defs/api/admins/GET/Query.ts b/defs/api/admins/GET/Query.ts index 8407f09b..88727cb8 100644 --- a/defs/api/admins/GET/Query.ts +++ b/defs/api/admins/GET/Query.ts @@ -1,5 +1,5 @@ // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { PaginationQs } from "../../../qs/PaginationQs"; -import type { VisibilityQs } from "../../../qs/VisibilityQs"; +import type { PaginationQs } from "../../../qs/PaginationQs.js"; +import type { VisibilityQs } from "../../../qs/VisibilityQs.js"; export type Query = {} & PaginationQs & VisibilityQs; diff --git a/defs/api/admins/POST/Output.ts b/defs/api/admins/POST/Output.ts index a22e875c..1aca2958 100644 --- a/defs/api/admins/POST/Output.ts +++ b/defs/api/admins/POST/Output.ts @@ -1,4 +1,4 @@ // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { PublicAdmin } from "../../../PublicAdmin"; +import type { PublicAdmin } from "../../../PublicAdmin.js"; export type Output = { admin: PublicAdmin }; diff --git a/defs/api/admins/POST/Payload.ts b/defs/api/admins/POST/Payload.ts index ca6c0e6c..49833daa 100644 --- a/defs/api/admins/POST/Payload.ts +++ b/defs/api/admins/POST/Payload.ts @@ -1,5 +1,5 @@ // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { Metadata } from "../../../db/Metadata"; +import type { Metadata } from "../../../db/Metadata.js"; export type Payload = { first_name: string; diff --git a/defs/api/admins/[admin]/GET/Output.ts b/defs/api/admins/[admin]/GET/Output.ts index 0bd41f42..e4717df7 100644 --- a/defs/api/admins/[admin]/GET/Output.ts +++ b/defs/api/admins/[admin]/GET/Output.ts @@ -1,4 +1,4 @@ // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { PublicAdmin } from "../../../../PublicAdmin"; +import type { PublicAdmin } from "../../../../PublicAdmin.js"; export type Output = { admin: PublicAdmin }; diff --git a/defs/api/admins/[admin]/PATCH/Output.ts b/defs/api/admins/[admin]/PATCH/Output.ts index 0ebdff70..34c6f229 100644 --- a/defs/api/admins/[admin]/PATCH/Output.ts +++ b/defs/api/admins/[admin]/PATCH/Output.ts @@ -1,4 +1,4 @@ // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { PublicAdmin } from "../../../../PublicAdmin"; +import type { PublicAdmin } from "../../../../PublicAdmin.js"; export type Output = PublicAdmin; diff --git a/defs/api/admins/[admin]/PATCH/Payload.ts b/defs/api/admins/[admin]/PATCH/Payload.ts index 55e750bf..2fc7da30 100644 --- a/defs/api/admins/[admin]/PATCH/Payload.ts +++ b/defs/api/admins/[admin]/PATCH/Payload.ts @@ -1,4 +1,4 @@ // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { AdminPatch } from "../../../../ops/AdminPatch"; +import type { AdminPatch } from "../../../../ops/AdminPatch.js"; export type Payload = {} & AdminPatch; diff --git a/defs/api/admins/[admin]/change-password/POST/Output.ts b/defs/api/admins/[admin]/change-password/POST/Output.ts index 2a429889..815ee8a0 100644 --- a/defs/api/admins/[admin]/change-password/POST/Output.ts +++ b/defs/api/admins/[admin]/change-password/POST/Output.ts @@ -1,4 +1,4 @@ // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { EmptyStruct } from "../../../../../EmptyStruct"; +import type { EmptyStruct } from "../../../../../EmptyStruct.js"; export type Output = EmptyStruct; diff --git a/defs/api/analytics/GET/CountryCodeOrZZ.ts b/defs/api/analytics/GET/CountryCodeOrZZ.ts index 3e594c3f..5d8a6903 100644 --- a/defs/api/analytics/GET/CountryCodeOrZZ.ts +++ b/defs/api/analytics/GET/CountryCodeOrZZ.ts @@ -1,5 +1,5 @@ // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { CountryCode } from "../../../CountryCode"; -import type { ZZ } from "./ZZ"; +import type { CountryCode } from "../../../CountryCode.js"; +import type { ZZ } from "./ZZ.js"; export type CountryCodeOrZZ = ZZ | CountryCode; diff --git a/defs/api/analytics/GET/Output.ts b/defs/api/analytics/GET/Output.ts index 54069cdd..5cc42d44 100644 --- a/defs/api/analytics/GET/Output.ts +++ b/defs/api/analytics/GET/Output.ts @@ -1,4 +1,4 @@ // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { Analytics } from "../../../analytics/Analytics"; +import type { Analytics } from "../../../analytics/Analytics.js"; export type Output = { analytics: Analytics }; diff --git a/defs/api/analytics/GET/Query.ts b/defs/api/analytics/GET/Query.ts index 76620dd7..b071be77 100644 --- a/defs/api/analytics/GET/Query.ts +++ b/defs/api/analytics/GET/Query.ts @@ -1,6 +1,6 @@ // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { AnalyticsQueryKind } from "../../../analytics/AnalyticsQueryKind"; -import type { CountryCodeOrZZ } from "./CountryCodeOrZZ"; +import type { AnalyticsQueryKind } from "../../../analytics/AnalyticsQueryKind.js"; +import type { CountryCodeOrZZ } from "./CountryCodeOrZZ.js"; export type Query = { kind: AnalyticsQueryKind; diff --git a/defs/api/app-analytics/GET/CountryCodeOrZZ.ts b/defs/api/app-analytics/GET/CountryCodeOrZZ.ts index 3e594c3f..5d8a6903 100644 --- a/defs/api/app-analytics/GET/CountryCodeOrZZ.ts +++ b/defs/api/app-analytics/GET/CountryCodeOrZZ.ts @@ -1,5 +1,5 @@ // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { CountryCode } from "../../../CountryCode"; -import type { ZZ } from "./ZZ"; +import type { CountryCode } from "../../../CountryCode.js"; +import type { ZZ } from "./ZZ.js"; export type CountryCodeOrZZ = ZZ | CountryCode; diff --git a/defs/api/app-analytics/GET/Output.ts b/defs/api/app-analytics/GET/Output.ts index 51d99836..2eddf2de 100644 --- a/defs/api/app-analytics/GET/Output.ts +++ b/defs/api/app-analytics/GET/Output.ts @@ -1,4 +1,4 @@ // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { Analytics } from "../../../app-analytics/Analytics"; +import type { Analytics } from "../../../app-analytics/Analytics.js"; export type Output = { analytics: Analytics }; diff --git a/defs/api/app-analytics/GET/Query.ts b/defs/api/app-analytics/GET/Query.ts index 45c3dded..dbafe688 100644 --- a/defs/api/app-analytics/GET/Query.ts +++ b/defs/api/app-analytics/GET/Query.ts @@ -1,6 +1,6 @@ // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { AnalyticsQueryKind } from "../../../app-analytics/AnalyticsQueryKind"; -import type { CountryCodeOrZZ } from "./CountryCodeOrZZ"; +import type { AnalyticsQueryKind } from "../../../app-analytics/AnalyticsQueryKind.js"; +import type { CountryCodeOrZZ } from "./CountryCodeOrZZ.js"; export type Query = { kind: AnalyticsQueryKind; diff --git a/defs/api/auth/admin/delegate/[user]/POST/Output.ts b/defs/api/auth/admin/delegate/[user]/POST/Output.ts index 9ad9033a..e87b1f45 100644 --- a/defs/api/auth/admin/delegate/[user]/POST/Output.ts +++ b/defs/api/auth/admin/delegate/[user]/POST/Output.ts @@ -1,5 +1,5 @@ // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { AdminPublicUser } from "../../../../../../db/AdminPublicUser"; +import type { AdminPublicUser } from "../../../../../../db/AdminPublicUser.js"; export type Output = { user: AdminPublicUser; diff --git a/defs/api/auth/admin/login/POST/Output.ts b/defs/api/auth/admin/login/POST/Output.ts index 8bebbefe..6d4d8fd5 100644 --- a/defs/api/auth/admin/login/POST/Output.ts +++ b/defs/api/auth/admin/login/POST/Output.ts @@ -1,4 +1,4 @@ // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { PublicAdmin } from "../../../../../PublicAdmin"; +import type { PublicAdmin } from "../../../../../PublicAdmin.js"; export type Output = { admin: PublicAdmin; token: string; media_key: string }; diff --git a/defs/api/auth/admin/logout/POST/Output.ts b/defs/api/auth/admin/logout/POST/Output.ts index 2a429889..815ee8a0 100644 --- a/defs/api/auth/admin/logout/POST/Output.ts +++ b/defs/api/auth/admin/logout/POST/Output.ts @@ -1,4 +1,4 @@ // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { EmptyStruct } from "../../../../../EmptyStruct"; +import type { EmptyStruct } from "../../../../../EmptyStruct.js"; export type Output = EmptyStruct; diff --git a/defs/api/auth/email-verification/send-code/POST/Output.ts b/defs/api/auth/email-verification/send-code/POST/Output.ts index 2a429889..815ee8a0 100644 --- a/defs/api/auth/email-verification/send-code/POST/Output.ts +++ b/defs/api/auth/email-verification/send-code/POST/Output.ts @@ -1,4 +1,4 @@ // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { EmptyStruct } from "../../../../../EmptyStruct"; +import type { EmptyStruct } from "../../../../../EmptyStruct.js"; export type Output = EmptyStruct; diff --git a/defs/api/auth/user/login/POST/Output.ts b/defs/api/auth/user/login/POST/Output.ts index ea5c324c..4b4c8739 100644 --- a/defs/api/auth/user/login/POST/Output.ts +++ b/defs/api/auth/user/login/POST/Output.ts @@ -1,4 +1,4 @@ // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { UserPublicUser } from "../../../../../db/UserPublicUser"; +import type { UserPublicUser } from "../../../../../db/UserPublicUser.js"; export type Output = { user: UserPublicUser; token: string; media_key: string }; diff --git a/defs/api/auth/user/logout/POST/Output.ts b/defs/api/auth/user/logout/POST/Output.ts index 2a429889..815ee8a0 100644 --- a/defs/api/auth/user/logout/POST/Output.ts +++ b/defs/api/auth/user/logout/POST/Output.ts @@ -1,4 +1,4 @@ // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { EmptyStruct } from "../../../../../EmptyStruct"; +import type { EmptyStruct } from "../../../../../EmptyStruct.js"; export type Output = EmptyStruct; diff --git a/defs/api/auth/user/recover/POST/Output.ts b/defs/api/auth/user/recover/POST/Output.ts index 2a429889..815ee8a0 100644 --- a/defs/api/auth/user/recover/POST/Output.ts +++ b/defs/api/auth/user/recover/POST/Output.ts @@ -1,4 +1,4 @@ // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { EmptyStruct } from "../../../../../EmptyStruct"; +import type { EmptyStruct } from "../../../../../EmptyStruct.js"; export type Output = EmptyStruct; diff --git a/defs/api/auth/user/register/POST/Output.ts b/defs/api/auth/user/register/POST/Output.ts index 21b417e8..e9291e40 100644 --- a/defs/api/auth/user/register/POST/Output.ts +++ b/defs/api/auth/user/register/POST/Output.ts @@ -1,6 +1,6 @@ // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { PublicAccount } from "../../../../../PublicAccount"; -import type { PublicUser } from "../../../../../db/PublicUser"; +import type { PublicAccount } from "../../../../../PublicAccount.js"; +import type { PublicUser } from "../../../../../db/PublicUser.js"; export type Output = { user: PublicUser; diff --git a/defs/api/auth/user/register/POST/Payload.ts b/defs/api/auth/user/register/POST/Payload.ts index 7809efe5..98b3169d 100644 --- a/defs/api/auth/user/register/POST/Payload.ts +++ b/defs/api/auth/user/register/POST/Payload.ts @@ -1,5 +1,5 @@ // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { Metadata } from "../../../../../db/Metadata"; +import type { Metadata } from "../../../../../db/Metadata.js"; export type Payload = { first_name: string; diff --git a/defs/api/invitations/GET/Output.ts b/defs/api/invitations/GET/Output.ts index 10cc544b..1bb92bd1 100644 --- a/defs/api/invitations/GET/Output.ts +++ b/defs/api/invitations/GET/Output.ts @@ -1,5 +1,5 @@ // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { Paged } from "../../../Paged"; -import type { PublicInvitation } from "../../PublicInvitation"; +import type { Paged } from "../../../Paged.js"; +import type { PublicInvitation } from "../../PublicInvitation.js"; export type Output = Paged; diff --git a/defs/api/invitations/GET/Query.ts b/defs/api/invitations/GET/Query.ts index 6feae634..9b0fce55 100644 --- a/defs/api/invitations/GET/Query.ts +++ b/defs/api/invitations/GET/Query.ts @@ -1,6 +1,6 @@ // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { PaginationQs } from "../../../qs/PaginationQs"; -import type { VisibilityQs } from "../../../qs/VisibilityQs"; +import type { PaginationQs } from "../../../qs/PaginationQs.js"; +import type { VisibilityQs } from "../../../qs/VisibilityQs.js"; export type Query = & { diff --git a/defs/api/invitations/POST/Output.ts b/defs/api/invitations/POST/Output.ts index 9dc11b68..3c7b3841 100644 --- a/defs/api/invitations/POST/Output.ts +++ b/defs/api/invitations/POST/Output.ts @@ -1,4 +1,4 @@ // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { PublicInvitation } from "../../PublicInvitation"; +import type { PublicInvitation } from "../../PublicInvitation.js"; export type Output = { invitation: PublicInvitation }; diff --git a/defs/api/invitations/[invitation]/DELETE/Output.ts b/defs/api/invitations/[invitation]/DELETE/Output.ts index 711ba65b..05fe135b 100644 --- a/defs/api/invitations/[invitation]/DELETE/Output.ts +++ b/defs/api/invitations/[invitation]/DELETE/Output.ts @@ -1,4 +1,4 @@ // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { EmptyStruct } from "../../../../EmptyStruct"; +import type { EmptyStruct } from "../../../../EmptyStruct.js"; export type Output = EmptyStruct; diff --git a/defs/api/invitations/[invitation]/GET/Output.ts b/defs/api/invitations/[invitation]/GET/Output.ts index 448d6af7..54c1dd09 100644 --- a/defs/api/invitations/[invitation]/GET/Output.ts +++ b/defs/api/invitations/[invitation]/GET/Output.ts @@ -1,4 +1,4 @@ // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { PublicInvitation } from "../../../PublicInvitation"; +import type { PublicInvitation } from "../../../PublicInvitation.js"; export type Output = { invitation: PublicInvitation }; diff --git a/defs/api/invitations/accept/POST/Payload.ts b/defs/api/invitations/accept/POST/Payload.ts index 6f4fc050..6d79038a 100644 --- a/defs/api/invitations/accept/POST/Payload.ts +++ b/defs/api/invitations/accept/POST/Payload.ts @@ -1,5 +1,5 @@ // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { UnauthenticatedAcceptPayloadData } from "./UnauthenticatedAcceptPayloadData"; +import type { UnauthenticatedAcceptPayloadData } from "./UnauthenticatedAcceptPayloadData.js"; export type Payload = {} & UnauthenticatedAcceptPayloadData | { invitation_id: string; diff --git a/defs/api/invitations/get-by-token/[token]/GET/Output.ts b/defs/api/invitations/get-by-token/[token]/GET/Output.ts index 81e25a78..fe6d232e 100644 --- a/defs/api/invitations/get-by-token/[token]/GET/Output.ts +++ b/defs/api/invitations/get-by-token/[token]/GET/Output.ts @@ -1,5 +1,5 @@ // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { PublicInvitation } from "../../../../PublicInvitation"; +import type { PublicInvitation } from "../../../../PublicInvitation.js"; export type Output = ({ kind: "ok" } & { invitation: PublicInvitation }) | { kind: "not-found"; diff --git a/defs/api/me/GET/Output.ts b/defs/api/me/GET/Output.ts index 0ef5f595..39e03632 100644 --- a/defs/api/me/GET/Output.ts +++ b/defs/api/me/GET/Output.ts @@ -1,4 +1,4 @@ // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { Me } from "../../Me"; +import type { Me } from "../../Me.js"; export type Output = Me; diff --git a/defs/api/me/api-keys/GET/Output.ts b/defs/api/me/api-keys/GET/Output.ts index 33a169ed..d2f4b4c7 100644 --- a/defs/api/me/api-keys/GET/Output.ts +++ b/defs/api/me/api-keys/GET/Output.ts @@ -1,5 +1,5 @@ // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { ApiKey } from "../../../ApiKey"; -import type { Paged } from "../../../../Paged"; +import type { ApiKey } from "../../../ApiKey.js"; +import type { Paged } from "../../../../Paged.js"; export type Output = Paged; diff --git a/defs/api/me/api-keys/GET/Query.ts b/defs/api/me/api-keys/GET/Query.ts index f6418e49..e7f89989 100644 --- a/defs/api/me/api-keys/GET/Query.ts +++ b/defs/api/me/api-keys/GET/Query.ts @@ -1,6 +1,6 @@ // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { PaginationQs } from "../../../../qs/PaginationQs"; -import type { VisibilityQs } from "../../../../qs/VisibilityQs"; +import type { PaginationQs } from "../../../../qs/PaginationQs.js"; +import type { VisibilityQs } from "../../../../qs/VisibilityQs.js"; export type Query = & { user_id?: string; admin_id?: string } diff --git a/defs/api/me/api-keys/POST/Output.ts b/defs/api/me/api-keys/POST/Output.ts index 6c2583bb..09c095d5 100644 --- a/defs/api/me/api-keys/POST/Output.ts +++ b/defs/api/me/api-keys/POST/Output.ts @@ -1,4 +1,4 @@ // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { ApiKey } from "../../../ApiKey"; +import type { ApiKey } from "../../../ApiKey.js"; export type Output = { api_key: ApiKey; token: string; media_key: string }; diff --git a/defs/api/me/api-keys/[id]/DELETE/Output.ts b/defs/api/me/api-keys/[id]/DELETE/Output.ts index 2a429889..815ee8a0 100644 --- a/defs/api/me/api-keys/[id]/DELETE/Output.ts +++ b/defs/api/me/api-keys/[id]/DELETE/Output.ts @@ -1,4 +1,4 @@ // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { EmptyStruct } from "../../../../../EmptyStruct"; +import type { EmptyStruct } from "../../../../../EmptyStruct.js"; export type Output = EmptyStruct; diff --git a/defs/api/me/api-keys/[id]/PATCH/Output.ts b/defs/api/me/api-keys/[id]/PATCH/Output.ts index 2a429889..815ee8a0 100644 --- a/defs/api/me/api-keys/[id]/PATCH/Output.ts +++ b/defs/api/me/api-keys/[id]/PATCH/Output.ts @@ -1,4 +1,4 @@ // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { EmptyStruct } from "../../../../../EmptyStruct"; +import type { EmptyStruct } from "../../../../../EmptyStruct.js"; export type Output = EmptyStruct; diff --git a/defs/api/me/devices/GET/Output.ts b/defs/api/me/devices/GET/Output.ts index 2b1d8ad0..56688715 100644 --- a/defs/api/me/devices/GET/Output.ts +++ b/defs/api/me/devices/GET/Output.ts @@ -1,5 +1,5 @@ // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { Device } from "../../../../Device"; -import type { Paged } from "../../../../Paged"; +import type { Device } from "../../../../Device.js"; +import type { Paged } from "../../../../Paged.js"; export type Output = Paged; diff --git a/defs/api/me/devices/GET/Query.ts b/defs/api/me/devices/GET/Query.ts index f6418e49..e7f89989 100644 --- a/defs/api/me/devices/GET/Query.ts +++ b/defs/api/me/devices/GET/Query.ts @@ -1,6 +1,6 @@ // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { PaginationQs } from "../../../../qs/PaginationQs"; -import type { VisibilityQs } from "../../../../qs/VisibilityQs"; +import type { PaginationQs } from "../../../../qs/PaginationQs.js"; +import type { VisibilityQs } from "../../../../qs/VisibilityQs.js"; export type Query = & { user_id?: string; admin_id?: string } diff --git a/defs/api/me/devices/[device]/DELETE/Output.ts b/defs/api/me/devices/[device]/DELETE/Output.ts index 2a429889..815ee8a0 100644 --- a/defs/api/me/devices/[device]/DELETE/Output.ts +++ b/defs/api/me/devices/[device]/DELETE/Output.ts @@ -1,4 +1,4 @@ // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { EmptyStruct } from "../../../../../EmptyStruct"; +import type { EmptyStruct } from "../../../../../EmptyStruct.js"; export type Output = EmptyStruct; diff --git a/defs/api/payment-methods/GET/Output.ts b/defs/api/payment-methods/GET/Output.ts index 4c5e8886..0bbbb225 100644 --- a/defs/api/payment-methods/GET/Output.ts +++ b/defs/api/payment-methods/GET/Output.ts @@ -1,5 +1,5 @@ // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { Paged } from "../../../Paged"; -import type { PublicPaymentMethod } from "../../../PublicPaymentMethod"; +import type { Paged } from "../../../Paged.js"; +import type { PublicPaymentMethod } from "../../../PublicPaymentMethod.js"; export type Output = Paged; diff --git a/defs/api/payment-methods/GET/Query.ts b/defs/api/payment-methods/GET/Query.ts index 9dd4d6b6..06d6bf8d 100644 --- a/defs/api/payment-methods/GET/Query.ts +++ b/defs/api/payment-methods/GET/Query.ts @@ -1,5 +1,5 @@ // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { PaginationQs } from "../../../qs/PaginationQs"; -import type { VisibilityQs } from "../../../qs/VisibilityQs"; +import type { PaginationQs } from "../../../qs/PaginationQs.js"; +import type { VisibilityQs } from "../../../qs/VisibilityQs.js"; export type Query = { user_id?: string } & PaginationQs & VisibilityQs; diff --git a/defs/api/payment-methods/POST/Output.ts b/defs/api/payment-methods/POST/Output.ts index bbf96566..61731493 100644 --- a/defs/api/payment-methods/POST/Output.ts +++ b/defs/api/payment-methods/POST/Output.ts @@ -1,4 +1,4 @@ // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { PublicPaymentMethod } from "../../../PublicPaymentMethod"; +import type { PublicPaymentMethod } from "../../../PublicPaymentMethod.js"; export type Output = { payment_method: PublicPaymentMethod }; diff --git a/defs/api/payment-methods/[payment-method]/GET/Output.ts b/defs/api/payment-methods/[payment-method]/GET/Output.ts index 743485ff..33709f1e 100644 --- a/defs/api/payment-methods/[payment-method]/GET/Output.ts +++ b/defs/api/payment-methods/[payment-method]/GET/Output.ts @@ -1,4 +1,4 @@ // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { PublicPaymentMethod } from "../../../../PublicPaymentMethod"; +import type { PublicPaymentMethod } from "../../../../PublicPaymentMethod.js"; export type Output = { payment_method: PublicPaymentMethod }; diff --git a/defs/api/plans/GET/Output.ts b/defs/api/plans/GET/Output.ts index 48eb5319..23222388 100644 --- a/defs/api/plans/GET/Output.ts +++ b/defs/api/plans/GET/Output.ts @@ -1,5 +1,5 @@ // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { Paged } from "../../../Paged"; -import type { Plan } from "../../../db/Plan"; +import type { Paged } from "../../../Paged.js"; +import type { Plan } from "../../../db/Plan.js"; export type Output = Paged; diff --git a/defs/api/plans/GET/Query.ts b/defs/api/plans/GET/Query.ts index 8407f09b..88727cb8 100644 --- a/defs/api/plans/GET/Query.ts +++ b/defs/api/plans/GET/Query.ts @@ -1,5 +1,5 @@ // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { PaginationQs } from "../../../qs/PaginationQs"; -import type { VisibilityQs } from "../../../qs/VisibilityQs"; +import type { PaginationQs } from "../../../qs/PaginationQs.js"; +import type { VisibilityQs } from "../../../qs/VisibilityQs.js"; export type Query = {} & PaginationQs & VisibilityQs; diff --git a/defs/api/plans/POST/Output.ts b/defs/api/plans/POST/Output.ts index 6e8039df..db116c25 100644 --- a/defs/api/plans/POST/Output.ts +++ b/defs/api/plans/POST/Output.ts @@ -1,4 +1,4 @@ // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { Plan } from "../../../db/Plan"; +import type { Plan } from "../../../db/Plan.js"; export type Output = Plan; diff --git a/defs/api/plans/[plan]/DELETE/Output.ts b/defs/api/plans/[plan]/DELETE/Output.ts index 9487446d..8a32fb78 100644 --- a/defs/api/plans/[plan]/DELETE/Output.ts +++ b/defs/api/plans/[plan]/DELETE/Output.ts @@ -1,4 +1,4 @@ // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { Plan } from "../../../../db/Plan"; +import type { Plan } from "../../../../db/Plan.js"; export type Output = { plan: Plan }; diff --git a/defs/api/plans/[plan]/GET/Output.ts b/defs/api/plans/[plan]/GET/Output.ts index 9487446d..8a32fb78 100644 --- a/defs/api/plans/[plan]/GET/Output.ts +++ b/defs/api/plans/[plan]/GET/Output.ts @@ -1,4 +1,4 @@ // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { Plan } from "../../../../db/Plan"; +import type { Plan } from "../../../../db/Plan.js"; export type Output = { plan: Plan }; diff --git a/defs/api/plans/[plan]/PATCH/Output.ts b/defs/api/plans/[plan]/PATCH/Output.ts index 9bbded00..f0a21960 100644 --- a/defs/api/plans/[plan]/PATCH/Output.ts +++ b/defs/api/plans/[plan]/PATCH/Output.ts @@ -1,4 +1,4 @@ // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { Plan } from "../../../../db/Plan"; +import type { Plan } from "../../../../db/Plan.js"; export type Output = Plan; diff --git a/defs/api/plans/by-slug/[slug]/GET/Output.ts b/defs/api/plans/by-slug/[slug]/GET/Output.ts index f06cac30..02fd75ea 100644 --- a/defs/api/plans/by-slug/[slug]/GET/Output.ts +++ b/defs/api/plans/by-slug/[slug]/GET/Output.ts @@ -1,4 +1,4 @@ // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { Plan } from "../../../../../db/Plan"; +import type { Plan } from "../../../../../db/Plan.js"; export type Output = { plan: Plan }; diff --git a/defs/api/runtime/external-relay-updated/[station]/POST/Output.ts b/defs/api/runtime/external-relay-updated/[station]/POST/Output.ts index 2a429889..815ee8a0 100644 --- a/defs/api/runtime/external-relay-updated/[station]/POST/Output.ts +++ b/defs/api/runtime/external-relay-updated/[station]/POST/Output.ts @@ -1,4 +1,4 @@ // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { EmptyStruct } from "../../../../../EmptyStruct"; +import type { EmptyStruct } from "../../../../../EmptyStruct.js"; export type Output = EmptyStruct; diff --git a/defs/api/runtime/restart-playlist/[station]/POST/Output.ts b/defs/api/runtime/restart-playlist/[station]/POST/Output.ts index 2a429889..815ee8a0 100644 --- a/defs/api/runtime/restart-playlist/[station]/POST/Output.ts +++ b/defs/api/runtime/restart-playlist/[station]/POST/Output.ts @@ -1,4 +1,4 @@ // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { EmptyStruct } from "../../../../../EmptyStruct"; +import type { EmptyStruct } from "../../../../../EmptyStruct.js"; export type Output = EmptyStruct; diff --git a/defs/api/runtime/source-password-updated/[station]/POST/Output.ts b/defs/api/runtime/source-password-updated/[station]/POST/Output.ts index 2a429889..815ee8a0 100644 --- a/defs/api/runtime/source-password-updated/[station]/POST/Output.ts +++ b/defs/api/runtime/source-password-updated/[station]/POST/Output.ts @@ -1,4 +1,4 @@ // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { EmptyStruct } from "../../../../../EmptyStruct"; +import type { EmptyStruct } from "../../../../../EmptyStruct.js"; export type Output = EmptyStruct; diff --git a/defs/api/runtime/station-deleted/[station]/POST/Output.ts b/defs/api/runtime/station-deleted/[station]/POST/Output.ts index 2a429889..815ee8a0 100644 --- a/defs/api/runtime/station-deleted/[station]/POST/Output.ts +++ b/defs/api/runtime/station-deleted/[station]/POST/Output.ts @@ -1,4 +1,4 @@ // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { EmptyStruct } from "../../../../../EmptyStruct"; +import type { EmptyStruct } from "../../../../../EmptyStruct.js"; export type Output = EmptyStruct; diff --git a/defs/api/station-pictures/POST/Output.ts b/defs/api/station-pictures/POST/Output.ts index b3dced59..49b26084 100644 --- a/defs/api/station-pictures/POST/Output.ts +++ b/defs/api/station-pictures/POST/Output.ts @@ -1,4 +1,4 @@ // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { StationPicture } from "../../../db/StationPicture"; +import type { StationPicture } from "../../../db/StationPicture.js"; export type Output = StationPicture; diff --git a/defs/api/stations/GET/Output.schema.json b/defs/api/stations/GET/Output.schema.json index 638eb327..e7df1a66 100644 --- a/defs/api/stations/GET/Output.schema.json +++ b/defs/api/stations/GET/Output.schema.json @@ -570,74 +570,74 @@ }, "website_url": { "type": "string", - "maxLength": 150, - "pattern": "^https?://.+", + "maxLength": 200, + "pattern": "^https?://(([a-z0-9-_]+)\\.)+([a-z0-9-_]+)", "nullable": true }, "twitter_url": { "type": "string", - "maxLength": 150, - "pattern": "^https://twitter\\.com/.+", + "maxLength": 200, + "pattern": "^https?://(www\\.)?twitter\\.com/.+", "nullable": true }, "facebook_url": { "type": "string", - "maxLength": 150, - "pattern": "^https://www\\.facebook\\.com/.+", + "maxLength": 200, + "pattern": "^https?://(www\\.)?facebook\\.com/.+", "nullable": true }, "instagram_url": { "type": "string", - "maxLength": 150, - "pattern": "^https://www\\.instagram\\.com/.+", + "maxLength": 200, + "pattern": "^https?://(www\\.)?instagram\\.com/.+", "nullable": true }, "threads_url": { "type": "string", - "maxLength": 150, - "pattern": "^https://www\\.threads\\.net/.+", + "maxLength": 200, + "pattern": "^https?://(www\\.)?threads\\.net/.+", "nullable": true }, "youtube_url": { "type": "string", - "maxLength": 150, - "pattern": "^https://www\\.youtube\\.com/.+", + "maxLength": 200, + "pattern": "^https?://(www\\.)?youtube\\.com/.+", "nullable": true }, "twitch_url": { "type": "string", - "maxLength": 150, - "pattern": "^https://www\\.twitch\\.tv/.+", + "maxLength": 200, + "pattern": "^https?://(www\\.)?twitch\\.tv/.+", "nullable": true }, "tiktok_url": { "type": "string", - "maxLength": 150, - "pattern": "^https://www\\.tiktok\\.com/.+", + "maxLength": 200, + "pattern": "^https?://(www\\.)?tiktok\\.com/.+", "nullable": true }, "spotify_url": { "type": "string", - "maxLength": 150, - "pattern": "^https://open\\.spotify\\.com/.+", + "maxLength": 200, + "pattern": "^https?://((open|www)\\.)?spotify\\.com/.+", "nullable": true }, "radiocut_url": { "type": "string", - "maxLength": 150, - "pattern": "^https://radiocut\\.fm/.+", + "maxLength": 200, + "pattern": "^https?://(www\\.)?radiocut\\.fm/.+", "nullable": true }, "google_play_url": { "type": "string", - "maxLength": 150, - "pattern": "^https://play\\.google\\.com/.+", + "maxLength": 200, + "pattern": "^https?://play\\.google\\.com/.+", "nullable": true }, "app_store_url": { "type": "string", - "maxLength": 150, - "pattern": "^https://apps\\.apple\\.com/.+", + "maxLength": 200, + "pattern": "^https?://apps\\.apple\\.com/.+", "nullable": true }, "user_metadata": { diff --git a/defs/api/stations/GET/Output.ts b/defs/api/stations/GET/Output.ts index 5163a390..2fcadfb9 100644 --- a/defs/api/stations/GET/Output.ts +++ b/defs/api/stations/GET/Output.ts @@ -1,5 +1,5 @@ // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { Paged } from "../../../Paged"; -import type { PublicStation } from "../../../PublicStation"; +import type { Paged } from "../../../Paged.js"; +import type { PublicStation } from "../../../PublicStation.js"; export type Output = Paged; diff --git a/defs/api/stations/GET/Query.ts b/defs/api/stations/GET/Query.ts index 5f048919..ed7db90c 100644 --- a/defs/api/stations/GET/Query.ts +++ b/defs/api/stations/GET/Query.ts @@ -1,5 +1,5 @@ // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { PaginationQs } from "../../../qs/PaginationQs"; -import type { VisibilityQs } from "../../../qs/VisibilityQs"; +import type { PaginationQs } from "../../../qs/PaginationQs.js"; +import type { VisibilityQs } from "../../../qs/VisibilityQs.js"; export type Query = { account_id?: string } & PaginationQs & VisibilityQs; diff --git a/defs/api/stations/POST/Output.schema.json b/defs/api/stations/POST/Output.schema.json index 2cbc016f..fceb0e54 100644 --- a/defs/api/stations/POST/Output.schema.json +++ b/defs/api/stations/POST/Output.schema.json @@ -551,74 +551,74 @@ }, "website_url": { "type": "string", - "maxLength": 150, - "pattern": "^https?://.+", + "maxLength": 200, + "pattern": "^https?://(([a-z0-9-_]+)\\.)+([a-z0-9-_]+)", "nullable": true }, "twitter_url": { "type": "string", - "maxLength": 150, - "pattern": "^https://twitter\\.com/.+", + "maxLength": 200, + "pattern": "^https?://(www\\.)?twitter\\.com/.+", "nullable": true }, "facebook_url": { "type": "string", - "maxLength": 150, - "pattern": "^https://www\\.facebook\\.com/.+", + "maxLength": 200, + "pattern": "^https?://(www\\.)?facebook\\.com/.+", "nullable": true }, "instagram_url": { "type": "string", - "maxLength": 150, - "pattern": "^https://www\\.instagram\\.com/.+", + "maxLength": 200, + "pattern": "^https?://(www\\.)?instagram\\.com/.+", "nullable": true }, "threads_url": { "type": "string", - "maxLength": 150, - "pattern": "^https://www\\.threads\\.net/.+", + "maxLength": 200, + "pattern": "^https?://(www\\.)?threads\\.net/.+", "nullable": true }, "youtube_url": { "type": "string", - "maxLength": 150, - "pattern": "^https://www\\.youtube\\.com/.+", + "maxLength": 200, + "pattern": "^https?://(www\\.)?youtube\\.com/.+", "nullable": true }, "twitch_url": { "type": "string", - "maxLength": 150, - "pattern": "^https://www\\.twitch\\.tv/.+", + "maxLength": 200, + "pattern": "^https?://(www\\.)?twitch\\.tv/.+", "nullable": true }, "tiktok_url": { "type": "string", - "maxLength": 150, - "pattern": "^https://www\\.tiktok\\.com/.+", + "maxLength": 200, + "pattern": "^https?://(www\\.)?tiktok\\.com/.+", "nullable": true }, "spotify_url": { "type": "string", - "maxLength": 150, - "pattern": "^https://open\\.spotify\\.com/.+", + "maxLength": 200, + "pattern": "^https?://((open|www)\\.)?spotify\\.com/.+", "nullable": true }, "radiocut_url": { "type": "string", - "maxLength": 150, - "pattern": "^https://radiocut\\.fm/.+", + "maxLength": 200, + "pattern": "^https?://(www\\.)?radiocut\\.fm/.+", "nullable": true }, "google_play_url": { "type": "string", - "maxLength": 150, - "pattern": "^https://play\\.google\\.com/.+", + "maxLength": 200, + "pattern": "^https?://play\\.google\\.com/.+", "nullable": true }, "app_store_url": { "type": "string", - "maxLength": 150, - "pattern": "^https://apps\\.apple\\.com/.+", + "maxLength": 200, + "pattern": "^https?://apps\\.apple\\.com/.+", "nullable": true }, "user_metadata": { diff --git a/defs/api/stations/POST/Output.ts b/defs/api/stations/POST/Output.ts index 39ad7262..e6c7bf41 100644 --- a/defs/api/stations/POST/Output.ts +++ b/defs/api/stations/POST/Output.ts @@ -1,4 +1,4 @@ // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { PublicStation } from "../../../PublicStation"; +import type { PublicStation } from "../../../PublicStation.js"; export type Output = { station: PublicStation }; diff --git a/defs/api/stations/POST/Payload.schema.json b/defs/api/stations/POST/Payload.schema.json index de8eca61..65653e1d 100644 --- a/defs/api/stations/POST/Payload.schema.json +++ b/defs/api/stations/POST/Payload.schema.json @@ -506,74 +506,74 @@ }, "website_url": { "type": "string", - "maxLength": 150, - "pattern": "^https?://.+", + "maxLength": 200, + "pattern": "^https?://(([a-z0-9-_]+)\\.)+([a-z0-9-_]+)", "nullable": true }, "twitter_url": { "type": "string", - "maxLength": 150, - "pattern": "^https://twitter\\.com/.+", + "maxLength": 200, + "pattern": "^https?://(www\\.)?twitter\\.com/.+", "nullable": true }, "facebook_url": { "type": "string", - "maxLength": 150, - "pattern": "^https://www\\.facebook\\.com/.+", + "maxLength": 200, + "pattern": "^https?://(www\\.)?facebook\\.com/.+", "nullable": true }, "instagram_url": { "type": "string", - "maxLength": 150, - "pattern": "^https://www\\.instagram\\.com/.+", + "maxLength": 200, + "pattern": "^https?://(www\\.)?instagram\\.com/.+", "nullable": true }, "threads_url": { "type": "string", - "maxLength": 150, - "pattern": "^https://www\\.threads\\.net/.+", + "maxLength": 200, + "pattern": "^https?://(www\\.)?threads\\.net/.+", "nullable": true }, "youtube_url": { "type": "string", - "maxLength": 150, - "pattern": "^https://www\\.youtube\\.com/.+", + "maxLength": 200, + "pattern": "^https?://(www\\.)?youtube\\.com/.+", "nullable": true }, "twitch_url": { "type": "string", - "maxLength": 150, - "pattern": "^https://www\\.twitch\\.tv/.+", + "maxLength": 200, + "pattern": "^https?://(www\\.)?twitch\\.tv/.+", "nullable": true }, "tiktok_url": { "type": "string", - "maxLength": 150, - "pattern": "^https://www\\.tiktok\\.com/.+", + "maxLength": 200, + "pattern": "^https?://(www\\.)?tiktok\\.com/.+", "nullable": true }, "spotify_url": { "type": "string", - "maxLength": 150, - "pattern": "^https://open\\.spotify\\.com/.+", + "maxLength": 200, + "pattern": "^https?://((open|www)\\.)?spotify\\.com/.+", "nullable": true }, "radiocut_url": { "type": "string", - "maxLength": 150, - "pattern": "^https://radiocut\\.fm/.+", + "maxLength": 200, + "pattern": "^https?://(www\\.)?radiocut\\.fm/.+", "nullable": true }, "google_play_url": { "type": "string", - "maxLength": 150, - "pattern": "^https://play\\.google\\.com/.+", + "maxLength": 200, + "pattern": "^https?://play\\.google\\.com/.+", "nullable": true }, "app_store_url": { "type": "string", - "maxLength": 150, - "pattern": "^https://apps\\.apple\\.com/.+", + "maxLength": 200, + "pattern": "^https?://apps\\.apple\\.com/.+", "nullable": true }, "frequency": { @@ -601,8 +601,8 @@ }, "external_relay_url": { "type": "string", - "maxLength": 200, - "pattern": "^https?://.+", + "maxLength": 2000, + "pattern": "^https?://(([a-z0-9-_]+)\\.)+([a-z0-9-_]+)", "nullable": true }, "user_metadata": { diff --git a/defs/api/stations/POST/Payload.ts b/defs/api/stations/POST/Payload.ts index 95a37f99..122be19f 100644 --- a/defs/api/stations/POST/Payload.ts +++ b/defs/api/stations/POST/Payload.ts @@ -1,9 +1,9 @@ // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { CountryCode } from "../../../CountryCode"; -import type { LangCode } from "../../../LangCode"; -import type { Metadata } from "../../../db/Metadata"; -import type { StationFrequency } from "../../../StationFrequency"; -import type { StationTypeOfContent } from "../../../db/StationTypeOfContent"; +import type { CountryCode } from "../../../CountryCode.js"; +import type { LangCode } from "../../../LangCode.js"; +import type { Metadata } from "../../../db/Metadata.js"; +import type { StationFrequency } from "../../../StationFrequency.js"; +import type { StationTypeOfContent } from "../../../db/StationTypeOfContent.js"; export type Payload = { account_id: string; diff --git a/defs/api/stations/[station]/DELETE/Output.ts b/defs/api/stations/[station]/DELETE/Output.ts index 711ba65b..05fe135b 100644 --- a/defs/api/stations/[station]/DELETE/Output.ts +++ b/defs/api/stations/[station]/DELETE/Output.ts @@ -1,4 +1,4 @@ // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { EmptyStruct } from "../../../../EmptyStruct"; +import type { EmptyStruct } from "../../../../EmptyStruct.js"; export type Output = EmptyStruct; diff --git a/defs/api/stations/[station]/GET/Output.schema.json b/defs/api/stations/[station]/GET/Output.schema.json index 2cbc016f..fceb0e54 100644 --- a/defs/api/stations/[station]/GET/Output.schema.json +++ b/defs/api/stations/[station]/GET/Output.schema.json @@ -551,74 +551,74 @@ }, "website_url": { "type": "string", - "maxLength": 150, - "pattern": "^https?://.+", + "maxLength": 200, + "pattern": "^https?://(([a-z0-9-_]+)\\.)+([a-z0-9-_]+)", "nullable": true }, "twitter_url": { "type": "string", - "maxLength": 150, - "pattern": "^https://twitter\\.com/.+", + "maxLength": 200, + "pattern": "^https?://(www\\.)?twitter\\.com/.+", "nullable": true }, "facebook_url": { "type": "string", - "maxLength": 150, - "pattern": "^https://www\\.facebook\\.com/.+", + "maxLength": 200, + "pattern": "^https?://(www\\.)?facebook\\.com/.+", "nullable": true }, "instagram_url": { "type": "string", - "maxLength": 150, - "pattern": "^https://www\\.instagram\\.com/.+", + "maxLength": 200, + "pattern": "^https?://(www\\.)?instagram\\.com/.+", "nullable": true }, "threads_url": { "type": "string", - "maxLength": 150, - "pattern": "^https://www\\.threads\\.net/.+", + "maxLength": 200, + "pattern": "^https?://(www\\.)?threads\\.net/.+", "nullable": true }, "youtube_url": { "type": "string", - "maxLength": 150, - "pattern": "^https://www\\.youtube\\.com/.+", + "maxLength": 200, + "pattern": "^https?://(www\\.)?youtube\\.com/.+", "nullable": true }, "twitch_url": { "type": "string", - "maxLength": 150, - "pattern": "^https://www\\.twitch\\.tv/.+", + "maxLength": 200, + "pattern": "^https?://(www\\.)?twitch\\.tv/.+", "nullable": true }, "tiktok_url": { "type": "string", - "maxLength": 150, - "pattern": "^https://www\\.tiktok\\.com/.+", + "maxLength": 200, + "pattern": "^https?://(www\\.)?tiktok\\.com/.+", "nullable": true }, "spotify_url": { "type": "string", - "maxLength": 150, - "pattern": "^https://open\\.spotify\\.com/.+", + "maxLength": 200, + "pattern": "^https?://((open|www)\\.)?spotify\\.com/.+", "nullable": true }, "radiocut_url": { "type": "string", - "maxLength": 150, - "pattern": "^https://radiocut\\.fm/.+", + "maxLength": 200, + "pattern": "^https?://(www\\.)?radiocut\\.fm/.+", "nullable": true }, "google_play_url": { "type": "string", - "maxLength": 150, - "pattern": "^https://play\\.google\\.com/.+", + "maxLength": 200, + "pattern": "^https?://play\\.google\\.com/.+", "nullable": true }, "app_store_url": { "type": "string", - "maxLength": 150, - "pattern": "^https://apps\\.apple\\.com/.+", + "maxLength": 200, + "pattern": "^https?://apps\\.apple\\.com/.+", "nullable": true }, "user_metadata": { diff --git a/defs/api/stations/[station]/GET/Output.ts b/defs/api/stations/[station]/GET/Output.ts index a2a715b5..e5ac96ee 100644 --- a/defs/api/stations/[station]/GET/Output.ts +++ b/defs/api/stations/[station]/GET/Output.ts @@ -1,4 +1,4 @@ // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { PublicStation } from "../../../../PublicStation"; +import type { PublicStation } from "../../../../PublicStation.js"; export type Output = { station: PublicStation }; diff --git a/defs/api/stations/[station]/PATCH/Output.schema.json b/defs/api/stations/[station]/PATCH/Output.schema.json index f08ca2db..46d772a1 100644 --- a/defs/api/stations/[station]/PATCH/Output.schema.json +++ b/defs/api/stations/[station]/PATCH/Output.schema.json @@ -545,74 +545,74 @@ }, "website_url": { "type": "string", - "maxLength": 150, - "pattern": "^https?://.+", + "maxLength": 200, + "pattern": "^https?://(([a-z0-9-_]+)\\.)+([a-z0-9-_]+)", "nullable": true }, "twitter_url": { "type": "string", - "maxLength": 150, - "pattern": "^https://twitter\\.com/.+", + "maxLength": 200, + "pattern": "^https?://(www\\.)?twitter\\.com/.+", "nullable": true }, "facebook_url": { "type": "string", - "maxLength": 150, - "pattern": "^https://www\\.facebook\\.com/.+", + "maxLength": 200, + "pattern": "^https?://(www\\.)?facebook\\.com/.+", "nullable": true }, "instagram_url": { "type": "string", - "maxLength": 150, - "pattern": "^https://www\\.instagram\\.com/.+", + "maxLength": 200, + "pattern": "^https?://(www\\.)?instagram\\.com/.+", "nullable": true }, "threads_url": { "type": "string", - "maxLength": 150, - "pattern": "^https://www\\.threads\\.net/.+", + "maxLength": 200, + "pattern": "^https?://(www\\.)?threads\\.net/.+", "nullable": true }, "youtube_url": { "type": "string", - "maxLength": 150, - "pattern": "^https://www\\.youtube\\.com/.+", + "maxLength": 200, + "pattern": "^https?://(www\\.)?youtube\\.com/.+", "nullable": true }, "twitch_url": { "type": "string", - "maxLength": 150, - "pattern": "^https://www\\.twitch\\.tv/.+", + "maxLength": 200, + "pattern": "^https?://(www\\.)?twitch\\.tv/.+", "nullable": true }, "tiktok_url": { "type": "string", - "maxLength": 150, - "pattern": "^https://www\\.tiktok\\.com/.+", + "maxLength": 200, + "pattern": "^https?://(www\\.)?tiktok\\.com/.+", "nullable": true }, "spotify_url": { "type": "string", - "maxLength": 150, - "pattern": "^https://open\\.spotify\\.com/.+", + "maxLength": 200, + "pattern": "^https?://((open|www)\\.)?spotify\\.com/.+", "nullable": true }, "radiocut_url": { "type": "string", - "maxLength": 150, - "pattern": "^https://radiocut\\.fm/.+", + "maxLength": 200, + "pattern": "^https?://(www\\.)?radiocut\\.fm/.+", "nullable": true }, "google_play_url": { "type": "string", - "maxLength": 150, - "pattern": "^https://play\\.google\\.com/.+", + "maxLength": 200, + "pattern": "^https?://play\\.google\\.com/.+", "nullable": true }, "app_store_url": { "type": "string", - "maxLength": 150, - "pattern": "^https://apps\\.apple\\.com/.+", + "maxLength": 200, + "pattern": "^https?://apps\\.apple\\.com/.+", "nullable": true }, "user_metadata": { diff --git a/defs/api/stations/[station]/PATCH/Output.ts b/defs/api/stations/[station]/PATCH/Output.ts index c096d6a1..7d109286 100644 --- a/defs/api/stations/[station]/PATCH/Output.ts +++ b/defs/api/stations/[station]/PATCH/Output.ts @@ -1,4 +1,4 @@ // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { PublicStation } from "../../../../PublicStation"; +import type { PublicStation } from "../../../../PublicStation.js"; export type Output = PublicStation; diff --git a/defs/api/stations/[station]/PATCH/Payload.schema.json b/defs/api/stations/[station]/PATCH/Payload.schema.json index 3353c2d0..ccc637a6 100644 --- a/defs/api/stations/[station]/PATCH/Payload.schema.json +++ b/defs/api/stations/[station]/PATCH/Payload.schema.json @@ -523,80 +523,80 @@ }, "website_url": { "type": "string", - "maxLength": 150, - "pattern": "^https?://.+", + "maxLength": 200, + "pattern": "^https?://(([a-z0-9-_]+)\\.)+([a-z0-9-_]+)", "nullable": true }, "twitter_url": { "type": "string", - "maxLength": 150, - "pattern": "^https://twitter\\.com/.+", + "maxLength": 200, + "pattern": "^https?://(www\\.)?twitter\\.com/.+", "nullable": true }, "facebook_url": { "type": "string", - "maxLength": 150, - "pattern": "^https://www\\.facebook\\.com/.+", + "maxLength": 200, + "pattern": "^https?://(www\\.)?facebook\\.com/.+", "nullable": true }, "instagram_url": { "type": "string", - "maxLength": 150, - "pattern": "^https://www\\.instagram\\.com/.+", + "maxLength": 200, + "pattern": "^https?://(www\\.)?instagram\\.com/.+", "nullable": true }, "threads_url": { "type": "string", - "maxLength": 150, - "pattern": "^https://www\\.threads\\.net/.+", + "maxLength": 200, + "pattern": "^https?://(www\\.)?threads\\.net/.+", "nullable": true }, "youtube_url": { "type": "string", - "maxLength": 150, - "pattern": "^https://www\\.youtube\\.com/.+", + "maxLength": 200, + "pattern": "^https?://(www\\.)?youtube\\.com/.+", "nullable": true }, "twitch_url": { "type": "string", - "maxLength": 150, - "pattern": "^https://www\\.twitch\\.tv/.+", + "maxLength": 200, + "pattern": "^https?://(www\\.)?twitch\\.tv/.+", "nullable": true }, "tiktok_url": { "type": "string", - "maxLength": 150, - "pattern": "^https://www\\.tiktok\\.com/.+", + "maxLength": 200, + "pattern": "^https?://(www\\.)?tiktok\\.com/.+", "nullable": true }, "spotify_url": { "type": "string", - "maxLength": 150, - "pattern": "^https://open\\.spotify\\.com/.+", + "maxLength": 200, + "pattern": "^https?://((open|www)\\.)?spotify\\.com/.+", "nullable": true }, "radiocut_url": { "type": "string", - "maxLength": 150, - "pattern": "^https://radiocut\\.fm/.+", + "maxLength": 200, + "pattern": "^https?://(www\\.)?radiocut\\.fm/.+", "nullable": true }, "google_play_url": { "type": "string", - "maxLength": 150, - "pattern": "^https://play\\.google\\.com/.+", + "maxLength": 200, + "pattern": "^https?://play\\.google\\.com/.+", "nullable": true }, "app_store_url": { "type": "string", - "maxLength": 150, - "pattern": "^https://apps\\.apple\\.com/.+", + "maxLength": 200, + "pattern": "^https?://apps\\.apple\\.com/.+", "nullable": true }, "external_relay_url": { "type": "string", - "maxLength": 200, - "pattern": "^https?://.+", + "maxLength": 2000, + "pattern": "^https?://(([a-z0-9-_]+)\\.)+([a-z0-9-_]+)", "nullable": true }, "external_relay_redirect": { diff --git a/defs/api/stations/[station]/PATCH/Payload.ts b/defs/api/stations/[station]/PATCH/Payload.ts index 7f6c818b..04c97f41 100644 --- a/defs/api/stations/[station]/PATCH/Payload.ts +++ b/defs/api/stations/[station]/PATCH/Payload.ts @@ -1,4 +1,4 @@ // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { StationPatch } from "../../../../ops/StationPatch"; +import type { StationPatch } from "../../../../ops/StationPatch.js"; export type Payload = {} & StationPatch; diff --git a/defs/api/stations/[station]/files/GET/Output.ts b/defs/api/stations/[station]/files/GET/Output.ts index 68924a3c..52ce1c5b 100644 --- a/defs/api/stations/[station]/files/GET/Output.ts +++ b/defs/api/stations/[station]/files/GET/Output.ts @@ -1,6 +1,6 @@ // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { AudioFile } from "../../../../../db/AudioFile"; -import type { Paged } from "../../../../../Paged"; +import type { AudioFile } from "../../../../../db/AudioFile.js"; +import type { Paged } from "../../../../../Paged.js"; export type Output = { files: Paged; diff --git a/defs/api/stations/[station]/files/GET/Query.ts b/defs/api/stations/[station]/files/GET/Query.ts index 19b0ed82..70b58599 100644 --- a/defs/api/stations/[station]/files/GET/Query.ts +++ b/defs/api/stations/[station]/files/GET/Query.ts @@ -1,4 +1,4 @@ // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { PaginationQs } from "../../../../../qs/PaginationQs"; +import type { PaginationQs } from "../../../../../qs/PaginationQs.js"; export type Query = {} & PaginationQs; diff --git a/defs/api/stations/[station]/files/POST/Output.ts b/defs/api/stations/[station]/files/POST/Output.ts index 436adaaf..70b052a8 100644 --- a/defs/api/stations/[station]/files/POST/Output.ts +++ b/defs/api/stations/[station]/files/POST/Output.ts @@ -1,4 +1,4 @@ // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { AudioFile } from "../../../../../db/AudioFile"; +import type { AudioFile } from "../../../../../db/AudioFile.js"; export type Output = { file: AudioFile }; diff --git a/defs/api/stations/[station]/files/[file]/DELETE/Output.ts b/defs/api/stations/[station]/files/[file]/DELETE/Output.ts index 13d084ac..5b21312c 100644 --- a/defs/api/stations/[station]/files/[file]/DELETE/Output.ts +++ b/defs/api/stations/[station]/files/[file]/DELETE/Output.ts @@ -1,4 +1,4 @@ // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { AudioFile } from "../../../../../../db/AudioFile"; +import type { AudioFile } from "../../../../../../db/AudioFile.js"; export type Output = AudioFile; diff --git a/defs/api/stations/[station]/files/[file]/GET/Output.ts b/defs/api/stations/[station]/files/[file]/GET/Output.ts index de8f23c3..57fd8f25 100644 --- a/defs/api/stations/[station]/files/[file]/GET/Output.ts +++ b/defs/api/stations/[station]/files/[file]/GET/Output.ts @@ -1,4 +1,4 @@ // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { AudioFile } from "../../../../../../db/AudioFile"; +import type { AudioFile } from "../../../../../../db/AudioFile.js"; export type Output = { item: AudioFile }; diff --git a/defs/api/stations/[station]/files/[file]/metadata/PUT/Output.ts b/defs/api/stations/[station]/files/[file]/metadata/PUT/Output.ts index e61f5b46..246f8fb9 100644 --- a/defs/api/stations/[station]/files/[file]/metadata/PUT/Output.ts +++ b/defs/api/stations/[station]/files/[file]/metadata/PUT/Output.ts @@ -1,4 +1,4 @@ // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { AudioFile } from "../../../../../../../db/AudioFile"; +import type { AudioFile } from "../../../../../../../db/AudioFile.js"; export type Output = { item: AudioFile }; diff --git a/defs/api/stations/[station]/files/[file]/order/swap/POST/Output.ts b/defs/api/stations/[station]/files/[file]/order/swap/POST/Output.ts index 3e140c02..807298b3 100644 --- a/defs/api/stations/[station]/files/[file]/order/swap/POST/Output.ts +++ b/defs/api/stations/[station]/files/[file]/order/swap/POST/Output.ts @@ -1,4 +1,4 @@ // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { EmptyStruct } from "../../../../../../../../EmptyStruct"; +import type { EmptyStruct } from "../../../../../../../../EmptyStruct.js"; export type Output = EmptyStruct; diff --git a/defs/api/stations/[station]/files/suffle/POST/Output.ts b/defs/api/stations/[station]/files/suffle/POST/Output.ts index 26622e8a..f50164fe 100644 --- a/defs/api/stations/[station]/files/suffle/POST/Output.ts +++ b/defs/api/stations/[station]/files/suffle/POST/Output.ts @@ -1,4 +1,4 @@ // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { EmptyStruct } from "../../../../../../EmptyStruct"; +import type { EmptyStruct } from "../../../../../../EmptyStruct.js"; export type Output = EmptyStruct; diff --git a/defs/api/stations/[station]/files/unsuffle/POST/Output.ts b/defs/api/stations/[station]/files/unsuffle/POST/Output.ts index 26622e8a..f50164fe 100644 --- a/defs/api/stations/[station]/files/unsuffle/POST/Output.ts +++ b/defs/api/stations/[station]/files/unsuffle/POST/Output.ts @@ -1,4 +1,4 @@ // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { EmptyStruct } from "../../../../../../EmptyStruct"; +import type { EmptyStruct } from "../../../../../../EmptyStruct.js"; export type Output = EmptyStruct; diff --git a/defs/api/stations/[station]/restart-playlist/POST/Output.ts b/defs/api/stations/[station]/restart-playlist/POST/Output.ts index 2a429889..815ee8a0 100644 --- a/defs/api/stations/[station]/restart-playlist/POST/Output.ts +++ b/defs/api/stations/[station]/restart-playlist/POST/Output.ts @@ -1,4 +1,4 @@ // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { EmptyStruct } from "../../../../../EmptyStruct"; +import type { EmptyStruct } from "../../../../../EmptyStruct.js"; export type Output = EmptyStruct; diff --git a/defs/api/stations/[station]/stream-stats/GET/Output.ts b/defs/api/stations/[station]/stream-stats/GET/Output.ts index 34b2a675..a4f66b2c 100644 --- a/defs/api/stations/[station]/stream-stats/GET/Output.ts +++ b/defs/api/stations/[station]/stream-stats/GET/Output.ts @@ -1,4 +1,4 @@ // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { Stats } from "../../../../../stream-connection-stats/Stats"; +import type { Stats } from "../../../../../stream-connection-stats/Stats.js"; export type Output = { stats: Stats }; diff --git a/defs/api/stations/[station]/stream-stats/[last-unitvalue]/GET/Output.ts b/defs/api/stations/[station]/stream-stats/[last-unitvalue]/GET/Output.ts index 3f73cef2..58a8957b 100644 --- a/defs/api/stations/[station]/stream-stats/[last-unitvalue]/GET/Output.ts +++ b/defs/api/stations/[station]/stream-stats/[last-unitvalue]/GET/Output.ts @@ -1,4 +1,4 @@ // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { StatsItem } from "../../../../../../stream-connection-stats/StatsItem"; +import type { StatsItem } from "../../../../../../stream-connection-stats/StatsItem.js"; export type Output = { stats: StatsItem }; diff --git a/defs/api/stations/[station]/stream-stats/now/GET/Output.ts b/defs/api/stations/[station]/stream-stats/now/GET/Output.ts index 3f73cef2..58a8957b 100644 --- a/defs/api/stations/[station]/stream-stats/now/GET/Output.ts +++ b/defs/api/stations/[station]/stream-stats/now/GET/Output.ts @@ -1,4 +1,4 @@ // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { StatsItem } from "../../../../../../stream-connection-stats/StatsItem"; +import type { StatsItem } from "../../../../../../stream-connection-stats/StatsItem.js"; export type Output = { stats: StatsItem }; diff --git a/defs/api/stations/[station]/transfer/POST/Output.schema.json b/defs/api/stations/[station]/transfer/POST/Output.schema.json index 2cbc016f..fceb0e54 100644 --- a/defs/api/stations/[station]/transfer/POST/Output.schema.json +++ b/defs/api/stations/[station]/transfer/POST/Output.schema.json @@ -551,74 +551,74 @@ }, "website_url": { "type": "string", - "maxLength": 150, - "pattern": "^https?://.+", + "maxLength": 200, + "pattern": "^https?://(([a-z0-9-_]+)\\.)+([a-z0-9-_]+)", "nullable": true }, "twitter_url": { "type": "string", - "maxLength": 150, - "pattern": "^https://twitter\\.com/.+", + "maxLength": 200, + "pattern": "^https?://(www\\.)?twitter\\.com/.+", "nullable": true }, "facebook_url": { "type": "string", - "maxLength": 150, - "pattern": "^https://www\\.facebook\\.com/.+", + "maxLength": 200, + "pattern": "^https?://(www\\.)?facebook\\.com/.+", "nullable": true }, "instagram_url": { "type": "string", - "maxLength": 150, - "pattern": "^https://www\\.instagram\\.com/.+", + "maxLength": 200, + "pattern": "^https?://(www\\.)?instagram\\.com/.+", "nullable": true }, "threads_url": { "type": "string", - "maxLength": 150, - "pattern": "^https://www\\.threads\\.net/.+", + "maxLength": 200, + "pattern": "^https?://(www\\.)?threads\\.net/.+", "nullable": true }, "youtube_url": { "type": "string", - "maxLength": 150, - "pattern": "^https://www\\.youtube\\.com/.+", + "maxLength": 200, + "pattern": "^https?://(www\\.)?youtube\\.com/.+", "nullable": true }, "twitch_url": { "type": "string", - "maxLength": 150, - "pattern": "^https://www\\.twitch\\.tv/.+", + "maxLength": 200, + "pattern": "^https?://(www\\.)?twitch\\.tv/.+", "nullable": true }, "tiktok_url": { "type": "string", - "maxLength": 150, - "pattern": "^https://www\\.tiktok\\.com/.+", + "maxLength": 200, + "pattern": "^https?://(www\\.)?tiktok\\.com/.+", "nullable": true }, "spotify_url": { "type": "string", - "maxLength": 150, - "pattern": "^https://open\\.spotify\\.com/.+", + "maxLength": 200, + "pattern": "^https?://((open|www)\\.)?spotify\\.com/.+", "nullable": true }, "radiocut_url": { "type": "string", - "maxLength": 150, - "pattern": "^https://radiocut\\.fm/.+", + "maxLength": 200, + "pattern": "^https?://(www\\.)?radiocut\\.fm/.+", "nullable": true }, "google_play_url": { "type": "string", - "maxLength": 150, - "pattern": "^https://play\\.google\\.com/.+", + "maxLength": 200, + "pattern": "^https?://play\\.google\\.com/.+", "nullable": true }, "app_store_url": { "type": "string", - "maxLength": 150, - "pattern": "^https://apps\\.apple\\.com/.+", + "maxLength": 200, + "pattern": "^https?://apps\\.apple\\.com/.+", "nullable": true }, "user_metadata": { diff --git a/defs/api/stations/[station]/transfer/POST/Output.ts b/defs/api/stations/[station]/transfer/POST/Output.ts index 5442e14b..72e71a76 100644 --- a/defs/api/stations/[station]/transfer/POST/Output.ts +++ b/defs/api/stations/[station]/transfer/POST/Output.ts @@ -1,4 +1,4 @@ // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { PublicStation } from "../../../../../PublicStation"; +import type { PublicStation } from "../../../../../PublicStation.js"; export type Output = { station: PublicStation }; diff --git a/defs/api/stream-connections/GET/Output.ts b/defs/api/stream-connections/GET/Output.ts index cc799b96..eea9c63c 100644 --- a/defs/api/stream-connections/GET/Output.ts +++ b/defs/api/stream-connections/GET/Output.ts @@ -1,5 +1,5 @@ // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { Paged } from "../../../Paged"; -import type { StreamConnection } from "../../../db/StreamConnection"; +import type { Paged } from "../../../Paged.js"; +import type { StreamConnection } from "../../../db/StreamConnection.js"; export type Output = Paged; diff --git a/defs/api/stream-connections/GET/Query.ts b/defs/api/stream-connections/GET/Query.ts index a8d55bea..e6b5fc0f 100644 --- a/defs/api/stream-connections/GET/Query.ts +++ b/defs/api/stream-connections/GET/Query.ts @@ -1,7 +1,7 @@ // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { PaginationQs } from "../../../qs/PaginationQs"; -import type { ShowQuery } from "./ShowQuery"; -import type { SortQuery } from "./SortQuery"; +import type { PaginationQs } from "../../../qs/PaginationQs.js"; +import type { ShowQuery } from "./ShowQuery.js"; +import type { SortQuery } from "./SortQuery.js"; export type Query = { show?: ShowQuery; diff --git a/defs/api/stream-stats/GET/Output.ts b/defs/api/stream-stats/GET/Output.ts index 12b1b0ad..111eba88 100644 --- a/defs/api/stream-stats/GET/Output.ts +++ b/defs/api/stream-stats/GET/Output.ts @@ -1,4 +1,4 @@ // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { Stats } from "../../../stream-connection-stats/Stats"; +import type { Stats } from "../../../stream-connection-stats/Stats.js"; export type Output = { stats: Stats }; diff --git a/defs/api/stream-stats/[last-unitvalue]/GET/Output.ts b/defs/api/stream-stats/[last-unitvalue]/GET/Output.ts index ae0912c6..7a97cf42 100644 --- a/defs/api/stream-stats/[last-unitvalue]/GET/Output.ts +++ b/defs/api/stream-stats/[last-unitvalue]/GET/Output.ts @@ -1,4 +1,4 @@ // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { StatsItem } from "../../../../stream-connection-stats/StatsItem"; +import type { StatsItem } from "../../../../stream-connection-stats/StatsItem.js"; export type Output = { stats: StatsItem }; diff --git a/defs/api/stream-stats/now/GET/Output.ts b/defs/api/stream-stats/now/GET/Output.ts index ae0912c6..7a97cf42 100644 --- a/defs/api/stream-stats/now/GET/Output.ts +++ b/defs/api/stream-stats/now/GET/Output.ts @@ -1,4 +1,4 @@ // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { StatsItem } from "../../../../stream-connection-stats/StatsItem"; +import type { StatsItem } from "../../../../stream-connection-stats/StatsItem.js"; export type Output = { stats: StatsItem }; diff --git a/defs/api/users/GET/Output.ts b/defs/api/users/GET/Output.ts index 74d9537e..ad4f7aea 100644 --- a/defs/api/users/GET/Output.ts +++ b/defs/api/users/GET/Output.ts @@ -1,5 +1,5 @@ // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { Paged } from "../../../Paged"; -import type { PublicUser } from "../../../db/PublicUser"; +import type { Paged } from "../../../Paged.js"; +import type { PublicUser } from "../../../db/PublicUser.js"; export type Output = Paged; diff --git a/defs/api/users/GET/Query.ts b/defs/api/users/GET/Query.ts index 8407f09b..88727cb8 100644 --- a/defs/api/users/GET/Query.ts +++ b/defs/api/users/GET/Query.ts @@ -1,5 +1,5 @@ // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { PaginationQs } from "../../../qs/PaginationQs"; -import type { VisibilityQs } from "../../../qs/VisibilityQs"; +import type { PaginationQs } from "../../../qs/PaginationQs.js"; +import type { VisibilityQs } from "../../../qs/VisibilityQs.js"; export type Query = {} & PaginationQs & VisibilityQs; diff --git a/defs/api/users/POST/Output.ts b/defs/api/users/POST/Output.ts index 5edf9e7e..b082176d 100644 --- a/defs/api/users/POST/Output.ts +++ b/defs/api/users/POST/Output.ts @@ -1,4 +1,4 @@ // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { PublicUser } from "../../../db/PublicUser"; +import type { PublicUser } from "../../../db/PublicUser.js"; export type Output = { user: PublicUser }; diff --git a/defs/api/users/POST/Payload.ts b/defs/api/users/POST/Payload.ts index c462967b..2fcccb8c 100644 --- a/defs/api/users/POST/Payload.ts +++ b/defs/api/users/POST/Payload.ts @@ -1,5 +1,5 @@ // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { Metadata } from "../../../db/Metadata"; +import type { Metadata } from "../../../db/Metadata.js"; export type Payload = { email: string; diff --git a/defs/api/users/[user]/DELETE/Output.ts b/defs/api/users/[user]/DELETE/Output.ts index e7bb1507..ab99a02e 100644 --- a/defs/api/users/[user]/DELETE/Output.ts +++ b/defs/api/users/[user]/DELETE/Output.ts @@ -1,4 +1,4 @@ // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { AdminPublicUser } from "../../../../db/AdminPublicUser"; +import type { AdminPublicUser } from "../../../../db/AdminPublicUser.js"; export type Output = { user: AdminPublicUser }; diff --git a/defs/api/users/[user]/GET/Output.ts b/defs/api/users/[user]/GET/Output.ts index 72e766c9..db9ee8ec 100644 --- a/defs/api/users/[user]/GET/Output.ts +++ b/defs/api/users/[user]/GET/Output.ts @@ -1,4 +1,4 @@ // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { PublicUser } from "../../../../db/PublicUser"; +import type { PublicUser } from "../../../../db/PublicUser.js"; export type Output = { user: PublicUser }; diff --git a/defs/api/users/[user]/PATCH/Output.ts b/defs/api/users/[user]/PATCH/Output.ts index 72e766c9..db9ee8ec 100644 --- a/defs/api/users/[user]/PATCH/Output.ts +++ b/defs/api/users/[user]/PATCH/Output.ts @@ -1,4 +1,4 @@ // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { PublicUser } from "../../../../db/PublicUser"; +import type { PublicUser } from "../../../../db/PublicUser.js"; export type Output = { user: PublicUser }; diff --git a/defs/api/users/[user]/change-password/POST/Output.ts b/defs/api/users/[user]/change-password/POST/Output.ts index 2a429889..815ee8a0 100644 --- a/defs/api/users/[user]/change-password/POST/Output.ts +++ b/defs/api/users/[user]/change-password/POST/Output.ts @@ -1,4 +1,4 @@ // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { EmptyStruct } from "../../../../../EmptyStruct"; +import type { EmptyStruct } from "../../../../../EmptyStruct.js"; export type Output = EmptyStruct; diff --git a/defs/app-analytics/Analytics.ts b/defs/app-analytics/Analytics.ts index 8648b2de..974973b5 100644 --- a/defs/app-analytics/Analytics.ts +++ b/defs/app-analytics/Analytics.ts @@ -1,13 +1,13 @@ // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { AnalyticsItem } from "./AnalyticsItem"; -import type { AnalyticsQueryKind } from "./AnalyticsQueryKind"; -import type { AnalyticsStation } from "./AnalyticsStation"; -import type { AppKindVersion } from "./AppKindVersion"; -import type { CountryCode } from "../CountryCode"; -import type { DateTime } from "../DateTime"; -import type { TimezoneDateTime } from "../TimezoneDateTime"; -import type { YearMonthDay } from "./YearMonthDay"; -import type { YearMonthDayHour } from "./YearMonthDayHour"; +import type { AnalyticsItem } from "./AnalyticsItem.js"; +import type { AnalyticsQueryKind } from "./AnalyticsQueryKind.js"; +import type { AnalyticsStation } from "./AnalyticsStation.js"; +import type { AppKindVersion } from "./AppKindVersion.js"; +import type { CountryCode } from "../CountryCode.js"; +import type { DateTime } from "../DateTime.js"; +import type { TimezoneDateTime } from "../TimezoneDateTime.js"; +import type { YearMonthDay } from "./YearMonthDay.js"; +import type { YearMonthDayHour } from "./YearMonthDayHour.js"; export type Analytics = { is_now: boolean; diff --git a/defs/app-analytics/AnalyticsItem.ts b/defs/app-analytics/AnalyticsItem.ts index 377b1be3..a14c3a83 100644 --- a/defs/app-analytics/AnalyticsItem.ts +++ b/defs/app-analytics/AnalyticsItem.ts @@ -1,5 +1,5 @@ // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { DateTime } from "../DateTime"; +import type { DateTime } from "../DateTime.js"; export type AnalyticsItem = { key: K; diff --git a/defs/app-analytics/AnalyticsQueryKind.ts b/defs/app-analytics/AnalyticsQueryKind.ts index b3492474..b16a3ba1 100644 --- a/defs/app-analytics/AnalyticsQueryKind.ts +++ b/defs/app-analytics/AnalyticsQueryKind.ts @@ -1,5 +1,5 @@ // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { TimezoneDateTime } from "../TimezoneDateTime"; +import type { TimezoneDateTime } from "../TimezoneDateTime.js"; export type AnalyticsQueryKind = { now: { offset_date: TimezoneDateTime } } | { time_range: { since: TimezoneDateTime; until: TimezoneDateTime }; diff --git a/defs/app-analytics/AnalyticsStation.ts b/defs/app-analytics/AnalyticsStation.ts index 5f563ce5..aa989482 100644 --- a/defs/app-analytics/AnalyticsStation.ts +++ b/defs/app-analytics/AnalyticsStation.ts @@ -1,5 +1,5 @@ // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { DateTime } from "../DateTime"; +import type { DateTime } from "../DateTime.js"; export type AnalyticsStation = { _id: string; diff --git a/defs/constants.ts b/defs/constants.ts index b3e982a2..e56e880b 100644 --- a/defs/constants.ts +++ b/defs/constants.ts @@ -167,7 +167,7 @@ export const VALIDATE_STATION_DESC_MIN_LEN = 1; export const VALIDATE_STATION_EMAIL_MAX_LEN = 100; -export const VALIDATE_STATION_EXTERNAL_RELAY_URL_MAX_LEN = 200; +export const VALIDATE_STATION_EXTERNAL_RELAY_URL_MAX_LEN = 2000; export const VALIDATE_STATION_FREQUENCY_MAX = 100000.0; @@ -183,7 +183,7 @@ export const VALIDATE_STATION_SLOGAN_MAX_LEN = 100; export const VALIDATE_STATION_SLOGAN_MIN_LEN = 1; -export const VALIDATE_STATION_URLS_MAX_LEN = 150; +export const VALIDATE_STATION_URLS_MAX_LEN = 200; export const VALIDATE_STATION_WHATSAPP_MAX_LEN = 60; diff --git a/defs/db/AccessTokenGeneratedBy.ts b/defs/db/AccessTokenGeneratedBy.ts index a4b37cdd..b0ec9fc2 100644 --- a/defs/db/AccessTokenGeneratedBy.ts +++ b/defs/db/AccessTokenGeneratedBy.ts @@ -1,5 +1,5 @@ // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { UserAgent } from "../UserAgent"; +import type { UserAgent } from "../UserAgent.js"; export type AccessTokenGeneratedBy = | ({ generated_by: "login" } & { diff --git a/defs/db/Account.ts b/defs/db/Account.ts index f23f9a4b..95d4611d 100644 --- a/defs/db/Account.ts +++ b/defs/db/Account.ts @@ -1,7 +1,7 @@ // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { AccountLimits } from "../AccountLimits"; -import type { DateTime } from "../DateTime"; -import type { Metadata } from "./Metadata"; +import type { AccountLimits } from "../AccountLimits.js"; +import type { DateTime } from "../DateTime.js"; +import type { Metadata } from "./Metadata.js"; export type Account = { _id: string; diff --git a/defs/db/AccountInvitationState.ts b/defs/db/AccountInvitationState.ts index e713c4d1..4459dea3 100644 --- a/defs/db/AccountInvitationState.ts +++ b/defs/db/AccountInvitationState.ts @@ -1,5 +1,5 @@ // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { DateTime } from "../DateTime"; +import type { DateTime } from "../DateTime.js"; export type AccountInvitationState = | { state: "pending" } diff --git a/defs/db/Admin.ts b/defs/db/Admin.ts index b3e086e4..ba0cb317 100644 --- a/defs/db/Admin.ts +++ b/defs/db/Admin.ts @@ -1,6 +1,6 @@ // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { DateTime } from "../DateTime"; -import type { Metadata } from "./Metadata"; +import type { DateTime } from "../DateTime.js"; +import type { Metadata } from "./Metadata.js"; export type Admin = { _id: string; diff --git a/defs/db/AdminPublicUser.ts b/defs/db/AdminPublicUser.ts index 3ee64d41..f1e8b45a 100644 --- a/defs/db/AdminPublicUser.ts +++ b/defs/db/AdminPublicUser.ts @@ -1,6 +1,6 @@ // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { DateTime } from "../DateTime"; -import type { Metadata } from "./Metadata"; +import type { DateTime } from "../DateTime.js"; +import type { Metadata } from "./Metadata.js"; export type AdminPublicUser = { _id: string; diff --git a/defs/db/AudioChunk.ts b/defs/db/AudioChunk.ts index 4b8e3ca4..2097d143 100644 --- a/defs/db/AudioChunk.ts +++ b/defs/db/AudioChunk.ts @@ -1,5 +1,5 @@ // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { DateTime } from "../DateTime"; +import type { DateTime } from "../DateTime.js"; export type AudioChunk = { _id: string; diff --git a/defs/db/AudioFile.ts b/defs/db/AudioFile.ts index 2f454394..daa69122 100644 --- a/defs/db/AudioFile.ts +++ b/defs/db/AudioFile.ts @@ -1,6 +1,6 @@ // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { AudioMetadata } from "./AudioMetadata"; -import type { DateTime } from "../DateTime"; +import type { AudioMetadata } from "./AudioMetadata.js"; +import type { DateTime } from "../DateTime.js"; export type AudioFile = { _id: string; diff --git a/defs/db/AudioUploadOperation.ts b/defs/db/AudioUploadOperation.ts index 29140409..677705e6 100644 --- a/defs/db/AudioUploadOperation.ts +++ b/defs/db/AudioUploadOperation.ts @@ -1,6 +1,6 @@ // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { AudioUploadOperationState } from "./AudioUploadOperationState"; -import type { DateTime } from "../DateTime"; +import type { AudioUploadOperationState } from "./AudioUploadOperationState.js"; +import type { DateTime } from "../DateTime.js"; export type AudioUploadOperation = { _id: string; diff --git a/defs/db/AudioUploadOperationState.ts b/defs/db/AudioUploadOperationState.ts index 68f9eb9b..82883a92 100644 --- a/defs/db/AudioUploadOperationState.ts +++ b/defs/db/AudioUploadOperationState.ts @@ -1,5 +1,5 @@ // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { DateTime } from "../DateTime"; +import type { DateTime } from "../DateTime.js"; export type AudioUploadOperationState = | { state: "pending" } diff --git a/defs/db/BaseAccessToken.ts b/defs/db/BaseAccessToken.ts index ed436c6b..7aae359e 100644 --- a/defs/db/BaseAccessToken.ts +++ b/defs/db/BaseAccessToken.ts @@ -1,7 +1,7 @@ // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { AccessTokenGeneratedBy } from "./AccessTokenGeneratedBy"; -import type { AccessTokenScope } from "./AccessTokenScope"; -import type { DateTime } from "../DateTime"; +import type { AccessTokenGeneratedBy } from "./AccessTokenGeneratedBy.js"; +import type { AccessTokenScope } from "./AccessTokenScope.js"; +import type { DateTime } from "../DateTime.js"; export type BaseAccessToken = & { diff --git a/defs/db/BaseEvent.ts b/defs/db/BaseEvent.ts index e624305e..0df49d9b 100644 --- a/defs/db/BaseEvent.ts +++ b/defs/db/BaseEvent.ts @@ -1,5 +1,5 @@ // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { DateTime } from "../DateTime"; -import type { EventVariant } from "./EventVariant"; +import type { DateTime } from "../DateTime.js"; +import type { EventVariant } from "./EventVariant.js"; export type BaseEvent = { _id: string; created_at: DateTime } & EventVariant; diff --git a/defs/db/Config.ts b/defs/db/Config.ts index 7c47617d..782286fc 100644 --- a/defs/db/Config.ts +++ b/defs/db/Config.ts @@ -1,4 +1,4 @@ // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { ConfigLimits } from "./ConfigLimits"; +import type { ConfigLimits } from "./ConfigLimits.js"; export type Config = { _id: string; limits: ConfigLimits }; diff --git a/defs/db/Deployment.ts b/defs/db/Deployment.ts index c44e5d7f..aa38eb60 100644 --- a/defs/db/Deployment.ts +++ b/defs/db/Deployment.ts @@ -1,6 +1,6 @@ // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { DateTime } from "../DateTime"; -import type { DeploymentState } from "./DeploymentState"; +import type { DateTime } from "../DateTime.js"; +import type { DeploymentState } from "./DeploymentState.js"; export type Deployment = { _id: string; diff --git a/defs/db/Document.ts b/defs/db/Document.ts index d2b61e29..3f620701 100644 --- a/defs/db/Document.ts +++ b/defs/db/Document.ts @@ -1,4 +1,4 @@ // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { Value } from "./Value"; +import type { Value } from "./Value.js"; export type Document = { [key: string]: Value }; diff --git a/defs/db/EmailVerificationCode.ts b/defs/db/EmailVerificationCode.ts index 5dacf7e1..aa05e889 100644 --- a/defs/db/EmailVerificationCode.ts +++ b/defs/db/EmailVerificationCode.ts @@ -1,5 +1,5 @@ // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { DateTime } from "../DateTime"; +import type { DateTime } from "../DateTime.js"; export type EmailVerificationCode = { _id: string; diff --git a/defs/db/EventVariant.ts b/defs/db/EventVariant.ts index 22f931c4..cbf8cdbb 100644 --- a/defs/db/EventVariant.ts +++ b/defs/db/EventVariant.ts @@ -1,6 +1,6 @@ // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { AudioListenerEnd } from "./event-payload/AudioListenerEnd"; -import type { AudioListenerStart } from "./event-payload/AudioListenerStart"; +import type { AudioListenerEnd } from "./event-payload/AudioListenerEnd.js"; +import type { AudioListenerStart } from "./event-payload/AudioListenerStart.js"; export type EventVariant = { kind: "listener.start"; diff --git a/defs/db/MediaSession.ts b/defs/db/MediaSession.ts index c054be6d..adb597a5 100644 --- a/defs/db/MediaSession.ts +++ b/defs/db/MediaSession.ts @@ -1,8 +1,8 @@ // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { DateTime } from "../DateTime"; -import type { MediaSessionKind } from "./MediaSessionKind"; -import type { MediaSessionNowPlaying } from "./MediaSessionNowPlaying"; -import type { MediaSessionState } from "./MediaSessionState"; +import type { DateTime } from "../DateTime.js"; +import type { MediaSessionKind } from "./MediaSessionKind.js"; +import type { MediaSessionNowPlaying } from "./MediaSessionNowPlaying.js"; +import type { MediaSessionState } from "./MediaSessionState.js"; export type MediaSession = { _id: string; diff --git a/defs/db/MediaSessionKind.ts b/defs/db/MediaSessionKind.ts index f73e5661..09f3e555 100644 --- a/defs/db/MediaSessionKind.ts +++ b/defs/db/MediaSessionKind.ts @@ -1,6 +1,6 @@ // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { DateTime } from "../DateTime"; -import type { Request } from "./http/Request"; +import type { DateTime } from "../DateTime.js"; +import type { Request } from "./http/Request.js"; export type MediaSessionKind = | ({ kind: "playlist" } & { diff --git a/defs/db/Metadata.ts b/defs/db/Metadata.ts index acdf37db..bf209250 100644 --- a/defs/db/Metadata.ts +++ b/defs/db/Metadata.ts @@ -1,4 +1,4 @@ // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { Document } from "./Document"; +import type { Document } from "./Document.js"; export type Metadata = Document; diff --git a/defs/db/OwnerDeploymentInfo.ts b/defs/db/OwnerDeploymentInfo.ts index d8521b13..c2d4ac8a 100644 --- a/defs/db/OwnerDeploymentInfo.ts +++ b/defs/db/OwnerDeploymentInfo.ts @@ -1,5 +1,5 @@ // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { DateTime } from "../DateTime"; +import type { DateTime } from "../DateTime.js"; export type OwnerDeploymentInfo = { deployment_id: string; diff --git a/defs/db/PaymentMethod.ts b/defs/db/PaymentMethod.ts index 5419881b..f0848767 100644 --- a/defs/db/PaymentMethod.ts +++ b/defs/db/PaymentMethod.ts @@ -1,6 +1,6 @@ // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { DateTime } from "../DateTime"; -import type { PaymentMethodKind } from "./PaymentMethodKind"; +import type { DateTime } from "../DateTime.js"; +import type { PaymentMethodKind } from "./PaymentMethodKind.js"; export type PaymentMethod = { _id: string; diff --git a/defs/db/Plan.ts b/defs/db/Plan.ts index 162d703c..230e8df7 100644 --- a/defs/db/Plan.ts +++ b/defs/db/Plan.ts @@ -1,6 +1,6 @@ // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { DateTime } from "../DateTime"; -import type { PlanLimits } from "./PlanLimits"; +import type { DateTime } from "../DateTime.js"; +import type { PlanLimits } from "./PlanLimits.js"; export type Plan = { _id: string; diff --git a/defs/db/PlayHistoryItem.ts b/defs/db/PlayHistoryItem.ts index fc07bf2c..ffadfdc3 100644 --- a/defs/db/PlayHistoryItem.ts +++ b/defs/db/PlayHistoryItem.ts @@ -1,6 +1,6 @@ // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { DateTime } from "../DateTime"; -import type { PlayHistoryItemKind } from "./PlayHistoryItemKind"; +import type { DateTime } from "../DateTime.js"; +import type { PlayHistoryItemKind } from "./PlayHistoryItemKind.js"; export type PlayHistoryItem = { _id: string; diff --git a/defs/db/Probe.ts b/defs/db/Probe.ts index cf9561e7..c9a8247d 100644 --- a/defs/db/Probe.ts +++ b/defs/db/Probe.ts @@ -1,6 +1,6 @@ // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { DateTime } from "../DateTime"; -import type { ProbeResult } from "./ProbeResult"; +import type { DateTime } from "../DateTime.js"; +import type { ProbeResult } from "./ProbeResult.js"; export type Probe = { _id: string; diff --git a/defs/db/PublicUser.ts b/defs/db/PublicUser.ts index 0bde3f99..c77e06a2 100644 --- a/defs/db/PublicUser.ts +++ b/defs/db/PublicUser.ts @@ -1,5 +1,5 @@ // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { AdminPublicUser } from "./AdminPublicUser"; -import type { UserPublicUser } from "./UserPublicUser"; +import type { AdminPublicUser } from "./AdminPublicUser.js"; +import type { UserPublicUser } from "./UserPublicUser.js"; export type PublicUser = AdminPublicUser | UserPublicUser; diff --git a/defs/db/RelaySession.ts b/defs/db/RelaySession.ts index fd861035..d1312dcb 100644 --- a/defs/db/RelaySession.ts +++ b/defs/db/RelaySession.ts @@ -1,6 +1,6 @@ // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { DateTime } from "../DateTime"; -import type { RelaySessionState } from "./RelaySessionState"; +import type { DateTime } from "../DateTime.js"; +import type { RelaySessionState } from "./RelaySessionState.js"; export type RelaySession = { _id: string; diff --git a/defs/db/SentEmailBase.ts b/defs/db/SentEmailBase.ts index f595b58d..8507a4cf 100644 --- a/defs/db/SentEmailBase.ts +++ b/defs/db/SentEmailBase.ts @@ -1,7 +1,7 @@ // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { DateTime } from "../DateTime"; -import type { SentEmailAddress } from "./SentEmailAddress"; -import type { SentEmailKind } from "./SentEmailKind"; +import type { DateTime } from "../DateTime.js"; +import type { SentEmailAddress } from "./SentEmailAddress.js"; +import type { SentEmailKind } from "./SentEmailKind.js"; export type SentEmailBase = { _id: string; diff --git a/defs/db/Station.ts b/defs/db/Station.ts index f71df518..d240cab6 100644 --- a/defs/db/Station.ts +++ b/defs/db/Station.ts @@ -1,11 +1,11 @@ // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { CountryCode } from "../CountryCode"; -import type { DateTime } from "../DateTime"; -import type { LangCode } from "../LangCode"; -import type { Metadata } from "./Metadata"; -import type { OwnerDeploymentInfo } from "./OwnerDeploymentInfo"; -import type { StationFrequency } from "../StationFrequency"; -import type { StationTypeOfContent } from "./StationTypeOfContent"; +import type { CountryCode } from "../CountryCode.js"; +import type { DateTime } from "../DateTime.js"; +import type { LangCode } from "../LangCode.js"; +import type { Metadata } from "./Metadata.js"; +import type { OwnerDeploymentInfo } from "./OwnerDeploymentInfo.js"; +import type { StationFrequency } from "../StationFrequency.js"; +import type { StationTypeOfContent } from "./StationTypeOfContent.js"; export type Station = { _id: string; diff --git a/defs/db/StationFilesPreShuffleCheckpoint.ts b/defs/db/StationFilesPreShuffleCheckpoint.ts index ea5480f2..be05c552 100644 --- a/defs/db/StationFilesPreShuffleCheckpoint.ts +++ b/defs/db/StationFilesPreShuffleCheckpoint.ts @@ -1,5 +1,5 @@ // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { DateTime } from "../DateTime"; +import type { DateTime } from "../DateTime.js"; export type StationFilesPreShuffleCheckpoint = { _id: string; diff --git a/defs/db/StationPicture.ts b/defs/db/StationPicture.ts index ed280d23..0d3d242a 100644 --- a/defs/db/StationPicture.ts +++ b/defs/db/StationPicture.ts @@ -1,5 +1,5 @@ // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { DateTime } from "../DateTime"; +import type { DateTime } from "../DateTime.js"; export type StationPicture = { _id: string; diff --git a/defs/db/StationPictureVariant.ts b/defs/db/StationPictureVariant.ts index ba17bfce..330a6281 100644 --- a/defs/db/StationPictureVariant.ts +++ b/defs/db/StationPictureVariant.ts @@ -1,6 +1,6 @@ // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { DateTime } from "../DateTime"; -import type { StationPictureVariantFormat } from "./StationPictureVariantFormat"; +import type { DateTime } from "../DateTime.js"; +import type { StationPictureVariantFormat } from "./StationPictureVariantFormat.js"; export type StationPictureVariant = { _id: string; diff --git a/defs/db/StreamConnection.ts b/defs/db/StreamConnection.ts index 23c76a73..6e6a0064 100644 --- a/defs/db/StreamConnection.ts +++ b/defs/db/StreamConnection.ts @@ -1,7 +1,7 @@ // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { CountryCode } from "../CountryCode"; -import type { DateTime } from "../DateTime"; -import type { Request } from "./http/Request"; +import type { CountryCode } from "../CountryCode.js"; +import type { DateTime } from "../DateTime.js"; +import type { Request } from "./http/Request.js"; export type StreamConnection = { _id: string; diff --git a/defs/db/StreamConnectionLite.ts b/defs/db/StreamConnectionLite.ts index 7bdfadcf..72990592 100644 --- a/defs/db/StreamConnectionLite.ts +++ b/defs/db/StreamConnectionLite.ts @@ -1,6 +1,6 @@ // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { CountryCode } from "../CountryCode"; -import type { DateTime } from "../DateTime"; +import type { CountryCode } from "../CountryCode.js"; +import type { DateTime } from "../DateTime.js"; export type StreamConnectionLite = { _id: string; diff --git a/defs/db/TokenUserRecovery.ts b/defs/db/TokenUserRecovery.ts index 22e8d5a1..046d2788 100644 --- a/defs/db/TokenUserRecovery.ts +++ b/defs/db/TokenUserRecovery.ts @@ -1,5 +1,5 @@ // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { DateTime } from "../DateTime"; +import type { DateTime } from "../DateTime.js"; export type TokenUserRecovery = { _id: string; diff --git a/defs/db/TransferCheckpoint.ts b/defs/db/TransferCheckpoint.ts index caff859d..8a72f303 100644 --- a/defs/db/TransferCheckpoint.ts +++ b/defs/db/TransferCheckpoint.ts @@ -1,5 +1,5 @@ // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { DateTime } from "../DateTime"; +import type { DateTime } from "../DateTime.js"; export type TransferCheckpoint = { _id: string; diff --git a/defs/db/User.ts b/defs/db/User.ts index 7e5befaf..f44d7d91 100644 --- a/defs/db/User.ts +++ b/defs/db/User.ts @@ -1,6 +1,6 @@ // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { DateTime } from "../DateTime"; -import type { Metadata } from "./Metadata"; +import type { DateTime } from "../DateTime.js"; +import type { Metadata } from "./Metadata.js"; export type User = { _id: string; diff --git a/defs/db/UserAccountRelation.ts b/defs/db/UserAccountRelation.ts index 02e438d1..3cca8cf8 100644 --- a/defs/db/UserAccountRelation.ts +++ b/defs/db/UserAccountRelation.ts @@ -1,6 +1,6 @@ // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { DateTime } from "../DateTime"; -import type { UserAccountRelationKind } from "./UserAccountRelationKind"; +import type { DateTime } from "../DateTime.js"; +import type { UserAccountRelationKind } from "./UserAccountRelationKind.js"; export type UserAccountRelation = { _id: string; diff --git a/defs/db/UserPublicUser.ts b/defs/db/UserPublicUser.ts index e6431213..2ba64e8a 100644 --- a/defs/db/UserPublicUser.ts +++ b/defs/db/UserPublicUser.ts @@ -1,6 +1,6 @@ // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { DateTime } from "../DateTime"; -import type { Metadata } from "./Metadata"; +import type { DateTime } from "../DateTime.js"; +import type { Metadata } from "./Metadata.js"; export type UserPublicUser = { _id: string; diff --git a/defs/db/Value.ts b/defs/db/Value.ts index 1153a465..cef7c77d 100644 --- a/defs/db/Value.ts +++ b/defs/db/Value.ts @@ -1,4 +1,4 @@ // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { Document } from "./Document"; +import type { Document } from "./Document.js"; export type Value = null | boolean | number | string | Array | Document; diff --git a/defs/db/WsStatsConnection.ts b/defs/db/WsStatsConnection.ts index 96c0f2b7..03d9d33c 100644 --- a/defs/db/WsStatsConnection.ts +++ b/defs/db/WsStatsConnection.ts @@ -1,6 +1,6 @@ // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { CountryCode } from "../CountryCode"; -import type { DateTime } from "../DateTime"; +import type { CountryCode } from "../CountryCode.js"; +import type { DateTime } from "../DateTime.js"; export type WsStatsConnection = { _id: string; diff --git a/defs/db/http/Request.ts b/defs/db/http/Request.ts index 0fe60ef5..99b001bd 100644 --- a/defs/db/http/Request.ts +++ b/defs/db/http/Request.ts @@ -1,11 +1,11 @@ // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { CountryCode } from "../../CountryCode"; -import type { Headers } from "./Headers"; -import type { Method } from "./Method"; -import type { SocketAddr } from "./SocketAddr"; -import type { Uri } from "./Uri"; -import type { UserAgent } from "../../UserAgent"; -import type { Version } from "./Version"; +import type { CountryCode } from "../../CountryCode.js"; +import type { Headers } from "./Headers.js"; +import type { Method } from "./Method.js"; +import type { SocketAddr } from "./SocketAddr.js"; +import type { Uri } from "./Uri.js"; +import type { UserAgent } from "../../UserAgent.js"; +import type { Version } from "./Version.js"; export type Request = { real_ip: string; diff --git a/defs/error/PublicError.ts b/defs/error/PublicError.ts index 1d60cd40..cecd3d24 100644 --- a/defs/error/PublicError.ts +++ b/defs/error/PublicError.ts @@ -1,5 +1,5 @@ // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { PublicErrorCode } from "./PublicErrorCode"; +import type { PublicErrorCode } from "./PublicErrorCode.js"; export type PublicError = { status: number; diff --git a/defs/error/PublicErrorPayload.ts b/defs/error/PublicErrorPayload.ts index 7b5c6243..3e3e9c66 100644 --- a/defs/error/PublicErrorPayload.ts +++ b/defs/error/PublicErrorPayload.ts @@ -1,4 +1,4 @@ // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { PublicError } from "./PublicError"; +import type { PublicError } from "./PublicError.js"; export type PublicErrorPayload = { error: PublicError }; diff --git a/defs/ops/AccountPatch.ts b/defs/ops/AccountPatch.ts index 36b02c3d..895b8332 100644 --- a/defs/ops/AccountPatch.ts +++ b/defs/ops/AccountPatch.ts @@ -1,5 +1,5 @@ // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { Metadata } from "../db/Metadata"; +import type { Metadata } from "../db/Metadata.js"; export type AccountPatch = { name?: string; diff --git a/defs/ops/AdminPatch.ts b/defs/ops/AdminPatch.ts index 7285aec8..361ee8ae 100644 --- a/defs/ops/AdminPatch.ts +++ b/defs/ops/AdminPatch.ts @@ -1,5 +1,5 @@ // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { Metadata } from "../db/Metadata"; +import type { Metadata } from "../db/Metadata.js"; export type AdminPatch = { first_name?: string; diff --git a/defs/ops/StationPatch.ts b/defs/ops/StationPatch.ts index 725a914f..7f85d362 100644 --- a/defs/ops/StationPatch.ts +++ b/defs/ops/StationPatch.ts @@ -1,9 +1,9 @@ // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { CountryCode } from "../CountryCode"; -import type { LangCode } from "../LangCode"; -import type { Metadata } from "../db/Metadata"; -import type { StationFrequency } from "../StationFrequency"; -import type { StationTypeOfContent } from "../db/StationTypeOfContent"; +import type { CountryCode } from "../CountryCode.js"; +import type { LangCode } from "../LangCode.js"; +import type { Metadata } from "../db/Metadata.js"; +import type { StationFrequency } from "../StationFrequency.js"; +import type { StationTypeOfContent } from "../db/StationTypeOfContent.js"; export type StationPatch = { name?: string; diff --git a/defs/payments/api/PaymentsError.ts b/defs/payments/api/PaymentsError.ts index be8b8357..3ecd177b 100644 --- a/defs/payments/api/PaymentsError.ts +++ b/defs/payments/api/PaymentsError.ts @@ -1,4 +1,4 @@ // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { PaymentsErrorKind } from "./PaymentsErrorKind"; +import type { PaymentsErrorKind } from "./PaymentsErrorKind.js"; export type PaymentsError = { message: string } & PaymentsErrorKind; diff --git a/defs/payments/api/PaymentsErrorPayload.ts b/defs/payments/api/PaymentsErrorPayload.ts index 5bfa3604..d0757ad9 100644 --- a/defs/payments/api/PaymentsErrorPayload.ts +++ b/defs/payments/api/PaymentsErrorPayload.ts @@ -1,4 +1,4 @@ // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { PaymentsError } from "./PaymentsError"; +import type { PaymentsError } from "./PaymentsError.js"; export type PaymentsErrorPayload = { error: PaymentsError }; diff --git a/defs/qs/VisibilityQs.ts b/defs/qs/VisibilityQs.ts index 15936e86..a4aadf91 100644 --- a/defs/qs/VisibilityQs.ts +++ b/defs/qs/VisibilityQs.ts @@ -1,4 +1,4 @@ // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { VisibilityKind } from "./VisibilityKind"; +import type { VisibilityKind } from "./VisibilityKind.js"; export type VisibilityQs = { show?: VisibilityKind }; diff --git a/defs/stream-connection-stats/Stats.ts b/defs/stream-connection-stats/Stats.ts index 50eac10f..c8ec984a 100644 --- a/defs/stream-connection-stats/Stats.ts +++ b/defs/stream-connection-stats/Stats.ts @@ -1,5 +1,5 @@ // This file was generated by [ts-rs](https://github.com/Aleph-Alpha/ts-rs). Do not edit this file manually. -import type { StatsItem } from "./StatsItem"; +import type { StatsItem } from "./StatsItem.js"; export type Stats = { now: StatsItem; diff --git a/rs/config/constants/src/lib.rs b/rs/config/constants/src/lib.rs index deebfa56..ce444d83 100644 --- a/rs/config/constants/src/lib.rs +++ b/rs/config/constants/src/lib.rs @@ -213,11 +213,13 @@ pub mod validate { // urls #[const_register] - pub const VALIDATE_STATION_URLS_MAX_LEN: usize = 150; + pub const VALIDATE_STATION_URLS_MAX_LEN: usize = 200; + // see https://stackoverflow.com/questions/417142/what-is-the-maximum-length-of-a-url-in-different-browsers + // for limits on the url length // external relay url #[const_register] - pub const VALIDATE_STATION_EXTERNAL_RELAY_URL_MAX_LEN: usize = 200; + pub const VALIDATE_STATION_EXTERNAL_RELAY_URL_MAX_LEN: usize = 2_000; #[const_register] pub const VALIDATE_STATION_FREQUENCY_MAX: f64 = 100_000.0; diff --git a/rs/packages/api/Cargo.toml b/rs/packages/api/Cargo.toml index 8204228e..27065449 100644 --- a/rs/packages/api/Cargo.toml +++ b/rs/packages/api/Cargo.toml @@ -60,7 +60,7 @@ url = "2.3.1" user-agent = { version = "0.1.0", path = "../user-agent" } validate = { version = "0.1.0", path = "../validate" } modify = { path = "../modify" } -validator = { version = "0.16.1", features = ["derive"] } +validator = { version = "0.16.1", features = ["derive", "phone", "unic"] } [dev-dependencies] test-util = { version = "0.1.0", path = "../test-util" } diff --git a/rs/packages/api/src/routes/accounts/mod.rs b/rs/packages/api/src/routes/accounts/mod.rs index 8370cf9a..56a29180 100644 --- a/rs/packages/api/src/routes/accounts/mod.rs +++ b/rs/packages/api/src/routes/accounts/mod.rs @@ -186,7 +186,7 @@ pub mod post { max = "VALIDATE_ACCOUNT_NAME_MAX_LEN", message = "Account name is either too long or empty" ), - // non_control_character(message = "Account name contains invalid characters") + non_control_character(message = "Account name contains invalid characters") )] pub name: String, pub plan_id: String, diff --git a/rs/packages/api/src/routes/admins/mod.rs b/rs/packages/api/src/routes/admins/mod.rs index 5c4f5c91..7ff96992 100644 --- a/rs/packages/api/src/routes/admins/mod.rs +++ b/rs/packages/api/src/routes/admins/mod.rs @@ -130,7 +130,7 @@ pub mod post { max = "VALIDATE_ADMIN_FIRST_NAME_MAX_LEN", message = "First name is either too short or too long", ), - // non_control_character(message = "First name contains invalid characters") + non_control_character(message = "First name contains invalid characters") )] pub first_name: String, @@ -141,7 +141,7 @@ pub mod post { max = "VALIDATE_ADMIN_LAST_NAME_MAX_LEN", message = "Last name is either too short or too long", ), - // non_control_character(message = "Last name contains invalid characters") + non_control_character(message = "Last name contains invalid characters") )] pub last_name: String, @@ -153,7 +153,7 @@ pub mod post { max = "VALIDATE_ADMIN_EMAIL_MAX_LEN", message = "Email is either too short or too long", ), - // non_control_character(message = "Email contains invalid characters") + non_control_character(message = "Email contains invalid characters") )] pub email: String, diff --git a/rs/packages/api/src/routes/auth/user/register.rs b/rs/packages/api/src/routes/auth/user/register.rs index efdee4a2..f13a66fe 100644 --- a/rs/packages/api/src/routes/auth/user/register.rs +++ b/rs/packages/api/src/routes/auth/user/register.rs @@ -170,7 +170,7 @@ pub mod post { max = "VALIDATE_USER_FIRST_NAME_MAX_LEN", message = "First name is either too short or too long" ), - // non_control_character(message = "First name contains invalid characters") + non_control_character(message = "First name contains invalid characters") )] first_name: String, @@ -181,7 +181,7 @@ pub mod post { max = "VALIDATE_USER_LAST_NAME_MAX_LEN", message = "Last name is either too short or too long" ), - // non_control_character(message = "Last name contains invalid characters") + non_control_character(message = "Last name contains invalid characters") )] last_name: String, @@ -192,7 +192,7 @@ pub mod post { max = "VALIDATE_ACCOUNT_NAME_MAX_LEN", message = "Account name is either too short or too long" ), - // non_control_character(message = "Account name contains invalid characters") + non_control_character(message = "Account name contains invalid characters") )] account_name: String, @@ -206,7 +206,7 @@ pub mod post { max = "VALIDATE_USER_EMAIL_MAX_LEN", message = "Email is either too short or too long" ), - // non_control_character(message = "Email contains invalid characters") + non_control_character(message = "Email contains invalid characters") )] email: String, @@ -221,7 +221,7 @@ pub mod post { #[validate( phone(message = "Phone is invalid"), length(max = "VALIDATE_USER_PHONE_MAX_LEN", message = "Phone is too long"), - // non_control_character(message = "Phone name contains invalid characters") + non_control_character(message = "Phone name contains invalid characters") )] phone: Option, @@ -232,7 +232,7 @@ pub mod post { max = "VALIDATE_USER_LANGUAGE_MAX_LEN", message = "Language is too long" ), - // non_control_character(message = "Language contains invalid characters") + non_control_character(message = "Language contains invalid characters") )] language: Option, diff --git a/rs/packages/api/src/routes/invitations/accept.rs b/rs/packages/api/src/routes/invitations/accept.rs index b8483970..587deecc 100644 --- a/rs/packages/api/src/routes/invitations/accept.rs +++ b/rs/packages/api/src/routes/invitations/accept.rs @@ -61,7 +61,7 @@ pub mod post { max = "VALIDATE_USER_FIRST_NAME_MAX_LEN", message = "First name is either too short or too long" ), - // non_control_character(message = "First name contains invalid characters") + non_control_character(message = "First name contains invalid characters") )] pub first_name: String, @@ -72,7 +72,7 @@ pub mod post { max = "VALIDATE_USER_LAST_NAME_MAX_LEN", message = "Last name is either too short or too long" ), - // non_control_character(message = "Last name contains invalid characters") + non_control_character(message = "Last name contains invalid characters") )] pub last_name: String, @@ -84,7 +84,7 @@ pub mod post { max = "VALIDATE_USER_PHONE_MAX_LEN", message = "Phone number is either too short or too long" ), - // non_control_character(message = "Phone number contains invalid characters") + non_control_character(message = "Phone number contains invalid characters") )] pub phone: Option, diff --git a/rs/packages/api/src/routes/invitations/mod.rs b/rs/packages/api/src/routes/invitations/mod.rs index de0c0338..4ea05445 100644 --- a/rs/packages/api/src/routes/invitations/mod.rs +++ b/rs/packages/api/src/routes/invitations/mod.rs @@ -351,7 +351,7 @@ pub mod post { max = "VALIDATE_USER_EMAIL_MAX_LEN", message = "Email is either too short or too long", ), - // non_control_character(message = "Email contains invalid characters") + non_control_character(message = "Email contains invalid characters") )] pub email: String, } diff --git a/rs/packages/api/src/routes/me/api_keys/id.rs b/rs/packages/api/src/routes/me/api_keys/id.rs index 5ef12fed..c85c3f2d 100644 --- a/rs/packages/api/src/routes/me/api_keys/id.rs +++ b/rs/packages/api/src/routes/me/api_keys/id.rs @@ -158,7 +158,7 @@ pub mod patch { max = "VALIDATE_ACCESS_TOKEN_TITLE_MAX_LEN", message = "Title is either too short or too long" ), - // non_control_character(message = "Title contains invalid characters") + non_control_character(message = "Title contains invalid characters") )] title: Option, } diff --git a/rs/packages/api/src/routes/me/api_keys/mod.rs b/rs/packages/api/src/routes/me/api_keys/mod.rs index cf8ac9f6..869022c0 100644 --- a/rs/packages/api/src/routes/me/api_keys/mod.rs +++ b/rs/packages/api/src/routes/me/api_keys/mod.rs @@ -228,7 +228,7 @@ pub mod post { max = "VALIDATE_ACCESS_TOKEN_TITLE_MAX_LEN", message = "API key title is either too short or too long", ), - // non_control_character(message = "API key title contains invalid characters") + non_control_character(message = "API key title contains invalid characters") )] title: String, password: String, diff --git a/rs/packages/api/src/routes/plans/id.rs b/rs/packages/api/src/routes/plans/id.rs index 6886fc15..c141e589 100644 --- a/rs/packages/api/src/routes/plans/id.rs +++ b/rs/packages/api/src/routes/plans/id.rs @@ -205,7 +205,7 @@ pub mod patch { max = "VALIDATE_PLAN_IDENTIFIER_MAX_LEN", message = "Identifier is either too short or too long" ), - // non_control_character(message = "Identifier contains invalid characters") + non_control_character(message = "Identifier contains invalid characters") )] identifier: Option, @@ -217,7 +217,7 @@ pub mod patch { max = "VALIDATE_PLAN_SLUG_MAX_LEN", message = "Slug is either too short or too long" ), - // non_control_character(message = "Slug contains invalid characters") + non_control_character(message = "Slug contains invalid characters") )] slug: Option, @@ -229,7 +229,7 @@ pub mod patch { max = "VALIDATE_PLAN_NAME_MAX_LEN", message = "Display name is either too short or too long" ), - // non_control_character(message = "Display name contains invalid characters") + non_control_character(message = "Display name contains invalid characters") )] display_name: Option, diff --git a/rs/packages/api/src/routes/plans/mod.rs b/rs/packages/api/src/routes/plans/mod.rs index e4f45647..0f612db1 100644 --- a/rs/packages/api/src/routes/plans/mod.rs +++ b/rs/packages/api/src/routes/plans/mod.rs @@ -150,7 +150,7 @@ pub mod post { max = "VALIDATE_PLAN_IDENTIFIER_MAX_LEN", message = "Identifier is either too short or too long" ), - // non_control_character(message = "Identifier contains invalid characters") + non_control_character(message = "Identifier contains invalid characters") )] pub identifier: String, @@ -161,7 +161,7 @@ pub mod post { max = "VALIDATE_PLAN_SLUG_MAX_LEN", message = "Slug is either too short or too long" ), - // non_control_character(message = "Slug contains invalid characters") + non_control_character(message = "Slug contains invalid characters") )] pub slug: String, @@ -172,7 +172,7 @@ pub mod post { max = "VALIDATE_PLAN_NAME_MAX_LEN", message = "Display name is either too short or too long" ), - // non_control_character(message = "Display name contains invalid characters") + non_control_character(message = "Display name contains invalid characters") )] pub display_name: String, diff --git a/rs/packages/api/src/routes/stations/files/metadata.rs b/rs/packages/api/src/routes/stations/files/metadata.rs index afffbeb5..4f9e1cd2 100644 --- a/rs/packages/api/src/routes/stations/files/metadata.rs +++ b/rs/packages/api/src/routes/stations/files/metadata.rs @@ -45,7 +45,7 @@ pub mod put { max = "VALIDATE_AUDIO_FILE_METADATA_TITLE_MAX_LEN", message = "Title is too long" ), - // non_control_character(message = "Title contains invalid characters") + non_control_character(message = "Title contains invalid characters") )] pub title: Option>, @@ -61,7 +61,7 @@ pub mod put { max = "VALIDATE_AUDIO_FILE_METADATA_ARTIST_MAX_LEN", message = "Artist is too long" ), - // non_control_character(message = "Artist contains invalid characters") + non_control_character(message = "Artist contains invalid characters") )] pub artist: Option>, @@ -77,7 +77,7 @@ pub mod put { max = "VALIDATE_AUDIO_FILE_METADATA_ALBUM_MAX_LEN", message = "Album is too long" ), - // non_control_character(message = "Album contains invalid characters") + non_control_character(message = "Album contains invalid characters") )] pub album: Option>, @@ -93,7 +93,7 @@ pub mod put { max = "VALIDATE_AUDIO_FILE_METADATA_ALBUM_ARTIST_MAX_LEN", message = "Album artist is too long" ), - // non_control_character(message = "Album artist contains invalid characters") + non_control_character(message = "Album artist contains invalid characters") )] pub album_artist: Option>, @@ -109,7 +109,7 @@ pub mod put { max = "VALIDATE_AUDIO_FILE_METADATA_GENRE_MAX_LEN", message = "Genre is too long" ), - // non_control_character(message = "Genre contains invalid characters") + non_control_character(message = "Genre contains invalid characters") )] pub genre: Option>, @@ -133,7 +133,7 @@ pub mod put { max = "VALIDATE_AUDIO_FILE_METADATA_COMMENT_MAX_LEN", message = "Comment is too long" ), - // non_control_character(message = "Comment contains invalid characters") + non_control_character(message = "Comment contains invalid characters") )] pub comment: Option>, diff --git a/rs/packages/api/src/routes/stations/mod.rs b/rs/packages/api/src/routes/stations/mod.rs index be93a74f..4940bc5e 100644 --- a/rs/packages/api/src/routes/stations/mod.rs +++ b/rs/packages/api/src/routes/stations/mod.rs @@ -187,7 +187,7 @@ pub mod post { max = "VALIDATE_STATION_NAME_MAX_LEN", message = "Station name is empty or too long" ), - // non_control_character(message = "Station name cannot have control characters") + non_control_character(message = "Station name cannot have control characters") )] pub name: String, @@ -199,7 +199,7 @@ pub mod post { max = "VALIDATE_STATION_SLOGAN_MAX_LEN", message = "Slogan is empty or too long" ), - // non_control_character(message = "Slogan cannot have control characters") + non_control_character(message = "Slogan cannot have control characters") )] pub slogan: Option, @@ -221,7 +221,7 @@ pub mod post { #[validate( email(message = "Email is invalid"), length(max = "VALIDATE_STATION_EMAIL_MAX_LEN", message = "Email is too long"), - // non_control_character(message = "Email cannot have control characters") + non_control_character(message = "Email cannot have control characters") )] pub email: Option, @@ -230,7 +230,7 @@ pub mod post { #[validate( phone(message = "Phone is invalid"), length(max = "VALIDATE_STATION_PHONE_MAX_LEN", message = "Phone is too long"), - // non_control_character(message = "Phone cannot have control characters") + non_control_character(message = "Phone cannot have control characters") )] pub phone: Option, @@ -242,7 +242,7 @@ pub mod post { max = "VALIDATE_STATION_WHATSAPP_MAX_LEN", message = "WhatsApp number is too long" ), - // non_control_character(message = "WhatsApp number cannot have control characters") + non_control_character(message = "WhatsApp number cannot have control characters") )] pub whatsapp: Option, @@ -255,7 +255,7 @@ pub mod post { max = "VALIDATE_STATION_URLS_MAX_LEN", message = "Website URL is too long" ), - // non_control_character(message = "Website URL cannot have control characters") + non_control_character(message = "Website URL cannot have control characters") )] pub website_url: Option, @@ -268,7 +268,7 @@ pub mod post { max = "VALIDATE_STATION_URLS_MAX_LEN", message = "Twitter URL is too long" ), - // non_control_character(message = "Twitter URL cannot have control characters") + non_control_character(message = "Twitter URL cannot have control characters") )] pub twitter_url: Option, @@ -281,7 +281,7 @@ pub mod post { max = "VALIDATE_STATION_URLS_MAX_LEN", message = "Facebook URL is too long" ), - // non_control_character(message = "Facebook URL cannot have control characters") + non_control_character(message = "Facebook URL cannot have control characters") )] pub facebook_url: Option, @@ -294,7 +294,7 @@ pub mod post { max = "VALIDATE_STATION_URLS_MAX_LEN", message = "Instagram URL is too long" ), - // non_control_character(message = "Instagram URL cannot have control characters") + non_control_character(message = "Instagram URL cannot have control characters") )] pub instagram_url: Option, @@ -307,7 +307,7 @@ pub mod post { max = "VALIDATE_STATION_URLS_MAX_LEN", message = "Threads URL is too long" ), - // non_control_character(message = "Threads URL cannot have control characters") + non_control_character(message = "Threads URL cannot have control characters") )] pub threads_url: Option, @@ -320,7 +320,7 @@ pub mod post { max = "VALIDATE_STATION_URLS_MAX_LEN", message = "Youtube URL is too long" ), - // non_control_character(message = "Youtube URL cannot have control characters") + non_control_character(message = "Youtube URL cannot have control characters") )] pub youtube_url: Option, @@ -333,7 +333,7 @@ pub mod post { max = "VALIDATE_STATION_URLS_MAX_LEN", message = "Twitch URL is too long" ), - // non_control_character(message = "Twitch URL cannot have control characters") + non_control_character(message = "Twitch URL cannot have control characters") )] pub twitch_url: Option, @@ -345,7 +345,7 @@ pub mod post { max = "VALIDATE_STATION_URLS_MAX_LEN", message = "TikTok URL is invalid" ), - // non_control_character(message = "TikTok URL cannot have control characters") + non_control_character(message = "TikTok URL cannot have control characters") )] pub tiktok_url: Option, @@ -357,7 +357,7 @@ pub mod post { max = "VALIDATE_STATION_URLS_MAX_LEN", message = "Spotify URL is invalid" ), - // non_control_character(message = "Spotify URL cannot have control characters") + non_control_character(message = "Spotify URL cannot have control characters") )] pub spotify_url: Option, @@ -369,7 +369,7 @@ pub mod post { max = "VALIDATE_STATION_URLS_MAX_LEN", message = "RadioCut URL is invalid" ), - // non_control_character(message = "RadioCut URL cannot have control characters") + non_control_character(message = "RadioCut URL cannot have control characters") )] pub radiocut_url: Option, @@ -382,7 +382,7 @@ pub mod post { max = "VALIDATE_STATION_URLS_MAX_LEN", message = "Google Play URL is too long" ), - // non_control_character(message = "Google Play URL cannot have control characters") + non_control_character(message = "Google Play URL cannot have control characters") )] pub google_play_url: Option, @@ -395,7 +395,7 @@ pub mod post { max = "VALIDATE_STATION_URLS_MAX_LEN", message = "App Store URL is too long" ), - // non_control_character(message = "App Store URL cannot have control characters") + non_control_character(message = "App Store URL cannot have control characters") )] pub app_store_url: Option, @@ -411,7 +411,7 @@ pub mod post { max = "VALIDATE_STATION_EXTERNAL_RELAY_URL_MAX_LEN", message = "External Relay URL is too long" ), - // non_control_character(message = "External Relay URL cannot have control characters") + non_control_character(message = "External Relay URL cannot have control characters") )] pub external_relay_url: Option, diff --git a/rs/packages/api/src/routes/users/id.rs b/rs/packages/api/src/routes/users/id.rs index eb107213..65e27baa 100644 --- a/rs/packages/api/src/routes/users/id.rs +++ b/rs/packages/api/src/routes/users/id.rs @@ -84,7 +84,7 @@ pub mod patch { max = "VALIDATE_USER_FIRST_NAME_MAX_LEN", message = "First name is either too long or too short" ), - // non_control_character(message = "First name contains invalid characters") + non_control_character(message = "First name contains invalid characters") )] first_name: Option, @@ -95,7 +95,7 @@ pub mod patch { max = "VALIDATE_USER_LAST_NAME_MAX_LEN", message = "Last name is either too long or too short" ), - // non_control_character(message = "Last name contains invalid characters") + non_control_character(message = "Last name contains invalid characters") )] last_name: Option, @@ -127,7 +127,7 @@ pub mod patch { max = "VALIDATE_USER_LANGUAGE_MAX_LEN", message = "Language is either too long or too short" ), - // non_control_character(message = "Language contains invalid characters") + non_control_character(message = "Language contains invalid characters") )] language: Option>, } diff --git a/rs/packages/api/src/routes/users/mod.rs b/rs/packages/api/src/routes/users/mod.rs index f4f1e30d..5ad43e01 100644 --- a/rs/packages/api/src/routes/users/mod.rs +++ b/rs/packages/api/src/routes/users/mod.rs @@ -140,7 +140,7 @@ pub mod post { max = "VALIDATE_USER_EMAIL_MAX_LEN", message = "Email is either too short or too long" ), - // non_control_character(message = "Email contains invalid characters") + non_control_character(message = "Email contains invalid characters") )] email: String, @@ -169,7 +169,7 @@ pub mod post { max = "VALIDATE_USER_FIRST_NAME_MAX_LEN", message = "First name is either too short or too long" ), - // non_control_character(message = "First name contains invalid characters") + non_control_character(message = "First name contains invalid characters") )] first_name: String, @@ -180,7 +180,7 @@ pub mod post { max = "VALIDATE_USER_LAST_NAME_MAX_LEN", message = "Last name is either too short or too long" ), - // non_control_character(message = "Last name contains invalid characters") + non_control_character(message = "Last name contains invalid characters") )] last_name: String, @@ -192,7 +192,7 @@ pub mod post { max = "VALIDATE_USER_LANGUAGE_MAX_LEN", message = "Language is either too short or too long" ), - // non_control_character(message = "Language contains invalid characters") + non_control_character(message = "Language contains invalid characters") )] language: Option, diff --git a/rs/packages/db/Cargo.toml b/rs/packages/db/Cargo.toml index 542a0bf9..9654e684 100644 --- a/rs/packages/db/Cargo.toml +++ b/rs/packages/db/Cargo.toml @@ -48,7 +48,7 @@ rand = "0.8.5" static_init = "1.0.3" parking_lot = "0.12.1" modify = { path = "../modify" } -validator = { version = "0.16.1", features = ["derive"] } +validator = { version = "0.16.1", features = ["derive", "phone", "unic"] } ril = { version = "0.9.0", features = ["all"] } lazy-regex = "2.5.0" geoip = { version = "0.1.0", path = "../geoip" } diff --git a/rs/packages/db/src/models/account/mod.rs b/rs/packages/db/src/models/account/mod.rs index d354f829..d480ebde 100644 --- a/rs/packages/db/src/models/account/mod.rs +++ b/rs/packages/db/src/models/account/mod.rs @@ -75,7 +75,7 @@ pub struct AccountPatch { max = "VALIDATE_ACCOUNT_NAME_MAX_LEN", message = "Account name is either too short or too long", ), - // non_control_character(message = "Account name cannot have control characters") + non_control_character(message = "Account name cannot have control characters") )] pub name: Option, #[serde(skip_serializing_if = "Option::is_none")] diff --git a/rs/packages/db/src/models/admin/mod.rs b/rs/packages/db/src/models/admin/mod.rs index 3673e80c..8d7efea1 100644 --- a/rs/packages/db/src/models/admin/mod.rs +++ b/rs/packages/db/src/models/admin/mod.rs @@ -70,7 +70,7 @@ pub struct AdminPatch { max = "VALIDATE_ADMIN_FIRST_NAME_MAX_LEN", message = "First name is either too short or too long", ), - // non_control_character(message = "Fist name cannot contain control characters") + non_control_character(message = "Fist name cannot contain control characters") )] pub first_name: Option, #[serde(skip_serializing_if = "Option::is_none")] @@ -81,7 +81,7 @@ pub struct AdminPatch { max = "VALIDATE_ADMIN_LAST_NAME_MAX_LEN", message = "Last name is either too short or too long", ), - // non_control_character(message = "Last name cannot contain control characters") + non_control_character(message = "Last name cannot contain control characters") )] pub last_name: Option, #[serde(skip_serializing_if = "Option::is_none")] diff --git a/rs/packages/db/src/models/station/mod.rs b/rs/packages/db/src/models/station/mod.rs index 1ba4f18b..5171d379 100644 --- a/rs/packages/db/src/models/station/mod.rs +++ b/rs/packages/db/src/models/station/mod.rs @@ -39,7 +39,7 @@ pub struct Station { max = "VALIDATE_STATION_NAME_MAX_LEN", message = "Station name is empty or too long" ), - // non_control_character(message = "Station name cannot have control characters") + non_control_character(message = "Station name cannot have control characters") )] pub name: String, @@ -52,7 +52,7 @@ pub struct Station { max = "VALIDATE_STATION_SLOGAN_MAX_LEN", message = "Slogan is empty or too long" ), - // non_control_character(message = "Slogan cannot have control characters") + non_control_character(message = "Slogan cannot have control characters") )] pub slogan: Option, @@ -82,7 +82,7 @@ pub struct Station { #[validate( email(message = "Email is invalid"), length(max = "VALIDATE_STATION_EMAIL_MAX_LEN", message = "Email is too long"), - // non_control_character(message = "Email cannot have control characters") + non_control_character(message = "Email cannot have control characters") )] pub email: Option, @@ -90,7 +90,7 @@ pub struct Station { #[validate( phone(message = "Phone is invalid"), length(max = "VALIDATE_STATION_PHONE_MAX_LEN", message = "Phone is too long"), - // non_control_character(message = "Phone is invalid") + non_control_character(message = "Phone is invalid") )] pub phone: Option, @@ -101,7 +101,7 @@ pub struct Station { max = "VALIDATE_STATION_WHATSAPP_MAX_LEN", message = "WhatsApp number is too long" ), - // non_control_character(message = "WhatsApp number cannot have control characters") + non_control_character(message = "WhatsApp number cannot have control characters") )] pub whatsapp: Option, @@ -114,7 +114,7 @@ pub struct Station { max = "VALIDATE_STATION_URLS_MAX_LEN", message = "Website URL is too long" ), - // non_control_character(message = "Website URL cannot have control characters") + non_control_character(message = "Website URL cannot have control characters") )] pub website_url: Option, @@ -126,7 +126,7 @@ pub struct Station { max = "VALIDATE_STATION_URLS_MAX_LEN", message = "Twitter URL is too long" ), - // non_control_character(message = "Twitter URL cannot have control characters") + non_control_character(message = "Twitter URL cannot have control characters") )] pub twitter_url: Option, @@ -138,7 +138,7 @@ pub struct Station { max = "VALIDATE_STATION_URLS_MAX_LEN", message = "Facebook URL is too long" ), - // non_control_character(message = "Facebook URL cannot have control characters") + non_control_character(message = "Facebook URL cannot have control characters") )] pub facebook_url: Option, @@ -150,7 +150,7 @@ pub struct Station { max = "VALIDATE_STATION_URLS_MAX_LEN", message = "Instagram URL is too long" ), - // non_control_character(message = "Instagram URL cannot have control characters") + non_control_character(message = "Instagram URL cannot have control characters") )] pub instagram_url: Option, @@ -162,7 +162,7 @@ pub struct Station { max = "VALIDATE_STATION_URLS_MAX_LEN", message = "Threads URL is too long" ), - // non_control_character(message = "Threads URL cannot have control characters") + non_control_character(message = "Threads URL cannot have control characters") )] pub threads_url: Option, @@ -174,7 +174,7 @@ pub struct Station { max = "VALIDATE_STATION_URLS_MAX_LEN", message = "Youtube URL is too long" ), - // non_control_character(message = "Youtube URL cannot have control characters") + non_control_character(message = "Youtube URL cannot have control characters") )] pub youtube_url: Option, @@ -186,7 +186,7 @@ pub struct Station { max = "VALIDATE_STATION_URLS_MAX_LEN", message = "Twitch URL is too long" ), - // non_control_character(message = "Twitch URL cannot have control characters") + non_control_character(message = "Twitch URL cannot have control characters") )] pub twitch_url: Option, @@ -198,7 +198,7 @@ pub struct Station { max = "VALIDATE_STATION_URLS_MAX_LEN", message = "TikTok URL is invalid" ), - // non_control_character(message = "TikTok URL cannot have control characters") + non_control_character(message = "TikTok URL cannot have control characters") )] pub tiktok_url: Option, @@ -210,7 +210,7 @@ pub struct Station { max = "VALIDATE_STATION_URLS_MAX_LEN", message = "Spotify URL is invalid" ), - // non_control_character(message = "Spotify URL cannot have control characters") + non_control_character(message = "Spotify URL cannot have control characters") )] pub spotify_url: Option, @@ -222,7 +222,7 @@ pub struct Station { max = "VALIDATE_STATION_URLS_MAX_LEN", message = "RadioCut URL is invalid" ), - // non_control_character(message = "RadioCut URL cannot have control characters") + non_control_character(message = "RadioCut URL cannot have control characters") )] pub radiocut_url: Option, @@ -235,7 +235,7 @@ pub struct Station { max = "VALIDATE_STATION_URLS_MAX_LEN", message = "Google Play URL is too long" ), - // non_control_character(message = "Google Play URL cannot have control characters") + non_control_character(message = "Google Play URL cannot have control characters") )] pub google_play_url: Option, @@ -247,7 +247,7 @@ pub struct Station { max = "VALIDATE_STATION_URLS_MAX_LEN", message = "App Store URL is too long" ), - // non_control_character(message = "App Store URL cannot have control characters") + non_control_character(message = "App Store URL cannot have control characters") )] pub app_store_url: Option, @@ -451,7 +451,7 @@ pub struct StationPatch { max = "VALIDATE_STATION_NAME_MAX_LEN", message = "Station name is empty or too long" ), - // non_control_character(message = "Station name cannot have control characters") + non_control_character(message = "Station name cannot have control characters") )] pub name: Option, @@ -471,7 +471,7 @@ pub struct StationPatch { max = "VALIDATE_STATION_SLOGAN_MAX_LEN", message = "Slogan is empty or too long" ), - // non_control_character(message = "Slogan cannot have control characters") + non_control_character(message = "Slogan cannot have control characters") )] pub slogan: Option>, @@ -530,7 +530,7 @@ pub struct StationPatch { #[validate( email(message = "Email is invalid"), length(max = "VALIDATE_STATION_EMAIL_MAX_LEN", message = "Email is too long"), - // non_control_character(message = "Email cannot have control characters") + non_control_character(message = "Email cannot have control characters") )] pub email: Option>, @@ -544,7 +544,7 @@ pub struct StationPatch { #[validate( phone(message = "Phone is invalid"), length(max = "VALIDATE_STATION_PHONE_MAX_LEN", message = "Phone is too long"), - // non_control_character(message = "Phone cannot have control characters") + non_control_character(message = "Phone cannot have control characters") )] pub phone: Option>, @@ -561,7 +561,7 @@ pub struct StationPatch { max = "VALIDATE_STATION_WHATSAPP_MAX_LEN", message = "WhatsApp number is too long" ), - // non_control_character(message = "WhatsApp number cannot have control characters") + non_control_character(message = "WhatsApp number cannot have control characters") )] pub whatsapp: Option>, @@ -580,7 +580,7 @@ pub struct StationPatch { max = "VALIDATE_STATION_URLS_MAX_LEN", message = "Website URL is too long" ), - // non_control_character(message = "Website URL cannot have control characters") + non_control_character(message = "Website URL cannot have control characters") )] pub website_url: Option>, @@ -598,7 +598,7 @@ pub struct StationPatch { max = "VALIDATE_STATION_URLS_MAX_LEN", message = "Twitter URL is too long" ), - // non_control_character(message = "Twitter URL cannot have control characters") + non_control_character(message = "Twitter URL cannot have control characters") )] pub twitter_url: Option>, @@ -616,7 +616,7 @@ pub struct StationPatch { max = "VALIDATE_STATION_URLS_MAX_LEN", message = "Facebook URL is too long" ), - // non_control_character(message = "Facebook URL cannot have control characters") + non_control_character(message = "Facebook URL cannot have control characters") )] pub facebook_url: Option>, @@ -634,7 +634,7 @@ pub struct StationPatch { max = "VALIDATE_STATION_URLS_MAX_LEN", message = "Instagram URL is too long" ), - // non_control_character(message = "Instagram URL cannot have control characters") + non_control_character(message = "Instagram URL cannot have control characters") )] pub instagram_url: Option>, @@ -652,7 +652,7 @@ pub struct StationPatch { max = "VALIDATE_STATION_URLS_MAX_LEN", message = "Threads URL is too long" ), - // non_control_character(message = "Threads URL cannot have control characters") + non_control_character(message = "Threads URL cannot have control characters") )] pub threads_url: Option>, @@ -670,7 +670,7 @@ pub struct StationPatch { max = "VALIDATE_STATION_URLS_MAX_LEN", message = "Youtube URL is too long" ), - // non_control_character(message = "Youtube URL cannot have control characters") + non_control_character(message = "Youtube URL cannot have control characters") )] pub youtube_url: Option>, @@ -688,7 +688,7 @@ pub struct StationPatch { max = "VALIDATE_STATION_URLS_MAX_LEN", message = "Twitch URL is too long" ), - // non_control_character(message = "Twitch URL cannot have control characters") + non_control_character(message = "Twitch URL cannot have control characters") )] pub twitch_url: Option>, @@ -706,7 +706,7 @@ pub struct StationPatch { max = "VALIDATE_STATION_URLS_MAX_LEN", message = "TikTok URL is invalid" ), - // non_control_character(message = "TikTok URL cannot have control characters") + non_control_character(message = "TikTok URL cannot have control characters") )] pub tiktok_url: Option>, @@ -724,7 +724,7 @@ pub struct StationPatch { max = "VALIDATE_STATION_URLS_MAX_LEN", message = "Spotify URL is invalid" ), - // non_control_character(message = "Spotify URL cannot have control characters") + non_control_character(message = "Spotify URL cannot have control characters") )] pub spotify_url: Option>, @@ -742,7 +742,7 @@ pub struct StationPatch { max = "VALIDATE_STATION_URLS_MAX_LEN", message = "RadioCut URL is invalid" ), - // non_control_character(message = "RadioCut URL cannot have control characters") + non_control_character(message = "RadioCut URL cannot have control characters") )] pub radiocut_url: Option>, @@ -761,7 +761,7 @@ pub struct StationPatch { max = "VALIDATE_STATION_URLS_MAX_LEN", message = "Google Play URL is too long" ), - // non_control_character(message = "Google Play URL cannot have control characters") + non_control_character(message = "Google Play URL cannot have control characters") )] pub google_play_url: Option>, @@ -779,7 +779,7 @@ pub struct StationPatch { max = "VALIDATE_STATION_URLS_MAX_LEN", message = "App Store URL is too long" ), - // non_control_character(message = "App Store URL cannot have control characters") + non_control_character(message = "App Store URL cannot have control characters") )] pub app_store_url: Option>, @@ -797,7 +797,7 @@ pub struct StationPatch { max = "VALIDATE_STATION_EXTERNAL_RELAY_URL_MAX_LEN", message = "External Relay URL is too long" ), - // non_control_character(message = "External Relay URL cannot have control characters") + non_control_character(message = "External Relay URL cannot have control characters") )] pub external_relay_url: Option>, diff --git a/rs/packages/prex/Cargo.toml b/rs/packages/prex/Cargo.toml index 4a371960..010d8937 100644 --- a/rs/packages/prex/Cargo.toml +++ b/rs/packages/prex/Cargo.toml @@ -26,7 +26,7 @@ tungstenite = "0.21.0" pin-project-lite = "0.2.13" hyper-util = "0.1.2" modify = { path = "../modify" } -validator = { version = "0.16.1", features = ["derive"] } +validator = { version = "0.16.1", features = ["derive", "phone", "unic"] } [dev-dependencies] test-util = { version = "0.1.0", path = "../test-util" } diff --git a/rs/patches/ts-rs/ts-rs/src/export.rs b/rs/patches/ts-rs/ts-rs/src/export.rs index d023ccb2..69adb86f 100644 --- a/rs/patches/ts-rs/ts-rs/src/export.rs +++ b/rs/patches/ts-rs/ts-rs/src/export.rs @@ -113,12 +113,17 @@ fn generate_imports(out: &mut String) -> Result<(), ExportError> fn import_path(from: &Path, import: &Path) -> String { let rel_path = diff_paths(import, from.parent().unwrap()).expect("failed to calculate import path"); - match rel_path.components().next() { + + let mut str = match rel_path.components().next() { Some(Component::Normal(_)) => format!("./{}", rel_path.to_string_lossy()), _ => rel_path.to_string_lossy().into(), } .trim_end_matches(".ts") - .to_owned() + .to_owned(); + + str.push_str(".js"); + + str } // Construct a relative path from a provided base directory path to the provided path.