Skip to content

A free and open source instant messaging and VoIP chat app built for friends, groups, and communities.

TypeScript fluxerfluxerapp

feat(api): app store readiness for the iOS app (#3839)

Hampus90d03a36563f
diff --git a/fluxer_admin/openapi-admin.json b/fluxer_admin/openapi-admin.json
index 67f518ff6..38896e99c 100644
--- a/fluxer_admin/openapi-admin.json
+++ b/fluxer_admin/openapi-admin.json
@@ -16591,6 +16591,7 @@
"global_name": {"nullable": true, "type": "string"},
"bio": {"nullable": true, "type": "string"},
"pronouns": {"nullable": true, "type": "string"},
+ "custom_status": {"nullable": true, "type": "string"},
"avatar": {
"nullable": true,
"type": "object",
@@ -16624,7 +16625,17 @@
"additionalProperties": false
}
},
- "required": ["id", "username", "discriminator", "global_name", "bio", "pronouns", "avatar", "banner"],
+ "required": [
+ "id",
+ "username",
+ "discriminator",
+ "global_name",
+ "bio",
+ "pronouns",
+ "custom_status",
+ "avatar",
+ "banner"
+ ],
"additionalProperties": false
},
"member": {
diff --git a/fluxer_api/pkgs/email/src/EmailService.ts b/fluxer_api/pkgs/email/src/EmailService.ts
index 6b42d424f..8bf57a559 100644
--- a/fluxer_api/pkgs/email/src/EmailService.ts
+++ b/fluxer_api/pkgs/email/src/EmailService.ts
@@ -266,6 +266,7 @@ type ReplyInbox = 'appeals' | 'privacy' | 'safety' | 'support';
const EMAIL_REPLY_INBOX: Record<EmailTemplateKey, ReplyInbox> = {
account_deletion_cancelled: 'safety',
+ account_deletion_completed: 'support',
account_deletion_scheduled_inactivity: 'support',
account_deletion_scheduled_requested: 'safety',
bulk_message_deletion_completed: 'privacy',
@@ -612,6 +613,9 @@ export class EmailService implements IEmailService {
account_deletion_cancelled: async (email, _params, locale) => {
return this.sendTemplatedEmail(email, 'account_deletion_cancelled', locale, {});
},
+ account_deletion_completed: async (email, _params, locale) => {
+ return this.sendTemplatedEmail(email, 'account_deletion_completed', locale, {});
+ },
inactivity_warning: async (email, {deletionDate, lastActiveDate}, locale) => {
const loginUrl = `${this.config.appBaseUrl}/login`;
return this.sendTemplatedEmail(
diff --git a/fluxer_api/pkgs/email/src/IEmailService.ts b/fluxer_api/pkgs/email/src/IEmailService.ts
index fbb35d98d..efb56e4a1 100644
--- a/fluxer_api/pkgs/email/src/IEmailService.ts
+++ b/fluxer_api/pkgs/email/src/IEmailService.ts
@@ -404,6 +404,7 @@ export interface EmailSendParams {
account_deletion_scheduled_requested: {deletionDate: string};
account_deletion_scheduled_inactivity: {deletionDate: string};
account_deletion_cancelled: Record<string, never>;
+ account_deletion_completed: Record<string, never>;
inactivity_warning: {deletionDate: Date; lastActiveDate: Date};
enforcement_notice: EmailTemplateVariables['enforcement_notice'];
enforcement_ended: EmailTemplateVariables['enforcement_ended'];
diff --git a/fluxer_api/pkgs/email/src/TestEmailService.ts b/fluxer_api/pkgs/email/src/TestEmailService.ts
index 4cc67b6ce..9533eafe8 100644
--- a/fluxer_api/pkgs/email/src/TestEmailService.ts
+++ b/fluxer_api/pkgs/email/src/TestEmailService.ts
@@ -131,6 +131,9 @@ export class TestEmailService implements IEmailService {
account_deletion_cancelled: async (email, _params) => {
return this.record(email, 'account_deletion_cancelled');
},
+ account_deletion_completed: async (email, _params) => {
+ return this.record(email, 'account_deletion_completed');
+ },
inactivity_warning: async (email, {deletionDate, lastActiveDate}) => {
return this.record(email, 'inactivity_warning', {
deletion_date: deletionDate.toISOString(),
diff --git a/fluxer_api/pkgs/email/src/email_html/EmailHtmlRenderer.test.ts b/fluxer_api/pkgs/email/src/email_html/EmailHtmlRenderer.test.ts
index 1c413c351..9a4cc672a 100644
--- a/fluxer_api/pkgs/email/src/email_html/EmailHtmlRenderer.test.ts
+++ b/fluxer_api/pkgs/email/src/email_html/EmailHtmlRenderer.test.ts
@@ -221,6 +221,11 @@ const EMAILS: Array<[string, string | null, Send]> = [
null,
(service, locale) => service.send('account_deletion_cancelled', USER, {}, locale),
],
+ [
+ 'account_deletion_completed',
+ null,
+ (service, locale) => service.send('account_deletion_completed', USER, {}, locale),
+ ],
[
'account_deletion_scheduled_requested',
null,
diff --git a/fluxer_api/pkgs/email/src/email_i18n/EmailI18nLocaleFiles.test.ts b/fluxer_api/pkgs/email/src/email_i18n/EmailI18nLocaleFiles.test.ts
index 4b4130540..df5226c3b 100644
--- a/fluxer_api/pkgs/email/src/email_i18n/EmailI18nLocaleFiles.test.ts
+++ b/fluxer_api/pkgs/email/src/email_i18n/EmailI18nLocaleFiles.test.ts
@@ -12,6 +12,7 @@ const DATE = new Date('2026-10-01T23:30:00Z');
const FIXTURE: {[K in EmailTemplateKey]: EmailTemplateVariables[K]} = {
account_deletion_cancelled: {},
+ account_deletion_completed: {},
account_deletion_scheduled_inactivity: {deletion_date: 'Dec 1, 2026'},
account_deletion_scheduled_requested: {deletion_date: 'Dec 14, 2026'},
diff --git a/fluxer_api/pkgs/email/src/email_i18n/EmailI18nMessages.ts b/fluxer_api/pkgs/email/src/email_i18n/EmailI18nMessages.ts
index bf4035b9d..cbd75abd2 100644
--- a/fluxer_api/pkgs/email/src/email_i18n/EmailI18nMessages.ts
+++ b/fluxer_api/pkgs/email/src/email_i18n/EmailI18nMessages.ts
@@ -8,6 +8,13 @@ export const EMAIL_I18N_MESSAGES = {
signoff: 'The {product_name} team',
footer_reason: 'You received this email because the deletion of your {product_name} account was canceled.',
},
+ account_deletion_completed: {
+ subject: 'Your {product_name} account has been deleted',
+ intro: "We've deleted your {product_name} account, as you asked.",
+ note: 'Your messages were deleted or unlinked from you, depending on what you chose. If you want to use {product_name} again, you can create a new account.',
+ signoff: 'The {product_name} team',
+ footer_reason: 'You received this email because you asked to delete your {product_name} account.',
+ },
account_deletion_scheduled_inactivity: {
subject: 'Your inactive {product_name} account will be deleted',
intro: "Your {product_name} account has been inactive for a long time, so we'll delete it on {deletion_date}.",
diff --git a/fluxer_api/pkgs/email/src/email_i18n/EmailI18nTypes.generated.ts b/fluxer_api/pkgs/email/src/email_i18n/EmailI18nTypes.generated.ts
index 5d8f32f97..e1aada1d7 100644
--- a/fluxer_api/pkgs/email/src/email_i18n/EmailI18nTypes.generated.ts
+++ b/fluxer_api/pkgs/email/src/email_i18n/EmailI18nTypes.generated.ts
@@ -2,6 +2,7 @@
export type EmailTemplateKey =
| 'account_deletion_cancelled'
+ | 'account_deletion_completed'
| 'account_deletion_scheduled_inactivity'
| 'account_deletion_scheduled_requested'
| 'bulk_message_deletion_completed'
diff --git a/fluxer_api/pkgs/email/src/email_i18n/EmailI18nTypes.ts b/fluxer_api/pkgs/email/src/email_i18n/EmailI18nTypes.ts
index bda08dd93..fccf10acf 100644
--- a/fluxer_api/pkgs/email/src/email_i18n/EmailI18nTypes.ts
+++ b/fluxer_api/pkgs/email/src/email_i18n/EmailI18nTypes.ts
@@ -74,6 +74,7 @@ export type EnforcementNoticeKindLabel =
export interface EmailTemplateVariables {
account_deletion_cancelled: Record<string, never>;
+ account_deletion_completed: Record<string, never>;
account_deletion_scheduled_inactivity: {
deletion_date: string;
};
diff --git a/fluxer_api/pkgs/email/src/email_i18n/weblate/locales/ar.json b/fluxer_api/pkgs/email/src/email_i18n/weblate/locales/ar.json
index fd40ee794..d8f72dc43 100644
--- a/fluxer_api/pkgs/email/src/email_i18n/weblate/locales/ar.json
+++ b/fluxer_api/pkgs/email/src/email_i18n/weblate/locales/ar.json
@@ -6,6 +6,13 @@
"signoff": "فريق {product_name}",
"subject": "لن يُحذف حسابك في {product_name}"
},
+ "account_deletion_completed": {
+ "footer_reason": "لقد تلقيت هذا البريد الإلكتروني لأنك طلبت حذف حسابك في {product_name}.",
+ "intro": "حذفنا حسابك في {product_name} بناءً على طلبك.",
+ "note": "حُذفت رسائلك أو لم تعد مرتبطة بك، بحسب ما اخترته. إذا أردت استخدام {product_name} مرة أخرى، يمكنك إنشاء حساب جديد.",
+ "signoff": "فريق {product_name}",
+ "subject": "تم حذف حسابك في {product_name}"
+ },
"account_deletion_scheduled_inactivity": {
"footer_reason": "لقد تلقيت هذا البريد الإلكتروني لأن حسابك في {product_name} لم يكن نشطًا لفترة طويلة.",
"intro": "لم يكن حسابك في {product_name} نشطًا لفترة طويلة، لذا سنحذفه في {deletion_date}.",
diff --git a/fluxer_api/pkgs/email/src/email_i18n/weblate/locales/bg.json b/fluxer_api/pkgs/email/src/email_i18n/weblate/locales/bg.json
index 7320cb8b7..1a445cc44 100644
--- a/fluxer_api/pkgs/email/src/email_i18n/weblate/locales/bg.json
+++ b/fluxer_api/pkgs/email/src/email_i18n/weblate/locales/bg.json
@@ -6,6 +6,13 @@
"signoff": "Екипът на {product_name}",
"subject": "Акаунтът ти във {product_name} няма да бъде изтрит"
},
+ "account_deletion_completed": {
+ "footer_reason": "Получи този имейл, защото поиска да изтриеш акаунта си във {product_name}.",
+ "intro": "Изтрихме акаунта ти във {product_name}, както поиска.",
+ "note": "Съобщенията ти бяха изтрити или вече не са свързани с теб, в зависимост от избора ти. Ако искаш да използваш {product_name} отново, можеш да създадеш нов акаунт.",
+ "signoff": "Екипът на {product_name}",
+ "subject": "Акаунтът ти във {product_name} е изтрит"
+ },
"account_deletion_scheduled_inactivity": {
"footer_reason": "Получи този имейл, защото акаунтът ти във {product_name} е неактивен от дълго време.",
"intro": "Акаунтът ти във {product_name} е неактивен от дълго време, затова ще го изтрием на {deletion_date}.",
diff --git a/fluxer_api/pkgs/email/src/email_i18n/weblate/locales/cs.json b/fluxer_api/pkgs/email/src/email_i18n/weblate/locales/cs.json
index 2615e14c8..feb3b0de5 100644
--- a/fluxer_api/pkgs/email/src/email_i18n/weblate/locales/cs.json
+++ b/fluxer_api/pkgs/email/src/email_i18n/weblate/locales/cs.json
@@ -6,6 +6,13 @@
"signoff": "Tým {product_name}",
"subject": "Váš účet {product_name} nebude smazán"
},
+ "account_deletion_completed": {
+ "footer_reason": "Tento e-mail jste obdrželi, protože jste požádali o smazání svého účtu {product_name}.",
+ "intro": "Na vaši žádost jsme smazali váš účet {product_name}.",
+ "note": "Vaše zprávy byly podle vaší volby smazány, nebo už nejsou spojené s vámi. Pokud chcete {product_name} znovu používat, můžete si vytvořit nový účet.",
+ "signoff": "Tým {product_name}",
+ "subject": "Váš účet {product_name} byl smazán"
+ },
"account_deletion_scheduled_inactivity": {
"footer_reason": "Tento e-mail jste obdrželi, protože váš účet {product_name} byl dlouho neaktivní.",
"intro": "Váš účet {product_name} byl dlouho neaktivní, proto ho {deletion_date} smažeme.",
diff --git a/fluxer_api/pkgs/email/src/email_i18n/weblate/locales/da.json b/fluxer_api/pkgs/email/src/email_i18n/weblate/locales/da.json
index b059e37be..9df18e40e 100644
--- a/fluxer_api/pkgs/email/src/email_i18n/weblate/locales/da.json
+++ b/fluxer_api/pkgs/email/src/email_i18n/weblate/locales/da.json
@@ -6,6 +6,13 @@
"signoff": "Teamet bag {product_name}",
"subject": "Din {product_name}-konto bliver ikke slettet"
},
+ "account_deletion_completed": {
+ "footer_reason": "Du modtog denne e-mail, fordi du anmodede om at slette din {product_name}-konto.",
+ "intro": "Vi har slettet din {product_name}-konto, som du bad om.",
+ "note": "Dine beskeder er blevet slettet eller er ikke længere knyttet til dig, afhængigt af hvad du valgte. Hvis du vil bruge {product_name} igen, kan du oprette en ny konto.",
+ "signoff": "Teamet bag {product_name}",
+ "subject": "Din {product_name}-konto er blevet slettet"
+ },
"account_deletion_scheduled_inactivity": {
"footer_reason": "Du har modtaget denne e-mail, fordi din {product_name}-konto har været inaktiv i lang tid.",
"intro": "Din {product_name}-konto har været inaktiv i lang tid, så vi sletter den den {deletion_date}.",
diff --git a/fluxer_api/pkgs/email/src/email_i18n/weblate/locales/de.json b/fluxer_api/pkgs/email/src/email_i18n/weblate/locales/de.json
index 635a97312..229d3961f 100644
--- a/fluxer_api/pkgs/email/src/email_i18n/weblate/locales/de.json
+++ b/fluxer_api/pkgs/email/src/email_i18n/weblate/locales/de.json
@@ -6,6 +6,13 @@
"signoff": "Das {product_name}-Team",
"subject": "Dein {product_name}-Account wird nicht gelöscht"
},
+ "account_deletion_completed": {
+ "footer_reason": "Du hast diese E-Mail erhalten, weil du die Löschung deines {product_name}-Accounts beantragt hast.",
+ "intro": "Wir haben deinen {product_name}-Account wie gewünscht gelöscht.",
+ "note": "Deine Nachrichten wurden je nach deiner Auswahl gelöscht oder sind nicht mehr mit dir verknüpft. Wenn du {product_name} wieder nutzen möchtest, kannst du einen neuen Account erstellen.",
+ "signoff": "Das {product_name}-Team",
+ "subject": "Dein {product_name}-Account wurde gelöscht"
+ },
"account_deletion_scheduled_inactivity": {
"footer_reason": "Du hast diese E-Mail erhalten, weil dein {product_name}-Account lange inaktiv war.",
"intro": "Dein {product_name}-Account ist seit Langem inaktiv, deshalb löschen wir ihn am {deletion_date}.",
diff --git a/fluxer_api/pkgs/email/src/email_i18n/weblate/locales/el.json b/fluxer_api/pkgs/email/src/email_i18n/weblate/locales/el.json
index 35704746e..11cb0c13b 100644
--- a/fluxer_api/pkgs/email/src/email_i18n/weblate/locales/el.json
+++ b/fluxer_api/pkgs/email/src/email_i18n/weblate/locales/el.json
@@ -6,6 +6,13 @@
"signoff": "Η ομάδα του {product_name}",
"subject": "Ο λογαριασμός σου στο {product_name} δεν θα διαγραφεί"
},
+ "account_deletion_completed": {
+ "footer_reason": "Έλαβες αυτό το email επειδή ζήτησες τη διαγραφή του λογαριασμού σου στο {product_name}.",
+ "intro": "Διαγράψαμε τον λογαριασμό σου στο {product_name}, όπως ζήτησες.",
+ "note": "Τα μηνύματά σου διαγράφηκαν ή δεν συνδέονται πλέον μαζί σου, ανάλογα με την επιλογή σου. Αν θέλεις να χρησιμοποιήσεις ξανά το {product_name}, μπορείς να δημιουργήσεις νέο λογαριασμό.",
+ "signoff": "Η ομάδα του {product_name}",
+ "subject": "Ο λογαριασμός σου στο {product_name} διαγράφηκε"
+ },
"account_deletion_scheduled_inactivity": {
"footer_reason": "Έλαβες αυτό το email επειδή ο λογαριασμός σου στο {product_name} είναι ανενεργός για μεγάλο χρονικό διάστημα.",
"intro": "Ο λογαριασμός σου στο {product_name} είναι ανενεργός για μεγάλο διάστημα, οπότε θα τον διαγράψουμε στις {deletion_date}.",
diff --git a/fluxer_api/pkgs/email/src/email_i18n/weblate/locales/en-GB.json b/fluxer_api/pkgs/email/src/email_i18n/weblate/locales/en-GB.json
index b813a85dd..e206eae9e 100644
--- a/fluxer_api/pkgs/email/src/email_i18n/weblate/locales/en-GB.json
+++ b/fluxer_api/pkgs/email/src/email_i18n/weblate/locales/en-GB.json
@@ -6,6 +6,13 @@
"signoff": "The {product_name} team",
"subject": "Your {product_name} account won't be deleted"
},
+ "account_deletion_completed": {
+ "footer_reason": "You received this email because you asked to delete your {product_name} account.",
+ "intro": "We've deleted your {product_name} account, as you asked.",
+ "note": "Your messages were deleted or unlinked from you, depending on what you chose. If you want to use {product_name} again, you can create a new account.",
+ "signoff": "The {product_name} team",
+ "subject": "Your {product_name} account has been deleted"
+ },
"account_deletion_scheduled_inactivity": {
"footer_reason": "You received this email because your {product_name} account has been inactive for a long time.",
"intro": "Your {product_name} account has been inactive for a long time, so we'll delete it on {deletion_date}.",
diff --git a/fluxer_api/pkgs/email/src/email_i18n/weblate/locales/es-419.json b/fluxer_api/pkgs/email/src/email_i18n/weblate/locales/es-419.json
index 17e6dd710..59466ee79 100644
--- a/fluxer_api/pkgs/email/src/email_i18n/weblate/locales/es-419.json
+++ b/fluxer_api/pkgs/email/src/email_i18n/weblate/locales/es-419.json
@@ -6,6 +6,13 @@
"signoff": "El equipo de {product_name}",
"subject": "Tu cuenta de {product_name} no se eliminará"
},
+ "account_deletion_completed": {
+ "footer_reason": "Recibiste este correo electrónico porque solicitaste eliminar tu cuenta de {product_name}.",
+ "intro": "Eliminamos tu cuenta de {product_name}, como lo solicitaste.",
+ "note": "Tus mensajes se eliminaron o dejaron de estar vinculados a ti, según lo que elegiste. Si quieres volver a usar {product_name}, puedes crear una cuenta nueva.",
+ "signoff": "El equipo de {product_name}",
+ "subject": "Se eliminó tu cuenta de {product_name}"
+ },
"account_deletion_scheduled_inactivity": {
"footer_reason": "Recibiste este correo electrónico porque tu cuenta de {product_name} lleva mucho tiempo inactiva.",
"intro": "Tu cuenta de {product_name} lleva mucho tiempo inactiva, así que la eliminaremos el {deletion_date}.",
diff --git a/fluxer_api/pkgs/email/src/email_i18n/weblate/locales/es-ES.json b/fluxer_api/pkgs/email/src/email_i18n/weblate/locales/es-ES.json
index 8601e6ce4..a18d47d2f 100644
--- a/fluxer_api/pkgs/email/src/email_i18n/weblate/locales/es-ES.json
+++ b/fluxer_api/pkgs/email/src/email_i18n/weblate/locales/es-ES.json
@@ -6,6 +6,13 @@
"signoff": "El equipo de {product_name}",
"subject": "Tu cuenta de {product_name} no se eliminará"
},
+ "account_deletion_completed": {
+ "footer_reason": "Has recibido este correo electrónico porque has solicitado eliminar tu cuenta de {product_name}.",
+ "intro": "Hemos eliminado tu cuenta de {product_name}, tal como solicitaste.",
+ "note": "Tus mensajes se han eliminado o han dejado de estar vinculados a ti, según lo que elegiste. Si quieres volver a usar {product_name}, puedes crear una cuenta nueva.",
+ "signoff": "El equipo de {product_name}",
+ "subject": "Se ha eliminado tu cuenta de {product_name}"
+ },
"account_deletion_scheduled_inactivity": {
"footer_reason": "Has recibido este correo electrónico porque tu cuenta de {product_name} lleva mucho tiempo inactiva.",
"intro": "Tu cuenta de {product_name} lleva mucho tiempo inactiva, así que la eliminaremos el {deletion_date}.",
diff --git a/fluxer_api/pkgs/email/src/email_i18n/weblate/locales/fi.json b/fluxer_api/pkgs/email/src/email_i18n/weblate/locales/fi.json
index 78f2c515e..91bfeb034 100644
--- a/fluxer_api/pkgs/email/src/email_i18n/weblate/locales/fi.json
+++ b/fluxer_api/pkgs/email/src/email_i18n/weblate/locales/fi.json
@@ -6,6 +6,13 @@
"signoff": "{product_name}-tiimi",
"subject": "{product_name}-tiliäsi ei poisteta"
},
+ "account_deletion_completed": {
+ "footer_reason": "Sait tämän sähköpostin, koska pyysit {product_name}-tilisi poistamista.",
+ "intro": "Poistimme {product_name}-tilisi pyyntösi mukaisesti.",
+ "note": "Viestisi on valintasi mukaan poistettu tai niitä ei enää yhdistetä sinuun. Jos haluat käyttää palvelua {product_name} uudelleen, voit luoda uuden tilin.",
+ "signoff": "{product_name}-tiimi",
+ "subject": "{product_name}-tilisi on poistettu"
+ },
"account_deletion_scheduled_inactivity": {
"footer_reason": "Sait tämän sähköpostin, koska {product_name}-tilisi on ollut pitkään käyttämättä.",
"intro": "{product_name}-tilisi on ollut pitkään käyttämättä, joten poistamme sen {deletion_date}.",
diff --git a/fluxer_api/pkgs/email/src/email_i18n/weblate/locales/fr.json b/fluxer_api/pkgs/email/src/email_i18n/weblate/locales/fr.json
index 6454f9f87..7f8b31204 100644
--- a/fluxer_api/pkgs/email/src/email_i18n/weblate/locales/fr.json
+++ b/fluxer_api/pkgs/email/src/email_i18n/weblate/locales/fr.json
@@ -6,6 +6,13 @@
"signoff": "L’équipe {product_name}",
"subject": "Votre compte {product_name} ne sera pas supprimé"
},
+ "account_deletion_completed": {
+ "footer_reason": "Vous avez reçu cet e-mail car vous avez demandé la suppression de votre compte {product_name}.",
+ "intro": "Nous avons supprimé votre compte {product_name}, comme vous l’avez demandé.",
+ "note": "Selon votre choix, vos messages ont été supprimés ou ne vous sont plus associés. Si vous souhaitez utiliser à nouveau {product_name}, vous pouvez créer un nouveau compte.",
+ "signoff": "L’équipe {product_name}",
+ "subject": "Votre compte {product_name} a été supprimé"
+ },
"account_deletion_scheduled_inactivity": {
"footer_reason": "Vous avez reçu cet e-mail car votre compte {product_name} est inactif depuis longtemps.",
"intro": "Votre compte {product_name} est inactif depuis longtemps. Nous le supprimerons donc le {deletion_date}.",
diff --git a/fluxer_api/pkgs/email/src/email_i18n/weblate/locales/he.json b/fluxer_api/pkgs/email/src/email_i18n/weblate/locales/he.json
index 8a81ff56a..bd652a0c2 100644
--- a/fluxer_api/pkgs/email/src/email_i18n/weblate/locales/he.json
+++ b/fluxer_api/pkgs/email/src/email_i18n/weblate/locales/he.json
@@ -6,6 +6,13 @@
"signoff": "צוות {product_name}",
"subject": "חשבון ה-{product_name} שלכם לא יימחק"
},
+ "account_deletion_completed": {
+ "footer_reason": "קיבלתם את האימייל הזה כי ביקשתם למחוק את חשבון ה-{product_name} שלכם.",
+ "intro": "מחקנו את חשבון ה-{product_name} שלכם, כפי שביקשתם.",
+ "note": "ההודעות שלכם נמחקו או שכבר אינן מקושרות אליכם, בהתאם לבחירה שלכם. אם תרצו להשתמש שוב ב-{product_name}, תוכלו ליצור חשבון חדש.",
+ "signoff": "צוות {product_name}",
+ "subject": "חשבון ה-{product_name} שלכם נמחק"
+ },
"account_deletion_scheduled_inactivity": {
"footer_reason": "קיבלתם את האימייל הזה כי חשבון ה-{product_name} שלכם לא היה פעיל זמן רב.",
"intro": "חשבון ה-{product_name} שלכם לא פעיל כבר זמן רב, ולכן נמחק אותו ב-{deletion_date}.",
diff --git a/fluxer_api/pkgs/email/src/email_i18n/weblate/locales/hi.json b/fluxer_api/pkgs/email/src/email_i18n/weblate/locales/hi.json
index ce9a02e6b..dea23d69b 100644
--- a/fluxer_api/pkgs/email/src/email_i18n/weblate/locales/hi.json
+++ b/fluxer_api/pkgs/email/src/email_i18n/weblate/locales/hi.json
@@ -6,6 +6,13 @@
"signoff": "{product_name} टीम",
"subject": "आपका {product_name} अकाउंट डिलीट नहीं होगा"
},
+ "account_deletion_completed": {
+ "footer_reason": "आपको यह ईमेल इसलिए मिला है क्योंकि आपने अपना {product_name} अकाउंट डिलीट करने का अनुरोध किया था।",
+ "intro": "आपके अनुरोध के अनुसार, हमने आपका {product_name} अकाउंट डिलीट कर दिया है।",
+ "note": "आपकी पसंद के अनुसार, आपके मैसेज डिलीट कर दिए गए हैं या अब आपसे जुड़े नहीं हैं। अगर आप {product_name} फिर से इस्तेमाल करना चाहते हैं, तो आप नया अकाउंट बना सकते हैं।",
+ "signoff": "{product_name} टीम",
+ "subject": "आपका {product_name} अकाउंट डिलीट कर दिया गया है"
+ },
"account_deletion_scheduled_inactivity": {
"footer_reason": "आपको यह ईमेल इसलिए मिला है क्योंकि आपका {product_name} अकाउंट लंबे समय से इनएक्टिव है।",
"intro": "आपका {product_name} अकाउंट लंबे समय से इनएक्टिव है, इसलिए हम इसे {deletion_date} को डिलीट कर देंगे।",
diff --git a/fluxer_api/pkgs/email/src/email_i18n/weblate/locales/hr.json b/fluxer_api/pkgs/email/src/email_i18n/weblate/locales/hr.json
index 559e886ec..1c1297e37 100644
--- a/fluxer_api/pkgs/email/src/email_i18n/weblate/locales/hr.json
+++ b/fluxer_api/pkgs/email/src/email_i18n/weblate/locales/hr.json
@@ -6,6 +6,13 @@
"signoff": "Tim {product_name}a",
"subject": "Tvoj {product_name} račun neće biti izbrisan"
},
+ "account_deletion_completed": {
+ "footer_reason": "Ovu si e-poruku primio jer si zatražio brisanje svog {product_name} računa.",
+ "intro": "Izbrisali smo tvoj {product_name} račun, kako si zatražio.",
+ "note": "Tvoje poruke su izbrisane ili više nisu povezane s tobom, ovisno o tome što si odabrao. Ako želiš ponovno koristiti {product_name}, možeš izraditi novi račun.",
+ "signoff": "Tim {product_name}a",
+ "subject": "Tvoj {product_name} račun je izbrisan"
+ },
"account_deletion_scheduled_inactivity": {
"footer_reason": "Ovu si e-poruku primio jer je tvoj račun na {product_name}u dugo bio neaktivan.",
"intro": "Tvoj {product_name} račun dugo je neaktivan, pa ćemo ga izbrisati {deletion_date}.",
diff --git a/fluxer_api/pkgs/email/src/email_i18n/weblate/locales/hu.json b/fluxer_api/pkgs/email/src/email_i18n/weblate/locales/hu.json
index bc78605c8..b23d68ac4 100644
--- a/fluxer_api/pkgs/email/src/email_i18n/weblate/locales/hu.json
+++ b/fluxer_api/pkgs/email/src/email_i18n/weblate/locales/hu.json
@@ -6,6 +6,13 @@
"signoff": "{product_name} csapata",
"subject": "Nem töröljük {product_name}-fiókodat"
},
+ "account_deletion_completed": {
+ "footer_reason": "Ezt az e-mailt azért kaptad, mert kérted a {product_name}-fiókod törlését.",
+ "intro": "A kérésednek megfelelően töröltük a {product_name}-fiókodat.",
+ "note": "Az üzeneteidet a választásodtól függően töröltük, vagy már nem kapcsolódnak hozzád. Ha újra szeretnéd használni a(z) {product_name} szolgáltatást, létrehozhatsz egy új fiókot.",
+ "signoff": "{product_name} csapata",
+ "subject": "{product_name}-fiókodat töröltük"
+ },
"account_deletion_scheduled_inactivity": {
"footer_reason": "Ezt az e-mailt azért kaptad, mert {product_name}-fiókod hosszú ideje inaktív.",
"intro": "{product_name}-fiókod hosszú ideje inaktív, ezért {deletion_date} napján töröljük.",
diff --git a/fluxer_api/pkgs/email/src/email_i18n/weblate/locales/id.json b/fluxer_api/pkgs/email/src/email_i18n/weblate/locales/id.json
index a5bda7665..0658fa75d 100644
--- a/fluxer_api/pkgs/email/src/email_i18n/weblate/locales/id.json
+++ b/fluxer_api/pkgs/email/src/email_i18n/weblate/locales/id.json
@@ -6,6 +6,13 @@
"signoff": "Tim {product_name}",
"subject": "Akun {product_name} kamu tidak jadi dihapus"
},
+ "account_deletion_completed": {
+ "footer_reason": "Kamu menerima email ini karena kamu meminta untuk menghapus akun {product_name} kamu.",
+ "intro": "Kami telah menghapus akun {product_name} kamu sesuai permintaanmu.",
+ "note": "Pesan-pesanmu telah dihapus atau tidak lagi terhubung denganmu, sesuai pilihanmu. Jika kamu ingin menggunakan {product_name} lagi, kamu bisa membuat akun baru.",
+ "signoff": "Tim {product_name}",
+ "subject": "Akun {product_name} kamu telah dihapus"
+ },
"account_deletion_scheduled_inactivity": {
"footer_reason": "Kamu menerima email ini karena akun {product_name} kamu sudah lama tidak aktif.",
"intro": "Akun {product_name} kamu sudah lama tidak aktif, jadi kami akan menghapusnya pada {deletion_date}.",
diff --git a/fluxer_api/pkgs/email/src/email_i18n/weblate/locales/it.json b/fluxer_api/pkgs/email/src/email_i18n/weblate/locales/it.json
index 29451dacb..c117c610c 100644
--- a/fluxer_api/pkgs/email/src/email_i18n/weblate/locales/it.json
+++ b/fluxer_api/pkgs/email/src/email_i18n/weblate/locales/it.json
@@ -6,6 +6,13 @@
"signoff": "Il team di {product_name}",
"subject": "Il tuo account {product_name} non verrà eliminato"
},
+ "account_deletion_completed": {
+ "footer_reason": "Hai ricevuto questa email perché hai richiesto di eliminare il tuo account {product_name}.",
+ "intro": "Abbiamo eliminato il tuo account {product_name}, come hai richiesto.",
+ "note": "I tuoi messaggi sono stati eliminati o non sono più collegati a te, in base alla tua scelta. Se vuoi usare di nuovo {product_name}, puoi creare un nuovo account.",
+ "signoff": "Il team di {product_name}",
+ "subject": "Il tuo account {product_name} è stato eliminato"
+ },
"account_deletion_scheduled_inactivity": {
"footer_reason": "Hai ricevuto questa email perché il tuo account {product_name} è inattivo da molto tempo.",
"intro": "Il tuo account {product_name} è inattivo da molto tempo, quindi lo elimineremo il {deletion_date}.",
diff --git a/fluxer_api/pkgs/email/src/email_i18n/weblate/locales/ja.json b/fluxer_api/pkgs/email/src/email_i18n/weblate/locales/ja.json
index 1ce80198b..c793a6a39 100644
--- a/fluxer_api/pkgs/email/src/email_i18n/weblate/locales/ja.json
+++ b/fluxer_api/pkgs/email/src/email_i18n/weblate/locales/ja.json
@@ -6,6 +6,13 @@
"signoff": "{product_name}チーム",
"subject": "{product_name}アカウントは削除されません"
},
+ "account_deletion_completed": {
+ "footer_reason": "このメールは、お客様の{product_name}アカウントの削除リクエストを受け付けたため送信されました。",
+ "intro": "ご依頼に基づき、{product_name}アカウントを削除しました。",
+ "note": "メッセージは、お客様の選択に応じて削除されたか、お客様との関連付けが解除されました。{product_name}を再びご利用になる場合は、新しいアカウントを作成できます。",
+ "signoff": "{product_name}チーム",
+ "subject": "{product_name}アカウントを削除しました"
+ },
"account_deletion_scheduled_inactivity": {
"footer_reason": "このメールは、{product_name}アカウントが長期間利用されていないため送信されました。",
"intro": "{product_name}アカウントが長期間利用されていないため、{deletion_date}に削除します。",
diff --git a/fluxer_api/pkgs/email/src/email_i18n/weblate/locales/ko.json b/fluxer_api/pkgs/email/src/email_i18n/weblate/locales/ko.json
index 39aab9b7a..f265ac0a5 100644
--- a/fluxer_api/pkgs/email/src/email_i18n/weblate/locales/ko.json
+++ b/fluxer_api/pkgs/email/src/email_i18n/weblate/locales/ko.json
@@ -6,6 +6,13 @@
"signoff": "{product_name} 팀 드림",
"subject": "{product_name} 계정이 삭제되지 않아요"
},
+ "account_deletion_completed": {
+ "footer_reason": "{product_name} 계정 삭제를 요청하셨기 때문에 이 이메일을 받으셨어요.",
+ "intro": "요청하신 대로 {product_name} 계정을 삭제했어요.",
+ "note": "선택하신 내용에 따라 메시지가 삭제되었거나 더 이상 회원님과 연결되지 않아요. {product_name}을(를) 다시 사용하고 싶다면 새 계정을 만들 수 있어요.",
+ "signoff": "{product_name} 팀 드림",
+ "subject": "{product_name} 계정이 삭제되었어요"
+ },
"account_deletion_scheduled_inactivity": {
"footer_reason": "이 이메일은 {product_name} 계정이 오랫동안 사용되지 않아 발송되었어요.",
"intro": "{product_name} 계정을 오랫동안 사용하지 않으셔서 {deletion_date}에 삭제할 예정이에요.",
diff --git a/fluxer_api/pkgs/email/src/email_i18n/weblate/locales/lt.json b/fluxer_api/pkgs/email/src/email_i18n/weblate/locales/lt.json
index e849fa984..b47c2c88d 100644
--- a/fluxer_api/pkgs/email/src/email_i18n/weblate/locales/lt.json
+++ b/fluxer_api/pkgs/email/src/email_i18n/weblate/locales/lt.json
@@ -6,6 +6,13 @@
"signoff": "{product_name} komanda",
"subject": "Tavo {product_name} paskyra nebus ištrinta"
},
+ "account_deletion_completed": {
+ "footer_reason": "Gavai šį el. laišką, nes paprašei ištrinti savo {product_name} paskyrą.",
+ "intro": "Kaip prašei, ištrynėme tavo {product_name} paskyrą.",
+ "note": "Priklausomai nuo tavo pasirinkimo, tavo žinutės buvo ištrintos arba nebėra susietos su tavimi. Jei nori vėl naudotis {product_name}, gali susikurti naują paskyrą.",
+ "signoff": "{product_name} komanda",
+ "subject": "Tavo {product_name} paskyra ištrinta"
+ },
"account_deletion_scheduled_inactivity": {
"footer_reason": "Gavai šį el. laišką, nes tavo {product_name} paskyra ilgą laiką buvo neaktyvi.",
"intro": "Tavo {product_name} paskyra ilgai nebuvo naudojama, todėl ją ištrinsime {deletion_date}.",
diff --git a/fluxer_api/pkgs/email/src/email_i18n/weblate/locales/nl.json b/fluxer_api/pkgs/email/src/email_i18n/weblate/locales/nl.json
index 101423496..71b2aed72 100644
--- a/fluxer_api/pkgs/email/src/email_i18n/weblate/locales/nl.json
+++ b/fluxer_api/pkgs/email/src/email_i18n/weblate/locales/nl.json
@@ -6,6 +6,13 @@
"signoff": "Het team van {product_name}",
"subject": "Je {product_name}-account wordt niet verwijderd"
},
+ "account_deletion_completed": {
+ "footer_reason": "Je hebt deze e-mail ontvangen omdat je hebt verzocht om je {product_name}-account te verwijderen.",
+ "intro": "We hebben je {product_name}-account verwijderd, zoals je had gevraagd.",
+ "note": "Je berichten zijn verwijderd of niet meer aan jou gekoppeld, afhankelijk van wat je hebt gekozen. Als je {product_name} weer wilt gebruiken, kun je een nieuw account aanmaken.",
+ "signoff": "Het team van {product_name}",
+ "subject": "Je {product_name}-account is verwijderd"
+ },
"account_deletion_scheduled_inactivity": {
"footer_reason": "Je hebt deze e-mail ontvangen omdat je {product_name}-account al lange tijd inactief is.",
"intro": "Je {product_name}-account is al lange tijd inactief, dus we verwijderen het op {deletion_date}.",
diff --git a/fluxer_api/pkgs/email/src/email_i18n/weblate/locales/no.json b/fluxer_api/pkgs/email/src/email_i18n/weblate/locales/no.json
index 98fd856af..9da272856 100644
--- a/fluxer_api/pkgs/email/src/email_i18n/weblate/locales/no.json
+++ b/fluxer_api/pkgs/email/src/email_i18n/weblate/locales/no.json
@@ -6,6 +6,13 @@
"signoff": "{product_name}-teamet",
"subject": "{product_name}-kontoen din blir ikke slettet"
},
+ "account_deletion_completed": {
+ "footer_reason": "Du mottok denne e-posten fordi du ba om å slette {product_name}-kontoen din.",
+ "intro": "Vi har slettet {product_name}-kontoen din, slik du ba om.",
+ "note": "Meldingene dine er slettet eller ikke lenger knyttet til deg, avhengig av hva du valgte. Hvis du vil bruke {product_name} igjen, kan du opprette en ny konto.",
+ "signoff": "{product_name}-teamet",
+ "subject": "{product_name}-kontoen din er slettet"
+ },
"account_deletion_scheduled_inactivity": {
"footer_reason": "Du mottok denne e-posten fordi {product_name}-kontoen din har vært inaktiv lenge.",
"intro": "{product_name}-kontoen din har vært inaktiv lenge, så vi sletter den {deletion_date}.",
diff --git a/fluxer_api/pkgs/email/src/email_i18n/weblate/locales/pl.json b/fluxer_api/pkgs/email/src/email_i18n/weblate/locales/pl.json
index bfc33cd9c..5dd0e60ee 100644
--- a/fluxer_api/pkgs/email/src/email_i18n/weblate/locales/pl.json
+++ b/fluxer_api/pkgs/email/src/email_i18n/weblate/locales/pl.json
@@ -6,6 +6,13 @@
"signoff": "Zespół {product_name}",
"subject": "Twoje konto {product_name} nie zostanie usunięte"
},
+ "account_deletion_completed": {
+ "footer_reason": "Otrzymujesz tę wiadomość, ponieważ wpłynęła Twoja prośba o usunięcie konta {product_name}.",
+ "intro": "Zgodnie z Twoją prośbą usunęliśmy Twoje konto {product_name}.",
+ "note": "W zależności od Twojego wyboru Twoje wiadomości zostały usunięte lub nie są już powiązane z Tobą. Jeśli zechcesz ponownie korzystać z {product_name}, możesz założyć nowe konto.",
+ "signoff": "Zespół {product_name}",
+ "subject": "Twoje konto {product_name} zostało usunięte"
+ },
"account_deletion_scheduled_inactivity": {
"footer_reason": "Otrzymujesz tę wiadomość e-mail, ponieważ Twoje konto {product_name} od dawna jest nieaktywne.",
"intro": "Twoje konto {product_name} od dawna jest nieaktywne, więc usuniemy je dnia {deletion_date}.",
diff --git a/fluxer_api/pkgs/email/src/email_i18n/weblate/locales/pt-BR.json b/fluxer_api/pkgs/email/src/email_i18n/weblate/locales/pt-BR.json
index 667b31c89..67d77fdb8 100644
--- a/fluxer_api/pkgs/email/src/email_i18n/weblate/locales/pt-BR.json
+++ b/fluxer_api/pkgs/email/src/email_i18n/weblate/locales/pt-BR.json
@@ -6,6 +6,13 @@
"signoff": "Equipe do {product_name}",
"subject": "Sua conta do {product_name} não será mais excluída"
},
+ "account_deletion_completed": {
+ "footer_reason": "Você recebeu este e-mail porque solicitou a exclusão da sua conta do {product_name}.",
+ "intro": "Excluímos sua conta do {product_name}, como você pediu.",
+ "note": "Suas mensagens foram excluídas ou deixaram de estar vinculadas a você, conforme sua escolha. Se quiser usar o {product_name} de novo, você pode criar uma conta nova.",
+ "signoff": "Equipe do {product_name}",
+ "subject": "Sua conta do {product_name} foi excluída"
+ },
"account_deletion_scheduled_inactivity": {
"footer_reason": "Você recebeu este e-mail porque sua conta do {product_name} está inativa há muito tempo.",
"intro": "Sua conta do {product_name} está inativa há muito tempo, então vamos excluí-la em {deletion_date}.",
diff --git a/fluxer_api/pkgs/email/src/email_i18n/weblate/locales/ro.json b/fluxer_api/pkgs/email/src/email_i18n/weblate/locales/ro.json
index b9a67b734..e79f1c243 100644
--- a/fluxer_api/pkgs/email/src/email_i18n/weblate/locales/ro.json
+++ b/fluxer_api/pkgs/email/src/email_i18n/weblate/locales/ro.json
@@ -6,6 +6,13 @@
"signoff": "Echipa {product_name}",
"subject": "Contul tău {product_name} nu va mai fi șters"
},
+ "account_deletion_completed": {
+ "footer_reason": "Ai primit acest e-mail deoarece ai solicitat ștergerea contului tău {product_name}.",
+ "intro": "Am șters contul tău {product_name}, așa cum ai cerut.",
+ "note": "Mesajele tale au fost șterse sau nu mai sunt asociate cu tine, în funcție de ce ai ales. Dacă vrei să folosești din nou {product_name}, poți crea un cont nou.",
+ "signoff": "Echipa {product_name}",
+ "subject": "Contul tău {product_name} a fost șters"
+ },
"account_deletion_scheduled_inactivity": {
"footer_reason": "Ai primit acest e-mail deoarece contul tău {product_name} a fost inactiv o perioadă lungă.",
"intro": "Contul tău {product_name} este inactiv de mult timp, așa că îl vom șterge pe {deletion_date}.",
diff --git a/fluxer_api/pkgs/email/src/email_i18n/weblate/locales/ru.json b/fluxer_api/pkgs/email/src/email_i18n/weblate/locales/ru.json
index bb338f021..13ee40cea 100644
--- a/fluxer_api/pkgs/email/src/email_i18n/weblate/locales/ru.json
+++ b/fluxer_api/pkgs/email/src/email_i18n/weblate/locales/ru.json
@@ -6,6 +6,13 @@
"signoff": "Команда {product_name}",
"subject": "Ваш аккаунт {product_name} не будет удалён"
},
+ "account_deletion_completed": {
+ "footer_reason": "Вы получили это письмо, потому что запросили удаление своего аккаунта {product_name}.",
+ "intro": "Мы удалили ваш аккаунт {product_name} по вашему запросу.",
+ "note": "В зависимости от вашего выбора ваши сообщения удалены или больше не связаны с вами. Если вы захотите снова пользоваться {product_name}, вы можете создать новый аккаунт.",
+ "signoff": "Команда {product_name}",
+ "subject": "Ваш аккаунт {product_name} удалён"
+ },
"account_deletion_scheduled_inactivity": {
"footer_reason": "Вы получили это письмо, потому что ваш аккаунт {product_name} долгое время был неактивен.",
"intro": "Вы давно не пользовались аккаунтом {product_name}, поэтому мы удалим его {deletion_date}.",
diff --git a/fluxer_api/pkgs/email/src/email_i18n/weblate/locales/sv-SE.json b/fluxer_api/pkgs/email/src/email_i18n/weblate/locales/sv-SE.json
index 732a5f52e..e77746384 100644
--- a/fluxer_api/pkgs/email/src/email_i18n/weblate/locales/sv-SE.json
+++ b/fluxer_api/pkgs/email/src/email_i18n/weblate/locales/sv-SE.json
@@ -6,6 +6,13 @@
"signoff": "{product_name}-teamet",
"subject": "Ditt {product_name}-konto kommer inte att raderas"
},
+ "account_deletion_completed": {
+ "footer_reason": "Du fick det här mejlet eftersom du begärde att ditt {product_name}-konto skulle raderas.",
+ "intro": "Vi har raderat ditt {product_name}-konto, som du bad om.",
+ "note": "Dina meddelanden har raderats eller är inte längre kopplade till dig, beroende på vad du valde. Om du vill använda {product_name} igen kan du skapa ett nytt konto.",
+ "signoff": "{product_name}-teamet",
+ "subject": "Ditt {product_name}-konto har raderats"
+ },
"account_deletion_scheduled_inactivity": {
"footer_reason": "Du fick det här mejlet eftersom ditt {product_name}-konto har varit inaktivt länge.",
"intro": "Ditt {product_name}-konto har varit inaktivt länge, så vi raderar det den {deletion_date}.",
diff --git a/fluxer_api/pkgs/email/src/email_i18n/weblate/locales/th.json b/fluxer_api/pkgs/email/src/email_i18n/weblate/locales/th.json
index 266e4e863..8ad13c16b 100644
--- a/fluxer_api/pkgs/email/src/email_i18n/weblate/locales/th.json
+++ b/fluxer_api/pkgs/email/src/email_i18n/weblate/locales/th.json
@@ -6,6 +6,13 @@
"signoff": "ทีม {product_name}",
"subject": "บัญชี {product_name} ของคุณจะไม่ถูกลบ"
},
+ "account_deletion_completed": {
+ "footer_reason": "คุณได้รับอีเมลนี้เนื่องจากคุณได้ขอให้ลบบัญชี {product_name} ของคุณ",
+ "intro": "เราได้ลบบัญชี {product_name} ของคุณตามที่คุณขอแล้ว",
+ "note": "ข้อความของคุณถูกลบหรือไม่ได้เชื่อมโยงกับคุณอีกต่อไป ขึ้นอยู่กับสิ่งที่คุณเลือก หากคุณต้องการใช้ {product_name} อีกครั้ง คุณสามารถสร้างบัญชีใหม่ได้",
+ "signoff": "ทีม {product_name}",
+ "subject": "บัญชี {product_name} ของคุณถูกลบแล้ว"
+ },
"account_deletion_scheduled_inactivity": {
"footer_reason": "คุณได้รับอีเมลนี้เนื่องจากบัญชี {product_name} ของคุณไม่มีการใช้งานมาเป็นเวลานาน",
"intro": "บัญชี {product_name} ของคุณไม่มีการใช้งานมานาน เราจึงจะลบบัญชีนี้ในวันที่ {deletion_date}",
diff --git a/fluxer_api/pkgs/email/src/email_i18n/weblate/locales/tr.json b/fluxer_api/pkgs/email/src/email_i18n/weblate/locales/tr.json
index abe54dac1..92c1c369e 100644
--- a/fluxer_api/pkgs/email/src/email_i18n/weblate/locales/tr.json
+++ b/fluxer_api/pkgs/email/src/email_i18n/weblate/locales/tr.json
@@ -6,6 +6,13 @@
"signoff": "{product_name} ekibi",
"subject": "{product_name} hesabınız silinmeyecek"
},
+ "account_deletion_completed": {
+ "footer_reason": "Bu e-postayı, {product_name} hesabınızın silinmesini istediğiniz için aldınız.",
+ "intro": "İsteğiniz üzerine {product_name} hesabınızı sildik.",
+ "note": "Mesajlarınız, seçiminize bağlı olarak silindi ya da artık sizinle ilişkilendirilmiyor. {product_name} hizmetini yeniden kullanmak isterseniz yeni bir hesap oluşturabilirsiniz.",
+ "signoff": "{product_name} ekibi",
+ "subject": "{product_name} hesabınız silindi"
+ },
"account_deletion_scheduled_inactivity": {
"footer_reason": "Bu e-postayı, {product_name} hesabınız uzun süredir kullanılmadığı için aldınız.",
"intro": "{product_name} hesabınız uzun süredir kullanılmıyor, bu yüzden hesabınızı {deletion_date} tarihinde sileceğiz.",
diff --git a/fluxer_api/pkgs/email/src/email_i18n/weblate/locales/uk.json b/fluxer_api/pkgs/email/src/email_i18n/weblate/locales/uk.json
index 64f39cef7..14a502442 100644
--- a/fluxer_api/pkgs/email/src/email_i18n/weblate/locales/uk.json
+++ b/fluxer_api/pkgs/email/src/email_i18n/weblate/locales/uk.json
@@ -6,6 +6,13 @@
"signoff": "Команда {product_name}",
"subject": "Твій акаунт {product_name} не буде видалено"
},
+ "account_deletion_completed": {
+ "footer_reason": "Ти отримав цей лист, оскільки попросив видалити свій акаунт {product_name}.",
+ "intro": "Ми видалили твій акаунт {product_name}, як ти й просив.",
+ "note": "Залежно від твого вибору, твої повідомлення видалено або вони більше не пов’язані з тобою. Якщо захочеш знову користуватися {product_name}, можеш створити новий акаунт.",
+ "signoff": "Команда {product_name}",
+ "subject": "Твій акаунт {product_name} видалено"
+ },
"account_deletion_scheduled_inactivity": {
"footer_reason": "Ти отримав цей лист, оскільки твій акаунт {product_name} тривалий час був неактивним.",
"intro": "Твій акаунт {product_name} тривалий час неактивний, тому ми видалимо його {deletion_date}.",
diff --git a/fluxer_api/pkgs/email/src/email_i18n/weblate/locales/vi.json b/fluxer_api/pkgs/email/src/email_i18n/weblate/locales/vi.json
index a5a37367e..4067ed178 100644
--- a/fluxer_api/pkgs/email/src/email_i18n/weblate/locales/vi.json
+++ b/fluxer_api/pkgs/email/src/email_i18n/weblate/locales/vi.json
@@ -6,6 +6,13 @@
"signoff": "Đội ngũ {product_name}",
"subject": "Tài khoản {product_name} của bạn sẽ không bị xóa"
},
+ "account_deletion_completed": {
+ "footer_reason": "Bạn nhận được email này vì bạn đã yêu cầu xóa tài khoản {product_name} của mình.",
+ "intro": "Chúng tôi đã xóa tài khoản {product_name} của bạn theo yêu cầu.",
+ "note": "Tùy theo lựa chọn của bạn, tin nhắn của bạn đã bị xóa hoặc không còn liên kết với bạn nữa. Nếu muốn dùng lại {product_name}, bạn có thể tạo tài khoản mới.",
+ "signoff": "Đội ngũ {product_name}",
+ "subject": "Tài khoản {product_name} của bạn đã bị xóa"
+ },
"account_deletion_scheduled_inactivity": {
"footer_reason": "Bạn nhận được email này vì tài khoản {product_name} của bạn đã không hoạt động trong thời gian dài.",
"intro": "Tài khoản {product_name} của bạn đã lâu không hoạt động, nên chúng tôi sẽ xóa tài khoản vào {deletion_date}.",
diff --git a/fluxer_api/pkgs/email/src/email_i18n/weblate/locales/zh-CN.json b/fluxer_api/pkgs/email/src/email_i18n/weblate/locales/zh-CN.json
index a49bb5bc6..c2b35f53f 100644
--- a/fluxer_api/pkgs/email/src/email_i18n/weblate/locales/zh-CN.json
+++ b/fluxer_api/pkgs/email/src/email_i18n/weblate/locales/zh-CN.json
@@ -6,6 +6,13 @@
"signoff": "{product_name} 团队",
"subject": "你的 {product_name} 账号不会被删除"
},
+ "account_deletion_completed": {
+ "footer_reason": "你收到此邮件是因为你曾申请删除你的 {product_name} 账号。",
+ "intro": "我们已按你的要求删除了你的 {product_name} 账号。",
+ "note": "根据你的选择,你的消息已被删除,或已不再与你关联。如果你想再次使用 {product_name},可以创建一个新账号。",
+ "signoff": "{product_name} 团队",
+ "subject": "你的 {product_name} 账号已删除"
+ },
"account_deletion_scheduled_inactivity": {
"footer_reason": "你收到此邮件是因为你的 {product_name} 账号已长时间未使用。",
"intro": "你的 {product_name} 账号已长时间未使用,我们将在 {deletion_date} 删除它。",
diff --git a/fluxer_api/pkgs/email/src/email_i18n/weblate/locales/zh-TW.json b/fluxer_api/pkgs/email/src/email_i18n/weblate/locales/zh-TW.json
index 44b3879c7..07168b4f5 100644
--- a/fluxer_api/pkgs/email/src/email_i18n/weblate/locales/zh-TW.json
+++ b/fluxer_api/pkgs/email/src/email_i18n/weblate/locales/zh-TW.json
@@ -6,6 +6,13 @@
"signoff": "{product_name} 團隊",
"subject": "您的 {product_name} 帳號不會被刪除"
},
+ "account_deletion_completed": {
+ "footer_reason": "您收到這封電子郵件,是因為您要求刪除您的 {product_name} 帳號。",
+ "intro": "我們已依照您的要求刪除您的 {product_name} 帳號。",
+ "note": "依照您的選擇,您的訊息已被刪除,或已不再與您連結。如果您想再次使用 {product_name},可以建立新帳號。",
+ "signoff": "{product_name} 團隊",
+ "subject": "您的 {product_name} 帳號已刪除"
+ },
"account_deletion_scheduled_inactivity": {
"footer_reason": "您收到此電子郵件是因為您的 {product_name} 帳號已長期未使用。",
"intro": "您的 {product_name} 帳號已長時間未使用,我們將在 {deletion_date} 刪除它。",
diff --git a/fluxer_api/pkgs/email/src/email_i18n/weblate/messages.json b/fluxer_api/pkgs/email/src/email_i18n/weblate/messages.json
index bceeee5f4..d9a92981b 100644
--- a/fluxer_api/pkgs/email/src/email_i18n/weblate/messages.json
+++ b/fluxer_api/pkgs/email/src/email_i18n/weblate/messages.json
@@ -6,6 +6,13 @@
"signoff": "The {product_name} team",
"footer_reason": "You received this email because the deletion of your {product_name} account was canceled."
},
+ "account_deletion_completed": {
+ "subject": "Your {product_name} account has been deleted",
+ "intro": "We've deleted your {product_name} account, as you asked.",
+ "note": "Your messages were deleted or unlinked from you, depending on what you chose. If you want to use {product_name} again, you can create a new account.",
+ "signoff": "The {product_name} team",
+ "footer_reason": "You received this email because you asked to delete your {product_name} account."
+ },
"account_deletion_scheduled_inactivity": {
"subject": "Your inactive {product_name} account will be deleted",
"intro": "Your {product_name} account has been inactive for a long time, so we'll delete it on {deletion_date}.",
diff --git a/fluxer_api/src/api/Config.ts b/fluxer_api/src/api/Config.ts
index 8c1d4c41e..485cdc28b 100644
--- a/fluxer_api/src/api/Config.ts
+++ b/fluxer_api/src/api/Config.ts
@@ -683,6 +683,7 @@ export function buildAPIConfigFromMaster(master: MasterConfig): APIConfig {
storeBilling: {
sandboxUserIds: master.integrations.store_billing.sandbox_user_ids ?? [],
sandboxEntitlesAll: master.integrations.store_billing.sandbox_entitles_all,
+ sandboxSubscriptions: master.integrations.store_billing.sandbox_subscriptions,
},
worker: {
mode: apiWorkerConfig?.mode ?? 'all_lanes',
diff --git a/fluxer_api/src/api/admin/services/AdminReportService.ts b/fluxer_api/src/api/admin/services/AdminReportService.ts
index 353a216bc..1fc96062b 100644
--- a/fluxer_api/src/api/admin/services/AdminReportService.ts
+++ b/fluxer_api/src/api/admin/services/AdminReportService.ts
@@ -529,6 +529,7 @@ export class AdminReportService {
global_name: user.global_name,
bio: user.bio,
pronouns: user.pronouns,
+ custom_status: user.custom_status,
avatar: await asset(user.avatar),
banner: await asset(user.banner),
};
diff --git a/fluxer_api/src/api/admin/services/AdminUserProfileService.ts b/fluxer_api/src/api/admin/services/AdminUserProfileService.ts
index e8629d37a..c58abeaac 100644
--- a/fluxer_api/src/api/admin/services/AdminUserProfileService.ts
+++ b/fluxer_api/src/api/admin/services/AdminUserProfileService.ts
@@ -20,7 +20,7 @@ import {
type PartialUserChangePropagationDeps,
propagateUserUpdate,
} from '@app/api/user/services/PartialUserChangePropagation';
-import {clearPendingDeletion} from '@app/api/user/services/PendingDeletionCoordinator';
+import {clearPendingDeletion, resetTiedBulkMessageDeletion} from '@app/api/user/services/PendingDeletionCoordinator';
import {assertNoDiscriminatorChange} from '@app/api/user/UniqueUsernames';
import {renameUser} from '@app/api/user/UserRename';
import {BELOW_MINIMUM_AGE_TRAIT, DOB_DEFERRED_TRAIT} from '@app/api/user/UserTraits';
@@ -340,6 +340,7 @@ export class AdminUserProfileService {
deletion_reason_code: null,
deletion_public_reason: null,
deletion_audit_log_reason: null,
+ ...resetTiedBulkMessageDeletion(updatedUser),
});
await clearPendingDeletion({userId, deletionQueue: getKVAccountDeletionQueue()});
}
diff --git a/fluxer_api/src/api/admin/tests/AdminReportDelete.test.ts b/fluxer_api/src/api/admin/tests/AdminReportDelete.test.ts
index b414a653f..2e12b0bb9 100644
--- a/fluxer_api/src/api/admin/tests/AdminReportDelete.test.ts
+++ b/fluxer_api/src/api/admin/tests/AdminReportDelete.test.ts
@@ -155,6 +155,7 @@ describe('DELETE /admin/reports/:report_id', () => {
global_name: null,
bio: null,
pronouns: null,
+ custom_status: null,
avatar: {hash: `abc${id}`, key: profileKey},
banner: null,
},
diff --git a/fluxer_api/src/api/auth/AuthUtility.ts b/fluxer_api/src/api/auth/AuthUtility.ts
index 3f64a7b00..7d2f81e9e 100644
--- a/fluxer_api/src/api/auth/AuthUtility.ts
+++ b/fluxer_api/src/api/auth/AuthUtility.ts
@@ -11,6 +11,7 @@ import type {KVAccountDeletionQueueService} from '@app/api/infrastructure/KVAcco
import {Logger} from '@app/api/Logger';
import type {User} from '@app/api/models/User';
import {followOperatorPassWallStanding} from '@app/api/operator_pass/OperatorPassWallStanding';
+import {resetTiedBulkMessageDeletion} from '@app/api/user/services/PendingDeletionCoordinator';
import {isAccountClosed, isSignInRefused} from '@app/api/user/UserHelpers';
import * as AgeUtils from '@app/api/utils/AgeUtils';
import * as RandomUtils from '@app/api/utils/RandomUtils';
@@ -136,6 +137,7 @@ export async function reactivateOnSignIn(
deletion_reason_code: null,
deletion_public_reason: null,
deletion_audit_log_reason: null,
+ ...resetTiedBulkMessageDeletion(currentUser),
});
await deletionQueue.removeFromQueue(currentUser.id);
Logger.info({userId: currentUser.id}, 'Auto-cancelled deletion on sign-in');
diff --git a/fluxer_api/src/api/auth/tests/AuthSudoRequiredOperations.test.ts b/fluxer_api/src/api/auth/tests/AuthSudoRequiredOperations.test.ts
index 467ca959f..db9ae7927 100644
--- a/fluxer_api/src/api/auth/tests/AuthSudoRequiredOperations.test.ts
+++ b/fluxer_api/src/api/auth/tests/AuthSudoRequiredOperations.test.ts
@@ -137,7 +137,7 @@ describe('Auth sudo required operations', () => {
.body({
password: testUser.password,
})
- .expect(204)
+ .expect(200)
.execute();
});
});
diff --git a/fluxer_api/src/api/auth/tests/SignInReactivation.test.ts b/fluxer_api/src/api/auth/tests/SignInReactivation.test.ts
index 09bba2fcc..1af32d009 100644
--- a/fluxer_api/src/api/auth/tests/SignInReactivation.test.ts
+++ b/fluxer_api/src/api/auth/tests/SignInReactivation.test.ts
@@ -56,7 +56,7 @@ describe('Signing in again reactivates the account on every sign-in path', () =>
await createBuilder(harness, account.token)
.post('/users/@me/delete')
.body({password: account.password})
- .expect(HTTP_STATUS.NO_CONTENT)
+ .expect(HTTP_STATUS.OK)
.execute();
expect((await readUser(account)).pendingDeletionAt).not.toBeNull();
expect(await harness.kvProvider.zcard('deletion_queue')).toBe(1);
diff --git a/fluxer_api/src/api/auth/tests/UnclaimedAccountRestrictions.test.ts b/fluxer_api/src/api/auth/tests/UnclaimedAccountRestrictions.test.ts
index 0d6d965ee..244f33840 100644
--- a/fluxer_api/src/api/auth/tests/UnclaimedAccountRestrictions.test.ts
+++ b/fluxer_api/src/api/auth/tests/UnclaimedAccountRestrictions.test.ts
@@ -115,11 +115,7 @@ describe('Unclaimed Account Restrictions', () => {
test('unclaimed account can delete without password', async () => {
const unclaimed = await createTestAccount(harness);
await unclaimAccount(harness, unclaimed.userId);
- await createBuilder(harness, unclaimed.token)
- .post('/users/@me/delete')
- .body({})
- .expect(HTTP_STATUS.NO_CONTENT)
- .execute();
+ await createBuilder(harness, unclaimed.token).post('/users/@me/delete').body({}).expect(HTTP_STATUS.OK).execute();
});
test('unclaimed account cannot create guild', async () => {
const unclaimed = await createTestAccount(harness);
diff --git a/fluxer_api/src/api/bluesky/BlueskyOAuthService.ts b/fluxer_api/src/api/bluesky/BlueskyOAuthService.ts
index 68a8bc48a..60818e909 100644
--- a/fluxer_api/src/api/bluesky/BlueskyOAuthService.ts
+++ b/fluxer_api/src/api/bluesky/BlueskyOAuthService.ts
@@ -15,6 +15,7 @@ import type {
import type {BlueskyOAuthConfig, BlueskyOAuthKeyConfig} from '@app/api/config/APIConfig';
import {ConnectionCredentialRepository} from '@app/api/connection/ConnectionCredentialRepository';
import type {ExternalFetchResponse, IUnfurlerService} from '@app/api/infrastructure/IUnfurlerService';
+import {Logger} from '@app/api/Logger';
import {JoseKey} from '@atproto/jwk-jose';
import {
AtprotoHandleResolver,
@@ -40,6 +41,7 @@ const NULL_BODY_STATUSES = new Set([204, 205, 304]);
const HANDLE_LOOKUP_TIMEOUT_MS = 3000;
const HANDLE_INVALID = 'handle.invalid';
+const SESSION_TTL_SECONDS = 300;
function createUnfurlerFetch(unfurler: IUnfurlerService): Fetch {
return async (input, init) => {
@@ -197,19 +199,25 @@ export class BlueskyOAuthService implements IBlueskyOAuthService {
});
const {session} = await client.callback(params);
const grantOwner = requireOwner();
- const handle = await this.resolveHandle(client, session.did);
- return {
- ...grantOwner,
- did: session.did,
- handle,
- };
+ try {
+ const handle = await this.resolveHandle(client, session.did);
+ return {
+ ...grantOwner,
+ did: session.did,
+ handle,
+ };
+ } finally {
+ await session.signOut().catch((error: unknown) => {
+ Logger.warn({error}, 'Bluesky OAuth sign-out after verification failed');
+ });
+ }
}
private createClient(
resolveOwner: () => BlueskyOAuthGrantOwner,
onConsume?: (owner: BlueskyOAuthGrantOwner) => void,
): BlueskyClientSession {
- const sessionStore = createSessionStore(this.credentials, 86400, resolveOwner);
+ const sessionStore = createSessionStore(this.credentials, SESSION_TTL_SECONDS, resolveOwner);
const client = new NodeOAuthClient({
...this.configuration,
stateStore: createStateStore(this.kvClient, this.credentials, 3600, resolveOwner, onConsume),
diff --git a/fluxer_api/src/api/channel/services/CallService.ts b/fluxer_api/src/api/channel/services/CallService.ts
index e89381996..e705740f8 100644
--- a/fluxer_api/src/api/channel/services/CallService.ts
+++ b/fluxer_api/src/api/channel/services/CallService.ts
@@ -91,6 +91,14 @@ export class CallService {
ringable: boolean;
silent: boolean;
}> {
+ const blockedByRecipient = await this.userRepository.getRelationship(
+ recipientId,
+ callerId,
+ RelationshipTypes.BLOCKED,
+ );
+ if (blockedByRecipient) {
+ return {ringable: false, silent: false};
+ }
const recipientSettings = await this.userRepository.findSettings(recipientId);
if (!recipientSettings) {
return {ringable: true, silent: false};
diff --git a/fluxer_api/src/api/channel/services/DMPermissionValidator.ts b/fluxer_api/src/api/channel/services/DMPermissionValidator.ts
index 3c18ade1c..7b2bf1fa6 100644
--- a/fluxer_api/src/api/channel/services/DMPermissionValidator.ts
+++ b/fluxer_api/src/api/channel/services/DMPermissionValidator.ts
@@ -56,9 +56,6 @@ export class DMPermissionValidator {
if (areFriends) {
return;
}
- if (targetUser.flags & UserFlags.APP_STORE_REVIEWER) {
- throw new CannotSendMessagesToUserError();
- }
if (this.hasStaffDmAccess({senderUser, targetUser, senderSettings, targetSettings, senderId, recipientId})) {
return;
}
diff --git a/fluxer_api/src/api/channel/services/interaction/MessageReactionService.ts b/fluxer_api/src/api/channel/services/interaction/MessageReactionService.ts
index e46fa41c6..a753ec833 100644
--- a/fluxer_api/src/api/channel/services/interaction/MessageReactionService.ts
+++ b/fluxer_api/src/api/channel/services/interaction/MessageReactionService.ts
@@ -16,7 +16,7 @@ import type {User} from '@app/api/models/User';
import {assertAccountNotLimited} from '@app/api/user/AccountLimit';
import type {UserRepository} from '@app/api/user/repositories/UserRepository';
import {mapUserToPartialResponse} from '@app/api/user/UserMappers';
-import {checkUserGlobalExpressions} from '@app/api/utils/EmojiUtils';
+import {checkUserGlobalExpressions, isExpressionSourceAgeRestricted} from '@app/api/utils/EmojiUtils';
import {assertGuildMemberCanCommunicate} from '@app/api/utils/GuildCommunicationUtils';
import {Permissions} from '@fluxer/constants/src/ChannelConstants';
import {GuildOperations} from '@fluxer/constants/src/GuildConstants';
@@ -407,6 +407,9 @@ export class MessageReactionService {
throw InputValidationError.fromCode('emoji', ValidationErrorCodes.CUSTOM_EMOJI_NOT_FOUND);
}
const isExternalEmoji = emoji.guildId.toString() !== guildId;
+ if (isExternalEmoji && (await isExpressionSourceAgeRestricted(this.guildRepository, emoji.guildId))) {
+ throw new MissingPermissionsError();
+ }
if (hasGlobalExpressions === 0 && isExternalEmoji) {
throw InputValidationError.fromCode('emoji', ValidationErrorCodes.CUSTOM_EMOJIS_REQUIRE_PREMIUM_OUTSIDE_SOURCE);
}
diff --git a/fluxer_api/src/api/channel/services/message/AttachmentProcessingService.ts b/fluxer_api/src/api/channel/services/message/AttachmentProcessingService.ts
index e2531bfac..08103a3e1 100644
--- a/fluxer_api/src/api/channel/services/message/AttachmentProcessingService.ts
+++ b/fluxer_api/src/api/channel/services/message/AttachmentProcessingService.ts
@@ -397,6 +397,43 @@ export class AttachmentProcessingService {
return null;
}
+ async screenStoredAttachment(params: {
+ attachment: MessageAttachment;
+ message: Message;
+ nsfwMode: MediaProxyNsfwMode;
+ }): Promise<MessageAttachment> {
+ const {attachment, message, nsfwMode} = params;
+ const bucket = Config.s3.buckets.cdn;
+ const key = makeAttachmentCdnKey(message.channelId, attachment.attachment_id, attachment.filename);
+ if (attachment.content_hash) {
+ await this.scanContentModerationHash({contentHash: attachment.content_hash, bucket, key, message});
+ } else {
+ await this.scanContentModerationWithLocalFile({localPath: null, bucket, key, message});
+ }
+ if (!isSupportedMediaContentType(attachment.content_type)) {
+ return attachment;
+ }
+ let metadata: MediaProxyMetadataResponse | null;
+ try {
+ metadata = await this.mediaService.getMetadata({type: 's3', bucket, key, nsfw: nsfwMode});
+ } catch (error) {
+ if (error instanceof ExplicitContentCannotBeSentError) {
+ await this.storageService.deleteObject(bucket, key);
+ throw error;
+ }
+ Logger.warn({error, context: METADATA_PROBE_DEGRADED_CONTEXT, key}, 'Favorite meme media probe failed');
+ return attachment;
+ }
+ if (!metadata?.nsfw) {
+ return attachment;
+ }
+ return {
+ ...attachment,
+ nsfw: true,
+ flags: attachment.flags | MessageAttachmentFlags.CONTAINS_EXPLICIT_MEDIA,
+ };
+ }
+
private async getAttachmentMediaMetadata(params: {
index: number;
uploadFilename: string;
diff --git a/fluxer_api/src/api/channel/services/message/MessageGatewayDispatch.ts b/fluxer_api/src/api/channel/services/message/MessageGatewayDispatch.ts
index 575f17c65..bcc341db7 100644
--- a/fluxer_api/src/api/channel/services/message/MessageGatewayDispatch.ts
+++ b/fluxer_api/src/api/channel/services/message/MessageGatewayDispatch.ts
@@ -26,6 +26,7 @@ type MessageCreateBroadcastData = MessageResponse & {
channel_type: Channel['type'];
nicks?: Record<string, string>;
mention_here?: true;
+ channel_nsfw?: true;
};
export async function buildBroadcastMessageData({
@@ -56,6 +57,7 @@ async function buildBroadcastMessageCreateData(
channel_type: params.channel.type,
...(groupDmNicks ? {nicks: groupDmNicks} : {}),
...(params.mentionHere ? {mention_here: true} : {}),
+ ...(params.channel.type === ChannelTypes.GROUP_DM && params.channel.isNsfw ? {channel_nsfw: true} : {}),
};
}
diff --git a/fluxer_api/src/api/channel/services/message/MessageOperationsHelpers.ts b/fluxer_api/src/api/channel/services/message/MessageOperationsHelpers.ts
index bc4308b32..2e706018d 100644
--- a/fluxer_api/src/api/channel/services/message/MessageOperationsHelpers.ts
+++ b/fluxer_api/src/api/channel/services/message/MessageOperationsHelpers.ts
@@ -211,6 +211,9 @@ export class MessageOperationsHelpers {
if (this.isFavoriteMemeAnimated(favoriteMeme, metadata)) {
flags |= MessageAttachmentFlags.IS_ANIMATED;
}
+ if (favoriteMeme.nsfw === true) {
+ flags |= MessageAttachmentFlags.CONTAINS_EXPLICIT_MEDIA;
+ }
return {
attachment_id: memeAttachmentId,
filename: favoriteMeme.filename,
@@ -224,7 +227,7 @@ export class MessageOperationsHelpers {
placeholder,
flags,
duration: favoriteMeme.duration,
- nsfw: null,
+ nsfw: favoriteMeme.nsfw === true ? true : null,
waveform: null,
};
}
diff --git a/fluxer_api/src/api/channel/services/message/MessagePersistenceService.ts b/fluxer_api/src/api/channel/services/message/MessagePersistenceService.ts
index 5646c2f85..34c46850f 100644
--- a/fluxer_api/src/api/channel/services/message/MessagePersistenceService.ts
+++ b/fluxer_api/src/api/channel/services/message/MessagePersistenceService.ts
@@ -94,6 +94,7 @@ interface CreateMessageParams {
attachmentUploadUserId?: UserID;
uploadChannelId?: ChannelID;
processedAttachments?: Array<MessageAttachment>;
+ favoriteMemeAttachment?: MessageAttachment;
stickerIds?: Array<StickerID>;
messageReference?: MessageReference;
messageSnapshots?: Array<MessageSnapshot>;
@@ -185,15 +186,23 @@ export class MessagePersistenceService {
dmNsfwContext: params.dmNsfwContext,
});
const isNSFWAllowed = attachmentNsfwMode !== 'block';
+ const screenedFavoriteMeme = params.favoriteMemeAttachment
+ ? await this.attachmentService.screenStoredAttachment({
+ attachment: params.favoriteMemeAttachment,
+ message: {id: params.messageId, channelId: params.channelId, authorId} as Message,
+ nsfwMode: attachmentNsfwMode,
+ })
+ : null;
const [sanitizedContent, attachmentResult, processedStickers] = await Promise.all([
this.sanitizeContentIfNeeded(params, authorId),
this.processAttachments(params, attachmentNsfwMode),
this.processStickers(params, authorId),
]);
let messageContent = sanitizedContent;
- let processedAttachments: Array<MessageAttachment> = params.processedAttachments
- ? [...params.processedAttachments]
- : [];
+ let processedAttachments: Array<MessageAttachment> = [
+ ...(params.processedAttachments ?? []),
+ ...(screenedFavoriteMeme ? [screenedFavoriteMeme] : []),
+ ];
if (attachmentResult) {
if (attachmentResult.hasVirusDetected) {
messageContent = getContentMessage('content.virus_detected', params.user?.locale);
diff --git a/fluxer_api/src/api/channel/services/message/MessageSendService.ts b/fluxer_api/src/api/channel/services/message/MessageSendService.ts
index a7b0319be..ad8efeb7d 100644
--- a/fluxer_api/src/api/channel/services/message/MessageSendService.ts
+++ b/fluxer_api/src/api/channel/services/message/MessageSendService.ts
@@ -838,7 +838,7 @@ export class MessageSendService {
attachments: attachmentsToProcess,
attachmentUploadUserId: user.id,
uploadChannelId,
- processedAttachments: favoriteMemeAttachment ? [favoriteMemeAttachment] : undefined,
+ favoriteMemeAttachment,
stickerIds: data.sticker_ids
? data.sticker_ids.flatMap((stickerId) => createStickerID(stickerId))
: undefined,
@@ -1315,7 +1315,7 @@ export class MessageSendService {
embeds: data.embeds,
attachments: attachmentsToProcess,
attachmentUploadUserId: user.id,
- processedAttachments: favoriteMemeAttachment ? [favoriteMemeAttachment] : undefined,
+ favoriteMemeAttachment,
stickerIds: data.sticker_ids
? data.sticker_ids.flatMap((stickerId) => createStickerID(stickerId))
: undefined,
diff --git a/fluxer_api/src/api/channel/services/message/MessageStickerService.ts b/fluxer_api/src/api/channel/services/message/MessageStickerService.ts
index a246a9253..dfb0bf04c 100644
--- a/fluxer_api/src/api/channel/services/message/MessageStickerService.ts
+++ b/fluxer_api/src/api/channel/services/message/MessageStickerService.ts
@@ -5,7 +5,7 @@ import type {MessageStickerItem} from '@app/api/database/types/MessageTypes';
import type {GuildRepository} from '@app/api/guild/repositories/GuildRepository';
import type {LimitConfigService} from '@app/api/limits/LimitConfigService';
import type {UserRepository} from '@app/api/user/repositories/UserRepository';
-import {checkUserGlobalExpressions} from '@app/api/utils/EmojiUtils';
+import {checkUserGlobalExpressions, isExpressionSourceAgeRestricted} from '@app/api/utils/EmojiUtils';
import {Permissions} from '@fluxer/constants/src/ChannelConstants';
import {ValidationErrorCodes} from '@fluxer/constants/src/ValidationErrorCodes';
import {InputValidationError} from '@fluxer/errors/src/domains/core/InputValidationError';
@@ -38,6 +38,9 @@ export class MessageStickerService {
if (!stickerFromAnyGuild) {
throw InputValidationError.fromCode('sticker', ValidationErrorCodes.CUSTOM_STICKER_NOT_FOUND);
}
+ if (await isExpressionSourceAgeRestricted(this.guildRepository, stickerFromAnyGuild.guildId)) {
+ throw new MissingPermissionsError();
+ }
return {
sticker_id: stickerFromAnyGuild.id,
name: stickerFromAnyGuild.name,
@@ -56,6 +59,9 @@ export class MessageStickerService {
if (!stickerFromOtherGuild) {
throw InputValidationError.fromCode('sticker', ValidationErrorCodes.CUSTOM_STICKER_NOT_FOUND);
}
+ if (await isExpressionSourceAgeRestricted(this.guildRepository, stickerFromOtherGuild.guildId)) {
+ throw new MissingPermissionsError();
+ }
if (hasGlobalExpressions === 0) {
throw InputValidationError.fromCode(
'sticker',
diff --git a/fluxer_api/src/api/channel/tests/DMPrivacyBidirectional.test.ts b/fluxer_api/src/api/channel/tests/DMPrivacyBidirectional.test.ts
index b91dbb6e0..e1d9b4844 100644
--- a/fluxer_api/src/api/channel/tests/DMPrivacyBidirectional.test.ts
+++ b/fluxer_api/src/api/channel/tests/DMPrivacyBidirectional.test.ts
@@ -155,6 +155,24 @@ describe('DM Privacy Bidirectional Enforcement', () => {
.execute();
});
});
+ describe('teen defaults', () => {
+ it('blocks a non-friend member of a community the teen joined after sign-up', async () => {
+ const sender = await createTestAccount(harness);
+ const teen = await createTestAccount(harness, {dateOfBirth: '2010-01-01'});
+ await ensureSessionStarted(harness, sender.token);
+ await ensureSessionStarted(harness, teen.token);
+ const guild = await createGuild(harness, sender.token, 'Shared Community');
+ const systemChannel = await getChannel(harness, sender.token, guild.system_channel_id!);
+ const invite = await createChannelInvite(harness, sender.token, systemChannel.id);
+ await acceptInvite(harness, teen.token, invite.code);
+ const channel = await createDmChannel(harness, sender.token, teen.userId);
+ await createBuilder(harness, sender.token)
+ .post(`/channels/${channel.id}/messages`)
+ .body({content: 'hello'})
+ .expect(HTTP_STATUS.BAD_REQUEST, 'CANNOT_SEND_MESSAGES_TO_USER')
+ .execute();
+ });
+ });
describe('friends bypass sender restrictions', () => {
it('allows message when sender has defaultGuildsRestricted but users are friends', async () => {
const sender = await createTestAccount(harness);
diff --git a/fluxer_api/src/api/channel/tests/ReactionExternalEmojiPermissions.test.ts b/fluxer_api/src/api/channel/tests/ReactionExternalEmojiPermissions.test.ts
index 7f437d60b..35e0818fd 100644
--- a/fluxer_api/src/api/channel/tests/ReactionExternalEmojiPermissions.test.ts
+++ b/fluxer_api/src/api/channel/tests/ReactionExternalEmojiPermissions.test.ts
@@ -6,12 +6,14 @@ import {
setupTestGuildWithMembers,
} from '@app/api/channel/tests/ChannelTestUtils';
import {createEmoji, createTestGuild, getPngDataUrl} from '@app/api/emoji/tests/EmojiTestUtils';
+import {updateGuild} from '@app/api/guild/tests/GuildTestUtils';
import {type ApiTestHarness, createApiTestHarness} from '@app/api/test/ApiTestHarness';
import {setLimitOverride} from '@app/api/test/LimitTestUtils';
import {HTTP_STATUS} from '@app/api/test/TestConstants';
import {createBuilder} from '@app/api/test/TestRequestBuilder';
import {APIErrorCodes} from '@fluxer/constants/src/ApiErrorCodes';
import {Permissions} from '@fluxer/constants/src/ChannelConstants';
+import {GuildNSFWLevel} from '@fluxer/constants/src/GuildConstants';
import {afterAll, beforeAll, beforeEach, describe, it} from 'vitest';
describe('Reactions without USE_EXTERNAL_EMOJIS', () => {
@@ -58,4 +60,26 @@ describe('Reactions without USE_EXTERNAL_EMOJIS', () => {
await restore();
}
});
+
+ it('refuses emojis from an 18+ community outside it', async () => {
+ const {owner, members, systemChannel} = await setupTestGuildWithMembers(harness, 1);
+ const [reactor] = members;
+ const message = await sendChannelMessage(harness, owner.token, systemChannel.id, 'react to me');
+ const restore = await setLimitOverride(harness, {feature_global_expressions: 1});
+ try {
+ const matureGuild = await createTestGuild(harness, reactor.token);
+ const matureEmoji = await createEmoji(harness, reactor.token, matureGuild.id, {
+ name: 'mature',
+ image: getPngDataUrl(),
+ });
+ await updateGuild(harness, reactor.token, matureGuild.id, {nsfw_level: GuildNSFWLevel.AGE_RESTRICTED});
+ await createBuilder(harness, reactor.token)
+ .put(`/channels/${systemChannel.id}/messages/${message.id}/reactions/${matureEmoji.name}:${matureEmoji.id}/@me`)
+ .body(null)
+ .expect(HTTP_STATUS.FORBIDDEN, APIErrorCodes.MISSING_PERMISSIONS)
+ .execute();
+ } finally {
+ await restore();
+ }
+ });
});
diff --git a/fluxer_api/src/api/config/APIConfig.ts b/fluxer_api/src/api/config/APIConfig.ts
index c2944b42b..de7181cdf 100644
--- a/fluxer_api/src/api/config/APIConfig.ts
+++ b/fluxer_api/src/api/config/APIConfig.ts
@@ -392,6 +392,7 @@ export interface APIConfig {
storeBilling: {
sandboxUserIds: Array<string>;
sandboxEntitlesAll: boolean;
+ sandboxSubscriptions: boolean;
};
worker: {
mode: APIWorkerMode;
diff --git a/fluxer_api/src/api/content_i18n/ContentI18nMessages.ts b/fluxer_api/src/api/content_i18n/ContentI18nMessages.ts
index 399907f1f..227ecb031 100644
--- a/fluxer_api/src/api/content_i18n/ContentI18nMessages.ts
+++ b/fluxer_api/src/api/content_i18n/ContentI18nMessages.ts
@@ -215,6 +215,7 @@ export const CONTENT_I18N_MESSAGES = {
'report_flow.label.age_yes_profile': 'Yes, their profile mentions their age',
'report_flow.label.atrocity_denial': 'Denying or celebrating the Holocaust or other genocides',
'report_flow.label.ban_evasion': 'Getting around a ban with another account',
+ 'report_flow.label.call_activity': 'Something they said or showed in a call',
'report_flow.label.channel_names': 'Channel names',
'report_flow.label.community_banner': 'Community banner',
'report_flow.label.community_icon': 'Community icon',
@@ -331,6 +332,7 @@ export const CONTENT_I18N_MESSAGES = {
'report_flow.label.synthetic_media': 'Fake or AI-made media presented as real',
'report_flow.label.terrorism': 'Terrorism or violent extremism',
'report_flow.label.terrorism_guild': 'Recruiting for or promoting terrorism or violent extremism',
+ 'report_flow.label.their_profile': 'Something in their profile',
'report_flow.label.threat': 'Threats or calls for violence',
'report_flow.label.threat_to_share': 'They are threatening to share it',
'report_flow.label.too_young': "They're under the minimum age to use {product_name}",
@@ -375,16 +377,13 @@ export const CONTENT_I18N_MESSAGES = {
'report_flow.screen.private_info.title': 'Which private details are involved?',
'report_flow.screen.profile_abuse.title': "What's harmful about their profile?",
'report_flow.screen.profile_hate_violence.title': 'What does their profile show or promote?',
- 'report_flow.screen.profile_intro.options_heading': 'Learn more',
- 'report_flow.screen.profile_intro.subtitle':
- "Tell us what's wrong with this profile. They won't be told who reported them.",
- 'report_flow.screen.profile_intro.title': 'Report profile',
'report_flow.screen.profile_minor_sexual.title': 'What in their profile involves a minor?',
'report_flow.screen.profile_parts.subtitle': 'Pick as many as you need.',
'report_flow.screen.profile_parts.title': 'Which parts of their profile are a problem?',
'report_flow.screen.profile_private_info.title': 'Which private details are in their profile?',
'report_flow.screen.profile_sexual.title': 'Tell us about the sexual content in their profile',
'report_flow.screen.profile_threat.title': 'How does their profile involve violence?',
+ 'report_flow.screen.root_call.title': 'What happened in the call?',
'report_flow.screen.root_guild.subtitle': 'Pick the closest match for what is going on in this community.',
'report_flow.screen.root_guild.title': "What's wrong with this community?",
'report_flow.screen.root_message.subtitle': 'Pick the closest match. You can check everything before it is sent.',
@@ -406,6 +405,8 @@ export const CONTENT_I18N_MESSAGES = {
'report_flow.screen.spam_kind_guild.title': 'How is this community abusing the platform?',
'report_flow.screen.spam_profile.title': 'How is the account being misused?',
'report_flow.screen.threat.title': 'How does it involve violence?',
+ 'report_flow.screen.user_start.subtitle': "They won't be told who reported them.",
+ 'report_flow.screen.user_start.title': 'What do you want to report?',
'report_flow.screen.violence_misinfo.title': 'Which of these matches it?',
'report_flow.screen.violence_misinfo_guild.title': 'Which of these happens in this community?',
} as const;
diff --git a/fluxer_api/src/api/content_i18n/weblate/locales/ar.json b/fluxer_api/src/api/content_i18n/weblate/locales/ar.json
index 1ec5b7d82..5702eba05 100644
--- a/fluxer_api/src/api/content_i18n/weblate/locales/ar.json
+++ b/fluxer_api/src/api/content_i18n/weblate/locales/ar.json
@@ -158,6 +158,7 @@
"report_flow.label.age_yes_profile": "نعم، يذكر ملفهم الشخصي عمرهم",
"report_flow.label.atrocity_denial": "إنكار أو تمجيد الهولوكوست أو الإبادات الجماعية الأخرى",
"report_flow.label.ban_evasion": "التحايل على الحظر باستخدام حساب آخر",
+ "report_flow.label.call_activity": "شيء قاله أو عرضه في مكالمة",
"report_flow.label.channel_names": "أسماء القنوات",
"report_flow.label.community_banner": "لافتة المجتمع",
"report_flow.label.community_icon": "أيقونة المجتمع",
@@ -269,6 +270,7 @@
"report_flow.label.synthetic_media": "وسائط مزيفة أو مصنوعة بالذكاء الاصطناعي تُقدم على أنها حقيقية",
"report_flow.label.terrorism": "الإرهاب أو التطرف العنيف",
"report_flow.label.terrorism_guild": "التجنيد أو الترويج للإرهاب أو التطرف العنيف",
+ "report_flow.label.their_profile": "شيء في ملفه الشخصي",
"report_flow.label.threat": "تهديدات أو دعوات للعنف",
"report_flow.label.threat_to_share": "إنهم يهددون بمشاركتها",
"report_flow.label.too_young": "إنهم أصغر من الحد الأدنى للسن لاستخدام {product_name}",
@@ -307,15 +309,13 @@
"report_flow.screen.private_info.title": "ما المعلومات الخاصة المعنية؟",
"report_flow.screen.profile_abuse.title": "ما الضار في ملفهم الشخصي؟",
"report_flow.screen.profile_hate_violence.title": "ماذا يُظهر ملفهم الشخصي أو يروّج له؟",
- "report_flow.screen.profile_intro.options_heading": "معرفة المزيد",
- "report_flow.screen.profile_intro.subtitle": "أخبرنا ما المشكلة في هذا الملف الشخصي. لن يعرفوا من أبلغ عنهم.",
- "report_flow.screen.profile_intro.title": "الإبلاغ عن الملف الشخصي",
"report_flow.screen.profile_minor_sexual.title": "ما الذي في ملفهم الشخصي يتعلق بقاصر؟",
"report_flow.screen.profile_parts.subtitle": "يمكنك اختيار أكثر من خيار.",
"report_flow.screen.profile_parts.title": "ما هي أجزاء ملفهم الشخصي التي تمثل مشكلة؟",
"report_flow.screen.profile_private_info.title": "ما المعلومات الخاصة الموجودة في ملفهم الشخصي؟",
"report_flow.screen.profile_sexual.title": "أخبرنا عن المحتوى الجنسي في ملفهم الشخصي",
"report_flow.screen.profile_threat.title": "كيف يتضمن ملفهم الشخصي العنف؟",
+ "report_flow.screen.root_call.title": "ماذا حدث في المكالمة؟",
"report_flow.screen.root_guild.subtitle": "اختر الخيار الأقرب لما يحدث في هذا المجتمع.",
"report_flow.screen.root_guild.title": "ما المشكلة في هذا المجتمع؟",
"report_flow.screen.root_message.subtitle": "اختر الخيار الأقرب. يمكنك مراجعة كل شيء قبل إرساله.",
@@ -336,6 +336,8 @@
"report_flow.screen.spam_kind_guild.title": "كيف يسيء هذا المجتمع استخدام المنصة؟",
"report_flow.screen.spam_profile.title": "كيف يُساء استخدام الحساب؟",
"report_flow.screen.threat.title": "كيف يتضمن ذلك عنفًا؟",
+ "report_flow.screen.user_start.subtitle": "لن يعرفوا من أبلغ عنهم.",
+ "report_flow.screen.user_start.title": "ما الذي تريد الإبلاغ عنه؟",
"report_flow.screen.violence_misinfo.title": "أي من هذه الخيارات ينطبق عليه؟",
"report_flow.screen.violence_misinfo_guild.title": "أي من هذه الخيارات يحدث في هذا المجتمع؟"
}
diff --git a/fluxer_api/src/api/content_i18n/weblate/locales/bg.json b/fluxer_api/src/api/content_i18n/weblate/locales/bg.json
index 12192e01a..7bcdc1493 100644
--- a/fluxer_api/src/api/content_i18n/weblate/locales/bg.json
+++ b/fluxer_api/src/api/content_i18n/weblate/locales/bg.json
@@ -158,6 +158,7 @@
"report_flow.label.age_yes_profile": "Да, профилът им споменава възрастта им",
"report_flow.label.atrocity_denial": "Отричане или възхваляване на Холокоста или други геноциди",
"report_flow.label.ban_evasion": "Заобикаляне на забрана с друг акаунт",
+ "report_flow.label.call_activity": "Нещо, което е казал или показал в разговор",
"report_flow.label.channel_names": "Имена на канали",
"report_flow.label.community_banner": "Банер на общността",
"report_flow.label.community_icon": "Икона на общността",
@@ -269,6 +270,7 @@
"report_flow.label.synthetic_media": "Фалшиви или създадени с изкуствен интелект медии, представени като реални",
"report_flow.label.terrorism": "Тероризъм или насилствен екстремизъм",
"report_flow.label.terrorism_guild": "Вербуване за или насърчаване на тероризъм или насилствен екстремизъм",
+ "report_flow.label.their_profile": "Нещо в профила му",
"report_flow.label.threat": "Заплахи или призиви за насилие",
"report_flow.label.threat_to_share": "Заплашват да го споделят",
"report_flow.label.too_young": "Те са под минималната възраст за използване на {product_name}",
@@ -307,15 +309,13 @@
"report_flow.screen.private_info.title": "Какви лични данни са замесени?",
"report_flow.screen.profile_abuse.title": "Какво има вредно в профила им?",
"report_flow.screen.profile_hate_violence.title": "Какво показва или насърчава профилът им?",
- "report_flow.screen.profile_intro.options_heading": "Научи повече",
- "report_flow.screen.profile_intro.subtitle": "Кажи ни какво не е наред с този профил. Човекът няма да научи кой го е докладвал.",
- "report_flow.screen.profile_intro.title": "Докладване на профил",
"report_flow.screen.profile_minor_sexual.title": "Какво в профила им е свързано с непълнолетен?",
"report_flow.screen.profile_parts.subtitle": "Избери колкото ти трябват.",
"report_flow.screen.profile_parts.title": "Кои части на профила им са проблемни?",
"report_flow.screen.profile_private_info.title": "Какви лични данни има в профила им?",
"report_flow.screen.profile_sexual.title": "Разкажи ни за сексуалното съдържание в профила им",
"report_flow.screen.profile_threat.title": "Как профилът им е свързан с насилие?",
+ "report_flow.screen.root_call.title": "Какво се случи в разговора?",
"report_flow.screen.root_guild.subtitle": "Избери най-близкото съвпадение за случващото се в тази общност.",
"report_flow.screen.root_guild.title": "Какво не е наред с тази общност?",
"report_flow.screen.root_message.subtitle": "Избери най-близкото съвпадение. Можеш да прегледаш всичко, преди да бъде изпратено.",
@@ -336,6 +336,8 @@
"report_flow.screen.spam_kind_guild.title": "Как тази общност злоупотребява с платформата?",
"report_flow.screen.spam_profile.title": "Как се злоупотребява с акаунта?",
"report_flow.screen.threat.title": "Как е свързано с насилие?",
+ "report_flow.screen.user_start.subtitle": "Човекът няма да научи кой го е докладвал.",
+ "report_flow.screen.user_start.title": "Какво искаш да докладваш?",
"report_flow.screen.violence_misinfo.title": "Кое от тези съвпада?",
"report_flow.screen.violence_misinfo_guild.title": "Кое от това се случва в тази общност?"
}
diff --git a/fluxer_api/src/api/content_i18n/weblate/locales/cs.json b/fluxer_api/src/api/content_i18n/weblate/locales/cs.json
index 9977cabe2..1b43787b5 100644
--- a/fluxer_api/src/api/content_i18n/weblate/locales/cs.json
+++ b/fluxer_api/src/api/content_i18n/weblate/locales/cs.json
@@ -158,6 +158,7 @@
"report_flow.label.age_yes_profile": "Ano, jejich profil zmiňuje jejich věk",
"report_flow.label.atrocity_denial": "Popírání nebo oslavování holokaustu či jiných genocid",
"report_flow.label.ban_evasion": "Obcházení zákazu pomocí jiného účtu",
+ "report_flow.label.call_activity": "Něco, co řekli nebo ukázali v hovoru",
"report_flow.label.channel_names": "Názvy kanálů",
"report_flow.label.community_banner": "Banner komunity",
"report_flow.label.community_icon": "Ikona komunity",
@@ -269,6 +270,7 @@
"report_flow.label.synthetic_media": "Falešná nebo umělou inteligencí vytvořená média prezentovaná jako skutečná",
"report_flow.label.terrorism": "Terorismus nebo násilný extremismus",
"report_flow.label.terrorism_guild": "Nábor nebo propagace terorismu či násilného extremismu",
+ "report_flow.label.their_profile": "Něco v jejich profilu",
"report_flow.label.threat": "Výhrůžky nebo výzvy k násilí",
"report_flow.label.threat_to_share": "Vyhrožují, že to budou sdílet",
"report_flow.label.too_young": "Tato osoba je mladší než minimální věk pro používání {product_name}",
@@ -307,15 +309,13 @@
"report_flow.screen.private_info.title": "Které soukromé údaje jsou v tom zahrnuty?",
"report_flow.screen.profile_abuse.title": "Co je na jejich profilu škodlivé?",
"report_flow.screen.profile_hate_violence.title": "Co jejich profil ukazuje nebo propaguje?",
- "report_flow.screen.profile_intro.options_heading": "Zjistit více",
- "report_flow.screen.profile_intro.subtitle": "Řekněte nám, co je s tímto profilem v nepořádku. Nebude jim řečeno, kdo je nahlásil.",
- "report_flow.screen.profile_intro.title": "Nahlásit profil",
"report_flow.screen.profile_minor_sexual.title": "Co v jejich profilu zahrnuje nezletilou osobu?",
"report_flow.screen.profile_parts.subtitle": "Vyberte tolik, kolik potřebujete.",
"report_flow.screen.profile_parts.title": "Které části jejich profilu jsou problém?",
"report_flow.screen.profile_private_info.title": "Jaké soukromé údaje jsou v jejich profilu?",
"report_flow.screen.profile_sexual.title": "Řekněte nám o sexuálním obsahu v jejich profilu",
"report_flow.screen.profile_threat.title": "Jak jejich profil souvisí s násilím?",
+ "report_flow.screen.root_call.title": "Co se v hovoru stalo?",
"report_flow.screen.root_guild.subtitle": "Vyberte možnost, která nejlépe odpovídá tomu, co se v této komunitě děje.",
"report_flow.screen.root_guild.title": "Co je s touto komunitou špatně?",
"report_flow.screen.root_message.subtitle": "Vyberte možnost, která nejlépe odpovídá. Před odesláním si vše můžete zkontrolovat.",
@@ -336,6 +336,8 @@
"report_flow.screen.spam_kind_guild.title": "Jak tato komunita zneužívá platformu?",
"report_flow.screen.spam_profile.title": "Jak je účet zneužíván?",
"report_flow.screen.threat.title": "Jak to souvisí s násilím?",
+ "report_flow.screen.user_start.subtitle": "Nebude jim řečeno, kdo je nahlásil.",
+ "report_flow.screen.user_start.title": "Co chcete nahlásit?",
"report_flow.screen.violence_misinfo.title": "Co z toho odpovídá?",
"report_flow.screen.violence_misinfo_guild.title": "Co z toho se v této komunitě děje?"
}
diff --git a/fluxer_api/src/api/content_i18n/weblate/locales/da.json b/fluxer_api/src/api/content_i18n/weblate/locales/da.json
index 8a142db05..f522be346 100644
--- a/fluxer_api/src/api/content_i18n/weblate/locales/da.json
+++ b/fluxer_api/src/api/content_i18n/weblate/locales/da.json
@@ -158,6 +158,7 @@
"report_flow.label.age_yes_profile": "Ja, deres profil nævner deres alder",
"report_flow.label.atrocity_denial": "Benægtelse eller hyldest af Holocaust eller andre folkedrab",
"report_flow.label.ban_evasion": "Omgåelse af et forbud med en anden konto",
+ "report_flow.label.call_activity": "Noget, de sagde eller viste i et opkald",
"report_flow.label.channel_names": "Kanalnavne",
"report_flow.label.community_banner": "Fællesskabsbanner",
"report_flow.label.community_icon": "Fællesskabsikon",
@@ -269,6 +270,7 @@
"report_flow.label.synthetic_media": "Falske eller AI-genererede medier præsenteret som ægte",
"report_flow.label.terrorism": "Terrorisme eller voldelig ekstremisme",
"report_flow.label.terrorism_guild": "Rekruttering til eller fremme af terrorisme eller voldelig ekstremisme",
+ "report_flow.label.their_profile": "Noget i deres profil",
"report_flow.label.threat": "Trusler eller opfordringer til vold",
"report_flow.label.threat_to_share": "De truer med at dele det",
"report_flow.label.too_young": "De er under minimumsalderen for at bruge {product_name}",
@@ -307,15 +309,13 @@
"report_flow.screen.private_info.title": "Hvilke private oplysninger er involveret?",
"report_flow.screen.profile_abuse.title": "Hvad er skadeligt ved deres profil?",
"report_flow.screen.profile_hate_violence.title": "Hvad viser eller fremmer deres profil?",
- "report_flow.screen.profile_intro.options_heading": "Læs mere",
- "report_flow.screen.profile_intro.subtitle": "Fortæl os, hvad der er galt med denne profil. De vil ikke få at vide, hvem der har anmeldt dem.",
- "report_flow.screen.profile_intro.title": "Anmeld profil",
"report_flow.screen.profile_minor_sexual.title": "Hvad i deres profil involverer en mindreårig?",
"report_flow.screen.profile_parts.subtitle": "Vælg så mange, som du har brug for.",
"report_flow.screen.profile_parts.title": "Hvilke dele af deres profil er et problem?",
"report_flow.screen.profile_private_info.title": "Hvilke private oplysninger står der i deres profil?",
"report_flow.screen.profile_sexual.title": "Fortæl os om det seksuelle indhold i deres profil",
"report_flow.screen.profile_threat.title": "Hvordan involverer deres profil vold?",
+ "report_flow.screen.root_call.title": "Hvad skete der i opkaldet?",
"report_flow.screen.root_guild.subtitle": "Vælg den mest passende beskrivelse af, hvad der foregår i dette fællesskab.",
"report_flow.screen.root_guild.title": "Hvad er der galt med dette fællesskab?",
"report_flow.screen.root_message.subtitle": "Vælg den mest passende beskrivelse. Du kan tjekke alt, før det bliver sendt.",
@@ -336,6 +336,8 @@
"report_flow.screen.spam_kind_guild.title": "Hvordan misbruger dette fællesskab platformen?",
"report_flow.screen.spam_profile.title": "Hvordan misbruges kontoen?",
"report_flow.screen.threat.title": "Hvordan involverer det vold?",
+ "report_flow.screen.user_start.subtitle": "De vil ikke få at vide, hvem der har anmeldt dem.",
+ "report_flow.screen.user_start.title": "Hvad vil du anmelde?",
"report_flow.screen.violence_misinfo.title": "Hvilken af disse passer bedst?",
"report_flow.screen.violence_misinfo_guild.title": "Hvilken af disse sker i dette fællesskab?"
}
diff --git a/fluxer_api/src/api/content_i18n/weblate/locales/de.json b/fluxer_api/src/api/content_i18n/weblate/locales/de.json
index e78fde77f..15ca8708c 100644
--- a/fluxer_api/src/api/content_i18n/weblate/locales/de.json
+++ b/fluxer_api/src/api/content_i18n/weblate/locales/de.json
@@ -158,6 +158,7 @@
"report_flow.label.age_yes_profile": "Ja, das Profil erwähnt das Alter der Person",
"report_flow.label.atrocity_denial": "Leugnung oder Verherrlichung des Holocaust oder anderer Völkermorde",
"report_flow.label.ban_evasion": "Umgehung eines Banns mit einem anderen Account",
+ "report_flow.label.call_activity": "Etwas, das die Person in einem Anruf gesagt oder gezeigt hat",
"report_flow.label.channel_names": "Kanalnamen",
"report_flow.label.community_banner": "Community-Banner",
"report_flow.label.community_icon": "Community-Icon",
@@ -269,6 +270,7 @@
"report_flow.label.synthetic_media": "Gefälschte oder KI-generierte Medien, die als echt dargestellt werden",
"report_flow.label.terrorism": "Terrorismus oder gewalttätiger Extremismus",
"report_flow.label.terrorism_guild": "Rekrutierung für oder Förderung von Terrorismus oder gewalttätigem Extremismus",
+ "report_flow.label.their_profile": "Etwas im Profil der Person",
"report_flow.label.threat": "Drohungen oder Aufrufe zur Gewalt",
"report_flow.label.threat_to_share": "Die Person droht, es zu teilen",
"report_flow.label.too_young": "Die Person ist jünger als das Mindestalter für die Nutzung von {product_name}",
@@ -307,15 +309,13 @@
"report_flow.screen.private_info.title": "Welche privaten Details sind betroffen?",
"report_flow.screen.profile_abuse.title": "Was ist an diesem Profil schädlich?",
"report_flow.screen.profile_hate_violence.title": "Was zeigt oder fördert dieses Profil?",
- "report_flow.screen.profile_intro.options_heading": "Mehr erfahren",
- "report_flow.screen.profile_intro.subtitle": "Beschreibe, was mit diesem Profil nicht stimmt. Die Person erfährt nicht, wer es gemeldet hat.",
- "report_flow.screen.profile_intro.title": "Profil melden",
"report_flow.screen.profile_minor_sexual.title": "Was in diesem Profil hat mit einer minderjährigen Person zu tun?",
"report_flow.screen.profile_parts.subtitle": "Wähle so viele aus, wie du brauchst.",
"report_flow.screen.profile_parts.title": "Welche Teile dieses Profils sind problematisch?",
"report_flow.screen.profile_private_info.title": "Welche privaten Details sind in diesem Profil enthalten?",
"report_flow.screen.profile_sexual.title": "Erzähl uns vom sexuellen Inhalt in diesem Profil",
"report_flow.screen.profile_threat.title": "Wie hat dieses Profil mit Gewalt zu tun?",
+ "report_flow.screen.root_call.title": "Was ist im Anruf passiert?",
"report_flow.screen.root_guild.subtitle": "Wähle die zutreffendste Option für das, was in dieser Community vor sich geht.",
"report_flow.screen.root_guild.title": "Was stimmt mit dieser Community nicht?",
"report_flow.screen.root_message.subtitle": "Wähle die zutreffendste Option. Du kannst alles überprüfen, bevor es gesendet wird.",
@@ -336,6 +336,8 @@
"report_flow.screen.spam_kind_guild.title": "Wie missbraucht diese Community die Plattform?",
"report_flow.screen.spam_profile.title": "Wie wird der Account missbraucht?",
"report_flow.screen.threat.title": "Wie ist es mit Gewalt verbunden?",
+ "report_flow.screen.user_start.subtitle": "Die Person erfährt nicht, wer es gemeldet hat.",
+ "report_flow.screen.user_start.title": "Was möchtest du melden?",
"report_flow.screen.violence_misinfo.title": "Was davon trifft zu?",
"report_flow.screen.violence_misinfo_guild.title": "Was davon passiert in dieser Community?"
}
diff --git a/fluxer_api/src/api/content_i18n/weblate/locales/el.json b/fluxer_api/src/api/content_i18n/weblate/locales/el.json
index 8cdb2e11f..44f51e6f6 100644
--- a/fluxer_api/src/api/content_i18n/weblate/locales/el.json
+++ b/fluxer_api/src/api/content_i18n/weblate/locales/el.json
@@ -158,6 +158,7 @@
"report_flow.label.age_yes_profile": "Ναι, το προφίλ τους αναφέρει την ηλικία τους",
"report_flow.label.atrocity_denial": "Άρνηση ή εξύμνηση του Ολοκαυτώματος ή άλλων γενοκτονιών",
"report_flow.label.ban_evasion": "Παράκαμψη απαγόρευσης με άλλο λογαριασμό",
+ "report_flow.label.call_activity": "Κάτι που είπαν ή έδειξαν σε μια κλήση",
"report_flow.label.channel_names": "Ονόματα καναλιών",
"report_flow.label.community_banner": "Banner κοινότητας",
"report_flow.label.community_icon": "Εικονίδιο κοινότητας",
@@ -269,6 +270,7 @@
"report_flow.label.synthetic_media": "Ψεύτικα ή δημιουργημένα με τεχνητή νοημοσύνη μέσα που παρουσιάζονται ως αληθινά",
"report_flow.label.terrorism": "Τρομοκρατία ή βίαιος εξτρεμισμός",
"report_flow.label.terrorism_guild": "Στρατολόγηση ή προώθηση τρομοκρατίας ή βίαιου εξτρεμισμού",
+ "report_flow.label.their_profile": "Κάτι στο προφίλ τους",
"report_flow.label.threat": "Απειλές ή εκκλήσεις για βία",
"report_flow.label.threat_to_share": "Απειλούν να το μοιραστούν",
"report_flow.label.too_young": "Είναι κάτω από την ελάχιστη ηλικία χρήσης του {product_name}",
@@ -307,15 +309,13 @@
"report_flow.screen.private_info.title": "Ποια προσωπικά στοιχεία εμπλέκονται;",
"report_flow.screen.profile_abuse.title": "Τι είναι επιβλαβές στο προφίλ τους;",
"report_flow.screen.profile_hate_violence.title": "Τι δείχνει ή προωθεί το προφίλ τους;",
- "report_flow.screen.profile_intro.options_heading": "Μάθετε περισσότερα",
- "report_flow.screen.profile_intro.subtitle": "Πείτε μας τι δεν πάει καλά με αυτό το προφίλ. Δεν θα μάθουν ποιος τους ανέφερε.",
- "report_flow.screen.profile_intro.title": "Αναφορά προφίλ",
"report_flow.screen.profile_minor_sexual.title": "Τι στο προφίλ τους αφορά ανήλικο;",
"report_flow.screen.profile_parts.subtitle": "Επιλέξτε όσα χρειάζεστε.",
"report_flow.screen.profile_parts.title": "Ποια μέρη του προφίλ τους είναι πρόβλημα;",
"report_flow.screen.profile_private_info.title": "Ποια προσωπικά στοιχεία υπάρχουν στο προφίλ τους;",
"report_flow.screen.profile_sexual.title": "Πείτε μας για το σεξουαλικό περιεχόμενο στο προφίλ τους",
"report_flow.screen.profile_threat.title": "Πώς το προφίλ τους σχετίζεται με βία;",
+ "report_flow.screen.root_call.title": "Τι συνέβη στην κλήση;",
"report_flow.screen.root_guild.subtitle": "Επιλέξτε την πιο κοντινή αντιστοιχία για αυτό που συμβαίνει σε αυτήν την κοινότητα.",
"report_flow.screen.root_guild.title": "Τι δεν πάει καλά με αυτήν την κοινότητα;",
"report_flow.screen.root_message.subtitle": "Επιλέξτε την πιο κοντινή αντιστοιχία. Μπορείτε να τα ελέγξετε όλα πριν σταλεί η αναφορά.",
@@ -336,6 +336,8 @@
"report_flow.screen.spam_kind_guild.title": "Πώς καταχράται αυτή η κοινότητα την πλατφόρμα;",
"report_flow.screen.spam_profile.title": "Πώς γίνεται κατάχρηση του λογαριασμού;",
"report_flow.screen.threat.title": "Πώς σχετίζεται με βία;",
+ "report_flow.screen.user_start.subtitle": "Δεν θα μάθουν ποιος τους ανέφερε.",
+ "report_flow.screen.user_start.title": "Τι θέλετε να αναφέρετε;",
"report_flow.screen.violence_misinfo.title": "Ποιο από αυτά ταιριάζει;",
"report_flow.screen.violence_misinfo_guild.title": "Τι από τα παρακάτω συμβαίνει σε αυτήν την κοινότητα;"
}
diff --git a/fluxer_api/src/api/content_i18n/weblate/locales/en-GB.json b/fluxer_api/src/api/content_i18n/weblate/locales/en-GB.json
index 549321b71..8c92655a3 100644
--- a/fluxer_api/src/api/content_i18n/weblate/locales/en-GB.json
+++ b/fluxer_api/src/api/content_i18n/weblate/locales/en-GB.json
@@ -158,6 +158,7 @@
"report_flow.label.age_yes_profile": "Yes, their profile mentions their age",
"report_flow.label.atrocity_denial": "Denying or celebrating the Holocaust or other genocides",
"report_flow.label.ban_evasion": "Getting around a ban with another account",
+ "report_flow.label.call_activity": "Something they said or showed in a call",
"report_flow.label.channel_names": "Channel names",
"report_flow.label.community_banner": "Community banner",
"report_flow.label.community_icon": "Community icon",
@@ -269,6 +270,7 @@
"report_flow.label.synthetic_media": "Fake or AI-made media presented as real",
"report_flow.label.terrorism": "Terrorism or violent extremism",
"report_flow.label.terrorism_guild": "Recruiting for or promoting terrorism or violent extremism",
+ "report_flow.label.their_profile": "Something in their profile",
"report_flow.label.threat": "Threats or calls for violence",
"report_flow.label.threat_to_share": "They are threatening to share it",
"report_flow.label.too_young": "They're under the minimum age to use {product_name}",
@@ -307,15 +309,13 @@
"report_flow.screen.private_info.title": "Which private details are involved?",
"report_flow.screen.profile_abuse.title": "What's harmful about their profile?",
"report_flow.screen.profile_hate_violence.title": "What does their profile show or promote?",
- "report_flow.screen.profile_intro.options_heading": "Learn more",
- "report_flow.screen.profile_intro.subtitle": "Tell us what's wrong with this profile. They won't be told who reported them.",
- "report_flow.screen.profile_intro.title": "Report profile",
"report_flow.screen.profile_minor_sexual.title": "What in their profile involves a minor?",
"report_flow.screen.profile_parts.subtitle": "Pick as many as you need.",
"report_flow.screen.profile_parts.title": "Which parts of their profile are a problem?",
"report_flow.screen.profile_private_info.title": "Which private details are in their profile?",
"report_flow.screen.profile_sexual.title": "Tell us about the sexual content in their profile",
"report_flow.screen.profile_threat.title": "How does their profile involve violence?",
+ "report_flow.screen.root_call.title": "What happened in the call?",
"report_flow.screen.root_guild.subtitle": "Pick the closest match for what is going on in this community.",
"report_flow.screen.root_guild.title": "What's wrong with this community?",
"report_flow.screen.root_message.subtitle": "Pick the closest match. You can check everything before it is sent.",
@@ -336,6 +336,8 @@
"report_flow.screen.spam_kind_guild.title": "How is this community abusing the platform?",
"report_flow.screen.spam_profile.title": "How is the account being misused?",
"report_flow.screen.threat.title": "How does it involve violence?",
+ "report_flow.screen.user_start.subtitle": "They won't be told who reported them.",
+ "report_flow.screen.user_start.title": "What do you want to report?",
"report_flow.screen.violence_misinfo.title": "Which of these matches it?",
"report_flow.screen.violence_misinfo_guild.title": "Which of these happens in this community?"
}
diff --git a/fluxer_api/src/api/content_i18n/weblate/locales/es-419.json b/fluxer_api/src/api/content_i18n/weblate/locales/es-419.json
index 42c85aed3..23dc4403c 100644
--- a/fluxer_api/src/api/content_i18n/weblate/locales/es-419.json
+++ b/fluxer_api/src/api/content_i18n/weblate/locales/es-419.json
@@ -158,6 +158,7 @@
"report_flow.label.age_yes_profile": "Sí, su perfil menciona su edad",
"report_flow.label.atrocity_denial": "Negación o celebración del Holocausto u otros genocidios",
"report_flow.label.ban_evasion": "Eludir un baneo con otra cuenta",
+ "report_flow.label.call_activity": "Algo que dijo o mostró en una llamada",
"report_flow.label.channel_names": "Nombres de canales",
"report_flow.label.community_banner": "Banner de la comunidad",
"report_flow.label.community_icon": "Ícono de la comunidad",
@@ -269,6 +270,7 @@
"report_flow.label.synthetic_media": "Medios falsos o creados con IA presentados como reales",
"report_flow.label.terrorism": "Terrorismo o extremismo violento",
"report_flow.label.terrorism_guild": "Reclutamiento o promoción del terrorismo o extremismo violento",
+ "report_flow.label.their_profile": "Algo en su perfil",
"report_flow.label.threat": "Amenazas o llamados a la violencia",
"report_flow.label.threat_to_share": "Amenaza con compartirlo",
"report_flow.label.too_young": "Está por debajo de la edad mínima para usar {product_name}",
@@ -307,15 +309,13 @@
"report_flow.screen.private_info.title": "¿Qué detalles privados están involucrados?",
"report_flow.screen.profile_abuse.title": "¿Qué es dañino en su perfil?",
"report_flow.screen.profile_hate_violence.title": "¿Qué muestra o promueve su perfil?",
- "report_flow.screen.profile_intro.options_heading": "Más información",
- "report_flow.screen.profile_intro.subtitle": "Dinos qué está mal con este perfil. No le diremos a la persona quién la reportó.",
- "report_flow.screen.profile_intro.title": "Reportar perfil",
"report_flow.screen.profile_minor_sexual.title": "¿Qué hay en su perfil que involucre a un menor?",
"report_flow.screen.profile_parts.subtitle": "Elige las que necesites.",
"report_flow.screen.profile_parts.title": "¿Qué partes de su perfil son un problema?",
"report_flow.screen.profile_private_info.title": "¿Qué detalles privados hay en su perfil?",
"report_flow.screen.profile_sexual.title": "Describe el contenido sexual en su perfil",
"report_flow.screen.profile_threat.title": "¿Cómo se relaciona su perfil con la violencia?",
+ "report_flow.screen.root_call.title": "¿Qué pasó en la llamada?",
"report_flow.screen.root_guild.subtitle": "Elige la opción más cercana a lo que ocurre en esta comunidad.",
"report_flow.screen.root_guild.title": "¿Qué le pasa a esta comunidad?",
"report_flow.screen.root_message.subtitle": "Elige la opción más cercana. Puedes revisar todo antes de que se envíe.",
@@ -336,6 +336,8 @@
"report_flow.screen.spam_kind_guild.title": "¿Cómo está abusando esta comunidad de la plataforma?",
"report_flow.screen.spam_profile.title": "¿Cómo se está haciendo mal uso de la cuenta?",
"report_flow.screen.threat.title": "¿Cómo se relaciona con la violencia?",
+ "report_flow.screen.user_start.subtitle": "No le diremos a la persona quién la reportó.",
+ "report_flow.screen.user_start.title": "¿Qué quieres reportar?",
"report_flow.screen.violence_misinfo.title": "¿Cuál de estas opciones lo describe mejor?",
"report_flow.screen.violence_misinfo_guild.title": "¿Cuál de estas situaciones ocurre en esta comunidad?"
}
diff --git a/fluxer_api/src/api/content_i18n/weblate/locales/es-ES.json b/fluxer_api/src/api/content_i18n/weblate/locales/es-ES.json
index 9aad1acfd..4d5f5f330 100644
--- a/fluxer_api/src/api/content_i18n/weblate/locales/es-ES.json
+++ b/fluxer_api/src/api/content_i18n/weblate/locales/es-ES.json
@@ -158,6 +158,7 @@
"report_flow.label.age_yes_profile": "Sí, su perfil menciona su edad",
"report_flow.label.atrocity_denial": "Negación o celebración del Holocausto u otros genocidios",
"report_flow.label.ban_evasion": "Eludir un veto con otra cuenta",
+ "report_flow.label.call_activity": "Algo que dijo o mostró en una llamada",
"report_flow.label.channel_names": "Nombres de canales",
"report_flow.label.community_banner": "Imagen de banner de la comunidad",
"report_flow.label.community_icon": "Icono de la comunidad",
@@ -269,6 +270,7 @@
"report_flow.label.synthetic_media": "Contenido multimedia falso o creado con IA presentado como real",
"report_flow.label.terrorism": "Terrorismo o extremismo violento",
"report_flow.label.terrorism_guild": "Reclutamiento o promoción del terrorismo o el extremismo violento",
+ "report_flow.label.their_profile": "Algo de su perfil",
"report_flow.label.threat": "Amenazas o llamamientos a la violencia",
"report_flow.label.threat_to_share": "Amenaza con compartirlo",
"report_flow.label.too_young": "Está por debajo de la edad mínima para usar {product_name}",
@@ -307,15 +309,13 @@
"report_flow.screen.private_info.title": "¿Qué detalles privados están involucrados?",
"report_flow.screen.profile_abuse.title": "¿Qué tiene de perjudicial su perfil?",
"report_flow.screen.profile_hate_violence.title": "¿Qué muestra o promueve su perfil?",
- "report_flow.screen.profile_intro.options_heading": "Más información",
- "report_flow.screen.profile_intro.subtitle": "Cuéntanos qué va mal en este perfil. No se le dirá a la persona quién la ha denunciado.",
- "report_flow.screen.profile_intro.title": "Denunciar perfil",
"report_flow.screen.profile_minor_sexual.title": "¿Qué hay en su perfil relacionado con un menor?",
"report_flow.screen.profile_parts.subtitle": "Selecciona tantas como necesites.",
"report_flow.screen.profile_parts.title": "¿Qué partes de su perfil son un problema?",
"report_flow.screen.profile_private_info.title": "¿Qué detalles privados hay en su perfil?",
"report_flow.screen.profile_sexual.title": "Cuéntanos sobre el contenido sexual de su perfil",
"report_flow.screen.profile_threat.title": "¿Cómo se relaciona su perfil con la violencia?",
+ "report_flow.screen.root_call.title": "¿Qué pasó en la llamada?",
"report_flow.screen.root_guild.subtitle": "Selecciona la opción que mejor describa lo que ocurre en esta comunidad.",
"report_flow.screen.root_guild.title": "¿Qué problema hay en esta comunidad?",
"report_flow.screen.root_message.subtitle": "Selecciona la opción que mejor se ajuste. Puedes revisar todo antes de enviarlo.",
@@ -336,6 +336,8 @@
"report_flow.screen.spam_kind_guild.title": "¿Cómo abusa esta comunidad de la plataforma?",
"report_flow.screen.spam_profile.title": "¿Cómo se está usando mal la cuenta?",
"report_flow.screen.threat.title": "¿Cómo se relaciona con la violencia?",
+ "report_flow.screen.user_start.subtitle": "No se le dirá a la persona quién la ha denunciado.",
+ "report_flow.screen.user_start.title": "¿Qué quieres denunciar?",
"report_flow.screen.violence_misinfo.title": "¿Cuál de estas opciones lo describe?",
"report_flow.screen.violence_misinfo_guild.title": "¿Cuál de estas situaciones ocurre en esta comunidad?"
}
diff --git a/fluxer_api/src/api/content_i18n/weblate/locales/fi.json b/fluxer_api/src/api/content_i18n/weblate/locales/fi.json
index 45d6290c7..6e4d867b1 100644
--- a/fluxer_api/src/api/content_i18n/weblate/locales/fi.json
+++ b/fluxer_api/src/api/content_i18n/weblate/locales/fi.json
@@ -158,6 +158,7 @@
"report_flow.label.age_yes_profile": "Kyllä, heidän profiilissaan mainitaan ikä",
"report_flow.label.atrocity_denial": "Holokaustin tai muiden kansanmurhien kieltäminen tai juhlistaminen",
"report_flow.label.ban_evasion": "Käyttökiellon kiertäminen toisella tilillä",
+ "report_flow.label.call_activity": "Jotain, mitä he sanoivat tai näyttivät puhelussa",
"report_flow.label.channel_names": "Kanavien nimet",
"report_flow.label.community_banner": "Yhteisön banneri",
"report_flow.label.community_icon": "Yhteisön kuvake",
@@ -269,6 +270,7 @@
"report_flow.label.synthetic_media": "Väärennetty tai tekoälyn luoma media esitettynä todellisena",
"report_flow.label.terrorism": "Terrorismi tai väkivaltainen ekstremismi",
"report_flow.label.terrorism_guild": "Rekrytointi terrorismiin tai väkivaltaiseen ekstremismiin tai niiden edistäminen",
+ "report_flow.label.their_profile": "Jotain heidän profiilissaan",
"report_flow.label.threat": "Uhkaukset tai kehotukset väkivaltaan",
"report_flow.label.threat_to_share": "He uhkaavat jakaa sen",
"report_flow.label.too_young": "He ovat alle palvelun {product_name} vähimmäisiän",
@@ -307,15 +309,13 @@
"report_flow.screen.private_info.title": "Mitä yksityisiä tietoja liittyy asiaan?",
"report_flow.screen.profile_abuse.title": "Mikä heidän profiilissaan on haitallista?",
"report_flow.screen.profile_hate_violence.title": "Mitä heidän profiilissaan näkyy tai mitä se edistää?",
- "report_flow.screen.profile_intro.options_heading": "Lue lisää",
- "report_flow.screen.profile_intro.subtitle": "Kerro meille, mikä tässä profiilissa on vialla. Heille ei kerrota, kuka ilmoitti.",
- "report_flow.screen.profile_intro.title": "Ilmoita profiilista",
"report_flow.screen.profile_minor_sexual.title": "Mitä heidän profiilissaan liittyy alaikäiseen?",
"report_flow.screen.profile_parts.subtitle": "Valitse niin monta kuin tarvitset.",
"report_flow.screen.profile_parts.title": "Mitkä heidän profiilinsa osat ovat ongelmallisia?",
"report_flow.screen.profile_private_info.title": "Mitä yksityisiä tietoja heidän profiilissaan on?",
"report_flow.screen.profile_sexual.title": "Kerro seksuaalisesta sisällöstä heidän profiilissaan",
"report_flow.screen.profile_threat.title": "Miten heidän profiilinsa liittyy väkivaltaan?",
+ "report_flow.screen.root_call.title": "Mitä puhelussa tapahtui?",
"report_flow.screen.root_guild.subtitle": "Valitse sopivin vaihtoehto sille, mitä tässä yhteisössä tapahtuu.",
"report_flow.screen.root_guild.title": "Mikä tässä yhteisössä on vialla?",
"report_flow.screen.root_message.subtitle": "Valitse sopivin vaihtoehto. Voit tarkistaa kaiken ennen lähettämistä.",
@@ -336,6 +336,8 @@
"report_flow.screen.spam_kind_guild.title": "Miten tämä yhteisö väärinkäyttää alustaa?",
"report_flow.screen.spam_profile.title": "Miten tiliä väärinkäytetään?",
"report_flow.screen.threat.title": "Miten se liittyy väkivaltaan?",
+ "report_flow.screen.user_start.subtitle": "Heille ei kerrota, kuka ilmoitti.",
+ "report_flow.screen.user_start.title": "Mistä haluat ilmoittaa?",
"report_flow.screen.violence_misinfo.title": "Mikä näistä vastaa sitä?",
"report_flow.screen.violence_misinfo_guild.title": "Mikä näistä tapahtuu tässä yhteisössä?"
}
diff --git a/fluxer_api/src/api/content_i18n/weblate/locales/fr.json b/fluxer_api/src/api/content_i18n/weblate/locales/fr.json
index 313832b86..40183a3ad 100644
--- a/fluxer_api/src/api/content_i18n/weblate/locales/fr.json
+++ b/fluxer_api/src/api/content_i18n/weblate/locales/fr.json
@@ -158,6 +158,7 @@
"report_flow.label.age_yes_profile": "Oui, son profil mentionne son âge",
"report_flow.label.atrocity_denial": "Nier ou célébrer l'Holocauste ou d'autres génocides",
"report_flow.label.ban_evasion": "Contourner un bannissement avec un autre compte",
+ "report_flow.label.call_activity": "Quelque chose que cette personne a dit ou montré pendant un appel",
"report_flow.label.channel_names": "Noms des salons",
"report_flow.label.community_banner": "Bannière de la communauté",
"report_flow.label.community_icon": "Icône de la communauté",
@@ -269,6 +270,7 @@
"report_flow.label.synthetic_media": "Médias falsifiés ou créés par IA présentés comme réels",
"report_flow.label.terrorism": "Terrorisme ou extrémisme violent",
"report_flow.label.terrorism_guild": "Recrutement ou promotion du terrorisme ou de l'extrémisme violent",
+ "report_flow.label.their_profile": "Quelque chose dans son profil",
"report_flow.label.threat": "Menaces ou appels à la violence",
"report_flow.label.threat_to_share": "Cette personne menace de le partager",
"report_flow.label.too_young": "Cette personne n'a pas l'âge minimum requis pour utiliser {product_name}",
@@ -307,15 +309,13 @@
"report_flow.screen.private_info.title": "Quelles informations privées sont concernées ?",
"report_flow.screen.profile_abuse.title": "Qu'y a-t-il de nuisible dans son profil ?",
"report_flow.screen.profile_hate_violence.title": "Qu'est-ce que son profil montre ou promeut ?",
- "report_flow.screen.profile_intro.options_heading": "En savoir plus",
- "report_flow.screen.profile_intro.subtitle": "Dites-nous ce qui ne va pas avec ce profil. La personne ne saura pas qui l'a signalée.",
- "report_flow.screen.profile_intro.title": "Signaler le profil",
"report_flow.screen.profile_minor_sexual.title": "Qu'y a-t-il dans son profil qui implique un mineur ?",
"report_flow.screen.profile_parts.subtitle": "Sélectionnez autant d'options que nécessaire.",
"report_flow.screen.profile_parts.title": "Quelles parties de son profil posent problème ?",
"report_flow.screen.profile_private_info.title": "Quelles informations privées figurent dans son profil ?",
"report_flow.screen.profile_sexual.title": "Parlez-nous du contenu sexuel dans son profil",
"report_flow.screen.profile_threat.title": "Comment son profil implique-t-il la violence ?",
+ "report_flow.screen.root_call.title": "Que s'est-il passé pendant l'appel ?",
"report_flow.screen.root_guild.subtitle": "Choisissez la correspondance la plus proche pour ce qui se passe dans cette communauté.",
"report_flow.screen.root_guild.title": "Qu'est-ce qui ne va pas avec cette communauté ?",
"report_flow.screen.root_message.subtitle": "Choisissez la correspondance la plus proche. Vous pouvez tout vérifier avant l'envoi.",
@@ -336,6 +336,8 @@
"report_flow.screen.spam_kind_guild.title": "Comment cette communauté abuse-t-elle de la plateforme ?",
"report_flow.screen.spam_profile.title": "Comment le compte est-il mal utilisé ?",
"report_flow.screen.threat.title": "Comment cela implique-t-il la violence ?",
+ "report_flow.screen.user_start.subtitle": "La personne ne saura pas qui l'a signalée.",
+ "report_flow.screen.user_start.title": "Que voulez-vous signaler ?",
"report_flow.screen.violence_misinfo.title": "Laquelle de ces options correspond ?",
"report_flow.screen.violence_misinfo_guild.title": "Laquelle de ces options se produit dans cette communauté ?"
}
diff --git a/fluxer_api/src/api/content_i18n/weblate/locales/he.json b/fluxer_api/src/api/content_i18n/weblate/locales/he.json
index 0883674ed..6f00bff7f 100644
--- a/fluxer_api/src/api/content_i18n/weblate/locales/he.json
+++ b/fluxer_api/src/api/content_i18n/weblate/locales/he.json
@@ -158,6 +158,7 @@
"report_flow.label.age_yes_profile": "כן, הפרופיל שלהם מזכיר את גילם",
"report_flow.label.atrocity_denial": "הכחשה או האדרה של השואה או של רצחי עם אחרים",
"report_flow.label.ban_evasion": "עקיפת הרחקה באמצעות חשבון אחר",
+ "report_flow.label.call_activity": "משהו שהם אמרו או הראו בשיחה",
"report_flow.label.channel_names": "שמות הערוצים",
"report_flow.label.community_banner": "באנר קהילה",
"report_flow.label.community_icon": "אייקון קהילה",
@@ -269,6 +270,7 @@
"report_flow.label.synthetic_media": "מדיה מזויפת או שנוצרה על ידי בינה מלאכותית ומוצגת כאמיתית",
"report_flow.label.terrorism": "טרור או קיצוניות אלימה",
"report_flow.label.terrorism_guild": "גיוס או קידום טרור או קיצוניות אלימה",
+ "report_flow.label.their_profile": "משהו בפרופיל שלהם",
"report_flow.label.threat": "איומים או קריאות לאלימות",
"report_flow.label.threat_to_share": "הם מאיימים לשתף את זה",
"report_flow.label.too_young": "הם מתחת לגיל המינימלי לשימוש ב-{product_name}",
@@ -307,15 +309,13 @@
"report_flow.screen.private_info.title": "אילו פרטים אישיים מעורבים?",
"report_flow.screen.profile_abuse.title": "מה פוגעני בפרופיל שלהם?",
"report_flow.screen.profile_hate_violence.title": "מה הפרופיל שלהם מציג או מקדם?",
- "report_flow.screen.profile_intro.options_heading": "מידע נוסף",
- "report_flow.screen.profile_intro.subtitle": "ספר לנו מה לא בסדר בפרופיל הזה. לא יימסר להם מי דיווח עליהם.",
- "report_flow.screen.profile_intro.title": "דיווח על פרופיל",
"report_flow.screen.profile_minor_sexual.title": "מה בפרופיל שלהם קשור לקטין?",
"report_flow.screen.profile_parts.subtitle": "בחר כמה שצריך.",
"report_flow.screen.profile_parts.title": "אילו חלקים בפרופיל שלהם מהווים בעיה?",
"report_flow.screen.profile_private_info.title": "אילו פרטים אישיים נמצאים בפרופיל שלהם?",
"report_flow.screen.profile_sexual.title": "ספר לנו על התוכן המיני בפרופיל שלהם",
"report_flow.screen.profile_threat.title": "כיצד הפרופיל שלהם קשור לאלימות?",
+ "report_flow.screen.root_call.title": "מה קרה בשיחה?",
"report_flow.screen.root_guild.subtitle": "בחר את ההתאמה הקרובה ביותר למה שקורה בקהילה הזו.",
"report_flow.screen.root_guild.title": "מה לא בסדר בקהילה הזו?",
"report_flow.screen.root_message.subtitle": "בחר את ההתאמה הקרובה ביותר. אפשר לבדוק הכול לפני השליחה.",
@@ -336,6 +336,8 @@
"report_flow.screen.spam_kind_guild.title": "כיצד הקהילה הזו משתמשת לרעה בפלטפורמה?",
"report_flow.screen.spam_profile.title": "כיצד החשבון מנוצל לרעה?",
"report_flow.screen.threat.title": "כיצד זה קשור לאלימות?",
+ "report_flow.screen.user_start.subtitle": "לא יימסר להם מי דיווח עליהם.",
+ "report_flow.screen.user_start.title": "על מה ברצונך לדווח?",
"report_flow.screen.violence_misinfo.title": "איזה מהבאים מתאים לזה?",
"report_flow.screen.violence_misinfo_guild.title": "איזה מהבאים קורה בקהילה הזו?"
}
diff --git a/fluxer_api/src/api/content_i18n/weblate/locales/hi.json b/fluxer_api/src/api/content_i18n/weblate/locales/hi.json
index 5a846da8d..213c7f202 100644
--- a/fluxer_api/src/api/content_i18n/weblate/locales/hi.json
+++ b/fluxer_api/src/api/content_i18n/weblate/locales/hi.json
@@ -158,6 +158,7 @@
"report_flow.label.age_yes_profile": "हाँ, उनकी प्रोफ़ाइल में उनकी उम्र का उल्लेख है",
"report_flow.label.atrocity_denial": "होलोकॉस्ट या अन्य नरसंहारों को नकारना या उनका जश्न मनाना",
"report_flow.label.ban_evasion": "दूसरे अकाउंट से प्रतिबंध को दरकिनार करना",
+ "report_flow.label.call_activity": "कुछ ऐसा जो उन्होंने कॉल में कहा या दिखाया",
"report_flow.label.channel_names": "चैनल के नाम",
"report_flow.label.community_banner": "कम्युनिटी बैनर",
"report_flow.label.community_icon": "कम्युनिटी आइकॉन",
@@ -269,6 +270,7 @@
"report_flow.label.synthetic_media": "नकली या AI-निर्मित मीडिया को वास्तविक के रूप में प्रस्तुत किया गया",
"report_flow.label.terrorism": "आतंकवाद या हिंसक उग्रवाद",
"report_flow.label.terrorism_guild": "आतंकवाद या हिंसक उग्रवाद के लिए भर्ती करना या उसे बढ़ावा देना",
+ "report_flow.label.their_profile": "उनकी प्रोफ़ाइल में कुछ",
"report_flow.label.threat": "धमकी या हिंसा का आह्वान",
"report_flow.label.threat_to_share": "वे इसे शेयर करने की धमकी दे रहे हैं",
"report_flow.label.too_young": "वे {product_name} का उपयोग करने की न्यूनतम आयु से कम हैं",
@@ -307,15 +309,13 @@
"report_flow.screen.private_info.title": "कौन से निजी विवरण शामिल हैं?",
"report_flow.screen.profile_abuse.title": "उनकी प्रोफ़ाइल में क्या हानिकारक है?",
"report_flow.screen.profile_hate_violence.title": "उनकी प्रोफ़ाइल क्या दिखाती है या बढ़ावा देती है?",
- "report_flow.screen.profile_intro.options_heading": "और जानें",
- "report_flow.screen.profile_intro.subtitle": "हमें बताएँ कि इस प्रोफ़ाइल में क्या गलत है। उन्हें यह नहीं बताया जाएगा कि किसने रिपोर्ट किया।",
- "report_flow.screen.profile_intro.title": "प्रोफ़ाइल की रिपोर्ट करें",
"report_flow.screen.profile_minor_sexual.title": "उनकी प्रोफ़ाइल में नाबालिग से जुड़ा क्या है?",
"report_flow.screen.profile_parts.subtitle": "जितनी ज़रूरत हो उतने चुनें।",
"report_flow.screen.profile_parts.title": "उनकी प्रोफ़ाइल के कौन से हिस्से समस्याग्रस्त हैं?",
"report_flow.screen.profile_private_info.title": "उनकी प्रोफ़ाइल में कौन से निजी विवरण हैं?",
"report_flow.screen.profile_sexual.title": "उनकी प्रोफ़ाइल में यौन सामग्री के बारे में हमें बताएँ",
"report_flow.screen.profile_threat.title": "उनकी प्रोफ़ाइल में हिंसा कैसे शामिल है?",
+ "report_flow.screen.root_call.title": "कॉल में क्या हुआ?",
"report_flow.screen.root_guild.subtitle": "इस कम्युनिटी में जो हो रहा है, उससे सबसे ज़्यादा मेल खाने वाला विकल्प चुनें।",
"report_flow.screen.root_guild.title": "इस कम्युनिटी में क्या गलत है?",
"report_flow.screen.root_message.subtitle": "सबसे ज़्यादा मेल खाने वाला विकल्प चुनें। भेजने से पहले आप सब कुछ जाँच सकते हैं।",
@@ -336,6 +336,8 @@
"report_flow.screen.spam_kind_guild.title": "यह कम्युनिटी प्लेटफ़ॉर्म का दुरुपयोग कैसे कर रही है?",
"report_flow.screen.spam_profile.title": "अकाउंट का दुरुपयोग कैसे किया जा रहा है?",
"report_flow.screen.threat.title": "इसमें हिंसा किस तरह शामिल है?",
+ "report_flow.screen.user_start.subtitle": "उन्हें यह नहीं बताया जाएगा कि किसने रिपोर्ट किया।",
+ "report_flow.screen.user_start.title": "आप किस बारे में रिपोर्ट करना चाहते हैं?",
"report_flow.screen.violence_misinfo.title": "इनमें से कौन सा इससे मेल खाता है?",
"report_flow.screen.violence_misinfo_guild.title": "इनमें से कौन सी बात इस कम्युनिटी में होती है?"
}
diff --git a/fluxer_api/src/api/content_i18n/weblate/locales/hr.json b/fluxer_api/src/api/content_i18n/weblate/locales/hr.json
index b8d08f163..f32aa91c8 100644
--- a/fluxer_api/src/api/content_i18n/weblate/locales/hr.json
+++ b/fluxer_api/src/api/content_i18n/weblate/locales/hr.json
@@ -158,6 +158,7 @@
"report_flow.label.age_yes_profile": "Da, njihov profil spominje njihovu dob",
"report_flow.label.atrocity_denial": "Poricanje ili slavljenje holokausta ili drugih genocida",
"report_flow.label.ban_evasion": "Zaobilaženje zabrane pomoću drugog računa",
+ "report_flow.label.call_activity": "Nešto što su rekli ili pokazali u pozivu",
"report_flow.label.channel_names": "Nazivi kanala",
"report_flow.label.community_banner": "Naslovna slika zajednice",
"report_flow.label.community_icon": "Ikona zajednice",
@@ -269,6 +270,7 @@
"report_flow.label.synthetic_media": "Lažni mediji ili mediji izrađeni pomoću AI-ja predstavljeni kao stvarni",
"report_flow.label.terrorism": "Terorizam ili nasilni ekstremizam",
"report_flow.label.terrorism_guild": "Novačenje za terorizam ili nasilni ekstremizam ili njihovo promicanje",
+ "report_flow.label.their_profile": "Nešto u njihovom profilu",
"report_flow.label.threat": "Prijetnje ili pozivi na nasilje",
"report_flow.label.threat_to_share": "Prijeti da će to podijeliti",
"report_flow.label.too_young": "Ta je osoba mlađa od minimalne dobi za korištenje aplikacije {product_name}",
@@ -307,15 +309,13 @@
"report_flow.screen.private_info.title": "Koji su privatni podaci uključeni?",
"report_flow.screen.profile_abuse.title": "Što je štetno na njihovom profilu?",
"report_flow.screen.profile_hate_violence.title": "Što njihov profil prikazuje ili promiče?",
- "report_flow.screen.profile_intro.options_heading": "Saznajte više",
- "report_flow.screen.profile_intro.subtitle": "Recite nam što nije u redu s ovim profilom. Neće im biti rečeno tko ih je prijavio.",
- "report_flow.screen.profile_intro.title": "Prijavi profil",
"report_flow.screen.profile_minor_sexual.title": "Što u njihovom profilu uključuje maloljetnika?",
"report_flow.screen.profile_parts.subtitle": "Odaberite onoliko stavki koliko vam je potrebno.",
"report_flow.screen.profile_parts.title": "Koji dijelovi njihovog profila predstavljaju problem?",
"report_flow.screen.profile_private_info.title": "Koji se privatni podaci nalaze na njihovom profilu?",
"report_flow.screen.profile_sexual.title": "Recite nam o seksualnom sadržaju na njihovom profilu",
"report_flow.screen.profile_threat.title": "Kako njihov profil uključuje nasilje?",
+ "report_flow.screen.root_call.title": "Što se dogodilo u pozivu?",
"report_flow.screen.root_guild.subtitle": "Odaberite ono što najbolje odgovara onome što se događa u ovoj zajednici.",
"report_flow.screen.root_guild.title": "Što nije u redu s ovom zajednicom?",
"report_flow.screen.root_message.subtitle": "Odaberite ono što najbolje odgovara. Sve možete provjeriti prije slanja.",
@@ -336,6 +336,8 @@
"report_flow.screen.spam_kind_guild.title": "Kako ova zajednica zloupotrebljava platformu?",
"report_flow.screen.spam_profile.title": "Kako se račun zloupotrebljava?",
"report_flow.screen.threat.title": "Kako to uključuje nasilje?",
+ "report_flow.screen.user_start.subtitle": "Neće im biti rečeno tko ih je prijavio.",
+ "report_flow.screen.user_start.title": "Što želite prijaviti?",
"report_flow.screen.violence_misinfo.title": "Što od ovoga odgovara?",
"report_flow.screen.violence_misinfo_guild.title": "Što se od ovoga događa u ovoj zajednici?"
}
diff --git a/fluxer_api/src/api/content_i18n/weblate/locales/hu.json b/fluxer_api/src/api/content_i18n/weblate/locales/hu.json
index feaca74b2..a9342084e 100644
--- a/fluxer_api/src/api/content_i18n/weblate/locales/hu.json
+++ b/fluxer_api/src/api/content_i18n/weblate/locales/hu.json
@@ -158,6 +158,7 @@
"report_flow.label.age_yes_profile": "Igen, a profiljuk említi a korukat",
"report_flow.label.atrocity_denial": "A holokauszt vagy más népirtások tagadása vagy dicsőítése",
"report_flow.label.ban_evasion": "Kitiltás megkerülése másik fiókkal",
+ "report_flow.label.call_activity": "Valami, amit egy hívásban mondott vagy mutatott",
"report_flow.label.channel_names": "Csatornanevek",
"report_flow.label.community_banner": "Közösség borítóképe",
"report_flow.label.community_icon": "Közösség ikonja",
@@ -269,6 +270,7 @@
"report_flow.label.synthetic_media": "Hamis vagy mesterséges intelligencia által készített média, amelyet valódiként mutatnak be",
"report_flow.label.terrorism": "Terrorizmus vagy erőszakos szélsőségesség",
"report_flow.label.terrorism_guild": "Toborzás terrorizmusra vagy erőszakos szélsőségességre, illetve ezek népszerűsítése",
+ "report_flow.label.their_profile": "Valami a profiljában",
"report_flow.label.threat": "Fenyegetések vagy erőszakra való felhívások",
"report_flow.label.threat_to_share": "A megosztással fenyegetőzik",
"report_flow.label.too_young": "A(z) {product_name} használatához szükséges minimális életkor alatt vannak",
@@ -307,15 +309,13 @@
"report_flow.screen.private_info.title": "Milyen magánjellegű adatok érintettek?",
"report_flow.screen.profile_abuse.title": "Mi a káros a profiljukban?",
"report_flow.screen.profile_hate_violence.title": "Mit mutat vagy népszerűsít a profiljuk?",
- "report_flow.screen.profile_intro.options_heading": "További információ",
- "report_flow.screen.profile_intro.subtitle": "Mondd el, mi a baj ezzel a profillal. Nem fogják megtudni, ki jelentette őket.",
- "report_flow.screen.profile_intro.title": "Profil bejelentése",
"report_flow.screen.profile_minor_sexual.title": "Mi van a profiljukban, ami kiskorúakat érint?",
"report_flow.screen.profile_parts.subtitle": "Jelölj ki annyit, amennyi szükséges.",
"report_flow.screen.profile_parts.title": "A profiljuk mely részei okoznak problémát?",
"report_flow.screen.profile_private_info.title": "Milyen magánjellegű adatok szerepelnek a profiljukban?",
"report_flow.screen.profile_sexual.title": "Mondd el, milyen szexuális tartalom van a profiljukban",
"report_flow.screen.profile_threat.title": "Miben kapcsolódik az erőszakhoz a profiljuk?",
+ "report_flow.screen.root_call.title": "Mi történt a hívásban?",
"report_flow.screen.root_guild.subtitle": "Válaszd ki a közösségben történtekhez leginkább illő lehetőséget.",
"report_flow.screen.root_guild.title": "Mi a baj ezzel a közösséggel?",
"report_flow.screen.root_message.subtitle": "Válaszd ki a leginkább illő lehetőséget. Elküldés előtt mindent ellenőrizhetsz.",
@@ -336,6 +336,8 @@
"report_flow.screen.spam_kind_guild.title": "Hogyan él vissza ez a közösség a platformmal?",
"report_flow.screen.spam_profile.title": "Hogyan élnek vissza a fiókkal?",
"report_flow.screen.threat.title": "Milyen módon kapcsolódik erőszakhoz?",
+ "report_flow.screen.user_start.subtitle": "Nem fogják megtudni, ki jelentette őket.",
+ "report_flow.screen.user_start.title": "Mit szeretnél jelenteni?",
"report_flow.screen.violence_misinfo.title": "Ezek közül melyik illik rá?",
"report_flow.screen.violence_misinfo_guild.title": "Ezek közül mi történik ebben a közösségben?"
}
diff --git a/fluxer_api/src/api/content_i18n/weblate/locales/id.json b/fluxer_api/src/api/content_i18n/weblate/locales/id.json
index 02cf00d2e..6975e72fe 100644
--- a/fluxer_api/src/api/content_i18n/weblate/locales/id.json
+++ b/fluxer_api/src/api/content_i18n/weblate/locales/id.json
@@ -158,6 +158,7 @@
"report_flow.label.age_yes_profile": "Ya, profilnya menyebutkan usianya",
"report_flow.label.atrocity_denial": "Menyangkal atau merayakan Holocaust atau genosida lainnya",
"report_flow.label.ban_evasion": "Mengakali larangan dengan akun lain",
+ "report_flow.label.call_activity": "Sesuatu yang mereka katakan atau tunjukkan dalam panggilan",
"report_flow.label.channel_names": "Nama saluran",
"report_flow.label.community_banner": "Banner komunitas",
"report_flow.label.community_icon": "Ikon komunitas",
@@ -269,6 +270,7 @@
"report_flow.label.synthetic_media": "Media palsu atau buatan AI yang disajikan sebagai asli",
"report_flow.label.terrorism": "Terorisme atau ekstremisme kekerasan",
"report_flow.label.terrorism_guild": "Merekrut atau mempromosikan terorisme atau ekstremisme kekerasan",
+ "report_flow.label.their_profile": "Sesuatu di profil mereka",
"report_flow.label.threat": "Ancaman atau seruan untuk kekerasan",
"report_flow.label.threat_to_share": "Mereka mengancam akan membagikannya",
"report_flow.label.too_young": "Mereka di bawah usia minimum untuk menggunakan {product_name}",
@@ -307,15 +309,13 @@
"report_flow.screen.private_info.title": "Detail pribadi apa yang terlibat?",
"report_flow.screen.profile_abuse.title": "Apa yang berbahaya dari profil mereka?",
"report_flow.screen.profile_hate_violence.title": "Apa yang ditampilkan atau dipromosikan oleh profil mereka?",
- "report_flow.screen.profile_intro.options_heading": "Pelajari selengkapnya",
- "report_flow.screen.profile_intro.subtitle": "Beri tahu kami apa yang salah dengan profil ini. Mereka tidak akan diberi tahu siapa yang melaporkannya.",
- "report_flow.screen.profile_intro.title": "Laporkan profil",
"report_flow.screen.profile_minor_sexual.title": "Apa yang ada di profil mereka yang melibatkan anak di bawah umur?",
"report_flow.screen.profile_parts.subtitle": "Pilih sebanyak yang kamu butuhkan.",
"report_flow.screen.profile_parts.title": "Bagian mana dari profil mereka yang bermasalah?",
"report_flow.screen.profile_private_info.title": "Detail pribadi apa yang ada di profil mereka?",
"report_flow.screen.profile_sexual.title": "Beri tahu kami tentang konten seksual di profilnya",
"report_flow.screen.profile_threat.title": "Bagaimana profilnya melibatkan kekerasan?",
+ "report_flow.screen.root_call.title": "Apa yang terjadi dalam panggilan?",
"report_flow.screen.root_guild.subtitle": "Pilih yang paling sesuai dengan apa yang terjadi di komunitas ini.",
"report_flow.screen.root_guild.title": "Ada apa dengan komunitas ini?",
"report_flow.screen.root_message.subtitle": "Pilih yang paling sesuai. Kamu dapat memeriksa semuanya sebelum dikirim.",
@@ -336,6 +336,8 @@
"report_flow.screen.spam_kind_guild.title": "Bagaimana komunitas ini menyalahgunakan platform?",
"report_flow.screen.spam_profile.title": "Bagaimana akun disalahgunakan?",
"report_flow.screen.threat.title": "Bagaimana ini melibatkan kekerasan?",
+ "report_flow.screen.user_start.subtitle": "Mereka tidak akan diberi tahu siapa yang melaporkannya.",
+ "report_flow.screen.user_start.title": "Apa yang ingin Anda laporkan?",
"report_flow.screen.violence_misinfo.title": "Mana yang paling sesuai?",
"report_flow.screen.violence_misinfo_guild.title": "Mana yang terjadi di komunitas ini?"
}
diff --git a/fluxer_api/src/api/content_i18n/weblate/locales/it.json b/fluxer_api/src/api/content_i18n/weblate/locales/it.json
index 600341b03..f171ae4eb 100644
--- a/fluxer_api/src/api/content_i18n/weblate/locales/it.json
+++ b/fluxer_api/src/api/content_i18n/weblate/locales/it.json
@@ -158,6 +158,7 @@
"report_flow.label.age_yes_profile": "Sì, il suo profilo menziona la sua età",
"report_flow.label.atrocity_denial": "Negazione o celebrazione dell'Olocausto o di altri genocidi",
"report_flow.label.ban_evasion": "Eludere un ban con un altro account",
+ "report_flow.label.call_activity": "Qualcosa che ha detto o mostrato in una chiamata",
"report_flow.label.channel_names": "Nomi dei canali",
"report_flow.label.community_banner": "Banner della community",
"report_flow.label.community_icon": "Icona della community",
@@ -269,6 +270,7 @@
"report_flow.label.synthetic_media": "Contenuti multimediali falsi o generati da IA presentati come reali",
"report_flow.label.terrorism": "Terrorismo o estremismo violento",
"report_flow.label.terrorism_guild": "Reclutamento o promozione del terrorismo o dell'estremismo violento",
+ "report_flow.label.their_profile": "Qualcosa nel suo profilo",
"report_flow.label.threat": "Minacce o incitamenti alla violenza",
"report_flow.label.threat_to_share": "Minaccia di condividerlo",
"report_flow.label.too_young": "È al di sotto dell'età minima per usare {product_name}",
@@ -307,15 +309,13 @@
"report_flow.screen.private_info.title": "Quali dettagli privati sono coinvolti?",
"report_flow.screen.profile_abuse.title": "Cosa c'è di dannoso nel suo profilo?",
"report_flow.screen.profile_hate_violence.title": "Cosa mostra o promuove il suo profilo?",
- "report_flow.screen.profile_intro.options_heading": "Scopri di più",
- "report_flow.screen.profile_intro.subtitle": "Dicci cosa non va in questo profilo. La persona non saprà chi l'ha segnalata.",
- "report_flow.screen.profile_intro.title": "Segnala profilo",
"report_flow.screen.profile_minor_sexual.title": "Cosa c'è nel suo profilo che coinvolge un minore?",
"report_flow.screen.profile_parts.subtitle": "Scegline quante ti servono.",
"report_flow.screen.profile_parts.title": "Quali parti del suo profilo sono problematiche?",
"report_flow.screen.profile_private_info.title": "Quali dettagli privati sono presenti nel suo profilo?",
"report_flow.screen.profile_sexual.title": "Parlaci del contenuto sessuale nel suo profilo",
"report_flow.screen.profile_threat.title": "In che modo il suo profilo riguarda la violenza?",
+ "report_flow.screen.root_call.title": "Cosa è successo nella chiamata?",
"report_flow.screen.root_guild.subtitle": "Scegli l'opzione più vicina a ciò che sta succedendo in questa community.",
"report_flow.screen.root_guild.title": "Cosa non va in questa community?",
"report_flow.screen.root_message.subtitle": "Scegli l'opzione più vicina. Potrai controllare tutto prima dell'invio.",
@@ -336,6 +336,8 @@
"report_flow.screen.spam_kind_guild.title": "In che modo questa community abusa della piattaforma?",
"report_flow.screen.spam_profile.title": "In che modo l'account viene utilizzato in modo improprio?",
"report_flow.screen.threat.title": "In che modo riguarda la violenza?",
+ "report_flow.screen.user_start.subtitle": "La persona non saprà chi l'ha segnalata.",
+ "report_flow.screen.user_start.title": "Cosa vuoi segnalare?",
"report_flow.screen.violence_misinfo.title": "Quale di queste corrisponde?",
"report_flow.screen.violence_misinfo_guild.title": "Quale di queste accade in questa community?"
}
diff --git a/fluxer_api/src/api/content_i18n/weblate/locales/ja.json b/fluxer_api/src/api/content_i18n/weblate/locales/ja.json
index fa7ca2775..e11089ced 100644
--- a/fluxer_api/src/api/content_i18n/weblate/locales/ja.json
+++ b/fluxer_api/src/api/content_i18n/weblate/locales/ja.json
@@ -158,6 +158,7 @@
"report_flow.label.age_yes_profile": "はい、プロフィールに年齢が記載されています",
"report_flow.label.atrocity_denial": "ホロコーストまたはその他のジェノサイドの否定または賛美",
"report_flow.label.ban_evasion": "別のアカウントでBANを回避する行為",
+ "report_flow.label.call_activity": "通話中に言ったことや見せたもの",
"report_flow.label.channel_names": "チャンネル名",
"report_flow.label.community_banner": "コミュニティバナー",
"report_flow.label.community_icon": "コミュニティアイコン",
@@ -269,6 +270,7 @@
"report_flow.label.synthetic_media": "偽物またはAIで作成されたメディアを本物として見せかけている",
"report_flow.label.terrorism": "テロリズムまたは暴力的過激主義",
"report_flow.label.terrorism_guild": "テロリズムまたは暴力的過激主義の勧誘または助長",
+ "report_flow.label.their_profile": "プロフィールの内容",
"report_flow.label.threat": "脅迫または暴力の呼びかけ",
"report_flow.label.threat_to_share": "共有すると脅迫している",
"report_flow.label.too_young": "{product_name}を利用できる最低年齢に達していません",
@@ -307,15 +309,13 @@
"report_flow.screen.private_info.title": "どの個人情報が関係していますか?",
"report_flow.screen.profile_abuse.title": "プロフィールのどのような点が有害ですか?",
"report_flow.screen.profile_hate_violence.title": "プロフィールには何が表示されていますか、または何を助長していますか?",
- "report_flow.screen.profile_intro.options_heading": "詳細はこちら",
- "report_flow.screen.profile_intro.subtitle": "このプロフィールのどこに問題があるか教えてください。報告者が誰であるかは本人に伝えられません。",
- "report_flow.screen.profile_intro.title": "プロフィールを報告",
"report_flow.screen.profile_minor_sexual.title": "プロフィールに未成年者がどのように関わっていますか?",
"report_flow.screen.profile_parts.subtitle": "いくつでも選択してください。",
"report_flow.screen.profile_parts.title": "プロフィールのどの部分に問題がありますか?",
"report_flow.screen.profile_private_info.title": "プロフィールにどの個人情報が含まれていますか?",
"report_flow.screen.profile_sexual.title": "プロフィールにある性的コンテンツについて教えてください",
"report_flow.screen.profile_threat.title": "プロフィールにはどのように暴力が関係していますか?",
+ "report_flow.screen.root_call.title": "通話中に何がありましたか?",
"report_flow.screen.root_guild.subtitle": "このコミュニティで起きていることに最も近いものを選んでください。",
"report_flow.screen.root_guild.title": "このコミュニティで何が問題になっていますか?",
"report_flow.screen.root_message.subtitle": "最も近いものを選んでください。送信前にすべて確認できます。",
@@ -336,6 +336,8 @@
"report_flow.screen.spam_kind_guild.title": "このコミュニティはプラットフォームをどのように悪用していますか?",
"report_flow.screen.spam_profile.title": "アカウントはどのように悪用されていますか?",
"report_flow.screen.threat.title": "どのように暴力に関係していますか?",
+ "report_flow.screen.user_start.subtitle": "報告者が誰であるかは本人に伝えられません。",
+ "report_flow.screen.user_start.title": "何を報告しますか?",
"report_flow.screen.violence_misinfo.title": "どれに当てはまりますか?",
"report_flow.screen.violence_misinfo_guild.title": "このコミュニティでは、どれが発生していますか?"
}
diff --git a/fluxer_api/src/api/content_i18n/weblate/locales/ko.json b/fluxer_api/src/api/content_i18n/weblate/locales/ko.json
index bed56d30a..0df995cf2 100644
--- a/fluxer_api/src/api/content_i18n/weblate/locales/ko.json
+++ b/fluxer_api/src/api/content_i18n/weblate/locales/ko.json
@@ -158,6 +158,7 @@
"report_flow.label.age_yes_profile": "예, 프로필에 나이가 언급되어 있습니다",
"report_flow.label.atrocity_denial": "홀로코스트 또는 기타 집단 학살(제노사이드)을 부인하거나 찬양하는 행위",
"report_flow.label.ban_evasion": "다른 계정으로 밴 우회",
+ "report_flow.label.call_activity": "통화 중에 말하거나 보여준 것",
"report_flow.label.channel_names": "채널 이름",
"report_flow.label.community_banner": "커뮤니티 배너",
"report_flow.label.community_icon": "커뮤니티 아이콘",
@@ -269,6 +270,7 @@
"report_flow.label.synthetic_media": "가짜 또는 AI 생성 미디어를 실제처럼 제시",
"report_flow.label.terrorism": "테러 또는 폭력적 극단주의",
"report_flow.label.terrorism_guild": "테러 또는 폭력적 극단주의 모집 또는 조장",
+ "report_flow.label.their_profile": "프로필의 내용",
"report_flow.label.threat": "협박 또는 폭력 선동",
"report_flow.label.threat_to_share": "공유하겠다고 위협함",
"report_flow.label.too_young": "{product_name} 이용 최소 연령 미만입니다",
@@ -307,15 +309,13 @@
"report_flow.screen.private_info.title": "어떤 개인 정보가 관련되어 있나요?",
"report_flow.screen.profile_abuse.title": "프로필의 어떤 점이 해로운가요?",
"report_flow.screen.profile_hate_violence.title": "프로필에 무엇이 표시되거나 홍보되나요?",
- "report_flow.screen.profile_intro.options_heading": "자세히 알아보기",
- "report_flow.screen.profile_intro.subtitle": "이 프로필에 어떤 문제가 있는지 알려주세요. 상대방에게는 누가 신고했는지 알리지 않습니다.",
- "report_flow.screen.profile_intro.title": "프로필 신고",
"report_flow.screen.profile_minor_sexual.title": "프로필의 어떤 내용이 미성년자와 관련되어 있나요?",
"report_flow.screen.profile_parts.subtitle": "필요한 만큼 선택하세요.",
"report_flow.screen.profile_parts.title": "프로필의 어떤 부분이 문제인가요?",
"report_flow.screen.profile_private_info.title": "프로필에 어떤 개인 정보가 포함되어 있나요?",
"report_flow.screen.profile_sexual.title": "프로필의 성적인 콘텐츠에 대해 알려주세요",
"report_flow.screen.profile_threat.title": "프로필에 폭력적인 내용이 어떻게 포함되어 있나요?",
+ "report_flow.screen.root_call.title": "통화 중에 무슨 일이 있었나요?",
"report_flow.screen.root_guild.subtitle": "커뮤니티에서 발생하고 있는 일과 가장 가까운 것을 선택하세요.",
"report_flow.screen.root_guild.title": "이 커뮤니티에 무슨 문제가 있나요?",
"report_flow.screen.root_message.subtitle": "가장 가까운 항목을 선택하세요. 신고를 보내기 전에 모든 내용을 확인할 수 있습니다.",
@@ -336,6 +336,8 @@
"report_flow.screen.spam_kind_guild.title": "이 커뮤니티는 플랫폼을 어떻게 악용하고 있나요?",
"report_flow.screen.spam_profile.title": "계정이 어떻게 오용되고 있나요?",
"report_flow.screen.threat.title": "어떻게 폭력과 관련이 있나요?",
+ "report_flow.screen.user_start.subtitle": "상대방에게는 누가 신고했는지 알리지 않습니다.",
+ "report_flow.screen.user_start.title": "무엇을 신고하시겠어요?",
"report_flow.screen.violence_misinfo.title": "이 중 어떤 것에 해당하나요?",
"report_flow.screen.violence_misinfo_guild.title": "이 커뮤니티에서 어떤 일이 발생하나요?"
}
diff --git a/fluxer_api/src/api/content_i18n/weblate/locales/lt.json b/fluxer_api/src/api/content_i18n/weblate/locales/lt.json
index b0fac4504..e525a87d6 100644
--- a/fluxer_api/src/api/content_i18n/weblate/locales/lt.json
+++ b/fluxer_api/src/api/content_i18n/weblate/locales/lt.json
@@ -158,6 +158,7 @@
"report_flow.label.age_yes_profile": "Taip, jų profilyje minimas jų amžius",
"report_flow.label.atrocity_denial": "Holokausto ar kitų genocidų neigimas arba šlovinimas",
"report_flow.label.ban_evasion": "Draudimo apėjimas naudojant kitą paskyrą",
+ "report_flow.label.call_activity": "Kažkas, ką jie pasakė ar parodė skambučio metu",
"report_flow.label.channel_names": "Kanalų pavadinimai",
"report_flow.label.community_banner": "Bendruomenės reklamjuostė",
"report_flow.label.community_icon": "Bendruomenės piktograma",
@@ -269,6 +270,7 @@
"report_flow.label.synthetic_media": "Netikra arba dirbtinio intelekto sukurta medija, pateikiama kaip tikra",
"report_flow.label.terrorism": "Terorizmas arba smurtinis ekstremizmas",
"report_flow.label.terrorism_guild": "Verbavimas terorizmui ar smurtiniam ekstremizmui arba jų skatinimas",
+ "report_flow.label.their_profile": "Kažkas jų profilyje",
"report_flow.label.threat": "Grasinimai ar raginimai smurtauti",
"report_flow.label.threat_to_share": "Jie grasina tuo pasidalyti",
"report_flow.label.too_young": "Jie jaunesni už minimalų amžių platformoje {product_name}",
@@ -307,15 +309,13 @@
"report_flow.screen.private_info.title": "Kokie privatūs duomenys yra susiję?",
"report_flow.screen.profile_abuse.title": "Kas kenksminga jų profilyje?",
"report_flow.screen.profile_hate_violence.title": "Ką jų profilis rodo ar skatina?",
- "report_flow.screen.profile_intro.options_heading": "Sužinoti daugiau",
- "report_flow.screen.profile_intro.subtitle": "Papasakokite, kas negerai su šiuo profiliu. Jiems nebus pasakyta, kas pranešė.",
- "report_flow.screen.profile_intro.title": "Pranešti apie profilį",
"report_flow.screen.profile_minor_sexual.title": "Kas jų profilyje susiję su nepilnamečiu?",
"report_flow.screen.profile_parts.subtitle": "Pasirinkite tiek, kiek reikia.",
"report_flow.screen.profile_parts.title": "Kurios jų profilio dalys kelia problemų?",
"report_flow.screen.profile_private_info.title": "Kokie privatūs duomenys yra jų profilyje?",
"report_flow.screen.profile_sexual.title": "Papasakokite apie seksualinį turinį jų profilyje",
"report_flow.screen.profile_threat.title": "Kaip jų profilis susijęs su smurtu?",
+ "report_flow.screen.root_call.title": "Kas nutiko skambučio metu?",
"report_flow.screen.root_guild.subtitle": "Pasirinkite artimiausią atitikmenį tam, kas vyksta šioje bendruomenėje.",
"report_flow.screen.root_guild.title": "Kas negerai su šia bendruomene?",
"report_flow.screen.root_message.subtitle": "Pasirinkite artimiausią atitikmenį. Viską galėsite patikrinti prieš pranešimo išsiuntimą.",
@@ -336,6 +336,8 @@
"report_flow.screen.spam_kind_guild.title": "Kaip ši bendruomenė piktnaudžiauja platforma?",
"report_flow.screen.spam_profile.title": "Kaip paskyra naudojama netinkamai?",
"report_flow.screen.threat.title": "Kaip tai susiję su smurtu?",
+ "report_flow.screen.user_start.subtitle": "Jiems nebus pasakyta, kas pranešė.",
+ "report_flow.screen.user_start.title": "Apie ką norite pranešti?",
"report_flow.screen.violence_misinfo.title": "Kuris iš šių variantų atitinka?",
"report_flow.screen.violence_misinfo_guild.title": "Kuris iš šių variantų vyksta šioje bendruomenėje?"
}
diff --git a/fluxer_api/src/api/content_i18n/weblate/locales/nl.json b/fluxer_api/src/api/content_i18n/weblate/locales/nl.json
index eb425d225..688bffe4e 100644
--- a/fluxer_api/src/api/content_i18n/weblate/locales/nl.json
+++ b/fluxer_api/src/api/content_i18n/weblate/locales/nl.json
@@ -158,6 +158,7 @@
"report_flow.label.age_yes_profile": "Ja, hun profiel vermeldt hun leeftijd",
"report_flow.label.atrocity_denial": "Het ontkennen of verheerlijken van de Holocaust of andere genocides",
"report_flow.label.ban_evasion": "Een ban omzeilen met een ander account",
+ "report_flow.label.call_activity": "Iets wat ze zeiden of lieten zien in een gesprek",
"report_flow.label.channel_names": "Kanaalnamen",
"report_flow.label.community_banner": "Communitybanner",
"report_flow.label.community_icon": "Communitypictogram",
@@ -269,6 +270,7 @@
"report_flow.label.synthetic_media": "Nep- of AI-gemaakte media die als echt worden gepresenteerd",
"report_flow.label.terrorism": "Terrorisme of gewelddadig extremisme",
"report_flow.label.terrorism_guild": "Werven voor of promoten van terrorisme of gewelddadig extremisme",
+ "report_flow.label.their_profile": "Iets in hun profiel",
"report_flow.label.threat": "Bedreigingen of oproepen tot geweld",
"report_flow.label.threat_to_share": "Ze dreigen het te delen",
"report_flow.label.too_young": "Ze zijn jonger dan de minimumleeftijd om {product_name} te gebruiken",
@@ -307,15 +309,13 @@
"report_flow.screen.private_info.title": "Welke privégegevens zijn betrokken?",
"report_flow.screen.profile_abuse.title": "Wat is er schadelijk aan hun profiel?",
"report_flow.screen.profile_hate_violence.title": "Wat laat hun profiel zien of promoot het?",
- "report_flow.screen.profile_intro.options_heading": "Meer informatie",
- "report_flow.screen.profile_intro.subtitle": "Vertel ons wat er mis is met dit profiel. Ze krijgen niet te horen wie de melding heeft gedaan.",
- "report_flow.screen.profile_intro.title": "Profiel melden",
"report_flow.screen.profile_minor_sexual.title": "Wat in hun profiel heeft met een minderjarige te maken?",
"report_flow.screen.profile_parts.subtitle": "Kies er zoveel als nodig is.",
"report_flow.screen.profile_parts.title": "Welke onderdelen van hun profiel zijn een probleem?",
"report_flow.screen.profile_private_info.title": "Welke privégegevens staan in hun profiel?",
"report_flow.screen.profile_sexual.title": "Vertel ons over de seksuele inhoud in hun profiel",
"report_flow.screen.profile_threat.title": "Hoe speelt geweld een rol in hun profiel?",
+ "report_flow.screen.root_call.title": "Wat is er gebeurd in het gesprek?",
"report_flow.screen.root_guild.subtitle": "Kies de beste omschrijving voor wat er in deze community gebeurt.",
"report_flow.screen.root_guild.title": "Wat is er mis met deze community?",
"report_flow.screen.root_message.subtitle": "Kies de beste omschrijving. Je kunt alles controleren voordat het wordt verzonden.",
@@ -336,6 +336,8 @@
"report_flow.screen.spam_kind_guild.title": "Hoe misbruikt deze community het platform?",
"report_flow.screen.spam_profile.title": "Hoe wordt het account misbruikt?",
"report_flow.screen.threat.title": "Hoe speelt geweld hierbij een rol?",
+ "report_flow.screen.user_start.subtitle": "Ze krijgen niet te horen wie de melding heeft gedaan.",
+ "report_flow.screen.user_start.title": "Wat wil je melden?",
"report_flow.screen.violence_misinfo.title": "Welke van deze past erbij?",
"report_flow.screen.violence_misinfo_guild.title": "Welke van deze gebeurt er in deze community?"
}
diff --git a/fluxer_api/src/api/content_i18n/weblate/locales/no.json b/fluxer_api/src/api/content_i18n/weblate/locales/no.json
index b7826e4ec..7d397b131 100644
--- a/fluxer_api/src/api/content_i18n/weblate/locales/no.json
+++ b/fluxer_api/src/api/content_i18n/weblate/locales/no.json
@@ -158,6 +158,7 @@
"report_flow.label.age_yes_profile": "Ja, profilen deres nevner alderen deres",
"report_flow.label.atrocity_denial": "Benekter eller feirer Holocaust eller andre folkemord",
"report_flow.label.ban_evasion": "Omgår en utestengelse med en annen konto",
+ "report_flow.label.call_activity": "Noe de sa eller viste i en samtale",
"report_flow.label.channel_names": "Kanalnavn",
"report_flow.label.community_banner": "Fellesskapsbanner",
"report_flow.label.community_icon": "Fellesskapsikon",
@@ -269,6 +270,7 @@
"report_flow.label.synthetic_media": "Falske eller AI-genererte medier som presenteres som ekte",
"report_flow.label.terrorism": "Terrorisme eller voldelig ekstremisme",
"report_flow.label.terrorism_guild": "Rekrutterer for eller fremmer terrorisme eller voldelig ekstremisme",
+ "report_flow.label.their_profile": "Noe i profilen deres",
"report_flow.label.threat": "Trusler eller oppfordringer til vold",
"report_flow.label.threat_to_share": "De truer med å dele det",
"report_flow.label.too_young": "De er under minimumsalderen for å bruke {product_name}",
@@ -307,15 +309,13 @@
"report_flow.screen.private_info.title": "Hvilke private detaljer er involvert?",
"report_flow.screen.profile_abuse.title": "Hva er skadelig med profilen deres?",
"report_flow.screen.profile_hate_violence.title": "Hva viser eller fremmer profilen deres?",
- "report_flow.screen.profile_intro.options_heading": "Lær mer",
- "report_flow.screen.profile_intro.subtitle": "Fortell oss hva som er galt med denne profilen. De vil ikke få vite hvem som rapporterte dem.",
- "report_flow.screen.profile_intro.title": "Rapporter profil",
"report_flow.screen.profile_minor_sexual.title": "Hva i profilen deres involverer en mindreårig?",
"report_flow.screen.profile_parts.subtitle": "Velg så mange du trenger.",
"report_flow.screen.profile_parts.title": "Hvilke deler av profilen deres er et problem?",
"report_flow.screen.profile_private_info.title": "Hvilke private detaljer er i profilen deres?",
"report_flow.screen.profile_sexual.title": "Fortell oss om det seksuelle innholdet i profilen deres",
"report_flow.screen.profile_threat.title": "Hvordan involverer profilen deres vold?",
+ "report_flow.screen.root_call.title": "Hva skjedde i samtalen?",
"report_flow.screen.root_guild.subtitle": "Velg alternativet som passer best med det som skjer i dette fellesskapet.",
"report_flow.screen.root_guild.title": "Hva er galt med dette fellesskapet?",
"report_flow.screen.root_message.subtitle": "Velg alternativet som passer best. Du kan se over alt før det sendes.",
@@ -336,6 +336,8 @@
"report_flow.screen.spam_kind_guild.title": "Hvordan misbruker dette fellesskapet plattformen?",
"report_flow.screen.spam_profile.title": "Hvordan misbrukes kontoen?",
"report_flow.screen.threat.title": "Hvordan involverer det vold?",
+ "report_flow.screen.user_start.subtitle": "De vil ikke få vite hvem som rapporterte dem.",
+ "report_flow.screen.user_start.title": "Hva vil du rapportere?",
"report_flow.screen.violence_misinfo.title": "Hvilket av disse passer best?",
"report_flow.screen.violence_misinfo_guild.title": "Hvilket av disse skjer i dette fellesskapet?"
}
diff --git a/fluxer_api/src/api/content_i18n/weblate/locales/pl.json b/fluxer_api/src/api/content_i18n/weblate/locales/pl.json
index 105fd8d87..c89fda57c 100644
--- a/fluxer_api/src/api/content_i18n/weblate/locales/pl.json
+++ b/fluxer_api/src/api/content_i18n/weblate/locales/pl.json
@@ -158,6 +158,7 @@
"report_flow.label.age_yes_profile": "Tak, ich profil wspomina o ich wieku",
"report_flow.label.atrocity_denial": "Zaprzeczanie Holokaustowi lub innym ludobójstwom albo ich gloryfikowanie",
"report_flow.label.ban_evasion": "Omijanie bana za pomocą innego konta",
+ "report_flow.label.call_activity": "Coś, co ta osoba powiedziała lub pokazała podczas rozmowy",
"report_flow.label.channel_names": "Nazwy kanałów",
"report_flow.label.community_banner": "Baner społeczności",
"report_flow.label.community_icon": "Ikona społeczności",
@@ -269,6 +270,7 @@
"report_flow.label.synthetic_media": "Fałszywe lub stworzone przez AI media przedstawiane jako prawdziwe",
"report_flow.label.terrorism": "Terroryzm lub brutalny ekstremizm",
"report_flow.label.terrorism_guild": "Rekrutowanie lub promowanie terroryzmu lub brutalnego ekstremizmu",
+ "report_flow.label.their_profile": "Coś w profilu tej osoby",
"report_flow.label.threat": "Groźby lub nawoływanie do przemocy",
"report_flow.label.threat_to_share": "Grożą, że to udostępnią",
"report_flow.label.too_young": "Ta osoba jest poniżej minimalnego wieku wymaganego do korzystania z platformy {product_name}",
@@ -307,15 +309,13 @@
"report_flow.screen.private_info.title": "Jakich prywatnych danych to dotyczy?",
"report_flow.screen.profile_abuse.title": "Co jest szkodliwe w ich profilu?",
"report_flow.screen.profile_hate_violence.title": "Co pokazuje lub promuje ich profil?",
- "report_flow.screen.profile_intro.options_heading": "Dowiedz się więcej",
- "report_flow.screen.profile_intro.subtitle": "Powiedz nam, co jest nie tak z tym profilem. Ta osoba nie dowie się, kto ją zgłosił.",
- "report_flow.screen.profile_intro.title": "Zgłoś profil",
"report_flow.screen.profile_minor_sexual.title": "Co w ich profilu dotyczy nieletniego?",
"report_flow.screen.profile_parts.subtitle": "Wybierz tyle, ile potrzebujesz.",
"report_flow.screen.profile_parts.title": "Które części ich profilu stanowią problem?",
"report_flow.screen.profile_private_info.title": "Jakie prywatne dane znajdują się w ich profilu?",
"report_flow.screen.profile_sexual.title": "Powiedz nam o treściach o charakterze seksualnym w ich profilu",
"report_flow.screen.profile_threat.title": "Jak ich profil wiąże się z przemocą?",
+ "report_flow.screen.root_call.title": "Co się stało podczas rozmowy?",
"report_flow.screen.root_guild.subtitle": "Wybierz opcję, która najlepiej pasuje do tego, co dzieje się w tej społeczności.",
"report_flow.screen.root_guild.title": "Co jest nie tak z tą społecznością?",
"report_flow.screen.root_message.subtitle": "Wybierz opcję, która najlepiej pasuje. Przed wysłaniem możesz wszystko sprawdzić.",
@@ -336,6 +336,8 @@
"report_flow.screen.spam_kind_guild.title": "Jak ta społeczność nadużywa platformy?",
"report_flow.screen.spam_profile.title": "Jak konto jest niewłaściwie używane?",
"report_flow.screen.threat.title": "Jak to wiąże się z przemocą?",
+ "report_flow.screen.user_start.subtitle": "Ta osoba nie dowie się, kto ją zgłosił.",
+ "report_flow.screen.user_start.title": "Co chcesz zgłosić?",
"report_flow.screen.violence_misinfo.title": "Które z nich najlepiej to opisuje?",
"report_flow.screen.violence_misinfo_guild.title": "Które z nich ma miejsce w tej społeczności?"
}
diff --git a/fluxer_api/src/api/content_i18n/weblate/locales/pt-BR.json b/fluxer_api/src/api/content_i18n/weblate/locales/pt-BR.json
index 0ba917e35..0c2119b80 100644
--- a/fluxer_api/src/api/content_i18n/weblate/locales/pt-BR.json
+++ b/fluxer_api/src/api/content_i18n/weblate/locales/pt-BR.json
@@ -158,6 +158,7 @@
"report_flow.label.age_yes_profile": "Sim, o perfil menciona a idade",
"report_flow.label.atrocity_denial": "Negação ou celebração do Holocausto ou outros genocídios",
"report_flow.label.ban_evasion": "Contornar um banimento com outra conta",
+ "report_flow.label.call_activity": "Algo que a pessoa disse ou mostrou em uma chamada",
"report_flow.label.channel_names": "Nomes de canais",
"report_flow.label.community_banner": "Banner da comunidade",
"report_flow.label.community_icon": "Ícone da comunidade",
@@ -269,6 +270,7 @@
"report_flow.label.synthetic_media": "Mídia falsa ou criada por IA apresentada como real",
"report_flow.label.terrorism": "Terrorismo ou extremismo violento",
"report_flow.label.terrorism_guild": "Recrutamento ou promoção de terrorismo ou extremismo violento",
+ "report_flow.label.their_profile": "Algo no perfil",
"report_flow.label.threat": "Ameaças ou apelos à violência",
"report_flow.label.threat_to_share": "A pessoa está ameaçando compartilhar isso",
"report_flow.label.too_young": "Essa pessoa não tem a idade mínima para usar o {product_name}",
@@ -307,15 +309,13 @@
"report_flow.screen.private_info.title": "Quais detalhes privados estão envolvidos?",
"report_flow.screen.profile_abuse.title": "O que há de prejudicial no perfil dele(a)?",
"report_flow.screen.profile_hate_violence.title": "O que o perfil dele(a) mostra ou promove?",
- "report_flow.screen.profile_intro.options_heading": "Saiba mais",
- "report_flow.screen.profile_intro.subtitle": "Conte-nos o que há de errado com este perfil. A pessoa não saberá quem a denunciou.",
- "report_flow.screen.profile_intro.title": "Denunciar perfil",
"report_flow.screen.profile_minor_sexual.title": "O que no perfil dele(a) envolve um menor?",
"report_flow.screen.profile_parts.subtitle": "Selecione quantas precisar.",
"report_flow.screen.profile_parts.title": "Quais partes do perfil dele(a) são um problema?",
"report_flow.screen.profile_private_info.title": "Quais detalhes privados estão no perfil dele(a)?",
"report_flow.screen.profile_sexual.title": "Conte-nos sobre o conteúdo sexual no perfil dele(a)",
"report_flow.screen.profile_threat.title": "Como o perfil dele(a) envolve violência?",
+ "report_flow.screen.root_call.title": "O que aconteceu na chamada?",
"report_flow.screen.root_guild.subtitle": "Escolha a opção que melhor descreve o que está acontecendo nesta comunidade.",
"report_flow.screen.root_guild.title": "O que há de errado nesta comunidade?",
"report_flow.screen.root_message.subtitle": "Escolha a opção mais próxima. Você poderá revisar tudo antes do envio.",
@@ -336,6 +336,8 @@
"report_flow.screen.spam_kind_guild.title": "Como esta comunidade está abusando da plataforma?",
"report_flow.screen.spam_profile.title": "Como a conta está sendo mal utilizada?",
"report_flow.screen.threat.title": "Como isso envolve violência?",
+ "report_flow.screen.user_start.subtitle": "A pessoa não saberá quem a denunciou.",
+ "report_flow.screen.user_start.title": "O que você quer denunciar?",
"report_flow.screen.violence_misinfo.title": "Qual destas opções corresponde?",
"report_flow.screen.violence_misinfo_guild.title": "Qual destas opções acontece nesta comunidade?"
}
diff --git a/fluxer_api/src/api/content_i18n/weblate/locales/ro.json b/fluxer_api/src/api/content_i18n/weblate/locales/ro.json
index e44fbf5dd..272e76c65 100644
--- a/fluxer_api/src/api/content_i18n/weblate/locales/ro.json
+++ b/fluxer_api/src/api/content_i18n/weblate/locales/ro.json
@@ -158,6 +158,7 @@
"report_flow.label.age_yes_profile": "Da, profilul menționează vârsta",
"report_flow.label.atrocity_denial": "Negarea sau celebrarea Holocaustului sau a altor genocide",
"report_flow.label.ban_evasion": "Ocolirea unei interdicții cu un alt cont",
+ "report_flow.label.call_activity": "Ceva ce a spus sau a arătat într-un apel",
"report_flow.label.channel_names": "Numele canalelor",
"report_flow.label.community_banner": "Bannerul comunității",
"report_flow.label.community_icon": "Pictograma comunității",
@@ -269,6 +270,7 @@
"report_flow.label.synthetic_media": "Materiale media false sau generate de AI, prezentate ca fiind reale",
"report_flow.label.terrorism": "Terorism sau extremism violent",
"report_flow.label.terrorism_guild": "Recrutarea sau promovarea terorismului sau a extremismului violent",
+ "report_flow.label.their_profile": "Ceva din profilul persoanei",
"report_flow.label.threat": "Amenințări sau apeluri la violență",
"report_flow.label.threat_to_share": "Amenință că o va distribui",
"report_flow.label.too_young": "Persoana este sub vârsta minimă pentru a folosi {product_name}",
@@ -307,15 +309,13 @@
"report_flow.screen.private_info.title": "Ce detalii private sunt implicate?",
"report_flow.screen.profile_abuse.title": "Ce este dăunător la profilul său?",
"report_flow.screen.profile_hate_violence.title": "Ce arată sau promovează profilul său?",
- "report_flow.screen.profile_intro.options_heading": "Află mai multe",
- "report_flow.screen.profile_intro.subtitle": "Spune-ne ce nu este în regulă cu acest profil. Persoana nu va fi informată cine a raportat-o.",
- "report_flow.screen.profile_intro.title": "Raportează profilul",
"report_flow.screen.profile_minor_sexual.title": "Ce anume din profilul său implică un minor?",
"report_flow.screen.profile_parts.subtitle": "Alege câte ai nevoie.",
"report_flow.screen.profile_parts.title": "Ce părți ale profilului său sunt o problemă?",
"report_flow.screen.profile_private_info.title": "Ce detalii private se află în profilul său?",
"report_flow.screen.profile_sexual.title": "Spune-ne despre conținutul sexual din profilul său",
"report_flow.screen.profile_threat.title": "Cum implică profilul său violența?",
+ "report_flow.screen.root_call.title": "Ce s-a întâmplat în apel?",
"report_flow.screen.root_guild.subtitle": "Alege cea mai potrivită descriere pentru ceea ce se întâmplă în această comunitate.",
"report_flow.screen.root_guild.title": "Ce nu este în regulă cu această comunitate?",
"report_flow.screen.root_message.subtitle": "Alege cea mai potrivită variantă. Poți verifica totul înainte de a fi trimis.",
@@ -336,6 +336,8 @@
"report_flow.screen.spam_kind_guild.title": "Cum abuzează această comunitate de platformă?",
"report_flow.screen.spam_profile.title": "Cum este folosit abuziv contul?",
"report_flow.screen.threat.title": "Cum implică violența?",
+ "report_flow.screen.user_start.subtitle": "Persoana nu va fi informată cine a raportat-o.",
+ "report_flow.screen.user_start.title": "Ce vrei să raportezi?",
"report_flow.screen.violence_misinfo.title": "Care dintre acestea se potrivește?",
"report_flow.screen.violence_misinfo_guild.title": "Care dintre acestea se întâmplă în această comunitate?"
}
diff --git a/fluxer_api/src/api/content_i18n/weblate/locales/ru.json b/fluxer_api/src/api/content_i18n/weblate/locales/ru.json
index a21d9f284..feace02f9 100644
--- a/fluxer_api/src/api/content_i18n/weblate/locales/ru.json
+++ b/fluxer_api/src/api/content_i18n/weblate/locales/ru.json
@@ -158,6 +158,7 @@
"report_flow.label.age_yes_profile": "Да, в их профиле указан возраст",
"report_flow.label.atrocity_denial": "Отрицание или прославление Холокоста или других геноцидов",
"report_flow.label.ban_evasion": "Обход бана с помощью другого аккаунта",
+ "report_flow.label.call_activity": "Что-то, что пользователь сказал или показал во время звонка",
"report_flow.label.channel_names": "Названия каналов",
"report_flow.label.community_banner": "Баннер сообщества",
"report_flow.label.community_icon": "Значок сообщества",
@@ -269,6 +270,7 @@
"report_flow.label.synthetic_media": "Фейковые или созданные ИИ медиа, выдаваемые за настоящие",
"report_flow.label.terrorism": "Терроризм или насильственный экстремизм",
"report_flow.label.terrorism_guild": "Вербовка или пропаганда терроризма или насильственного экстремизма",
+ "report_flow.label.their_profile": "Что-то в профиле",
"report_flow.label.threat": "Угрозы или призывы к насилию",
"report_flow.label.threat_to_share": "Они угрожают поделиться этим",
"report_flow.label.too_young": "Они младше минимального возраста для использования {product_name}",
@@ -307,15 +309,13 @@
"report_flow.screen.private_info.title": "Какие личные сведения затронуты?",
"report_flow.screen.profile_abuse.title": "Что именно вредоносного в их профиле?",
"report_flow.screen.profile_hate_violence.title": "Что показывает или продвигает их профиль?",
- "report_flow.screen.profile_intro.options_heading": "Подробнее",
- "report_flow.screen.profile_intro.subtitle": "Расскажите, что не так с этим профилем. Пользователю не сообщат, кто на него пожаловался.",
- "report_flow.screen.profile_intro.title": "Пожаловаться на профиль",
"report_flow.screen.profile_minor_sexual.title": "Что в их профиле связано с несовершеннолетним?",
"report_flow.screen.profile_parts.subtitle": "Выберите столько, сколько вам нужно.",
"report_flow.screen.profile_parts.title": "Какие части профиля вызывают проблемы?",
"report_flow.screen.profile_private_info.title": "Какие личные сведения содержатся в их профиле?",
"report_flow.screen.profile_sexual.title": "Расскажите о сексуальном контенте в их профиле",
"report_flow.screen.profile_threat.title": "Как профиль связан с насилием?",
+ "report_flow.screen.root_call.title": "Что произошло во время звонка?",
"report_flow.screen.root_guild.subtitle": "Выберите наиболее подходящий вариант того, что происходит в этом сообществе.",
"report_flow.screen.root_guild.title": "Что не так с этим сообществом?",
"report_flow.screen.root_message.subtitle": "Выберите наиболее подходящий вариант. Перед отправкой вы сможете всё проверить.",
@@ -336,6 +336,8 @@
"report_flow.screen.spam_kind_guild.title": "Как это сообщество злоупотребляет платформой?",
"report_flow.screen.spam_profile.title": "Как аккаунт используется не по назначению?",
"report_flow.screen.threat.title": "Как это связано с насилием?",
+ "report_flow.screen.user_start.subtitle": "Пользователю не сообщат, кто на него пожаловался.",
+ "report_flow.screen.user_start.title": "О чём вы хотите сообщить?",
"report_flow.screen.violence_misinfo.title": "Что из этого подходит?",
"report_flow.screen.violence_misinfo_guild.title": "Что из этого происходит в этом сообществе?"
}
diff --git a/fluxer_api/src/api/content_i18n/weblate/locales/sv-SE.json b/fluxer_api/src/api/content_i18n/weblate/locales/sv-SE.json
index 87d8641e5..a7710cee6 100644
--- a/fluxer_api/src/api/content_i18n/weblate/locales/sv-SE.json
+++ b/fluxer_api/src/api/content_i18n/weblate/locales/sv-SE.json
@@ -158,6 +158,7 @@
"report_flow.label.age_yes_profile": "Ja, deras profil nämner deras ålder",
"report_flow.label.atrocity_denial": "Förnekar eller hyllar Förintelsen eller andra folkmord",
"report_flow.label.ban_evasion": "Kringgår en avstängning genom att använda ett annat konto",
+ "report_flow.label.call_activity": "Något de sa eller visade i ett samtal",
"report_flow.label.channel_names": "Kanalnamn",
"report_flow.label.community_banner": "Communitybanner",
"report_flow.label.community_icon": "Communityikon",
@@ -269,6 +270,7 @@
"report_flow.label.synthetic_media": "Falska eller AI-skapade medier som presenteras som verkliga",
"report_flow.label.terrorism": "Terrorism eller våldsbejakande extremism",
"report_flow.label.terrorism_guild": "Rekryterar för eller främjar terrorism eller våldsbejakande extremism",
+ "report_flow.label.their_profile": "Något i deras profil",
"report_flow.label.threat": "Hot eller uppmaningar till våld",
"report_flow.label.threat_to_share": "De hotar med att dela det",
"report_flow.label.too_young": "De är yngre än minimiåldern för att använda {product_name}",
@@ -307,15 +309,13 @@
"report_flow.screen.private_info.title": "Vilka privata uppgifter är inblandade?",
"report_flow.screen.profile_abuse.title": "Vad är skadligt med profilen?",
"report_flow.screen.profile_hate_violence.title": "Vad visar eller främjar profilen?",
- "report_flow.screen.profile_intro.options_heading": "Läs mer",
- "report_flow.screen.profile_intro.subtitle": "Berätta vad som är fel med den här profilen. De får inte veta vem som har anmält dem.",
- "report_flow.screen.profile_intro.title": "Anmäl profil",
"report_flow.screen.profile_minor_sexual.title": "Vad i profilen involverar en minderårig?",
"report_flow.screen.profile_parts.subtitle": "Välj så många som du behöver.",
"report_flow.screen.profile_parts.title": "Vilka delar av profilen är ett problem?",
"report_flow.screen.profile_private_info.title": "Vilka privata uppgifter finns i deras profil?",
"report_flow.screen.profile_sexual.title": "Berätta om det sexuella innehållet i deras profil",
"report_flow.screen.profile_threat.title": "Hur involverar deras profil våld?",
+ "report_flow.screen.root_call.title": "Vad hände i samtalet?",
"report_flow.screen.root_guild.subtitle": "Välj det alternativ som passar bäst för det som pågår i den här communityn.",
"report_flow.screen.root_guild.title": "Vad är fel med den här communityn?",
"report_flow.screen.root_message.subtitle": "Välj det alternativ som passar bäst. Du kan se över allt innan det skickas.",
@@ -336,6 +336,8 @@
"report_flow.screen.spam_kind_guild.title": "Hur missbrukar den här communityn plattformen?",
"report_flow.screen.spam_profile.title": "Hur missbrukas kontot?",
"report_flow.screen.threat.title": "Hur involverar det våld?",
+ "report_flow.screen.user_start.subtitle": "De får inte veta vem som har anmält dem.",
+ "report_flow.screen.user_start.title": "Vad vill du anmäla?",
"report_flow.screen.violence_misinfo.title": "Vilket av dessa stämmer in?",
"report_flow.screen.violence_misinfo_guild.title": "Vilket av dessa sker i den här communityn?"
}
diff --git a/fluxer_api/src/api/content_i18n/weblate/locales/th.json b/fluxer_api/src/api/content_i18n/weblate/locales/th.json
index f53d4d355..603d4612c 100644
--- a/fluxer_api/src/api/content_i18n/weblate/locales/th.json
+++ b/fluxer_api/src/api/content_i18n/weblate/locales/th.json
@@ -158,6 +158,7 @@
"report_flow.label.age_yes_profile": "ใช่ โปรไฟล์ของพวกเขาระบุอายุ",
"report_flow.label.atrocity_denial": "การปฏิเสธหรือเฉลิมฉลองฮอโลคอสต์หรือการฆ่าล้างเผ่าพันธุ์อื่นๆ",
"report_flow.label.ban_evasion": "การหลีกเลี่ยงการแบนด้วยบัญชีอื่น",
+ "report_flow.label.call_activity": "สิ่งที่พวกเขาพูดหรือแสดงในการโทร",
"report_flow.label.channel_names": "ชื่อช่อง",
"report_flow.label.community_banner": "แบนเนอร์คอมมูนิตี้",
"report_flow.label.community_icon": "ไอคอนคอมมูนิตี้",
@@ -269,6 +270,7 @@
"report_flow.label.synthetic_media": "สื่อปลอมหรือสื่อที่สร้างโดย AI ที่นำเสนอว่าเป็นของจริง",
"report_flow.label.terrorism": "การก่อการร้ายหรือแนวคิดสุดโต่งที่ใช้ความรุนแรง",
"report_flow.label.terrorism_guild": "การชักชวนหรือส่งเสริมการก่อการร้ายหรือแนวคิดสุดโต่งที่ใช้ความรุนแรง",
+ "report_flow.label.their_profile": "บางอย่างในโปรไฟล์ของพวกเขา",
"report_flow.label.threat": "การข่มขู่หรือการยุยงให้ใช้ความรุนแรง",
"report_flow.label.threat_to_share": "พวกเขากำลังขู่ว่าจะแชร์",
"report_flow.label.too_young": "พวกเขาอายุต่ำกว่าเกณฑ์ขั้นต่ำในการใช้ {product_name}",
@@ -307,15 +309,13 @@
"report_flow.screen.private_info.title": "มีรายละเอียดส่วนตัวใดบ้างที่เกี่ยวข้อง",
"report_flow.screen.profile_abuse.title": "โปรไฟล์ของพวกเขามีอันตรายอย่างไร",
"report_flow.screen.profile_hate_violence.title": "โปรไฟล์ของพวกเขากำลังแสดงหรือส่งเสริมอะไร",
- "report_flow.screen.profile_intro.options_heading": "ดูเพิ่มเติม",
- "report_flow.screen.profile_intro.subtitle": "บอกเราว่ามีอะไรผิดปกติกับโปรไฟล์นี้ พวกเขาจะไม่ทราบว่าใครเป็นผู้รายงาน",
- "report_flow.screen.profile_intro.title": "รายงานโปรไฟล์",
"report_flow.screen.profile_minor_sexual.title": "โปรไฟล์ของพวกเขามีอะไรที่เกี่ยวข้องกับผู้เยาว์",
"report_flow.screen.profile_parts.subtitle": "เลือกได้มากเท่าที่คุณต้องการ",
"report_flow.screen.profile_parts.title": "ส่วนใดของโปรไฟล์ของพวกเขามีปัญหา",
"report_flow.screen.profile_private_info.title": "มีรายละเอียดส่วนตัวใดบ้างในโปรไฟล์ของพวกเขา",
"report_flow.screen.profile_sexual.title": "บอกเราเกี่ยวกับเนื้อหาทางเพศในโปรไฟล์ของพวกเขา",
"report_flow.screen.profile_threat.title": "โปรไฟล์ของพวกเขามีส่วนเกี่ยวข้องกับความรุนแรงได้อย่างไร",
+ "report_flow.screen.root_call.title": "เกิดอะไรขึ้นในการโทร",
"report_flow.screen.root_guild.subtitle": "เลือกข้อที่ตรงที่สุดกับสิ่งที่เกิดขึ้นในคอมมูนิตี้นี้",
"report_flow.screen.root_guild.title": "มีอะไรผิดปกติกับคอมมูนิตี้นี้",
"report_flow.screen.root_message.subtitle": "เลือกข้อที่ตรงที่สุด คุณสามารถตรวจสอบทุกอย่างก่อนที่จะส่งได้",
@@ -336,6 +336,8 @@
"report_flow.screen.spam_kind_guild.title": "คอมมูนิตี้นี้ละเมิดแพลตฟอร์มอย่างไร",
"report_flow.screen.spam_profile.title": "บัญชีนี้ถูกนำไปใช้ในทางที่ผิดอย่างไร",
"report_flow.screen.threat.title": "มันเกี่ยวข้องกับความรุนแรงได้อย่างไร",
+ "report_flow.screen.user_start.subtitle": "พวกเขาจะไม่ทราบว่าใครเป็นผู้รายงาน",
+ "report_flow.screen.user_start.title": "คุณต้องการรายงานเรื่องอะไร",
"report_flow.screen.violence_misinfo.title": "ข้อใดตรงกับเรื่องนี้",
"report_flow.screen.violence_misinfo_guild.title": "ข้อใดเกิดขึ้นในคอมมูนิตี้นี้"
}
diff --git a/fluxer_api/src/api/content_i18n/weblate/locales/tr.json b/fluxer_api/src/api/content_i18n/weblate/locales/tr.json
index 4a19ad074..797dff092 100644
--- a/fluxer_api/src/api/content_i18n/weblate/locales/tr.json
+++ b/fluxer_api/src/api/content_i18n/weblate/locales/tr.json
@@ -158,6 +158,7 @@
"report_flow.label.age_yes_profile": "Evet, profilleri yaşlarını belirtiyor",
"report_flow.label.atrocity_denial": "Holokost'u veya diğer soykırımları inkâr etme ya da kutlama",
"report_flow.label.ban_evasion": "Başka bir hesapla yasaklamayı aşma",
+ "report_flow.label.call_activity": "Bir aramada söyledikleri veya gösterdikleri bir şey",
"report_flow.label.channel_names": "Kanal adları",
"report_flow.label.community_banner": "Topluluk banner'ı",
"report_flow.label.community_icon": "Topluluk simgesi",
@@ -269,6 +270,7 @@
"report_flow.label.synthetic_media": "Gerçek gibi gösterilen sahte veya yapay zeka ürünü medya",
"report_flow.label.terrorism": "Terörizm veya şiddet yanlısı aşırıcılık",
"report_flow.label.terrorism_guild": "Terörizm veya şiddet yanlısı aşırıcılık için eleman toplama veya teşvik etme",
+ "report_flow.label.their_profile": "Profillerindeki bir şey",
"report_flow.label.threat": "Tehditler veya şiddet çağrıları",
"report_flow.label.threat_to_share": "Paylaşmakla tehdit ediyorlar",
"report_flow.label.too_young": "{product_name} kullanmak için gereken minimum yaşın altındalar",
@@ -307,15 +309,13 @@
"report_flow.screen.private_info.title": "Hangi özel bilgiler söz konusu?",
"report_flow.screen.profile_abuse.title": "Profilinde ne zararlı?",
"report_flow.screen.profile_hate_violence.title": "Profilleri ne gösteriyor veya neyi teşvik ediyor?",
- "report_flow.screen.profile_intro.options_heading": "Daha fazla bilgi edinin",
- "report_flow.screen.profile_intro.subtitle": "Bu profilde neyin yanlış olduğunu bize söyleyin. Bildirimi kimin yaptığı onlara söylenmeyecek.",
- "report_flow.screen.profile_intro.title": "Profili bildir",
"report_flow.screen.profile_minor_sexual.title": "Profillerinde reşit olmayan biriyle ilgili olan ne var?",
"report_flow.screen.profile_parts.subtitle": "İhtiyacınız kadarını seçin.",
"report_flow.screen.profile_parts.title": "Profilinin hangi kısımları sorunlu?",
"report_flow.screen.profile_private_info.title": "Profilinde hangi özel bilgiler yer alıyor?",
"report_flow.screen.profile_sexual.title": "Profillerindeki cinsel içerik hakkında bize bilgi verin",
"report_flow.screen.profile_threat.title": "Profillerinde şiddet nasıl yer alıyor?",
+ "report_flow.screen.root_call.title": "Aramada ne oldu?",
"report_flow.screen.root_guild.subtitle": "Bu toplulukta olup bitene en yakın seçeneği belirleyin.",
"report_flow.screen.root_guild.title": "Bu toplulukla ilgili sorun nedir?",
"report_flow.screen.root_message.subtitle": "En yakın seçeneği belirleyin. Göndermeden önce her şeyi kontrol edebilirsiniz.",
@@ -336,6 +336,8 @@
"report_flow.screen.spam_kind_guild.title": "Bu topluluk platformu nasıl kötüye kullanıyor?",
"report_flow.screen.spam_profile.title": "Hesap nasıl kötüye kullanılıyor?",
"report_flow.screen.threat.title": "Şiddet nasıl yer alıyor?",
+ "report_flow.screen.user_start.subtitle": "Bildirimi kimin yaptığı onlara söylenmeyecek.",
+ "report_flow.screen.user_start.title": "Neyi bildirmek istiyorsunuz?",
"report_flow.screen.violence_misinfo.title": "Bunlardan hangisi buna uyuyor?",
"report_flow.screen.violence_misinfo_guild.title": "Bunlardan hangisi bu toplulukta oluyor?"
}
diff --git a/fluxer_api/src/api/content_i18n/weblate/locales/uk.json b/fluxer_api/src/api/content_i18n/weblate/locales/uk.json
index 25051b4ff..34babd73e 100644
--- a/fluxer_api/src/api/content_i18n/weblate/locales/uk.json
+++ b/fluxer_api/src/api/content_i18n/weblate/locales/uk.json
@@ -158,6 +158,7 @@
"report_flow.label.age_yes_profile": "Так, у профілі згадано їхній вік",
"report_flow.label.atrocity_denial": "Заперечення або прославляння Голокосту чи інших геноцидів",
"report_flow.label.ban_evasion": "Обхід бану через інший обліковий запис",
+ "report_flow.label.call_activity": "Щось, що особа сказала або показала під час дзвінка",
"report_flow.label.channel_names": "Назви каналів",
"report_flow.label.community_banner": "Банер спільноти",
"report_flow.label.community_icon": "Іконка спільноти",
@@ -269,6 +270,7 @@
"report_flow.label.synthetic_media": "Фейкові або створені ШІ медіа, представлені як справжні",
"report_flow.label.terrorism": "Тероризм або насильницький екстремізм",
"report_flow.label.terrorism_guild": "Вербування або пропаганда тероризму чи насильницького екстремізму",
+ "report_flow.label.their_profile": "Щось у профілі",
"report_flow.label.threat": "Погрози або заклики до насильства",
"report_flow.label.threat_to_share": "Вони погрожують поширити це",
"report_flow.label.too_young": "Вони не досягли мінімального віку, щоб користуватися {product_name}",
@@ -307,15 +309,13 @@
"report_flow.screen.private_info.title": "Яких приватних даних це стосується?",
"report_flow.screen.profile_abuse.title": "Що шкідливого в їхньому профілі?",
"report_flow.screen.profile_hate_violence.title": "Що показує або пропагує їхній профіль?",
- "report_flow.screen.profile_intro.options_heading": "Докладніше",
- "report_flow.screen.profile_intro.subtitle": "Розкажіть, що не так із цим профілем. Особа не дізнається, хто на неї поскаржився.",
- "report_flow.screen.profile_intro.title": "Поскаржитися на профіль",
"report_flow.screen.profile_minor_sexual.title": "Що в їхньому профілі стосується неповнолітньої особи?",
"report_flow.screen.profile_parts.subtitle": "Виберіть стільки, скільки потрібно.",
"report_flow.screen.profile_parts.title": "Які частини їхнього профілю є проблемою?",
"report_flow.screen.profile_private_info.title": "Які приватні дані містяться в їхньому профілі?",
"report_flow.screen.profile_sexual.title": "Розкажіть про сексуальний вміст у їхньому профілі",
"report_flow.screen.profile_threat.title": "Як їхній профіль пов'язаний із насильством?",
+ "report_flow.screen.root_call.title": "Що сталося під час дзвінка?",
"report_flow.screen.root_guild.subtitle": "Виберіть найближчий варіант того, що відбувається в цій спільноті.",
"report_flow.screen.root_guild.title": "Що не так із цією спільнотою?",
"report_flow.screen.root_message.subtitle": "Виберіть найближчий варіант. Ви можете перевірити все перед надсиланням.",
@@ -336,6 +336,8 @@
"report_flow.screen.spam_kind_guild.title": "Як ця спільнота зловживає платформою?",
"report_flow.screen.spam_profile.title": "Як обліковий запис використовується не за призначенням?",
"report_flow.screen.threat.title": "Як це пов'язано з насильством?",
+ "report_flow.screen.user_start.subtitle": "Особа не дізнається, хто на неї поскаржився.",
+ "report_flow.screen.user_start.title": "Про що ви хочете поскаржитися?",
"report_flow.screen.violence_misinfo.title": "Що з цього найбільше підходить?",
"report_flow.screen.violence_misinfo_guild.title": "Що з цього відбувається в цій спільноті?"
}
diff --git a/fluxer_api/src/api/content_i18n/weblate/locales/vi.json b/fluxer_api/src/api/content_i18n/weblate/locales/vi.json
index 759d75907..673f7fb8b 100644
--- a/fluxer_api/src/api/content_i18n/weblate/locales/vi.json
+++ b/fluxer_api/src/api/content_i18n/weblate/locales/vi.json
@@ -158,6 +158,7 @@
"report_flow.label.age_yes_profile": "Có, hồ sơ của họ có đề cập đến tuổi",
"report_flow.label.atrocity_denial": "Phủ nhận hoặc ca ngợi Holocaust hoặc các cuộc diệt chủng khác",
"report_flow.label.ban_evasion": "Lách lệnh cấm bằng một tài khoản khác",
+ "report_flow.label.call_activity": "Điều gì đó họ đã nói hoặc cho xem trong cuộc gọi",
"report_flow.label.channel_names": "Tên kênh",
"report_flow.label.community_banner": "Ảnh bìa cộng đồng",
"report_flow.label.community_icon": "Biểu tượng cộng đồng",
@@ -269,6 +270,7 @@
"report_flow.label.synthetic_media": "Phương tiện truyền thông giả mạo hoặc do AI tạo ra được trình bày như thật",
"report_flow.label.terrorism": "Khủng bố hoặc chủ nghĩa cực đoan bạo lực",
"report_flow.label.terrorism_guild": "Tuyển mộ hoặc cổ xúy khủng bố hoặc chủ nghĩa cực đoan bạo lực",
+ "report_flow.label.their_profile": "Điều gì đó trong hồ sơ của họ",
"report_flow.label.threat": "Đe dọa hoặc kêu gọi bạo lực",
"report_flow.label.threat_to_share": "Họ đang đe dọa chia sẻ nó",
"report_flow.label.too_young": "Họ dưới độ tuổi tối thiểu để sử dụng {product_name}",
@@ -307,15 +309,13 @@
"report_flow.screen.private_info.title": "Những chi tiết riêng tư nào có liên quan?",
"report_flow.screen.profile_abuse.title": "Điều gì gây hại về hồ sơ của họ?",
"report_flow.screen.profile_hate_violence.title": "Hồ sơ của họ hiển thị hoặc quảng bá điều gì?",
- "report_flow.screen.profile_intro.options_heading": "Tìm hiểu thêm",
- "report_flow.screen.profile_intro.subtitle": "Cho chúng tôi biết có gì sai với hồ sơ này. Họ sẽ không biết ai đã báo cáo họ.",
- "report_flow.screen.profile_intro.title": "Báo cáo hồ sơ",
"report_flow.screen.profile_minor_sexual.title": "Hồ sơ của họ có gì liên quan đến trẻ vị thành niên?",
"report_flow.screen.profile_parts.subtitle": "Chọn nhiều mục nếu cần.",
"report_flow.screen.profile_parts.title": "Những phần nào trong hồ sơ của họ có vấn đề?",
"report_flow.screen.profile_private_info.title": "Những chi tiết riêng tư nào có trong hồ sơ của họ?",
"report_flow.screen.profile_sexual.title": "Hãy cho chúng tôi biết về nội dung tình dục trong hồ sơ của họ",
"report_flow.screen.profile_threat.title": "Hồ sơ của họ liên quan đến bạo lực như thế nào?",
+ "report_flow.screen.root_call.title": "Điều gì đã xảy ra trong cuộc gọi?",
"report_flow.screen.root_guild.subtitle": "Chọn mục khớp nhất với những gì đang diễn ra trong cộng đồng này.",
"report_flow.screen.root_guild.title": "Có vấn đề gì với cộng đồng này?",
"report_flow.screen.root_message.subtitle": "Chọn mục khớp nhất. Bạn có thể xem lại mọi thứ trước khi gửi.",
@@ -336,6 +336,8 @@
"report_flow.screen.spam_kind_guild.title": "Cộng đồng này đang lạm dụng nền tảng như thế nào?",
"report_flow.screen.spam_profile.title": "Tài khoản đang bị lạm dụng như thế nào?",
"report_flow.screen.threat.title": "Nó liên quan đến bạo lực như thế nào?",
+ "report_flow.screen.user_start.subtitle": "Họ sẽ không biết ai đã báo cáo họ.",
+ "report_flow.screen.user_start.title": "Bạn muốn báo cáo điều gì?",
"report_flow.screen.violence_misinfo.title": "Mục nào trong số này khớp với trường hợp này?",
"report_flow.screen.violence_misinfo_guild.title": "Điều nào trong số này xảy ra trong cộng đồng này?"
}
diff --git a/fluxer_api/src/api/content_i18n/weblate/locales/zh-CN.json b/fluxer_api/src/api/content_i18n/weblate/locales/zh-CN.json
index e38758cfa..7abe35f3f 100644
--- a/fluxer_api/src/api/content_i18n/weblate/locales/zh-CN.json
+++ b/fluxer_api/src/api/content_i18n/weblate/locales/zh-CN.json
@@ -158,6 +158,7 @@
"report_flow.label.age_yes_profile": "是,其个人资料提到了他们的年龄",
"report_flow.label.atrocity_denial": "否认或美化犹太人大屠杀或其他种族灭绝",
"report_flow.label.ban_evasion": "使用其他账号规避封禁",
+ "report_flow.label.call_activity": "对方在通话中说过或展示过的内容",
"report_flow.label.channel_names": "频道名称",
"report_flow.label.community_banner": "社区横幅",
"report_flow.label.community_icon": "社区图标",
@@ -269,6 +270,7 @@
"report_flow.label.synthetic_media": "冒充真实内容的虚假或 AI 生成媒体",
"report_flow.label.terrorism": "恐怖主义或暴力极端主义",
"report_flow.label.terrorism_guild": "招募或宣扬恐怖主义或暴力极端主义",
+ "report_flow.label.their_profile": "个人资料中的内容",
"report_flow.label.threat": "威胁或煽动暴力",
"report_flow.label.threat_to_share": "他们威胁要分享",
"report_flow.label.too_young": "他们未满 {product_name} 的最低使用年龄",
@@ -307,15 +309,13 @@
"report_flow.screen.private_info.title": "涉及哪些私人信息?",
"report_flow.screen.profile_abuse.title": "他们的个人资料有什么有害之处?",
"report_flow.screen.profile_hate_violence.title": "他们的个人资料显示或宣传了什么?",
- "report_flow.screen.profile_intro.options_heading": "了解详情",
- "report_flow.screen.profile_intro.subtitle": "告诉我们这个个人资料有什么问题。对方不会知道是谁举报的。",
- "report_flow.screen.profile_intro.title": "举报个人资料",
"report_flow.screen.profile_minor_sexual.title": "他们的个人资料中有哪些涉及未成年人的内容?",
"report_flow.screen.profile_parts.subtitle": "按需选择,可多选。",
"report_flow.screen.profile_parts.title": "他们的个人资料中有哪些部分有问题?",
"report_flow.screen.profile_private_info.title": "他们的个人资料中有哪些私人信息?",
"report_flow.screen.profile_sexual.title": "请说明其个人资料中的性内容",
"report_flow.screen.profile_threat.title": "其个人资料如何涉及暴力?",
+ "report_flow.screen.root_call.title": "通话中发生了什么?",
"report_flow.screen.root_guild.subtitle": "请选择最能描述此社区情况的选项。",
"report_flow.screen.root_guild.title": "此社区有什么问题?",
"report_flow.screen.root_message.subtitle": "请选择最接近的选项。发送前你可以检查所有内容。",
@@ -336,6 +336,8 @@
"report_flow.screen.spam_kind_guild.title": "此社区如何滥用平台?",
"report_flow.screen.spam_profile.title": "该账号被如何滥用?",
"report_flow.screen.threat.title": "它如何涉及暴力?",
+ "report_flow.screen.user_start.subtitle": "对方不会知道是谁举报的。",
+ "report_flow.screen.user_start.title": "你想举报什么?",
"report_flow.screen.violence_misinfo.title": "以下哪项符合?",
"report_flow.screen.violence_misinfo_guild.title": "此社区中发生了以下哪种情况?"
}
diff --git a/fluxer_api/src/api/content_i18n/weblate/locales/zh-TW.json b/fluxer_api/src/api/content_i18n/weblate/locales/zh-TW.json
index e4f04a67b..8aeb05088 100644
--- a/fluxer_api/src/api/content_i18n/weblate/locales/zh-TW.json
+++ b/fluxer_api/src/api/content_i18n/weblate/locales/zh-TW.json
@@ -158,6 +158,7 @@
"report_flow.label.age_yes_profile": "是,他們的個人檔案中有提到年齡",
"report_flow.label.atrocity_denial": "否認或慶祝猶太人大屠殺或其他種族滅絕",
"report_flow.label.ban_evasion": "使用其他帳號規避停權",
+ "report_flow.label.call_activity": "對方在通話中說過或展示過的內容",
"report_flow.label.channel_names": "頻道名稱",
"report_flow.label.community_banner": "社群橫幅",
"report_flow.label.community_icon": "社群圖示",
@@ -269,6 +270,7 @@
"report_flow.label.synthetic_media": "將偽造或 AI 製作的媒體內容呈現為真實內容",
"report_flow.label.terrorism": "恐怖主義或暴力極端主義",
"report_flow.label.terrorism_guild": "招募或宣揚恐怖主義或暴力極端主義",
+ "report_flow.label.their_profile": "個人檔案中的內容",
"report_flow.label.threat": "威脅或煽動暴力",
"report_flow.label.threat_to_share": "他們威脅要分享",
"report_flow.label.too_young": "他們未達使用 {product_name} 的最低年齡",
@@ -307,15 +309,13 @@
"report_flow.screen.private_info.title": "涉及哪些個人資訊?",
"report_flow.screen.profile_abuse.title": "他們的個人檔案有什麼有害之處?",
"report_flow.screen.profile_hate_violence.title": "他們的個人檔案顯示或宣傳了什麼內容?",
- "report_flow.screen.profile_intro.options_heading": "瞭解詳情",
- "report_flow.screen.profile_intro.subtitle": "請告訴我們這個個人檔案的問題所在。對方不會知道是誰檢舉的。",
- "report_flow.screen.profile_intro.title": "檢舉個人檔案",
"report_flow.screen.profile_minor_sexual.title": "他們的個人檔案中,有什麼涉及未成年人?",
"report_flow.screen.profile_parts.subtitle": "請選擇所有適用的項目。",
"report_flow.screen.profile_parts.title": "他們的個人檔案的哪些部分有問題?",
"report_flow.screen.profile_private_info.title": "他們的個人檔案中有哪些個人資訊?",
"report_flow.screen.profile_sexual.title": "告訴我們他們個人檔案中的性內容",
"report_flow.screen.profile_threat.title": "他們的個人檔案如何涉及暴力?",
+ "report_flow.screen.root_call.title": "通話中發生了什麼事?",
"report_flow.screen.root_guild.subtitle": "請選擇最符合此社群情況的選項。",
"report_flow.screen.root_guild.title": "這個社群有什麼問題?",
"report_flow.screen.root_message.subtitle": "請選擇最接近的選項。送出檢舉前,您可以檢查所有內容。",
@@ -336,6 +336,8 @@
"report_flow.screen.spam_kind_guild.title": "這個社群如何濫用平台?",
"report_flow.screen.spam_profile.title": "該帳號如何被濫用?",
"report_flow.screen.threat.title": "它如何涉及暴力?",
+ "report_flow.screen.user_start.subtitle": "對方不會知道是誰檢舉的。",
+ "report_flow.screen.user_start.title": "你想檢舉什麼?",
"report_flow.screen.violence_misinfo.title": "哪一個最符合?",
"report_flow.screen.violence_misinfo_guild.title": "社群中發生了哪種情況?"
}
diff --git a/fluxer_api/src/api/content_i18n/weblate/messages.json b/fluxer_api/src/api/content_i18n/weblate/messages.json
index 38c9c5fc6..bc95f9d51 100644
--- a/fluxer_api/src/api/content_i18n/weblate/messages.json
+++ b/fluxer_api/src/api/content_i18n/weblate/messages.json
@@ -158,6 +158,7 @@
"report_flow.label.age_yes_profile": "Yes, their profile mentions their age",
"report_flow.label.atrocity_denial": "Denying or celebrating the Holocaust or other genocides",
"report_flow.label.ban_evasion": "Getting around a ban with another account",
+ "report_flow.label.call_activity": "Something they said or showed in a call",
"report_flow.label.channel_names": "Channel names",
"report_flow.label.community_banner": "Community banner",
"report_flow.label.community_icon": "Community icon",
@@ -269,6 +270,7 @@
"report_flow.label.synthetic_media": "Fake or AI-made media presented as real",
"report_flow.label.terrorism": "Terrorism or violent extremism",
"report_flow.label.terrorism_guild": "Recruiting for or promoting terrorism or violent extremism",
+ "report_flow.label.their_profile": "Something in their profile",
"report_flow.label.threat": "Threats or calls for violence",
"report_flow.label.threat_to_share": "They are threatening to share it",
"report_flow.label.too_young": "They're under the minimum age to use {product_name}",
@@ -307,15 +309,13 @@
"report_flow.screen.private_info.title": "Which private details are involved?",
"report_flow.screen.profile_abuse.title": "What's harmful about their profile?",
"report_flow.screen.profile_hate_violence.title": "What does their profile show or promote?",
- "report_flow.screen.profile_intro.options_heading": "Learn more",
- "report_flow.screen.profile_intro.subtitle": "Tell us what's wrong with this profile. They won't be told who reported them.",
- "report_flow.screen.profile_intro.title": "Report profile",
"report_flow.screen.profile_minor_sexual.title": "What in their profile involves a minor?",
"report_flow.screen.profile_parts.subtitle": "Pick as many as you need.",
"report_flow.screen.profile_parts.title": "Which parts of their profile are a problem?",
"report_flow.screen.profile_private_info.title": "Which private details are in their profile?",
"report_flow.screen.profile_sexual.title": "Tell us about the sexual content in their profile",
"report_flow.screen.profile_threat.title": "How does their profile involve violence?",
+ "report_flow.screen.root_call.title": "What happened in the call?",
"report_flow.screen.root_guild.subtitle": "Pick the closest match for what is going on in this community.",
"report_flow.screen.root_guild.title": "What's wrong with this community?",
"report_flow.screen.root_message.subtitle": "Pick the closest match. You can check everything before it is sent.",
@@ -336,6 +336,8 @@
"report_flow.screen.spam_kind_guild.title": "How is this community abusing the platform?",
"report_flow.screen.spam_profile.title": "How is the account being misused?",
"report_flow.screen.threat.title": "How does it involve violence?",
+ "report_flow.screen.user_start.subtitle": "They won't be told who reported them.",
+ "report_flow.screen.user_start.title": "What do you want to report?",
"report_flow.screen.violence_misinfo.title": "Which of these matches it?",
"report_flow.screen.violence_misinfo_guild.title": "Which of these happens in this community?"
}
diff --git a/fluxer_api/src/api/database/types/UserTypes.ts b/fluxer_api/src/api/database/types/UserTypes.ts
index 6e1076e25..da01ff28f 100644
--- a/fluxer_api/src/api/database/types/UserTypes.ts
+++ b/fluxer_api/src/api/database/types/UserTypes.ts
@@ -277,6 +277,7 @@ export interface UserSettingsRow {
sensitive_content_friend_dm_filter: number | null;
sensitive_content_non_friend_dm_filter: number | null;
sensitive_content_guild_filter: number | null;
+ allow_mature_content_on_ios: boolean | null;
suppress_unprivileged_self_mentions: boolean | null;
suppress_unprivileged_self_mentions_bypass_user_ids: Set<UserID> | null;
staff_dm_access_user_ids: Set<UserID> | null;
@@ -367,6 +368,7 @@ export interface FavoriteMemeRow {
tenor_id_str: string | null;
media_formats: string | null;
placeholder: string | null;
+ nsfw: boolean | null;
version: number;
}
@@ -389,6 +391,7 @@ export const FAVORITE_MEME_COLUMNS = [
'tenor_id_str',
'media_formats',
'placeholder',
+ 'nsfw',
'version',
] as const satisfies ReadonlyArray<keyof FavoriteMemeRow>;
@@ -518,6 +521,7 @@ export const USER_SETTINGS_COLUMNS = [
'sensitive_content_friend_dm_filter',
'sensitive_content_non_friend_dm_filter',
'sensitive_content_guild_filter',
+ 'allow_mature_content_on_ios',
'suppress_unprivileged_self_mentions',
'suppress_unprivileged_self_mentions_bypass_user_ids',
'staff_dm_access_user_ids',
diff --git a/fluxer_api/src/api/enforcement/ClosureState.ts b/fluxer_api/src/api/enforcement/ClosureState.ts
index fdde88ff9..779a665b2 100644
--- a/fluxer_api/src/api/enforcement/ClosureState.ts
+++ b/fluxer_api/src/api/enforcement/ClosureState.ts
@@ -5,7 +5,7 @@ import type {KVAccountDeletionQueueService} from '@app/api/infrastructure/KVAcco
import type {User} from '@app/api/models/User';
import {clearNewConversationLimit} from '@app/api/user/NewConversationLimit';
import {propagateUserUpdate} from '@app/api/user/services/PartialUserChangePropagation';
-import {clearPendingDeletion} from '@app/api/user/services/PendingDeletionCoordinator';
+import {clearPendingDeletion, resetTiedBulkMessageDeletion} from '@app/api/user/services/PendingDeletionCoordinator';
import {UserFlags} from '@fluxer/constants/src/UserConstants';
export interface ClosureStateDeps extends SuspensionStateDeps {
@@ -23,6 +23,7 @@ export async function cancelClosure(
deletion_public_reason: null,
deletion_audit_log_reason: null,
enforcement_decision_id: null,
+ ...resetTiedBulkMessageDeletion(user),
});
await clearPendingDeletion({userId: user.id, deletionQueue: kvDeletionQueue});
await propagateUserUpdate(userUpdateDeps, user, updated);
diff --git a/fluxer_api/src/api/enforcement/SuspensionState.ts b/fluxer_api/src/api/enforcement/SuspensionState.ts
index a4c47662c..445619cb5 100644
--- a/fluxer_api/src/api/enforcement/SuspensionState.ts
+++ b/fluxer_api/src/api/enforcement/SuspensionState.ts
@@ -12,7 +12,7 @@ import {
type PartialUserChangePropagationDeps,
propagateUserUpdate,
} from '@app/api/user/services/PartialUserChangePropagation';
-import {clearPendingDeletion} from '@app/api/user/services/PendingDeletionCoordinator';
+import {clearPendingDeletion, resetTiedBulkMessageDeletion} from '@app/api/user/services/PendingDeletionCoordinator';
import {UserFlags} from '@fluxer/constants/src/UserConstants';
export interface SuspensionStateDeps {
@@ -36,6 +36,7 @@ async function cancelHolderDeletionAndSuspend(
deletion_reason_code: null,
deletion_public_reason: null,
deletion_audit_log_reason: null,
+ ...resetTiedBulkMessageDeletion(user),
temp_banned_until: until,
enforcement_decision_id: decisionId,
});
diff --git a/fluxer_api/src/api/favorite_meme/FavoriteMemeModel.ts b/fluxer_api/src/api/favorite_meme/FavoriteMemeModel.ts
index 237c9485f..c3f663302 100644
--- a/fluxer_api/src/api/favorite_meme/FavoriteMemeModel.ts
+++ b/fluxer_api/src/api/favorite_meme/FavoriteMemeModel.ts
@@ -28,5 +28,6 @@ export function mapFavoriteMemeToResponse(meme: FavoriteMeme): FavoriteMemeRespo
gif_provider: meme.gifProvider ?? null,
media: meme.mediaFormats ?? null,
placeholder: meme.placeholder ?? null,
+ nsfw: meme.nsfw === true,
};
}
diff --git a/fluxer_api/src/api/favorite_meme/FavoriteMemeRepository.ts b/fluxer_api/src/api/favorite_meme/FavoriteMemeRepository.ts
index f357c6e0c..4ee1a626a 100644
--- a/fluxer_api/src/api/favorite_meme/FavoriteMemeRepository.ts
+++ b/fluxer_api/src/api/favorite_meme/FavoriteMemeRepository.ts
@@ -27,6 +27,7 @@ export interface CreateFavoriteMemeParams {
gif_provider?: string | null;
media_formats?: Record<string, GifMediaFormat> | null;
placeholder?: string | null;
+ nsfw?: boolean | null;
}
const FETCH_FAVORITE_MEME_CQL = FavoriteMemes.selectCql({
@@ -81,6 +82,7 @@ export class FavoriteMemeRepository {
tenor_id_str: data.gif_provider === 'tenor' ? (data.gif_slug ?? null) : null,
media_formats: data.media_formats ? JSON.stringify(data.media_formats) : null,
placeholder: data.placeholder ?? null,
+ nsfw: data.nsfw ?? null,
version: 1,
};
const batch = new BatchBuilder();
@@ -115,6 +117,7 @@ export class FavoriteMemeRepository {
tenor_id_str: data.gif_provider === 'tenor' ? (data.gif_slug ?? null) : null,
media_formats: data.media_formats ? JSON.stringify(data.media_formats) : null,
placeholder: data.placeholder ?? null,
+ nsfw: data.nsfw ?? null,
version: 1,
};
await upsertOne(FavoriteMemes.upsertAll(memeRow));
@@ -125,6 +128,10 @@ export class FavoriteMemeRepository {
await fetchOne(FavoriteMemes.patchByPk({user_id: userId, meme_id: memeId}, {placeholder: Db.set(placeholder)}));
}
+ async updateNsfw(userId: UserID, memeId: MemeID, nsfw: boolean): Promise<void> {
+ await fetchOne(FavoriteMemes.patchByPk({user_id: userId, meme_id: memeId}, {nsfw: Db.set(nsfw)}));
+ }
+
async delete(userId: UserID, memeId: MemeID): Promise<void> {
const batch = new BatchBuilder();
batch.addPrepared(FavoriteMemes.deleteByPk({user_id: userId, meme_id: memeId}));
diff --git a/fluxer_api/src/api/favorite_meme/FavoriteMemeService.ts b/fluxer_api/src/api/favorite_meme/FavoriteMemeService.ts
index 55bbf760f..5fe792cdd 100644
--- a/fluxer_api/src/api/favorite_meme/FavoriteMemeService.ts
+++ b/fluxer_api/src/api/favorite_meme/FavoriteMemeService.ts
@@ -58,6 +58,7 @@ type FavoriteMemeMedia = {
placeholder: string | null;
gifSlug: string | null;
gifProvider: string | null;
+ nsfw: boolean;
};
type ResolvedFavoriteMemeMetadata = {
@@ -69,6 +70,7 @@ type ResolvedFavoriteMemeMetadata = {
duration: number | null;
isGifv: boolean;
placeholder: string | null;
+ nsfw: boolean;
};
function isAnimatedAttachment(contentType: string, flags: number | undefined): boolean {
@@ -209,6 +211,7 @@ export class FavoriteMemeService {
gif_slug: media.gifSlug,
gif_provider: media.gifProvider,
placeholder: resolved.placeholder,
+ nsfw: resolved.nsfw,
});
const responseData = mapFavoriteMemeToResponse(favoriteMeme);
await this.apiContext.services.gateway.dispatchPresence({
@@ -247,6 +250,7 @@ export class FavoriteMemeService {
duration: metadata?.duration && metadata.duration > 0 ? metadata.duration : media.duration,
isGifv: resolveFavoriteMemeAnimationFlag(media, metadata),
placeholder: metadata?.placeholder ?? media.placeholder,
+ nsfw: media.nsfw || metadata?.nsfw === true,
};
}
@@ -296,6 +300,7 @@ export class FavoriteMemeService {
duration: metadata.duration && metadata.duration > 0 ? metadata.duration : null,
isGifv: resolveFavoriteMemeAnimationFlag(media, metadata),
placeholder: metadata.placeholder ?? null,
+ nsfw: media.nsfw || metadata.nsfw === true,
};
}
@@ -379,6 +384,7 @@ export class FavoriteMemeService {
gif_provider: resolvedGif?.provider.meta.name ?? null,
media_formats: resolvedGif && media && Object.keys(media).length > 0 ? media : null,
placeholder: metadata.placeholder ?? null,
+ nsfw: metadata.nsfw === true,
});
const responseData = mapFavoriteMemeToResponse(favoriteMeme);
await this.apiContext.services.gateway.dispatchPresence({
@@ -428,6 +434,7 @@ export class FavoriteMemeService {
gif_provider: existingMeme.gifProvider,
media_formats: existingMeme.mediaFormats,
placeholder: existingMeme.placeholder,
+ nsfw: existingMeme.nsfw,
version: existingMeme.version,
};
const updatedMeme = await this.favoriteMemeRepository.update(user.id, memeId, updatedRow);
@@ -620,6 +627,7 @@ export class FavoriteMemeService {
placeholder: attachment.placeholder ?? null,
gifSlug: null,
gifProvider: null,
+ nsfw: (attachment.flags & MessageAttachmentFlags.CONTAINS_EXPLICIT_MEDIA) !== 0 || attachment.nsfw === true,
};
}
@@ -657,6 +665,7 @@ export class FavoriteMemeService {
placeholder: media.placeholder ?? null,
gifSlug: detectedGif?.slug ?? null,
gifProvider: detectedGif?.provider.meta.name ?? null,
+ nsfw: embed.nsfw === true || (media.flags & EmbedMediaFlags.CONTAINS_EXPLICIT_MEDIA) !== 0,
};
}
diff --git a/fluxer_api/src/api/guild/services/GuildDiscoveryService.ts b/fluxer_api/src/api/guild/services/GuildDiscoveryService.ts
index 50697affa..bac6adf3a 100644
--- a/fluxer_api/src/api/guild/services/GuildDiscoveryService.ts
+++ b/fluxer_api/src/api/guild/services/GuildDiscoveryService.ts
@@ -364,6 +364,7 @@ export class GuildDiscoveryService {
if (
status?.status !== DiscoveryApplicationStatus.APPROVED ||
!guild ||
+ guild.nsfw ||
guild.features.has(GuildFeatures.INVITES_DISABLED) ||
!channel ||
channel.guildId !== guildId ||
@@ -376,9 +377,9 @@ export class GuildDiscoveryService {
const permissions = computeGuildVisitorChannelPermissions({
guildId: guildId.toString(),
everyonePermissions: everyoneRole.permissions,
- guildNsfw: false,
+ guildNsfw: guild.nsfw,
channel: channelToVisitorInput(channel),
- adultContentAllowed: true,
+ adultContentAllowed: false,
});
if ((permissions & GUILD_VISITOR_PERMISSIONS_MASK) !== GUILD_VISITOR_PERMISSIONS_MASK) {
throw new DiscoveryNotDiscoverableError();
diff --git a/fluxer_api/src/api/guild/services/GuildSearchService.ts b/fluxer_api/src/api/guild/services/GuildSearchService.ts
index 63eafba99..f38a48029 100644
--- a/fluxer_api/src/api/guild/services/GuildSearchService.ts
+++ b/fluxer_api/src/api/guild/services/GuildSearchService.ts
@@ -17,7 +17,7 @@ import {getMessageSearchService} from '@app/api/SearchFactory';
import {channelNeedsReindexing, queueIndexingChannels} from '@app/api/search/ChannelIndexingUtils';
import {MessageSearchResponseMapper} from '@app/api/search/MessageSearchResponseMapper';
import {emptyMessageSearchResponse, runMessageSearch} from '@app/api/search/MessageSearchResultReconciler';
-import {channelRequiresAgeVerification, getCanUserAccessNsfw} from '@app/api/search/SearchNsfwUtils';
+import {channelRequiresAgeVerification, getSearchNsfwAccess} from '@app/api/search/SearchNsfwUtils';
import {accessibleRequestedThreadIds, accessibleThreadIds} from '@app/api/search/ThreadSearchScope';
import type {UserRepository} from '@app/api/user/repositories/UserRepository';
import {mapWithConcurrency} from '@app/api/utils/ConcurrencyUtils';
@@ -55,10 +55,11 @@ export class GuildSearchService {
viewer: ThreadViewer;
guildId: GuildID;
channelIds: Array<ChannelID>;
+ iosApp: boolean;
searchParams: MessageSearchRequest;
requestCache: RequestCache;
}): Promise<MessageSearchResponse> {
- const {userId, viewer, guildId, searchParams, requestCache} = params;
+ const {userId, viewer, guildId, iosApp, searchParams, requestCache} = params;
let {channelIds} = params;
const guildData = await this.gatewayService.getGuildData({guildId, userId});
const guildIsAgeRestricted = guildData?.nsfw_level === GuildNSFWLevel.AGE_RESTRICTED;
@@ -73,12 +74,17 @@ export class GuildSearchService {
channelIds = channels.filter((c) => threadsVisible || !c.isThreadOnly()).map((c) => c.id);
}
const includeNsfwRequested = searchParams.include_nsfw ?? false;
- const canUserAccessNsfw =
- guildIsAgeRestricted || includeNsfwRequested ? await getCanUserAccessNsfw(this.userRepository, userId) : false;
- if (guildIsAgeRestricted && !canUserAccessNsfw) {
+ const nsfwAccess =
+ guildIsAgeRestricted || includeNsfwRequested
+ ? await getSearchNsfwAccess(this.userRepository, userId, iosApp)
+ : {adult: false, allowed: false};
+ if (guildIsAgeRestricted && !nsfwAccess.adult) {
throw new NsfwContentRequiresAgeVerificationError();
}
- const canIncludeNsfw = canUserAccessNsfw && (includeNsfwRequested || guildIsAgeRestricted);
+ if (guildIsAgeRestricted && !nsfwAccess.allowed) {
+ return emptyMessageSearchResponse(searchParams);
+ }
+ const canIncludeNsfw = nsfwAccess.allowed && (includeNsfwRequested || guildIsAgeRestricted);
const guildNsfw = guildData?.nsfw ?? false;
const channels = await this.channelRepository.channelData.listChannels(channelIds);
const channelMap = new Map<string, Channel>();
@@ -180,10 +186,11 @@ export class GuildSearchService {
userId: UserID;
viewer: ThreadViewer;
channelIds: Array<ChannelID>;
+ iosApp: boolean;
searchParams: MessageSearchRequest;
requestCache: RequestCache;
}): Promise<MessageSearchResponse> {
- const {userId, viewer, channelIds, searchParams, requestCache} = params;
+ const {userId, viewer, channelIds, iosApp, searchParams, requestCache} = params;
const searchService = getMessageSearchService();
if (!searchService) {
throw new FeatureTemporarilyDisabledError();
@@ -207,7 +214,7 @@ export class GuildSearchService {
const includeNsfwRequested = searchParams.include_nsfw ?? false;
let canIncludeNsfw = false;
if (includeNsfwRequested) {
- canIncludeNsfw = await getCanUserAccessNsfw(this.userRepository, userId);
+ canIncludeNsfw = (await getSearchNsfwAccess(this.userRepository, userId, iosApp)).allowed;
}
searchChannelIds = searchChannelIds.filter((channelIdStr) => {
const channel = accessibleChannels.get(channelIdStr) ?? threadParents.get(channelIdStr);
diff --git a/fluxer_api/src/api/guild/tests/DiscoverySearchAndJoin.test.ts b/fluxer_api/src/api/guild/tests/DiscoverySearchAndJoin.test.ts
index aeafca5bc..6d9ab8583 100644
--- a/fluxer_api/src/api/guild/tests/DiscoverySearchAndJoin.test.ts
+++ b/fluxer_api/src/api/guild/tests/DiscoverySearchAndJoin.test.ts
@@ -172,6 +172,33 @@ describe('Discovery Search and Join', () => {
expect(new Set(paged).size).toBe(paged.length);
expect([...paged].sort()).toEqual([...guildIds].sort());
});
+ test('an approved guild disappears from search after it is marked 18+', async () => {
+ const admin = await createTestAccount(harness);
+ await setUserACLs(harness, admin, ['admin:authenticate', 'discovery:review']);
+ const owner = await createTestAccount(harness);
+ const guild = await createGuild(harness, owner.token, 'Soon Adult Guild');
+ await setGuildMemberCount(harness, guild.id, 10);
+ await applyAndApprove(
+ harness,
+ owner.token,
+ admin.token,
+ guild.id,
+ 'Soon Adult Guild welcomes everyone',
+ DiscoveryCategories.GAMING,
+ );
+ const searcher = await createTestAccount(harness);
+ const before = await createBuilder<DiscoveryGuildListResponse>(harness, searcher.token)
+ .get('/discovery/guilds')
+ .expect(HTTP_STATUS.OK)
+ .execute();
+ expect(before.guilds.some((g) => g.id === guild.id)).toBe(true);
+ await updateGuild(harness, owner.token, guild.id, {nsfw: true});
+ const after = await createBuilder<DiscoveryGuildListResponse>(harness, searcher.token)
+ .get('/discovery/guilds')
+ .expect(HTTP_STATUS.OK)
+ .execute();
+ expect(after.guilds.some((g) => g.id === guild.id)).toBe(false);
+ });
});
describe('join', () => {
test('should block discovery join for an email ban on a different user and IP', async () => {
diff --git a/fluxer_api/src/api/infrastructure/ImageUploadValidation.ts b/fluxer_api/src/api/infrastructure/ImageUploadValidation.ts
index 9b88e8e26..12e263ef0 100644
--- a/fluxer_api/src/api/infrastructure/ImageUploadValidation.ts
+++ b/fluxer_api/src/api/infrastructure/ImageUploadValidation.ts
@@ -15,6 +15,18 @@ import {ValidationErrorCodes} from '@fluxer/constants/src/ValidationErrorCodes';
import {InputValidationError} from '@fluxer/errors/src/domains/core/InputValidationError';
import {resolveLimit} from '@fluxer/limits/src/LimitResolver';
+const EXPLICIT_IMAGERY_BLOCKED_KINDS: ReadonlySet<AssetKind> = new Set([
+ 'avatar',
+ 'banner',
+ 'guild_icon',
+ 'splash',
+ 'embed_splash',
+ 'role_icon',
+ 'sign_in_backdrop',
+ 'emoji',
+ 'sticker',
+]);
+
export function resolveAssetSizeLimit(
limitConfigService: Pick<LimitConfigService, 'getConfigSnapshot'>,
key: LimitKey,
@@ -43,7 +55,12 @@ export async function decodeValidatedImage(
}
const imageBuffer = new Uint8Array(Buffer.from(base64Data, 'base64'));
const metadata = requireAllowedMetadata({
- metadata: await mediaService.getMetadata({type: 'base64', base64: base64Data, version: 2, nsfw: 'allow'}),
+ metadata: await mediaService.getMetadata({
+ type: 'base64',
+ base64: base64Data,
+ version: 2,
+ nsfw: EXPLICIT_IMAGERY_BLOCKED_KINDS.has(kind) ? 'block' : 'allow',
+ }),
kind,
errorPath,
});
diff --git a/fluxer_api/src/api/models/FavoriteMeme.ts b/fluxer_api/src/api/models/FavoriteMeme.ts
index bd47c9b18..c0a3b5d98 100644
--- a/fluxer_api/src/api/models/FavoriteMeme.ts
+++ b/fluxer_api/src/api/models/FavoriteMeme.ts
@@ -27,6 +27,7 @@ export class FavoriteMeme {
readonly gifProvider: string | null;
readonly mediaFormats: Record<string, GifMediaFormat> | null;
readonly placeholder: string | null;
+ readonly nsfw: boolean | null;
readonly createdAt: Date;
readonly version: number;
@@ -57,6 +58,7 @@ export class FavoriteMeme {
}
this.mediaFormats = parseMediaFormats(row.media_formats);
this.placeholder = row.placeholder ?? null;
+ this.nsfw = row.nsfw ?? null;
this.createdAt = snowflakeToDate(this.id);
this.version = row.version;
}
@@ -81,6 +83,7 @@ export class FavoriteMeme {
tenor_id_str: this.gifProvider === 'tenor' ? this.gifSlug : null,
media_formats: this.mediaFormats ? JSON.stringify(this.mediaFormats) : null,
placeholder: this.placeholder,
+ nsfw: this.nsfw,
version: this.version,
};
}
diff --git a/fluxer_api/src/api/models/UserSettings.ts b/fluxer_api/src/api/models/UserSettings.ts
index 055f9fdd9..c1a6d835c 100644
--- a/fluxer_api/src/api/models/UserSettings.ts
+++ b/fluxer_api/src/api/models/UserSettings.ts
@@ -62,6 +62,7 @@ export class UserSettings {
readonly sensitiveContentFriendDmFilter: SensitiveMediaFilterLevelValue;
readonly sensitiveContentNonFriendDmFilter: SensitiveMediaFilterLevelValue;
readonly sensitiveContentGuildFilter: SensitiveMediaFilterLevelValue;
+ readonly allowMatureContentOnIos: boolean;
readonly suppressUnprivilegedSelfMentions: boolean;
readonly suppressUnprivilegedSelfMentionBypassUserIds: Set<UserID>;
readonly staffDmAccessUserIds: Set<UserID>;
@@ -110,6 +111,7 @@ export class UserSettings {
SensitiveMediaFilterLevel.SHOW) as SensitiveMediaFilterLevelValue;
this.sensitiveContentGuildFilter = (row.sensitive_content_guild_filter ??
SensitiveMediaFilterLevel.SHOW) as SensitiveMediaFilterLevelValue;
+ this.allowMatureContentOnIos = row.allow_mature_content_on_ios ?? false;
this.suppressUnprivilegedSelfMentions = row.suppress_unprivileged_self_mentions ?? false;
this.suppressUnprivilegedSelfMentionBypassUserIds =
row.suppress_unprivileged_self_mentions_bypass_user_ids ?? new Set<UserID>();
@@ -158,6 +160,7 @@ export class UserSettings {
sensitive_content_friend_dm_filter: this.sensitiveContentFriendDmFilter,
sensitive_content_non_friend_dm_filter: this.sensitiveContentNonFriendDmFilter,
sensitive_content_guild_filter: this.sensitiveContentGuildFilter,
+ allow_mature_content_on_ios: this.allowMatureContentOnIos,
suppress_unprivileged_self_mentions: this.suppressUnprivilegedSelfMentions,
suppress_unprivileged_self_mentions_bypass_user_ids:
this.suppressUnprivilegedSelfMentionBypassUserIds.size > 0
@@ -214,7 +217,7 @@ export class UserSettings {
friend_source_flags: friendSourceFlags,
incoming_call_flags: IncomingCallFlags.FRIENDS_ONLY,
group_dm_add_permission_flags: GroupDmAddPermissionFlags.FRIENDS_ONLY,
- default_guilds_restricted: false,
+ default_guilds_restricted: !isAdult,
bot_default_guilds_restricted: false,
restricted_guilds: new Set(),
bot_restricted_guilds: new Set(),
@@ -236,6 +239,7 @@ export class UserSettings {
sensitive_content_friend_dm_filter: isAdult ? SensitiveMediaFilterLevel.SHOW : SensitiveMediaFilterLevel.BLUR,
sensitive_content_non_friend_dm_filter: SensitiveMediaFilterLevel.BLOCK,
sensitive_content_guild_filter: SensitiveMediaFilterLevel.BLUR,
+ allow_mature_content_on_ios: false,
suppress_unprivileged_self_mentions: false,
suppress_unprivileged_self_mentions_bypass_user_ids: null,
staff_dm_access_user_ids: null,
diff --git a/fluxer_api/src/api/openapi/openapi.json b/fluxer_api/src/api/openapi/openapi.json
index 58ed45c6f..fa5fbaa55 100644
--- a/fluxer_api/src/api/openapi/openapi.json
+++ b/fluxer_api/src/api/openapi/openapi.json
@@ -16374,6 +16374,63 @@
}
}
},
+ "/reports/flows/guild/submissions": {
+ "post": {
+ "operationId": "submit_guild_report_flow",
+ "summary": "Submit community report flow",
+ "tags": ["Reports"],
+ "responses": {
+ "200": {
+ "description": "Success",
+ "content": {"application/json": {"schema": {"$ref": "#/components/schemas/ReportResponse"}}}
+ },
+ "400": {
+ "description": "Bad Request - The request was malformed or contained invalid data",
+ "content": {"application/json": {"schema": {"$ref": "#/components/schemas/Error"}}}
+ },
+ "401": {
+ "description": "Unauthorized - Authentication is required or the token is invalid",
+ "content": {"application/json": {"schema": {"$ref": "#/components/schemas/Error"}}}
+ },
+ "403": {
+ "description": "Forbidden - You do not have permission to perform this action",
+ "content": {"application/json": {"schema": {"$ref": "#/components/schemas/Error"}}}
+ },
+ "429": {
+ "description": "Too Many Requests - You are being rate limited",
+ "content": {"application/json": {"schema": {"$ref": "#/components/schemas/ThrottledError"}}},
+ "headers": {
+ "Retry-After": {
+ "description": "Number of seconds to wait before retrying (only on 429)",
+ "schema": {"type": "integer"}
+ },
+ "X-RateLimit-Limit": {
+ "description": "The number of requests that can be made in the current window",
+ "schema": {"type": "integer"}
+ },
+ "X-RateLimit-Remaining": {
+ "description": "The number of remaining requests that can be made",
+ "schema": {"type": "integer"}
+ },
+ "X-RateLimit-Reset": {
+ "description": "Unix timestamp when the rate limit resets",
+ "schema": {"type": "integer"}
+ }
+ }
+ },
+ "500": {
+ "description": "Internal Server Error - An unexpected error occurred",
+ "content": {"application/json": {"schema": {"$ref": "#/components/schemas/Error"}}}
+ }
+ },
+ "description": "Files a report about a community from the answers given in the in-app community report flow. The reporter must be a member, the community must be discoverable, or the request must include an invite code.",
+ "security": [{"sessionToken": []}],
+ "requestBody": {
+ "required": true,
+ "content": {"application/json": {"schema": {"$ref": "#/components/schemas/ReportFlowGuildSubmissionRequest"}}}
+ }
+ }
+ },
"/reports/flows/message/submissions": {
"post": {
"operationId": "submit_message_report_flow",
@@ -16531,7 +16588,7 @@
"content": {"application/json": {"schema": {"$ref": "#/components/schemas/Error"}}}
}
},
- "description": "Returns every screen of the report flow for a target type, rendered in the requested locale. Message and user flows are available in app and on the DSA form, the guild flow only on the DSA form.",
+ "description": "Returns every screen of the report flow for a target type, rendered in the requested locale. Message, user and community flows are available in the app and on the DSA form.",
"parameters": [
{
"name": "target_type",
@@ -18823,7 +18880,10 @@
"summary": "Delete current user account",
"tags": ["Users"],
"responses": {
- "204": {"description": "No Content"},
+ "200": {
+ "description": "Success",
+ "content": {"application/json": {"schema": {"$ref": "#/components/schemas/UserAccountDeleteResponse"}}}
+ },
"400": {
"description": "Bad Request - The request was malformed or contained invalid data",
"content": {"application/json": {"schema": {"$ref": "#/components/schemas/Error"}}}
@@ -18863,11 +18923,11 @@
"content": {"application/json": {"schema": {"$ref": "#/components/schemas/Error"}}}
}
},
- "description": "Permanently deletes the current user's account and all associated data. Requires sudo mode verification. This action is irreversible and will remove all user data, messages, and connections.",
+ "description": "Schedules the deletion of the current user's account and personal data after the instance's grace period, or right away when immediate is true. Signing in before the deletion runs cancels it. Messages the account sent are anonymized unless delete_messages is true, in which case they are deleted with the account. Requires sudo mode verification. The response has the time the deletion runs.",
"security": [{"sessionToken": []}],
"requestBody": {
"required": false,
- "content": {"application/json": {"schema": {"$ref": "#/components/schemas/SudoVerificationSchema"}}}
+ "content": {"application/json": {"schema": {"$ref": "#/components/schemas/UserAccountDeleteRequest"}}}
}
}
},
@@ -28812,6 +28872,10 @@
"description": "Sensitive media filter level for DMs from non-friends"
},
"sensitive_content_guild_filter": {"$ref": "#/components/schemas/SensitiveMediaGuildFilterLevelInput"},
+ "allow_mature_content_on_ios": {
+ "type": "boolean",
+ "description": "Whether 18+ communities, channels and the \"Show\" sensitive media option are allowed in the iOS app. Only adults can turn this on. The iOS app never offers this setting."
+ },
"suppress_unprivileged_self_mentions": {
"type": "boolean",
"description": "Suppress direct mentions and reply mentions from unprivileged users"
@@ -28977,6 +29041,10 @@
"description": "Sensitive media filter level for DMs from non-friends"
},
"sensitive_content_guild_filter": {"$ref": "#/components/schemas/SensitiveMediaGuildFilterLevel"},
+ "allow_mature_content_on_ios": {
+ "type": "boolean",
+ "description": "Whether 18+ communities, channels and the \"Show\" sensitive media option are allowed in the iOS app. Only adults can turn this on. The iOS app never offers this setting."
+ },
"suppress_unprivileged_self_mentions": {
"type": "boolean",
"description": "Whether direct mentions and reply mentions from unprivileged users are suppressed"
@@ -29051,6 +29119,7 @@
"sensitive_content_friend_dm_filter",
"sensitive_content_non_friend_dm_filter",
"sensitive_content_guild_filter",
+ "allow_mature_content_on_ios",
"suppress_unprivileged_self_mentions",
"suppress_unprivileged_self_mentions_bypass_user_ids",
"staff_dm_access_user_ids",
@@ -30169,6 +30238,11 @@
"placeholder": {
"description": "Compact thumbhash placeholder produced by the media proxy at favorite-time. Clients render it as a low-res preview while the full media loads. Null when the proxy did not emit one.",
"type": ["string", "null"]
+ },
+ "nsfw": {
+ "default": false,
+ "description": "Whether the media is flagged as explicit. Clients apply the same sensitive media rules as for chat media.",
+ "type": "boolean"
}
},
"required": [
@@ -30181,7 +30255,8 @@
"content_type",
"size",
"url",
- "is_gifv"
+ "is_gifv",
+ "nsfw"
],
"additionalProperties": false
},
@@ -31177,6 +31252,50 @@
},
"required": ["email_token"]
},
+ "UserAccountDeleteRequest": {
+ "type": "object",
+ "properties": {
+ "password": {
+ "description": "Account password for sudo verification",
+ "$ref": "#/components/schemas/PasswordType"
+ },
+ "mfa_method": {
+ "description": "MFA method to use for verification",
+ "x-enumNames": ["TOTP", "WebAuthn", "Email code"],
+ "x-enumDescriptions": [
+ "Time-based one-time password authentication via authenticator app",
+ "Security key or biometric authentication",
+ "A 6-digit code sent to the account email address"
+ ],
+ "enum": ["totp", "webauthn", "email_code"],
+ "type": "string"
+ },
+ "mfa_code": {"description": "MFA verification code from an authenticator app", "type": "string"},
+ "email_code_ticket": {
+ "description": "Ticket from POST /users/@me/sudo/email-code, sent with mfa_method email_code",
+ "type": "string"
+ },
+ "email_code": {
+ "description": "The 6-digit code from the email, sent with mfa_method email_code",
+ "type": "string"
+ },
+ "webauthn_response": {
+ "description": "WebAuthn authentication response",
+ "$ref": "#/components/schemas/WebAuthnAuthenticationResponse"
+ },
+ "webauthn_challenge": {"description": "WebAuthn challenge string", "type": "string"},
+ "immediate": {"description": "Delete the account now instead of after the grace period", "type": "boolean"},
+ "delete_messages": {"description": "Also delete every message the account sent", "type": "boolean"}
+ }
+ },
+ "UserAccountDeleteResponse": {
+ "type": "object",
+ "properties": {
+ "pending_deletion_at": {"type": "string", "description": "ISO8601 timestamp of when the account is deleted"}
+ },
+ "required": ["pending_deletion_at"],
+ "additionalProperties": false
+ },
"DateOfBirthUpdateRequest": {
"type": "object",
"properties": {"date_of_birth": {"description": "Date of birth in YYYY-MM-DD format", "type": "string"}},
@@ -32516,6 +32635,22 @@
},
"required": ["revision_hash", "steps", "channel_id", "message_id"]
},
+ "ReportFlowGuildSubmissionRequest": {
+ "type": "object",
+ "properties": {
+ "revision_hash": {"type": "string"},
+ "steps": {
+ "minItems": 1,
+ "maxItems": 16,
+ "type": "array",
+ "items": {"$ref": "#/components/schemas/ReportFlowStep"}
+ },
+ "locale": {"description": "Language tag the reporter saw the flow in", "type": "string"},
+ "guild_id": {"$ref": "#/components/schemas/SnowflakeType"},
+ "invite_code": {"description": "Invite code used to access the guild", "type": "string"}
+ },
+ "required": ["revision_hash", "steps", "guild_id"]
+ },
"DsaReportEmailVerifyRequest": {
"type": "object",
"properties": {
diff --git a/fluxer_api/src/api/report/LimitedReporterPolicy.ts b/fluxer_api/src/api/report/LimitedReporterPolicy.ts
index a2107934b..83bd052d9 100644
--- a/fluxer_api/src/api/report/LimitedReporterPolicy.ts
+++ b/fluxer_api/src/api/report/LimitedReporterPolicy.ts
@@ -21,8 +21,8 @@ function dedupeKey(clientIp: string, target: LimitedReportTarget): string {
return `report:dedupe:${getSubnet(clientIp) ?? ipKey(clientIp)}:${target.type}:${target.id}`;
}
-export function isLimitedReporter(user: User): boolean {
- return isInteractionTierEnforced() && getAccountTier(user) !== 'verified';
+export function isLimitedReporter(user: User, capExempt = false): boolean {
+ return getAccountTier(user) !== 'verified' && (isInteractionTierEnforced() || capExempt);
}
export async function admitLimitedReport(
diff --git a/fluxer_api/src/api/report/ReportController.ts b/fluxer_api/src/api/report/ReportController.ts
index bdd408190..f017f80ee 100644
--- a/fluxer_api/src/api/report/ReportController.ts
+++ b/fluxer_api/src/api/report/ReportController.ts
@@ -9,6 +9,7 @@ import {RateLimitConfigs} from '@app/api/RateLimitConfig';
import type {HonoApp} from '@app/api/types/HonoEnv';
import {Validator} from '@app/api/Validator';
import {
+ ReportFlowGuildSubmissionRequest,
ReportFlowMessageSubmissionRequest,
ReportFlowPathParams,
ReportFlowQuery,
@@ -36,7 +37,7 @@ export function ReportController(app: HonoApp) {
operationId: 'get_report_flow',
summary: 'Get report flow',
description:
- 'Returns every screen of the report flow for a target type, rendered in the requested locale. Message and user flows are available in app and on the DSA form, the guild flow only on the DSA form.',
+ 'Returns every screen of the report flow for a target type, rendered in the requested locale. Message, user and community flows are available in the app and on the DSA form.',
responseSchema: ReportFlowResponse,
statusCode: 200,
security: [],
@@ -111,6 +112,33 @@ export function ReportController(app: HonoApp) {
);
},
);
+ app.post(
+ '/reports/flows/guild/submissions',
+ RateLimitMiddleware(RateLimitConfigs.REPORT_CREATE),
+ LoginRequired,
+ DefaultUserOnly,
+ OpenAPI({
+ operationId: 'submit_guild_report_flow',
+ summary: 'Submit community report flow',
+ description:
+ 'Files a report about a community from the answers given in the in-app community report flow. The reporter must be a member, the community must be discoverable, or the request must include an invite code.',
+ responseSchema: ReportResponse,
+ statusCode: 200,
+ security: ['bearerToken', 'sessionToken'],
+ tags: 'Reports',
+ }),
+ Validator('json', ReportFlowGuildSubmissionRequest),
+ async (ctx) => {
+ return ctx.json(
+ await ctx.get('reportRequestService').submitGuildReportFlow({
+ user: ctx.get('user'),
+ request: ctx.req.raw,
+ data: ctx.req.valid('json'),
+ locale: ctx.get('requestLocale') ?? null,
+ }),
+ );
+ },
+ );
app.post(
'/reports/message',
RateLimitMiddleware(RateLimitConfigs.REPORT_CREATE),
diff --git a/fluxer_api/src/api/report/ReportRequestService.ts b/fluxer_api/src/api/report/ReportRequestService.ts
index e43b743b7..60ce265d7 100644
--- a/fluxer_api/src/api/report/ReportRequestService.ts
+++ b/fluxer_api/src/api/report/ReportRequestService.ts
@@ -11,6 +11,7 @@ import {
resolveReportFlowAnswers,
resolveReportFlowLocale,
} from '@app/api/report/flows/ReportFlowRegistry';
+import {reasonSkipsReporterCaps} from '@app/api/report/flows/ReportReasonCatalog';
import {admitLimitedReport, isLimitedReporter, type LimitedReportTarget} from '@app/api/report/LimitedReporterPolicy';
import {ReportStatus, reportStatusToString} from '@app/api/report/ReportModels';
import type {ReportFlowRecord, ReportService} from '@app/api/report/ReportService';
@@ -18,6 +19,7 @@ import {assertTierAllows, getAccountTier, NO_TIER_CONTEXT} from '@app/api/user/A
import {TierGatedActions} from '@fluxer/constants/src/AccountTierConstants';
import {requireClientIp} from '@fluxer/ip_utils/src/ClientIp';
import type {
+ ReportFlowGuildSubmissionRequest,
ReportFlowMessageSubmissionRequest,
ReportFlowResponse,
ReportFlowStep,
@@ -132,11 +134,17 @@ export class ReportRequestService {
}: ReportFlowSubmissionContext<ReportFlowMessageSubmissionRequest> & {
viewer: ThreadViewer;
}): Promise<ReportResponse> {
- const admission = await this.admitReporter(user, request, {type: 'message', id: BigInt(data.message_id)});
+ const capExempt = this.isCapExemptWalk('message', data);
+ const admission = await this.admitReporter(
+ user,
+ request,
+ {type: 'message', id: BigInt(data.message_id)},
+ capExempt,
+ );
if (admission) return admission;
const flow = this.resolveInAppFlow('message', data, locale);
const report = await this.reportService.reportMessage(
- this.createReporter(user),
+ this.createReporter(user, capExempt),
viewer,
createChannelID(data.channel_id),
createMessageID(data.message_id),
@@ -152,11 +160,12 @@ export class ReportRequestService {
locale,
request,
}: ReportFlowSubmissionContext<ReportFlowUserSubmissionRequest>): Promise<ReportResponse> {
- const admission = await this.admitReporter(user, request, {type: 'user', id: BigInt(data.user_id)});
+ const capExempt = this.isCapExemptWalk('user', data);
+ const admission = await this.admitReporter(user, request, {type: 'user', id: BigInt(data.user_id)}, capExempt);
if (admission) return admission;
const flow = this.resolveInAppFlow('user', data, locale);
const report = await this.reportService.reportUser(
- this.createReporter(user),
+ this.createReporter(user, capExempt),
createUserID(data.user_id),
flow.category,
data.guild_id ? createGuildID(data.guild_id) : undefined,
@@ -165,6 +174,26 @@ export class ReportRequestService {
return this.toReportResponse(report);
}
+ async submitGuildReportFlow({
+ user,
+ data,
+ locale,
+ request,
+ }: ReportFlowSubmissionContext<ReportFlowGuildSubmissionRequest>): Promise<ReportResponse> {
+ const capExempt = this.isCapExemptWalk('guild', data);
+ const admission = await this.admitReporter(user, request, {type: 'guild', id: BigInt(data.guild_id)}, capExempt);
+ if (admission) return admission;
+ const flow = this.resolveInAppFlow('guild', data, locale);
+ const report = await this.reportService.reportGuild(
+ this.createReporter(user, capExempt),
+ createGuildID(data.guild_id),
+ flow.category,
+ data.invite_code ? createInviteCode(data.invite_code) : undefined,
+ flow.record,
+ );
+ return this.toReportResponse(report);
+ }
+
async sendDsaReportVerificationEmail({
data,
locale,
@@ -211,12 +240,27 @@ export class ReportRequestService {
};
}
+ private isCapExemptWalk(target: ReportFlowTargetType, data: ReportFlowAnswersInput): boolean {
+ try {
+ const {reason} = resolveReportFlowAnswers({
+ target,
+ surface: 'in_app',
+ revisionHash: data.revision_hash,
+ steps: data.steps,
+ });
+ return reasonSkipsReporterCaps(reason);
+ } catch {
+ return false;
+ }
+ }
+
private async admitReporter(
user: User,
request: Request,
target: LimitedReportTarget,
+ capExempt = false,
): Promise<ReportResponse | null> {
- if (!isLimitedReporter(user)) {
+ if (!isLimitedReporter(user, capExempt)) {
assertTierAllows(user, TierGatedActions.REPORT, NO_TIER_CONTEXT);
return null;
}
@@ -234,13 +278,14 @@ export class ReportRequestService {
};
}
- private createReporter(user: User) {
+ private createReporter(user: User, capExempt = false) {
return {
id: user.id,
email: user.email,
fullLegalName: null,
countryOfResidence: null,
tier: getAccountTier(user),
+ capExempt,
};
}
diff --git a/fluxer_api/src/api/report/ReportService.ts b/fluxer_api/src/api/report/ReportService.ts
index 48acfb86a..ab032d8e6 100644
--- a/fluxer_api/src/api/report/ReportService.ts
+++ b/fluxer_api/src/api/report/ReportService.ts
@@ -127,6 +127,7 @@ interface ReporterMetadata {
fullLegalName: string | null;
countryOfResidence: string | null;
tier?: ReporterTier;
+ capExempt?: boolean;
}
export interface ReportFlowRecord {
@@ -318,8 +319,7 @@ export class ReportService {
flow: ReportFlowRecord | null = null,
): Promise<IARSubmission> {
await this.checkReportBan(reporter.id);
- const reporterKey = this.getReporterRateLimitKey(reporter);
- await this.ensureReportRateLimit(this.createReportRateLimitIdentifier(reporterKey), REPORT_RATE_LIMIT_MAX, false);
+ await this.ensureReporterAllowance(reporter, false);
const {authChannel, channel, message} = await this.getReportableMessageForReporter({
reporterId: reporter.id,
viewer,
@@ -417,8 +417,7 @@ export class ReportService {
flow: ReportFlowRecord | null = null,
): Promise<IARSubmission> {
await this.checkReportBan(reporter.id);
- const rateLimitIdentifier = this.createReportRateLimitIdentifier(this.getReporterRateLimitKey(reporter));
- await this.ensureReportRateLimit(rateLimitIdentifier, REPORT_RATE_LIMIT_MAX, false);
+ await this.ensureReporterAllowance(reporter, false);
if (reporter.id && reportedUserId === reporter.id) {
throw new CannotReportYourselfError();
}
@@ -474,7 +473,7 @@ export class ReportService {
}
}
try {
- await this.ensureReportRateLimit(rateLimitIdentifier, REPORT_RATE_LIMIT_MAX, true);
+ await this.ensureReporterAllowance(reporter, true);
reportData.reported_profile_snapshot = await this.captureProfileSnapshot(reportId, {
user: reportedUser,
memberGuildId: guildId,
@@ -500,10 +499,10 @@ export class ReportService {
guildId: GuildID,
category: string,
inviteCode?: InviteCode,
+ flow: ReportFlowRecord | null = null,
): Promise<IARSubmission> {
await this.checkReportBan(reporter.id);
- const rateLimitIdentifier = this.createReportRateLimitIdentifier(this.getReporterRateLimitKey(reporter));
- await this.ensureReportRateLimit(rateLimitIdentifier, REPORT_RATE_LIMIT_MAX, false);
+ await this.ensureReporterAllowance(reporter, false);
const guild = await this.guildRepository.findUnique(guildId);
if (!guild) {
throw new UnknownGuildError();
@@ -542,7 +541,7 @@ export class ReportService {
audit_log_reason: null,
reported_guild_invite_code: reportedInviteCode,
...contentWarningSnapshot,
- ...buildReportFlowColumns(null),
+ ...buildReportFlowColumns(flow),
...buildReportedWebhookColumns(null),
};
let reservation: GuildReportSubmissionByReporterRow | null = null;
@@ -558,7 +557,7 @@ export class ReportService {
}
}
try {
- await this.ensureReportRateLimit(rateLimitIdentifier, REPORT_RATE_LIMIT_MAX, true);
+ await this.ensureReporterAllowance(reporter, true);
reportData.reported_profile_snapshot = await this.captureProfileSnapshot(reportId, {guild});
const report = await this.reportRepository.createReport(reportData);
await emitReportFiled(reportData, 'guild', reporter.tier);
@@ -717,8 +716,7 @@ export class ReportService {
fullLegalName: report.reporter_full_legal_name ?? null,
countryOfResidence: report.reporter_country_of_residence,
};
- const reporterKey = this.getReporterRateLimitKey(reporterMeta);
- await this.ensureReportRateLimit(this.createReportRateLimitIdentifier(reporterKey), REPORT_RATE_LIMIT_MAX, false);
+ await this.ensureReporterAllowance(reporterMeta, false);
const reportId = createReportID(await this.snowflakeService.generate());
const {row: reportRow, profileSubject} = await this.buildDsaReportRow(
reportId,
@@ -726,7 +724,7 @@ export class ReportService {
reporterMeta,
classification,
);
- await this.ensureReportRateLimit(this.createReportRateLimitIdentifier(reporterKey), REPORT_RATE_LIMIT_MAX, true);
+ await this.ensureReporterAllowance(reporterMeta, true);
const claimed = await this.reportRepository.consumeDsaTicket(report.ticket, ticket.email_lower);
if (!claimed) {
throw new InvalidDsaTicketError();
@@ -1553,10 +1551,12 @@ export class ReportService {
global_name: null,
bio: null,
pronouns: null,
+ custom_status: null,
avatar: null,
banner: null,
};
}
+ const customStatus = (await this.userRepository.findSettings(user.id))?.customStatus ?? null;
return {
id,
username: user.username,
@@ -1564,6 +1564,7 @@ export class ReportService {
global_name: user.globalName,
bio: user.bio,
pronouns: user.pronouns,
+ custom_status: customStatus && !customStatus.isExpired() ? customStatus.text : null,
avatar: await this.cloneProfileAssetForReport(reportId, 'user_avatar', 'avatars', id, user.avatarHash),
banner: await this.cloneProfileAssetForReport(reportId, 'user_banner', 'banners', id, user.bannerHash),
};
@@ -1660,29 +1661,30 @@ export class ReportService {
channel: Channel;
message: Message;
}): Promise<void> {
- const reporterKey = this.getReporterRateLimitKey(reporter);
const checks: Array<{
identifier: string;
maxAttempts: number;
}> = [
- {
- identifier: this.createReportRateLimitIdentifier(reporterKey),
- maxAttempts: REPORT_RATE_LIMIT_MAX,
- },
- {
- identifier: `report:message:channel:${reporterKey}:${channel.id.toString()}`,
- maxAttempts: MESSAGE_REPORT_USER_CHANNEL_RATE_LIMIT_MAX,
- },
{
identifier: `report:message:target:${message.id.toString()}`,
maxAttempts: MESSAGE_REPORT_TARGET_MESSAGE_RATE_LIMIT_MAX,
},
];
- if (channel.guildId) {
- checks.push({
- identifier: `report:message:guild:${reporterKey}:${channel.guildId.toString()}`,
- maxAttempts: MESSAGE_REPORT_USER_GUILD_RATE_LIMIT_MAX,
- });
+ if (!reporter.capExempt) {
+ const reporterKey = this.getReporterRateLimitKey(reporter);
+ checks.push(
+ {identifier: this.createReportRateLimitIdentifier(reporterKey), maxAttempts: REPORT_RATE_LIMIT_MAX},
+ {
+ identifier: `report:message:channel:${reporterKey}:${channel.id.toString()}`,
+ maxAttempts: MESSAGE_REPORT_USER_CHANNEL_RATE_LIMIT_MAX,
+ },
+ );
+ if (channel.guildId) {
+ checks.push({
+ identifier: `report:message:guild:${reporterKey}:${channel.guildId.toString()}`,
+ maxAttempts: MESSAGE_REPORT_USER_GUILD_RATE_LIMIT_MAX,
+ });
+ }
}
for (const check of checks) {
await this.ensureReportRateLimit(check.identifier, check.maxAttempts, false);
@@ -1692,6 +1694,14 @@ export class ReportService {
}
}
+ private async ensureReporterAllowance(reporter: ReporterMetadata, consume: boolean): Promise<void> {
+ if (reporter.capExempt) {
+ return;
+ }
+ const identifier = this.createReportRateLimitIdentifier(this.getReporterRateLimitKey(reporter));
+ await this.ensureReportRateLimit(identifier, REPORT_RATE_LIMIT_MAX, consume);
+ }
+
private async ensureReportRateLimit(identifier: string, maxAttempts: number, consume: boolean): Promise<void> {
const result = consume
? await this.rateLimitService.checkLimit({
diff --git a/fluxer_api/src/api/report/flows/ReportFlowCompiler.ts b/fluxer_api/src/api/report/flows/ReportFlowCompiler.ts
index 26db4c571..0d3d7616c 100644
--- a/fluxer_api/src/api/report/flows/ReportFlowCompiler.ts
+++ b/fluxer_api/src/api/report/flows/ReportFlowCompiler.ts
@@ -166,7 +166,6 @@ function computeRevisionHash(
kind: screen.kind,
title: screen.def.title,
subtitle: screen.subtitle,
- options_heading: screen.options.length > 0 ? (screen.def.optionsHeading ?? null) : null,
urgent: screen.def.urgent === true,
next: screen.def.nextScreenId ?? null,
options: screen.options.map((option) => ({
@@ -197,11 +196,8 @@ export function buildReportFlowVariant(
target: ReportFlowTargetType,
surface: ReportFlowSurface,
instance: ReportFlowInstance,
-): ReportFlowVariant | null {
+): ReportFlowVariant {
const startScreenId = library.flows[target].start[surface];
- if (startScreenId === undefined) {
- return null;
- }
const screenDefs = new Map(library.screens.map((screen) => [screen.id, screen]));
const screens = new Map<string, ReportFlowVariantScreen>();
const noticeIds = new Set<string>();
@@ -281,7 +277,6 @@ function collectDefinitionErrors(library: ReportFlowLibrary): Array<string> {
checkKey(screen.subtitle, where);
checkKey(screen.subtitleVariants?.dsa ?? undefined, where);
checkKey(screen.subtitleVariants?.selfHosted ?? undefined, where);
- checkKey(screen.optionsHeading, where);
const options = screen.options ?? [];
const kind = getReportFlowScreenKind(screen);
if (kind === 'checklist' && (options.length > 0 || screen.nextScreenId !== undefined)) {
@@ -348,7 +343,7 @@ function collectDefinitionErrors(library: ReportFlowLibrary): Array<string> {
}
for (const {target, surface} of REPORT_FLOW_VARIANTS) {
const start = library.flows[target].start[surface];
- if (start !== undefined && !screenIds.has(start)) {
+ if (!screenIds.has(start)) {
errors.push(`flow ${target}/${surface}: start screen ${start} is not defined`);
}
}
@@ -358,14 +353,8 @@ function collectDefinitionErrors(library: ReportFlowLibrary): Array<string> {
function collectVariantErrors(variant: ReportFlowVariant): Array<string> {
const errors: Array<string> = [];
const name = `flow ${variant.target}/${variant.surface}`;
- const startKind = variant.screens.get(variant.startScreenId)?.kind;
- const mustStartWithInfo = variant.target === 'user' && variant.surface === 'in_app';
- if (mustStartWithInfo !== (startKind === 'info')) {
- errors.push(
- mustStartWithInfo
- ? `${name}: the start screen must be an info screen`
- : `${name}: the start screen must not be an info screen`,
- );
+ if (variant.screens.get(variant.startScreenId)?.kind === 'info') {
+ errors.push(`${name}: the start screen must not be an info screen`);
}
for (const screen of variant.screens.values()) {
if (screen.kind === 'choice' && !screen.options.some((option) => option.outcome.type !== 'link')) {
@@ -429,9 +418,6 @@ export function assertValidReportFlowLibrary(library: ReportFlowLibrary): void {
for (const instance of REPORT_FLOW_CHECKED_INSTANCES) {
for (const {target, surface} of REPORT_FLOW_VARIANTS) {
const variant = buildReportFlowVariant(library, target, surface, instance);
- if (!variant) {
- continue;
- }
errors.push(...collectVariantErrors(variant));
for (const screenId of variant.screens.keys()) {
reachable.add(screenId);
diff --git a/fluxer_api/src/api/report/flows/ReportFlowDefinitions.ts b/fluxer_api/src/api/report/flows/ReportFlowDefinitions.ts
index 3b8e958fb..deecfa95c 100644
--- a/fluxer_api/src/api/report/flows/ReportFlowDefinitions.ts
+++ b/fluxer_api/src/api/report/flows/ReportFlowDefinitions.ts
@@ -4,11 +4,11 @@ import type {ReportFlowSurface, ReportFlowTargetType} from '@fluxer/schema/src/d
export interface ReportFlowDef {
target: ReportFlowTargetType;
- start: Partial<Record<ReportFlowSurface, string>>;
+ start: Record<ReportFlowSurface, string>;
}
export const REPORT_FLOWS: Record<ReportFlowTargetType, ReportFlowDef> = {
message: {target: 'message', start: {in_app: 'root_message', dsa: 'root_message'}},
- user: {target: 'user', start: {in_app: 'profile_intro', dsa: 'profile_parts'}},
- guild: {target: 'guild', start: {dsa: 'community_parts'}},
+ user: {target: 'user', start: {in_app: 'user_start', dsa: 'profile_parts'}},
+ guild: {target: 'guild', start: {in_app: 'community_parts', dsa: 'community_parts'}},
};
diff --git a/fluxer_api/src/api/report/flows/ReportFlowIds.snapshot.json b/fluxer_api/src/api/report/flows/ReportFlowIds.snapshot.json
index d889fa764..51365f543 100644
--- a/fluxer_api/src/api/report/flows/ReportFlowIds.snapshot.json
+++ b/fluxer_api/src/api/report/flows/ReportFlowIds.snapshot.json
@@ -72,8 +72,8 @@
"message/abuse/harassment": "screen:harassment",
"message/abuse/hate": "screen:hate",
"message/abuse/minor_risk": "screen:minor_risk",
- "message/abuse/rude_language": "end",
"message/abuse/sexual": "screen:sexual",
+ "message/abuse/swearing": "submit:rude_language",
"message/abuse/threat": "screen:threat",
"message/age_stated_message/age_no": "end:need_more_info",
"message/age_stated_message/age_yes": "submit:underage",
@@ -157,10 +157,23 @@
"message/violence_misinfo/hate": "screen:hate",
"message/violence_misinfo/terrorism": "submit:terrorism_extremism",
"message/violence_misinfo/violence_glorification": "submit:violence_glorification",
+ "user/abuse/harassment": "screen:harassment",
+ "user/abuse/hate": "screen:hate",
+ "user/abuse/minor_risk": "screen:minor_risk",
+ "user/abuse/sexual": "screen:sexual",
+ "user/abuse/swearing": "submit:rude_language",
+ "user/abuse/threat": "screen:threat",
"user/age_stated_profile/age_no": "end:need_more_info_profile",
"user/age_stated_profile/age_yes": "submit:underage",
"user/crisis_support/#next": "screen:self_harm_profile",
"user/crisis_support/crisis_lines": "link:crisis_lines",
+ "user/false_info/false_claims": "submit:false_claims_about_person",
+ "user/false_info/harmful_false_claims": "submit:harmful_false_claims",
+ "user/false_info/synthetic_media": "submit:deceptive_synthetic_media",
+ "user/harassment/false_claims": "submit:false_claims_about_person",
+ "user/harassment/harassment_direct": "submit:harassment",
+ "user/harassment/raid": "submit:raid",
+ "user/harassment/unwanted_contact": "submit:unwanted_contact",
"user/hate/atrocity_denial": "submit:atrocity_denial",
"user/hate/conversion_therapy": "submit:conversion_therapy",
"user/hate/hate_dehumanizing": "submit:hate_dehumanizing",
@@ -173,6 +186,15 @@
"user/impersonation/impersonation_person": "submit:impersonation_person",
"user/impersonation/impersonation_public_figure": "submit:impersonation_public_figure",
"user/impersonation/impersonation_staff": "submit:impersonation_staff",
+ "user/minor_risk/minor_contact": "submit:minor_contact",
+ "user/minor_risk/minor_grooming": "submit:minor_grooming",
+ "user/minor_risk/minor_in_adult_space": "submit:minor_in_adult_space",
+ "user/minor_risk/minor_sexual": "screen:minor_sexual",
+ "user/minor_sexual/csam": "submit:csam",
+ "user/minor_sexual/minor_fictional": "submit:minor_fictional_sexualization",
+ "user/minor_sexual/minor_sexual_contact": "submit:minor_sexual_contact",
+ "user/minor_sexual/minor_sexual_content": "submit:minor_sexual_content",
+ "user/minor_sexual/minor_sexualization": "submit:minor_sexualization",
"user/profile_abuse/harassment": "submit:harassment",
"user/profile_abuse/hate": "screen:hate",
"user/profile_abuse/minor_sexual": "screen:profile_minor_sexual",
@@ -182,8 +204,6 @@
"user/profile_hate_violence/hate": "screen:hate",
"user/profile_hate_violence/terrorism": "submit:terrorism_extremism",
"user/profile_hate_violence/violence_glorification": "submit:violence_glorification",
- "user/profile_intro/#next": "screen:profile_parts",
- "user/profile_intro/learn_more": "link:guidelines",
"user/profile_minor_sexual/csam": "submit:csam",
"user/profile_minor_sexual/minor_fictional": "submit:minor_fictional_sexualization",
"user/profile_minor_sexual/minor_sexual_content": "submit:minor_sexual_content",
@@ -213,16 +233,32 @@
"user/profile_threat/violence_glorification": "submit:violence_glorification",
"user/profile_threat/violence_incitement": "submit:violence_incitement",
"user/profile_threat/violent_threat": "submit:violent_threat",
+ "user/root_call/abuse": "screen:abuse",
+ "user/root_call/self_harm": "screen:self_harm",
+ "user/root_call/violence_misinfo": "screen:violence_misinfo",
"user/root_user/abuse": "screen:profile_abuse",
"user/root_user/hate_violence": "screen:profile_hate_violence",
"user/root_user/impersonation": "screen:impersonation",
"user/root_user/something_else": "screen:something_else_user",
"user/root_user/spam": "screen:spam_profile",
+ "user/self_harm/crisis_lines": "link:crisis_lines",
+ "user/self_harm/eating_disorder_promotion": "submit:eating_disorder_promotion",
+ "user/self_harm/self_harm_graphic": "submit:self_harm_graphic",
+ "user/self_harm/self_harm_pressure": "submit:self_harm_pressure",
+ "user/self_harm/self_harm_promotion": "submit:self_harm_promotion",
+ "user/self_harm/suicide_promotion": "submit:suicide_promotion",
+ "user/self_harm/worried_self_harm": "submit:wellbeing_concern",
+ "user/self_harm/worried_suicide": "submit:wellbeing_concern",
"user/self_harm_profile/eating_disorder_promotion": "submit:eating_disorder_promotion",
"user/self_harm_profile/self_harm_graphic": "submit:self_harm_graphic",
"user/self_harm_profile/self_harm_promotion": "submit:self_harm_promotion",
"user/self_harm_profile/suicide_promotion": "submit:suicide_promotion",
"user/self_harm_profile/worried": "submit:wellbeing_concern",
+ "user/sexual/adult_content_unmarked": "submit:adult_content_unmarked",
+ "user/sexual/intimate_image_abuse": "submit:intimate_image_abuse",
+ "user/sexual/minor_sexual": "screen:minor_sexual",
+ "user/sexual/sexual_exploitation": "submit:sexual_exploitation",
+ "user/sexual/sexual_unwanted": "submit:sexual_unwanted",
"user/something_else_user/account_trading": "submit:account_trading",
"user/something_else_user/ban_evasion": "submit:ban_evasion",
"user/something_else_user/copyright": "link:copyright",
@@ -237,11 +273,25 @@
"user/spam_profile/account_trading": "submit:account_trading",
"user/spam_profile/fake_account": "submit:fake_account",
"user/spam_profile/platform_abuse": "submit:platform_abuse",
- "user/spam_profile/spam_profile": "submit:spam"
+ "user/spam_profile/spam_profile": "submit:spam",
+ "user/threat/violence_glorification": "submit:violence_glorification",
+ "user/threat/violence_incitement": "submit:violence_incitement",
+ "user/threat/violent_threat": "submit:violent_threat",
+ "user/user_start/call": "screen:root_call",
+ "user/user_start/learn_more": "link:guidelines",
+ "user/user_start/profile": "screen:profile_parts",
+ "user/violence_misinfo/false_info": "screen:false_info",
+ "user/violence_misinfo/graphic_violence": "submit:graphic_violence",
+ "user/violence_misinfo/hate": "screen:hate",
+ "user/violence_misinfo/terrorism": "submit:terrorism_extremism",
+ "user/violence_misinfo/violence_glorification": "submit:violence_glorification"
},
"retired": {
+ "message/abuse/rude_language": "end",
"message/root_message/dsa": "link:dsa",
"message/something_else_message/violence_misinfo": "screen:violence_misinfo",
+ "user/profile_intro/#next": "screen:profile_parts",
+ "user/profile_intro/learn_more": "link:guidelines",
"user/root_user/dsa": "link:dsa"
}
}
diff --git a/fluxer_api/src/api/report/flows/ReportFlowRegistry.ts b/fluxer_api/src/api/report/flows/ReportFlowRegistry.ts
index 1ffe7ba10..94000c0d5 100644
--- a/fluxer_api/src/api/report/flows/ReportFlowRegistry.ts
+++ b/fluxer_api/src/api/report/flows/ReportFlowRegistry.ts
@@ -23,8 +23,6 @@ import {
import {getLegacyCategory, type ReportReasonKey} from '@app/api/report/flows/ReportReasonCatalog';
import {isStringArray, parseJsonArray} from '@app/api/utils/JsonBoundaryUtils';
import type {LocaleCode} from '@fluxer/constants/src/Locales';
-import {ValidationErrorCodes} from '@fluxer/constants/src/ValidationErrorCodes';
-import {InputValidationError} from '@fluxer/errors/src/domains/core/InputValidationError';
import {InvalidReportFlowAnswersError} from '@fluxer/errors/src/domains/moderation/InvalidReportFlowAnswersError';
import {ReportFlowOutdatedError} from '@fluxer/errors/src/domains/moderation/ReportFlowOutdatedError';
import {parseAcceptLanguage} from '@fluxer/i18n/src/locale/resolution/AcceptLanguageNegotiation';
@@ -83,7 +81,7 @@ const ADMIN_LOCALE = 'en-US';
assertValidReportFlowLibrary(REPORT_FLOW_LIBRARY);
-const variantCache = new Map<string, ReportFlowVariant | null>();
+const variantCache = new Map<string, ReportFlowVariant>();
const responseCache = new Map<string, ReportFlowResponse>();
function getReportFlowInstance(guidelinesUrl: string | null): ReportFlowInstance {
@@ -101,27 +99,18 @@ function getLinkUrl(link: ReportFlowLinkId, guidelinesUrl: string | null): strin
}
}
-function findReportFlowVariant(
- target: ReportFlowTargetType,
- surface: ReportFlowSurface,
- instance: ReportFlowInstance,
-): ReportFlowVariant | null {
- const cacheKey = `${target}:${surface}:${instance.selfHosted}:${instance.guidelinesLinked}`;
- if (!variantCache.has(cacheKey)) {
- variantCache.set(cacheKey, buildReportFlowVariant(REPORT_FLOW_LIBRARY, target, surface, instance));
- }
- return variantCache.get(cacheKey) ?? null;
-}
-
-function requireReportFlowVariant(
+function getReportFlowVariant(
target: ReportFlowTargetType,
surface: ReportFlowSurface,
instance: ReportFlowInstance,
): ReportFlowVariant {
- const variant = findReportFlowVariant(target, surface, instance);
- if (!variant) {
- throw InputValidationError.fromCode('surface', ValidationErrorCodes.INVALID_FORMAT);
+ const cacheKey = `${target}:${surface}:${instance.selfHosted}:${instance.guidelinesLinked}`;
+ const cached = variantCache.get(cacheKey);
+ if (cached) {
+ return cached;
}
+ const variant = buildReportFlowVariant(REPORT_FLOW_LIBRARY, target, surface, instance);
+ variantCache.set(cacheKey, variant);
return variant;
}
@@ -155,7 +144,7 @@ function renderScreen(screen: ReportFlowVariantScreen, locale: string, guideline
label: renderCopy(option.label, locale),
outcome: renderOutcome(option.outcome, guidelinesUrl),
})),
- options_heading: def.optionsHeading && screen.options.length > 0 ? renderCopy(def.optionsHeading, locale) : null,
+ options_heading: null,
checklist: def.checklist
? {
items: def.checklist.items.map((item) => ({
@@ -178,7 +167,7 @@ export function getReportFlowResponse(
): ReportFlowResponse {
const {guidelinesUrl} = getLegalUrls();
const instance = getReportFlowInstance(guidelinesUrl);
- const variant = requireReportFlowVariant(target, surface, instance);
+ const variant = getReportFlowVariant(target, surface, instance);
const locale = resolveReportFlowLocale(rawLocale);
const cacheKey = [
target,
@@ -283,7 +272,7 @@ export function resolveReportFlowAnswers(params: {
revisionHash: string;
steps: ReadonlyArray<ReportFlowStepInput>;
}): ResolvedReportFlowAnswers {
- const variant = requireReportFlowVariant(
+ const variant = getReportFlowVariant(
params.target,
params.surface,
getReportFlowInstance(getLegalUrls().guidelinesUrl),
diff --git a/fluxer_api/src/api/report/flows/ReportFlowScreens.ts b/fluxer_api/src/api/report/flows/ReportFlowScreens.ts
index 596018809..44a7ab16a 100644
--- a/fluxer_api/src/api/report/flows/ReportFlowScreens.ts
+++ b/fluxer_api/src/api/report/flows/ReportFlowScreens.ts
@@ -46,7 +46,6 @@ export interface ReportFlowScreenDef {
subtitleVariants?: ReportFlowSubtitleVariantsDef;
urgent?: true;
options?: ReadonlyArray<ReportFlowOptionDef>;
- optionsHeading?: ReportFlowCopyKey;
checklist?: ReportFlowChecklistDef;
nextScreenId?: string;
}
@@ -121,7 +120,12 @@ export const REPORT_FLOW_SCREENS: ReadonlyArray<ReportFlowScreenDef> = [
{id: 'harassment', label: 'report_flow.label.harassment', outcome: {type: 'screen', screenId: 'harassment'}},
{id: 'hate', label: 'report_flow.label.hate', outcome: {type: 'screen', screenId: 'hate'}},
{id: 'sexual', label: 'report_flow.label.sexual', outcome: {type: 'screen', screenId: 'sexual'}},
- {id: 'rude_language', label: 'report_flow.label.rude_language', outcome: {type: 'end'}, surface: 'in_app'},
+ {
+ id: 'swearing',
+ label: 'report_flow.label.rude_language',
+ outcome: {type: 'submit', reason: 'rude_language'},
+ surface: 'in_app',
+ },
],
},
{
@@ -473,12 +477,27 @@ export const REPORT_FLOW_SCREENS: ReadonlyArray<ReportFlowScreenDef> = [
],
},
{
- id: 'profile_intro',
- title: 'report_flow.screen.profile_intro.title',
- subtitle: 'report_flow.screen.profile_intro.subtitle',
- optionsHeading: 'report_flow.screen.profile_intro.options_heading',
- options: [{id: 'learn_more', label: 'report_flow.label.learn_more', outcome: {type: 'link', link: 'guidelines'}}],
- nextScreenId: 'profile_parts',
+ id: 'user_start',
+ title: 'report_flow.screen.user_start.title',
+ subtitle: 'report_flow.screen.user_start.subtitle',
+ options: [
+ {id: 'profile', label: 'report_flow.label.their_profile', outcome: {type: 'screen', screenId: 'profile_parts'}},
+ {id: 'call', label: 'report_flow.label.call_activity', outcome: {type: 'screen', screenId: 'root_call'}},
+ {id: 'learn_more', label: 'report_flow.label.learn_more', outcome: {type: 'link', link: 'guidelines'}},
+ ],
+ },
+ {
+ id: 'root_call',
+ title: 'report_flow.screen.root_call.title',
+ options: [
+ {id: 'abuse', label: 'report_flow.label.abuse', outcome: {type: 'screen', screenId: 'abuse'}},
+ {
+ id: 'violence_misinfo',
+ label: 'report_flow.label.violence_misinfo',
+ outcome: {type: 'screen', screenId: 'violence_misinfo'},
+ },
+ {id: 'self_harm', label: 'report_flow.label.self_harm', outcome: {type: 'screen', screenId: 'self_harm'}},
+ ],
},
{
id: 'profile_parts',
diff --git a/fluxer_api/src/api/report/flows/ReportReasonCatalog.ts b/fluxer_api/src/api/report/flows/ReportReasonCatalog.ts
index 27e7fe073..8daaa8c03 100644
--- a/fluxer_api/src/api/report/flows/ReportReasonCatalog.ts
+++ b/fluxer_api/src/api/report/flows/ReportReasonCatalog.ts
@@ -390,6 +390,13 @@ export const REPORT_REASONS = {
user: 'other',
guild: 'other',
},
+ rude_language: {
+ label: 'Swearing or rude remarks',
+ highestPriority: false,
+ message: 'other',
+ user: 'other',
+ guild: 'other',
+ },
other: {label: 'Something not listed', highestPriority: false, message: 'other', user: 'other', guild: 'other'},
} as const satisfies Record<string, ReportReasonDef>;
@@ -427,3 +434,8 @@ export function findReportReason(key: string): ReportReason | null {
export function listReportReasons(): Array<ReportReason> {
return (Object.keys(REPORT_REASONS) as Array<ReportReasonKey>).map(toReportReason);
}
+
+export function reasonSkipsReporterCaps(reason: ReportReasonKey): boolean {
+ const def: ReportReasonDef = REPORT_REASONS[reason];
+ return def.highestPriority || def.guild === 'self_harm';
+}
diff --git a/fluxer_api/src/api/report/tests/ReportFlowAdmin.test.ts b/fluxer_api/src/api/report/tests/ReportFlowAdmin.test.ts
index 1c532382a..a8f5b3554 100644
--- a/fluxer_api/src/api/report/tests/ReportFlowAdmin.test.ts
+++ b/fluxer_api/src/api/report/tests/ReportFlowAdmin.test.ts
@@ -212,6 +212,7 @@ describe('Report flow admin', () => {
global_name: 'Name At Report Time',
bio: 'Bio at report time',
pronouns: 'they/them',
+ custom_status: 'status text',
avatar: {hash: 'avatarhash', key: assetKey('user_avatar', 'avatarhash')},
banner: {hash: 'bannerhash', key: null},
},
@@ -246,6 +247,7 @@ describe('Report flow admin', () => {
global_name: 'Name At Report Time',
bio: 'Bio at report time',
pronouns: 'they/them',
+ custom_status: 'status text',
avatar: {hash: 'avatarhash', url: 'https://presigned.url/test'},
banner: {hash: 'bannerhash', url: null},
},
diff --git a/fluxer_api/src/api/report/tests/ReportFlowRegistry.test.ts b/fluxer_api/src/api/report/tests/ReportFlowRegistry.test.ts
index a4d9e7e36..6010a6cb4 100644
--- a/fluxer_api/src/api/report/tests/ReportFlowRegistry.test.ts
+++ b/fluxer_api/src/api/report/tests/ReportFlowRegistry.test.ts
@@ -57,8 +57,9 @@ const LEDGER_PATH = path.join(THIS_DIR, '../flows/ReportFlowIds.snapshot.json');
const VARIANTS: ReadonlyArray<[ReportFlowTargetType, ReportFlowSurface, 'choice' | 'checklist' | 'info']> = [
['message', 'in_app', 'choice'],
['message', 'dsa', 'choice'],
- ['user', 'in_app', 'info'],
+ ['user', 'in_app', 'choice'],
['user', 'dsa', 'checklist'],
+ ['guild', 'in_app', 'checklist'],
['guild', 'dsa', 'checklist'],
];
@@ -93,9 +94,6 @@ function buildReportFlowLedger(library: ReportFlowLibrary): Record<string, strin
);
for (const {target, surface} of variants) {
const variant = buildReportFlowVariant(library, target, surface, HOSTED);
- if (!variant) {
- continue;
- }
for (const screen of variant.screens.values()) {
const prefix = `${target}/${screen.def.id}`;
for (const option of screen.options) {
@@ -171,11 +169,7 @@ function variantOf(
library: ReportFlowLibrary = REPORT_FLOW_LIBRARY,
instance: ReportFlowInstance = HOSTED,
): ReportFlowVariant {
- const variant = buildReportFlowVariant(library, target, surface, instance);
- if (!variant) {
- throw new Error(`no variant ${target}/${surface}`);
- }
- return variant;
+ return buildReportFlowVariant(library, target, surface, instance);
}
function variantReasons(variant: ReportFlowVariant): Set<string> {
@@ -264,7 +258,6 @@ describe('report flow definitions', () => {
expect(variant.screens.get(variant.startScreenId)?.kind).toBe(expectedStartKind);
}
}
- expect(buildReportFlowVariant(REPORT_FLOW_LIBRARY, 'guild', 'in_app', HOSTED)).toBeNull();
});
test('DSA variants omit in-app options and no-report outcomes', () => {
@@ -525,7 +518,7 @@ describe('report flow walks', () => {
name: 'P1 to P3 harassment',
target: 'user',
steps: [
- {screen_id: 'profile_intro'},
+ {screen_id: 'user_start', option_id: 'profile'},
{screen_id: 'profile_parts', item_ids: ['photo', 'profile_text']},
{screen_id: 'root_user', option_id: 'abuse'},
{screen_id: 'profile_abuse', option_id: 'harassment'},
@@ -537,7 +530,7 @@ describe('report flow walks', () => {
name: 'P4 self-harm worry',
target: 'user',
steps: [
- {screen_id: 'profile_intro'},
+ {screen_id: 'user_start', option_id: 'profile'},
{screen_id: 'profile_parts', item_ids: ['profile_text']},
{screen_id: 'root_user', option_id: 'something_else'},
{screen_id: 'something_else_user', option_id: 'self_harm'},
@@ -551,7 +544,7 @@ describe('report flow walks', () => {
name: 'P5 private information',
target: 'user',
steps: [
- {screen_id: 'profile_intro'},
+ {screen_id: 'user_start', option_id: 'profile'},
{screen_id: 'profile_parts', item_ids: ['profile_text']},
{screen_id: 'root_user', option_id: 'something_else'},
{screen_id: 'something_else_user', option_id: 'private_info'},
@@ -657,7 +650,7 @@ describe('report flow walks', () => {
'user',
'in_app',
[
- {screen_id: 'profile_intro'},
+ {screen_id: 'user_start', option_id: 'profile'},
{screen_id: 'profile_parts', item_ids: ['profile_text']},
{screen_id: 'root_user', option_id: 'something_else'},
{screen_id: 'something_else_user', option_id: 'too_young'},
@@ -679,7 +672,7 @@ describe('report flow walks', () => {
'user',
'in_app',
[
- {screen_id: 'profile_intro'},
+ {screen_id: 'user_start', option_id: 'profile'},
{screen_id: 'profile_parts', item_ids: ['photo']},
{screen_id: 'root_user', option_id: 'something_else'},
{screen_id: 'something_else_user', option_id: 'self_harm'},
@@ -709,7 +702,7 @@ describe('report flow walks', () => {
],
1,
);
- expectInvalidStep('user', 'dsa', [{screen_id: 'profile_intro'}], 0);
+ expectInvalidStep('user', 'dsa', [{screen_id: 'user_start', option_id: 'profile'}], 0);
});
test('broken walks report the first bad step', () => {
@@ -750,7 +743,7 @@ describe('report flow walks', () => {
'user',
'in_app',
[
- {screen_id: 'profile_intro'},
+ {screen_id: 'user_start', option_id: 'profile'},
{screen_id: 'profile_parts', item_ids: ['photo']},
{screen_id: 'root_user', option_id: 'something_else'},
{screen_id: 'something_else_user', option_id: 'self_harm'},
@@ -762,7 +755,7 @@ describe('report flow walks', () => {
'user',
'in_app',
[
- {screen_id: 'profile_intro', option_id: 'learn_more'},
+ {screen_id: 'user_start', option_id: 'learn_more'},
{screen_id: 'profile_parts', item_ids: ['photo']},
],
0,
@@ -802,12 +795,6 @@ describe('report flow walks', () => {
expect(outdated.code).toBe(APIErrorCodes.REPORT_FLOW_OUTDATED);
expect(outdated.status).toBe(HttpStatus.CONFLICT);
});
-
- test('a flow without a variant for the surface is a validation error on surface', () => {
- const error = captureError(() => getReportFlowResponse('guild', 'in_app', 'en-US'));
- expect(error.code).toBe(APIErrorCodes.INVALID_FORM_BODY);
- expect(JSON.stringify(error.data)).toContain('"path":"surface"');
- });
});
describe('report reasons and legacy categories', () => {
@@ -897,7 +884,7 @@ describe('report flow rendering', () => {
expect(response.notices.map((notice) => notice.id)).toEqual(EXPECTED_NOTICES[target]);
expect(response.locale).toBe('en-US');
}
- expect(getReportFlowResponse('user', 'in_app', 'en-US').start_screen_id).toBe('profile_intro');
+ expect(getReportFlowResponse('user', 'in_app', 'en-US').start_screen_id).toBe('user_start');
expect(getReportFlowResponse('user', 'dsa', 'en-US').start_screen_id).toBe('profile_parts');
expect(getReportFlowResponse('guild', 'dsa', 'en-US').start_screen_id).toBe('community_parts');
});
@@ -916,10 +903,8 @@ describe('report flow rendering', () => {
const user = getReportFlowResponse('user', 'in_app', 'en-US');
expect(user.guidelines_url).toBeNull();
expect(user.revision_hash).not.toBe(hostedUser.revision_hash);
- const intro = user.screens[0];
- expect(intro.options).toEqual([]);
- expect(intro.options_heading).toBeNull();
- expect(intro.next_screen_id).toBe('profile_parts');
+ const start = user.screens[0];
+ expect(start.options.map((option) => option.id)).toEqual(['profile', 'call']);
const userScreens = new Map(user.screens.map((screen) => [screen.id, screen]));
expect(userScreens.get('something_else_user')?.options.map((option) => option.id)).not.toContain('copyright');
const message = getReportFlowResponse('message', 'in_app', 'en-US');
@@ -939,7 +924,7 @@ describe('report flow rendering', () => {
surface: 'in_app',
revisionHash: user.revision_hash,
steps: [
- {screen_id: 'profile_intro'},
+ {screen_id: 'user_start', option_id: 'profile'},
{screen_id: 'profile_parts', item_ids: ['photo']},
{screen_id: 'root_user', option_id: 'spam'},
{screen_id: 'spam_profile', option_id: 'spam_profile'},
@@ -959,10 +944,9 @@ describe('report flow rendering', () => {
expect(user.guidelines_url).toBe('https://rules.example.org/community');
expect(user.revision_hash).not.toBe(unconfigured.revision_hash);
expect(user.revision_hash).not.toBe(hostedUser.revision_hash);
- const intro = user.screens[0];
- expect(intro.options_heading).toBe('Learn more');
- expect(intro.options.map((option) => option.id)).toEqual(['learn_more']);
- expect(intro.options[0].outcome.url).toBe('https://rules.example.org/community');
+ const start = user.screens[0];
+ expect(start.options.map((option) => option.id)).toEqual(['profile', 'call', 'learn_more']);
+ expect(start.options[2].outcome.url).toBe('https://rules.example.org/community');
const userScreens = new Map(user.screens.map((screen) => [screen.id, screen]));
expect(userScreens.get('root_user')?.options.map((option) => option.id)).not.toContain('dsa');
resolveReportFlowAnswers({
@@ -970,7 +954,7 @@ describe('report flow rendering', () => {
surface: 'in_app',
revisionHash: user.revision_hash,
steps: [
- {screen_id: 'profile_intro'},
+ {screen_id: 'user_start', option_id: 'profile'},
{screen_id: 'profile_parts', item_ids: ['photo']},
{screen_id: 'root_user', option_id: 'spam'},
{screen_id: 'spam_profile', option_id: 'spam_profile'},
@@ -979,7 +963,7 @@ describe('report flow rendering', () => {
setCachedConfiguredLegalUrls({terms_url: null, guidelines_url: 'https://rules.example.org/v2'});
const moved = getReportFlowResponse('user', 'in_app', 'en-US');
expect(moved.guidelines_url).toBe('https://rules.example.org/v2');
- expect(moved.screens[0].options[0].outcome.url).toBe('https://rules.example.org/v2');
+ expect(moved.screens[0].options[2].outcome.url).toBe('https://rules.example.org/v2');
expect(moved.revision_hash).toBe(user.revision_hash);
setCachedConfiguredLegalUrls({terms_url: null, guidelines_url: null});
expect(getReportFlowResponse('user', 'in_app', 'en-US')).toBe(unconfigured);
diff --git a/fluxer_api/src/api/report/tests/ReportFlows.test.ts b/fluxer_api/src/api/report/tests/ReportFlows.test.ts
index 7f1ceb6c5..fed02959f 100644
--- a/fluxer_api/src/api/report/tests/ReportFlows.test.ts
+++ b/fluxer_api/src/api/report/tests/ReportFlows.test.ts
@@ -4,7 +4,9 @@ import {createTestAccount, type TestAccount, unclaimAccount} from '@app/api/auth
import {createReportID} from '@app/api/BrandedTypes';
import {createTestBotAccount} from '@app/api/bot/tests/BotTestUtils';
import {
+ acceptInvite,
createChannel,
+ createChannelInvite,
createDmChannel,
createFriendship,
getChannel,
@@ -38,12 +40,6 @@ interface ReportResponse {
reported_at: string;
}
-interface ErrorResponse {
- code: string;
- step_index?: number;
- errors?: Array<{path: string; code: string}>;
-}
-
interface MessageTarget {
reporter: TestAccount;
author: TestAccount;
@@ -57,7 +53,7 @@ const RATE_LIMIT_HEADER = 'x-fluxer-test-enable-rate-limits';
const SPAM_WALK: ReadonlyArray<ReportFlowStep> = [{screen_id: 'root_message', option_id: 'spam'}];
const USER_SPAM_WALK: ReadonlyArray<ReportFlowStep> = [
- {screen_id: 'profile_intro'},
+ {screen_id: 'user_start', option_id: 'profile'},
{screen_id: 'profile_parts', item_ids: ['name']},
{screen_id: 'root_user', option_id: 'spam'},
{screen_id: 'spam_profile', option_id: 'spam_profile'},
@@ -72,8 +68,25 @@ const CSAM_WALK: ReadonlyArray<ReportFlowStep> = [
{screen_id: 'sexual', option_id: 'minor_sexual'},
{screen_id: 'minor_sexual', option_id: 'csam'},
];
+const CALL_CSAM_WALK: ReadonlyArray<ReportFlowStep> = [
+ {screen_id: 'user_start', option_id: 'call'},
+ {screen_id: 'root_call', option_id: 'abuse'},
+ {screen_id: 'abuse', option_id: 'sexual'},
+ {screen_id: 'sexual', option_id: 'minor_sexual'},
+ {screen_id: 'minor_sexual', option_id: 'csam'},
+];
+const SELF_HARM_PROMOTION_WALK: ReadonlyArray<ReportFlowStep> = [
+ {screen_id: 'root_message', option_id: 'something_else'},
+ {screen_id: 'something_else_message', option_id: 'self_harm'},
+ {screen_id: 'self_harm', option_id: 'self_harm_promotion'},
+];
+const GUILD_HARASSMENT_WALK: ReadonlyArray<ReportFlowStep> = [
+ {screen_id: 'community_parts', item_ids: ['icon']},
+ {screen_id: 'root_guild', option_id: 'abuse'},
+ {screen_id: 'abuse_guild', option_id: 'harassment'},
+];
const USER_PRIVATE_INFO_WALK: ReadonlyArray<ReportFlowStep> = [
- {screen_id: 'profile_intro'},
+ {screen_id: 'user_start', option_id: 'profile'},
{screen_id: 'profile_parts', item_ids: ['profile_text']},
{screen_id: 'root_user', option_id: 'something_else'},
{screen_id: 'something_else_user', option_id: 'private_info'},
@@ -149,6 +162,10 @@ function submitUser(harness: ApiTestHarness, token: string, body: unknown) {
return createBuilder<ReportResponse>(harness, token).post('/reports/flows/user/submissions').body(body);
}
+function submitGuild(harness: ApiTestHarness, token: string, body: unknown) {
+ return createBuilder<ReportResponse>(harness, token).post('/reports/flows/guild/submissions').body(body);
+}
+
function legacyMessage(harness: ApiTestHarness, token: string, target: {channelId: string; messageId: string}) {
return createBuilder<ReportResponse>(harness, token)
.post('/reports/message')
@@ -197,24 +214,35 @@ describe('Report flows', () => {
.get('/reports/flows/user')
.expect(HTTP_STATUS.OK)
.executeWithResponse();
- expect(json.start_screen_id).toBe('profile_intro');
+ expect(json.start_screen_id).toBe('user_start');
expect(response.headers.get('cache-control')).toBe('private, no-cache');
expect(response.headers.get('vary')).toContain('Accept-Language');
});
- test('the guild flow exists only on the DSA surface', async () => {
- for (const path of ['/reports/flows/guild', '/reports/flows/guild?surface=in_app']) {
- const error = await createBuilderWithoutAuth<ErrorResponse>(harness)
+ test('the guild flow is served in the app and on the DSA form', async () => {
+ for (const path of ['/reports/flows/guild', '/reports/flows/guild?surface=dsa']) {
+ const flow = await createBuilderWithoutAuth<ReportFlowResponse>(harness)
.get(path)
- .expect(HTTP_STATUS.BAD_REQUEST, APIErrorCodes.INVALID_FORM_BODY)
+ .expect(HTTP_STATUS.OK)
.execute();
- expect(error.errors?.map((entry) => entry.path)).toEqual(['surface']);
+ expect(flow.start_screen_id).toBe('community_parts');
}
- const flow = await createBuilderWithoutAuth<ReportFlowResponse>(harness)
- .get('/reports/flows/guild?surface=dsa')
+ });
+ });
+
+ describe('Submit, guild', () => {
+ test('a member files the in-app community flow and the walk is stored', async () => {
+ const {members, guild} = await setupTestGuildWithMembers(harness, 1);
+ const result = await submitGuild(harness, members[0].token, {
+ guild_id: guild.id,
+ revision_hash: currentHash('guild'),
+ steps: GUILD_HARASSMENT_WALK,
+ })
.expect(HTTP_STATUS.OK)
.execute();
- expect(flow.start_screen_id).toBe('community_parts');
+ const report = await readReport(result.report_id);
+ expect(report.reportedGuildId?.toString()).toBe(guild.id);
+ expect(report.reason).toBe('harassment');
});
});
@@ -267,6 +295,32 @@ describe('Report flows', () => {
});
});
+ describe('Submit, message and call reasons', () => {
+ test('swearing is filed as a report', async () => {
+ const target = await setupMessage(harness);
+ const result = await submitMessage(
+ harness,
+ target.reporter.token,
+ messageBody(target, [
+ {screen_id: 'root_message', option_id: 'abuse'},
+ {screen_id: 'abuse', option_id: 'swearing'},
+ ]),
+ )
+ .expect(HTTP_STATUS.OK)
+ .execute();
+ expect((await readReport(result.report_id)).reason).toBe('rude_language');
+ });
+
+ test('a call report leads to the child safety reasons', async () => {
+ const reporter = await createTestAccount(harness);
+ const reported = await createTestAccount(harness);
+ const result = await submitUser(harness, reporter.token, userBody(reported.userId, CALL_CSAM_WALK))
+ .expect(HTTP_STATUS.OK)
+ .execute();
+ expect((await readReport(result.report_id)).reason).toBe('csam');
+ });
+ });
+
describe('Invalid walks', () => {
test('shape errors are standard validation errors', async () => {
const target = await setupMessage(harness);
@@ -384,6 +438,17 @@ describe('Report flows', () => {
.execute();
});
+ test('an unverified reporter can file a highest priority report', async () => {
+ const target = await setupMessage(harness);
+ const unverified = await createTestAccount(harness, {skipEmailVerification: true});
+ const invite = await createChannelInvite(harness, target.reporter.token, target.channelId);
+ await acceptInvite(harness, unverified.token, invite.code);
+ const result = await submitMessage(harness, unverified.token, messageBody(target, CSAM_WALK))
+ .expect(HTTP_STATUS.OK)
+ .execute();
+ expect((await readReport(result.report_id)).reason).toBe('csam');
+ });
+
test('an unclaimed reporter is refused', async () => {
const target = await setupMessage(harness);
await unclaimAccount(harness, target.reporter.userId);
@@ -629,6 +694,40 @@ describe('Report flows', () => {
expect(await countReports()).toBe(5);
});
+ test('child safety and self-harm reports are filed past the reporter allowances', async () => {
+ const reporter = await createTestAccount(harness);
+ const dm = await setupDmMessages(harness, reporter, 5);
+ for (const messageId of dm.messageIds.slice(0, 3)) {
+ await submitMessage(harness, reporter.token, messageBody({channelId: dm.channelId, messageId}))
+ .expect(HTTP_STATUS.OK)
+ .execute();
+ }
+ const users = await Promise.all([0, 1, 2].map(() => createTestAccount(harness)));
+ for (const user of users.slice(0, 2)) {
+ await submitUser(harness, reporter.token, userBody(user.userId)).expect(HTTP_STATUS.OK).execute();
+ }
+ await submitUser(harness, reporter.token, userBody(users[2].userId))
+ .expect(429, APIErrorCodes.RATE_LIMITED)
+ .execute();
+ const urgent = {channelId: dm.channelId, messageId: dm.messageIds[3]};
+ const result = await submitMessage(harness, reporter.token, messageBody(urgent, CSAM_WALK))
+ .expect(HTTP_STATUS.OK)
+ .execute();
+ expect((await readReport(result.report_id)).reason).toBe('csam');
+ await submitUser(harness, reporter.token, userBody(users[2].userId, CALL_CSAM_WALK))
+ .expect(HTTP_STATUS.OK)
+ .execute();
+ const selfHarm = await submitMessage(
+ harness,
+ reporter.token,
+ messageBody({channelId: dm.channelId, messageId: dm.messageIds[4]}, SELF_HARM_PROMOTION_WALK),
+ )
+ .expect(HTTP_STATUS.OK)
+ .execute();
+ expect((await readReport(selfHarm.report_id)).reason).toBe('self_harm_promotion');
+ expect(await countReports()).toBe(8);
+ });
+
test('the route bucket is shared and invalid walks spend a route token but no service token', async () => {
const reporter = await createTestAccount(harness);
const dm = await setupDmMessages(harness, reporter, 3);
diff --git a/fluxer_api/src/api/report/tests/ReportProfileSnapshot.test.ts b/fluxer_api/src/api/report/tests/ReportProfileSnapshot.test.ts
index bdb333a1c..55e1099f6 100644
--- a/fluxer_api/src/api/report/tests/ReportProfileSnapshot.test.ts
+++ b/fluxer_api/src/api/report/tests/ReportProfileSnapshot.test.ts
@@ -142,6 +142,11 @@ async function setupProfile(
bio: 'Original guild bio',
avatar: FIRST_IMAGE,
});
+ await createBuilder(harness, target.token)
+ .patch('/users/@me/settings')
+ .body({custom_status: {text: 'Original status'}})
+ .expect(HTTP_STATUS.OK)
+ .execute();
return {owner, target, guild, profile};
}
@@ -179,6 +184,7 @@ describe('Report profile snapshots', () => {
global_name: 'Original Name',
bio: 'Original bio',
pronouns: 'they/them',
+ custom_status: 'Original status',
avatar: {
hash: profile.avatar,
key: `reports/${result.report_id}/profile/user_avatar/${profile.avatar}`,
@@ -300,6 +306,7 @@ describe('Report profile snapshots', () => {
global_name: null,
bio: null,
pronouns: null,
+ custom_status: null,
avatar: null,
banner: null,
},
diff --git a/fluxer_api/src/api/rpc/RpcService.ts b/fluxer_api/src/api/rpc/RpcService.ts
index aafb69016..2450eec24 100644
--- a/fluxer_api/src/api/rpc/RpcService.ts
+++ b/fluxer_api/src/api/rpc/RpcService.ts
@@ -406,6 +406,11 @@ export class RpcService {
userIds: request.user_ids.map(createUserID),
}),
};
+ case 'get_users_adult_content_allowed':
+ return {
+ type: 'get_users_adult_content_allowed',
+ data: {user_ids: await this.getUsersAdultContentAllowed(request.user_ids.map(createUserID))},
+ };
case 'voice_get_token': {
Logger.debug(
{type: 'voice_get_token', guildId: request.guild_id, channelId: request.channel_id, userId: request.user_id},
@@ -1954,6 +1959,11 @@ export class RpcService {
return result;
}
+ private async getUsersAdultContentAllowed(userIds: Array<UserID>): Promise<Array<string>> {
+ const users = await this.userRepository.listUsers(userIds);
+ return users.filter((user) => canUserAccessNsfwContent(user)).map((user) => user.id.toString());
+ }
+
private async kickTemporaryMember(params: {userId: UserID; guildIds: Array<GuildID>}): Promise<boolean> {
const {userId, guildIds} = params;
try {
diff --git a/fluxer_api/src/api/rpc/tests/RpcUserBatchFanout.test.ts b/fluxer_api/src/api/rpc/tests/RpcUserBatchFanout.test.ts
index ef8d901c9..885a06632 100644
--- a/fluxer_api/src/api/rpc/tests/RpcUserBatchFanout.test.ts
+++ b/fluxer_api/src/api/rpc/tests/RpcUserBatchFanout.test.ts
@@ -89,4 +89,15 @@ describe('RpcService user batch fanout', () => {
);
expect(rpcResponse.data[bystander.userId]).toStrictEqual([]);
});
+
+ test('returns only adults for get_users_adult_content_allowed', async () => {
+ const adult = await createTestAccount(harness, {dateOfBirth: '2000-01-01'});
+ const teen = await createTestAccount(harness, {dateOfBirth: '2012-01-01'});
+ const rpcResponse = await createBuilder<{data: {user_ids: Array<string>}}>(harness, '')
+ .post('/test/rpc-session-init')
+ .body({type: 'get_users_adult_content_allowed', user_ids: [adult.userId, teen.userId, UNKNOWN_USER_ID]})
+ .expect(HTTP_STATUS.OK)
+ .execute();
+ expect(rpcResponse.data.user_ids).toStrictEqual([adult.userId]);
+ });
});
diff --git a/fluxer_api/src/api/search/GlobalSearchService.ts b/fluxer_api/src/api/search/GlobalSearchService.ts
index b0b472558..0138e0a84 100644
--- a/fluxer_api/src/api/search/GlobalSearchService.ts
+++ b/fluxer_api/src/api/search/GlobalSearchService.ts
@@ -18,7 +18,7 @@ import {channelNeedsReindexing, queueIndexingChannels} from '@app/api/search/Cha
import type {IMessageSearchService} from '@app/api/search/IMessageSearchService';
import {MessageSearchResponseMapper} from '@app/api/search/MessageSearchResponseMapper';
import {emptyMessageSearchResponse, runMessageSearch} from '@app/api/search/MessageSearchResultReconciler';
-import {channelRequiresAgeVerification, getCanUserAccessNsfw} from '@app/api/search/SearchNsfwUtils';
+import {channelRequiresAgeVerification, getSearchNsfwAccess} from '@app/api/search/SearchNsfwUtils';
import type {UserRepository} from '@app/api/user/repositories/UserRepository';
import {mapWithConcurrency} from '@app/api/utils/ConcurrencyUtils';
import type {WorkerTaskName} from '@app/api/worker/WorkerLaneConfig';
@@ -84,6 +84,7 @@ export class GlobalSearchService {
userId: UserID;
viewer: ThreadViewer;
dmScope: DmSearchScope;
+ iosApp: boolean;
searchParams: MessageSearchRequest;
requestCache: RequestCache;
includeChannelId?: ChannelID | null;
@@ -113,7 +114,7 @@ export class GlobalSearchService {
const includeNsfwRequested = params.searchParams.include_nsfw ?? false;
let canIncludeNsfw = false;
if (includeNsfwRequested) {
- canIncludeNsfw = await getCanUserAccessNsfw(this.userRepository, params.userId);
+ canIncludeNsfw = (await getSearchNsfwAccess(this.userRepository, params.userId, params.iosApp)).allowed;
}
const finalChannelIds = validatedChannelIds.filter((channelIdStr) => {
const channel = accessibleChannels.get(channelIdStr) ?? threadParents.get(channelIdStr);
diff --git a/fluxer_api/src/api/search/SearchNsfwUtils.ts b/fluxer_api/src/api/search/SearchNsfwUtils.ts
index 8230ec952..d1f232936 100644
--- a/fluxer_api/src/api/search/SearchNsfwUtils.ts
+++ b/fluxer_api/src/api/search/SearchNsfwUtils.ts
@@ -36,10 +36,24 @@ export function channelRequiresAgeVerification(
);
}
-export async function getCanUserAccessNsfw(userRepository: UserRepository, userId: UserID): Promise<boolean> {
+export interface SearchNsfwAccess {
+ adult: boolean;
+ allowed: boolean;
+}
+
+export async function getSearchNsfwAccess(
+ userRepository: UserRepository,
+ userId: UserID,
+ iosApp: boolean,
+): Promise<SearchNsfwAccess> {
const user = await userRepository.findUnique(userId);
if (!user) {
throw new UnknownUserError();
}
- return canUserAccessNsfwContent(user);
+ const adult = canUserAccessNsfwContent(user);
+ if (!adult || !iosApp) {
+ return {adult, allowed: adult};
+ }
+ const settings = await userRepository.findSettings(userId);
+ return {adult, allowed: settings?.allowMatureContentOnIos ?? false};
}
diff --git a/fluxer_api/src/api/search/SearchService.ts b/fluxer_api/src/api/search/SearchService.ts
index 0e30d2743..f1585bcc7 100644
--- a/fluxer_api/src/api/search/SearchService.ts
+++ b/fluxer_api/src/api/search/SearchService.ts
@@ -44,10 +44,11 @@ export class SearchService {
async searchMessages(params: {
userId: UserID;
viewer: ThreadViewer;
+ iosApp: boolean;
requestCache: RequestCache;
data: GlobalSearchMessagesRequest;
}): Promise<MessageSearchResponse> {
- const {userId, viewer, requestCache, data} = params;
+ const {userId, viewer, iosApp, requestCache, data} = params;
const {channel_id, channel_ids, context_channel_id, context_guild_id, ...rawSearchParams} = data;
const searchParams = normalizeQuotedPhrases(rawSearchParams);
const contextChannelId = context_channel_id ? createChannelID(context_channel_id) : null;
@@ -61,6 +62,7 @@ export class SearchService {
userId,
viewer,
channelIds,
+ iosApp,
searchParams,
requestCache,
});
@@ -82,6 +84,7 @@ export class SearchService {
userId,
viewer,
dmScope: 'all_dms',
+ iosApp,
searchParams,
requestCache,
includeChannelId: contextChannelId,
@@ -93,6 +96,7 @@ export class SearchService {
userId,
viewer,
dmScope: 'open_dms',
+ iosApp,
searchParams,
requestCache,
includeChannelId: contextChannelId,
@@ -106,6 +110,7 @@ export class SearchService {
viewer,
guildId: contextGuildId,
channelIds,
+ iosApp,
searchParams,
requestCache,
});
diff --git a/fluxer_api/src/api/search/controllers/SearchController.ts b/fluxer_api/src/api/search/controllers/SearchController.ts
index 3ad52b2d6..43e53486c 100644
--- a/fluxer_api/src/api/search/controllers/SearchController.ts
+++ b/fluxer_api/src/api/search/controllers/SearchController.ts
@@ -6,6 +6,7 @@ import {RateLimitMiddleware} from '@app/api/middleware/RateLimitMiddleware';
import {OpenAPI} from '@app/api/middleware/ResponseTypeMiddleware';
import {RateLimitConfigs} from '@app/api/RateLimitConfig';
import type {HonoApp} from '@app/api/types/HonoEnv';
+import {isFluxerIosAppRequest} from '@app/api/utils/SessionClientIdentity';
import {Validator} from '@app/api/Validator';
import {ValidationErrorCodes} from '@fluxer/constants/src/ValidationErrorCodes';
import {InputValidationError} from '@fluxer/errors/src/domains/core/InputValidationError';
@@ -36,9 +37,13 @@ export function SearchController(app: HonoApp) {
}
const userId = user.id;
const requestCache = ctx.get('requestCache');
+ const iosApp = isFluxerIosAppRequest(
+ ctx.req.header('user-agent') ?? null,
+ ctx.req.header('x-fluxer-client-properties') ?? null,
+ );
const result = await ctx
.get('searchService')
- .searchMessages({viewer: viewerFromCtx(ctx), userId, requestCache, data: params});
+ .searchMessages({viewer: viewerFromCtx(ctx), userId, iosApp, requestCache, data: params});
return ctx.json(result);
},
);
diff --git a/fluxer_api/src/api/search/guild/GuildSearchSerializer.ts b/fluxer_api/src/api/search/guild/GuildSearchSerializer.ts
index cd4fffd04..b0958ad09 100644
--- a/fluxer_api/src/api/search/guild/GuildSearchSerializer.ts
+++ b/fluxer_api/src/api/search/guild/GuildSearchSerializer.ts
@@ -23,7 +23,8 @@ function hasIndexableDiscoveryContext(
export function convertToSearchableGuild(guild: Guild, discovery?: GuildDiscoveryContext): SearchableGuild {
const createdAt = Math.floor(snowflakeToDate(BigInt(guild.id)).getTime() / 1000);
const isDiscoverable = guild.features.has(GuildFeatures.DISCOVERABLE) && hasIndexableDiscoveryContext(discovery);
- const discoveryContext = isDiscoverable ? discovery : undefined;
+ const listed = isDiscoverable && !guild.nsfw;
+ const discoveryContext = listed ? discovery : undefined;
const tags = (discoveryContext?.tags ?? []).map((t) => normalizeDiscoveryTag(t)).filter((t) => t.length > 0);
return {
id: guild.id.toString(),
@@ -44,6 +45,6 @@ export function convertToSearchableGuild(guild: Guild, discovery?: GuildDiscover
discoveryCategory: discoveryContext?.categoryId ?? null,
discoveryPrimaryLanguage: discoveryContext?.primaryLanguage ?? null,
discoveryTags: tags,
- isDiscoverable,
+ isDiscoverable: listed,
};
}
diff --git a/fluxer_api/src/api/search/guild/tests/GuildSearchSerializer.test.ts b/fluxer_api/src/api/search/guild/tests/GuildSearchSerializer.test.ts
index 81e21d3c1..4b4f127ec 100644
--- a/fluxer_api/src/api/search/guild/tests/GuildSearchSerializer.test.ts
+++ b/fluxer_api/src/api/search/guild/tests/GuildSearchSerializer.test.ts
@@ -7,7 +7,7 @@ import {convertToSearchableGuild} from '@app/api/search/guild/GuildSearchSeriali
import {GuildFeatures} from '@fluxer/constants/src/GuildConstants';
import {describe, expect, it} from 'vitest';
-function guildRow(features: Set<string>): GuildRow {
+function guildRow(features: Set<string>, nsfw = false): GuildRow {
return {
guild_id: createGuildID(1472623911696138261n),
owner_id: createUserID(1472623911696138262n),
@@ -28,7 +28,7 @@ function guildRow(features: Set<string>): GuildRow {
verification_level: 0,
mfa_level: 0,
nsfw_level: 0,
- nsfw: false,
+ nsfw,
content_warning_level: 0,
content_warning_text: null,
explicit_content_filter: 0,
@@ -79,4 +79,15 @@ describe('GuildSearchSerializer', () => {
expect(result.discoveryDescription).toBeNull();
expect(result.discoveryTags).toEqual([]);
});
+ it('an 18+ guild with DISCOVERABLE is not discoverable', () => {
+ const guild = new Guild(guildRow(new Set([GuildFeatures.DISCOVERABLE]), true));
+ const result = convertToSearchableGuild(guild, {
+ description: 'Adults only.',
+ categoryId: 8,
+ primaryLanguage: 'en-US',
+ tags: ['adults'],
+ });
+ expect(result.isDiscoverable).toBe(false);
+ expect(result.discoveryDescription).toBeNull();
+ });
});
diff --git a/fluxer_api/src/api/search/tests/MessageSearchPermissions.test.ts b/fluxer_api/src/api/search/tests/MessageSearchPermissions.test.ts
index babdbed19..4ad55351a 100644
--- a/fluxer_api/src/api/search/tests/MessageSearchPermissions.test.ts
+++ b/fluxer_api/src/api/search/tests/MessageSearchPermissions.test.ts
@@ -24,6 +24,7 @@ import {markChannelAsIndexed, markGuildChannelsAsIndexed} from '@app/api/message
import {type ApiTestHarness, createApiTestHarness} from '@app/api/test/ApiTestHarness';
import {HTTP_STATUS} from '@app/api/test/TestConstants';
import {createBuilder} from '@app/api/test/TestRequestBuilder';
+import {updateUserSettings} from '@app/api/user/tests/UserTestUtils';
import {APIErrorCodes} from '@fluxer/constants/src/ApiErrorCodes';
import {ChannelTypes, Permissions} from '@fluxer/constants/src/ChannelConstants';
import {GuildNSFWLevel} from '@fluxer/constants/src/GuildConstants';
@@ -300,6 +301,29 @@ describe('Message Search Permissions', () => {
expect(included.messages.length).toBeGreaterThan(0);
expect(included.messages.some((m) => m.channel_id === systemChannelId)).toBe(true);
});
+ test('the iOS app gets 18+ results only after the iOS opt-in', async () => {
+ const owner = await createTestAccount(harness, {dateOfBirth: '2000-01-01'});
+ const guild = await createGuild(harness, owner.token, 'iOS Opt-in Search Guild');
+ const nsfwChannel = await createChannel(harness, owner.token, guild.id, 'nsfw-channel', ChannelTypes.GUILD_TEXT);
+ await updateChannel(harness, owner.token, nsfwChannel.id, {nsfw: true});
+ await sendChannelMessage(harness, owner.token, nsfwChannel.id, 'ios optin nsfw message');
+ await markGuildChannelsAsIndexed(harness, owner.token, guild.id);
+ const searchFromIos = async () => {
+ const result = await createBuilder<MessageSearchResponse>(harness, owner.token)
+ .post('/search/messages')
+ .header('User-Agent', 'Fluxer iOS/1.0.0 (stable)')
+ .body({content: 'ios optin nsfw', scope: 'all_guilds', include_nsfw: true})
+ .expect(HTTP_STATUS.OK)
+ .execute();
+ if (!isSearchResult(result)) {
+ expect.fail('Expected search result but got indexing response');
+ }
+ return result.messages.filter((m) => m.channel_id === nsfwChannel.id);
+ };
+ expect(await searchFromIos()).toHaveLength(0);
+ await updateUserSettings(harness, owner.token, {allow_mature_content_on_ios: true});
+ expect((await searchFromIos()).length).toBeGreaterThan(0);
+ });
test('age-restricted guild is searchable in a channel pinned to nsfw_override: false', async () => {
const owner = await createTestAccount(harness, {dateOfBirth: '2000-01-01'});
const guild = await createGuild(harness, owner.token, 'Age Restricted Override Guild');
diff --git a/fluxer_api/src/api/store_billing/StoreBillingConfig.ts b/fluxer_api/src/api/store_billing/StoreBillingConfig.ts
index 7b3f3bff4..280c22c2b 100644
--- a/fluxer_api/src/api/store_billing/StoreBillingConfig.ts
+++ b/fluxer_api/src/api/store_billing/StoreBillingConfig.ts
@@ -6,6 +6,9 @@ import type {AppStoreAppConfig} from '@app/api/config/APIConfig';
import {hasText} from '@app/api/store_billing/StoreBillingCredentials';
import type {StorePurchaseKind, StoreSlot} from '@app/api/store_billing/StoreBillingTypes';
import type {RecurringBillingCycle} from '@app/api/stripe/ProductRegistry';
+import {ms} from 'itty-time';
+
+const SANDBOX_SUBSCRIPTION_WINDOW_MS = ms('7 days');
interface StoreProductSlotShape {
kind: StorePurchaseKind;
@@ -102,7 +105,20 @@ export function isGooglePlaySubscriptionProduct(productId: string): boolean {
);
}
-export function isSandboxEntitlementAllowed(userId: UserID): boolean {
+export function isSandboxEntitlementAllowed(
+ userId: UserID,
+ kind: StorePurchaseKind,
+ purchasedAt: Date | null,
+ now: number = Date.now(),
+): boolean {
const cfg = Config.storeBilling;
- return cfg.sandboxEntitlesAll || cfg.sandboxUserIds.includes(userId.toString());
+ if (cfg.sandboxEntitlesAll || cfg.sandboxUserIds.includes(userId.toString())) {
+ return true;
+ }
+ return (
+ kind === 'subscription' &&
+ cfg.sandboxSubscriptions &&
+ purchasedAt !== null &&
+ now - purchasedAt.getTime() <= SANDBOX_SUBSCRIPTION_WINDOW_MS
+ );
}
diff --git a/fluxer_api/src/api/store_billing/StoreEntitlementService.ts b/fluxer_api/src/api/store_billing/StoreEntitlementService.ts
index 1f3a11e3d..fd20ade73 100644
--- a/fluxer_api/src/api/store_billing/StoreEntitlementService.ts
+++ b/fluxer_api/src/api/store_billing/StoreEntitlementService.ts
@@ -592,7 +592,7 @@ export class StoreEntitlementService {
}
private async finishClaim(userId: UserID, row: StorePurchaseRow): Promise<StorePurchaseClaimResult> {
- if (row.environment === 'sandbox' && !isSandboxEntitlementAllowed(userId)) {
+ if (row.environment === 'sandbox' && !isSandboxEntitlementAllowed(userId, row.kind, row.purchased_at)) {
throw new StorePurchaseSandboxNotEntitledError();
}
if (row.revocation_reason === UNSUPPORTED_QUANTITY_REASON) {
@@ -952,7 +952,9 @@ export class StoreEntitlementService {
if (!snapshot.providerEntitled || ownerId === null) {
return false;
}
- return snapshot.environment === 'production' || isSandboxEntitlementAllowed(ownerId);
+ return (
+ snapshot.environment === 'production' || isSandboxEntitlementAllowed(ownerId, snapshot.kind, snapshot.purchasedAt)
+ );
}
private isStoredRowEntitled(row: StorePurchaseRow, ownerId: UserID | null): boolean {
@@ -963,7 +965,9 @@ export class StoreEntitlementService {
row.kind === 'gift'
? row.state === 'purchased' || row.state === 'fulfilled'
: PAID_SUBSCRIPTION_STATES.has(row.state);
- return paid && (row.environment === 'production' || isSandboxEntitlementAllowed(ownerId));
+ return (
+ paid && (row.environment === 'production' || isSandboxEntitlementAllowed(ownerId, row.kind, row.purchased_at))
+ );
}
private async resolveOwner(
@@ -973,6 +977,13 @@ export class StoreEntitlementService {
): Promise<UserID | null> {
const claimerId = context.claimerId;
if (existing?.user_id != null) {
+ if (
+ claimerId !== null &&
+ existing.environment === 'sandbox' &&
+ isSandboxEntitlementAllowed(claimerId, snapshot.kind, snapshot.purchasedAt)
+ ) {
+ return claimerId;
+ }
const signedToken =
snapshot.provider === 'app_store' ? (snapshot.accountToken ?? context.hintAccountToken) : null;
if (signedToken && signedToken !== existing.account_token && !existing.entitled) {
@@ -984,13 +995,6 @@ export class StoreEntitlementService {
if (claimerId === null || existing.user_id === claimerId) {
return existing.user_id;
}
- if (
- existing.environment === 'sandbox' &&
- !isSandboxEntitlementAllowed(existing.user_id) &&
- isSandboxEntitlementAllowed(claimerId)
- ) {
- return claimerId;
- }
if (await this.isLiveUser(existing.user_id)) {
throw new StorePurchaseOwnedByOtherAccountError();
}
diff --git a/fluxer_api/src/api/store_billing/tests/StoreBillingAppStore.test.ts b/fluxer_api/src/api/store_billing/tests/StoreBillingAppStore.test.ts
index 065e5c979..22f0cc10d 100644
--- a/fluxer_api/src/api/store_billing/tests/StoreBillingAppStore.test.ts
+++ b/fluxer_api/src/api/store_billing/tests/StoreBillingAppStore.test.ts
@@ -64,6 +64,7 @@ interface SubscriptionSeed {
gracePeriodExpiresDate?: number;
recentSubscriptionStartDate?: number;
productId?: string;
+ purchaseDate?: number;
}
let transactionCounter = 0;
@@ -121,7 +122,7 @@ describe('App Store purchases', () => {
transactionId: originalTransactionId,
originalTransactionId,
productId: seed.productId ?? MONTHLY,
- purchaseDate: now - ms('1 day'),
+ purchaseDate: seed.purchaseDate ?? now - ms('1 day'),
expiresDate: seed.expiresDate,
...(seed.appAccountToken ? {appAccountToken: seed.appAccountToken} : {}),
});
@@ -490,7 +491,29 @@ describe('App Store purchases', () => {
expect(purchaser.isPremium()).toBe(false);
});
- it('records a sandbox purchase without entitlement unless the account is allowed', async () => {
+ it('entitles any account to a sandbox subscription bought in the last week', async () => {
+ Config.storeBilling.sandboxSubscriptions = true;
+ const tester = await createTestAccount(harness);
+ const originalTransactionId = seedSubscription({environment: 'sandbox', expiresDate: Date.now() + ms('1 day')});
+ const result = await claim(tester, await signStoredTransaction('sandbox', originalTransactionId));
+ expect(result.purchase).toMatchObject({environment: 'sandbox', entitled: true});
+ expect((await findUser(tester.userId)).isPremium()).toBe(true);
+ });
+
+ it('refuses a sandbox gift for an unlisted account and mints no code', async () => {
+ Config.storeBilling.sandboxSubscriptions = true;
+ const tester = await createTestAccount(harness);
+ const giftTransactionId = seedGift('sandbox');
+ await claim(
+ tester,
+ await signStoredTransaction('sandbox', giftTransactionId),
+ 403,
+ APIErrorCodes.STORE_PURCHASE_SANDBOX_NOT_ENTITLED,
+ );
+ expect(await getUserRepository().findGiftCodesByCreator((await findUser(tester.userId)).id)).toHaveLength(0);
+ });
+
+ it('refuses a sandbox subscription when sandbox subscriptions are off', async () => {
const tester = await createTestAccount(harness);
const originalTransactionId = seedSubscription({environment: 'sandbox', expiresDate: Date.now() + ms('1 day')});
await claim(
@@ -505,26 +528,28 @@ describe('App Store purchases', () => {
expect(purchases).toHaveLength(1);
expect(purchases[0]).toMatchObject({environment: 'sandbox', entitled: false, state: 'active'});
expect((await findUser(tester.userId)).isPremium()).toBe(false);
- const giftTransactionId = seedGift('sandbox');
+ });
+
+ it('refuses a sandbox subscription bought more than a week ago', async () => {
+ Config.storeBilling.sandboxSubscriptions = true;
+ const tester = await createTestAccount(harness);
+ const originalTransactionId = seedSubscription({
+ environment: 'sandbox',
+ purchaseDate: Date.now() - ms('8 days'),
+ expiresDate: Date.now() + ms('1 day'),
+ });
await claim(
tester,
- await signStoredTransaction('sandbox', giftTransactionId),
+ await signStoredTransaction('sandbox', originalTransactionId),
403,
APIErrorCodes.STORE_PURCHASE_SANDBOX_NOT_ENTITLED,
);
- expect(await getUserRepository().findGiftCodesByCreator((await findUser(tester.userId)).id)).toHaveLength(0);
-
- const allowed = await createTestAccount(harness);
- Config.storeBilling.sandboxUserIds = [allowed.userId];
- const allowedTransactionId = seedSubscription({environment: 'sandbox', expiresDate: Date.now() + ms('1 day')});
- const result = await claim(allowed, await signStoredTransaction('sandbox', allowedTransactionId));
- expect(result.purchase).toMatchObject({environment: 'sandbox', entitled: true});
- expect((await findUser(allowed.userId)).isPremium()).toBe(true);
+ expect((await findUser(tester.userId)).isPremium()).toBe(false);
});
- it('moves a sandbox purchase to an allowed account that restores it after another account bought it', async () => {
+ it('moves a sandbox purchase to the account that claims it after another account bought it', async () => {
const tester = await createTestAccount(harness);
- const allowed = await createTestAccount(harness);
+ const claimer = await createTestAccount(harness);
const originalTransactionId = seedSubscription({
environment: 'sandbox',
expiresDate: Date.now() + ms('1 day'),
@@ -532,15 +557,34 @@ describe('App Store purchases', () => {
});
const jws = await signStoredTransaction('sandbox', originalTransactionId);
await claim(tester, jws, 403, APIErrorCodes.STORE_PURCHASE_SANDBOX_NOT_ENTITLED);
- Config.storeBilling.sandboxUserIds = [allowed.userId];
- const result = await claim(allowed, jws);
+ Config.storeBilling.sandboxSubscriptions = true;
+ const result = await claim(claimer, jws);
expect(result.purchase).toMatchObject({environment: 'sandbox', entitled: true});
- expect((await findUser(allowed.userId)).isPremium()).toBe(true);
- expect(fake.getTransaction('sandbox', originalTransactionId)?.appAccountToken).toBe(await accountToken(allowed));
+ expect((await findUser(claimer.userId)).isPremium()).toBe(true);
+ expect(fake.getTransaction('sandbox', originalTransactionId)?.appAccountToken).toBe(await accountToken(claimer));
expect(await service.listStorePurchases((await findUser(tester.userId)).id)).toHaveLength(0);
expect((await findUser(tester.userId)).isPremium()).toBe(false);
});
+ it('moves a sandbox purchase even when it is signed with another live account token', async () => {
+ const tester = await createTestAccount(harness);
+ const tokenHolder = await createTestAccount(harness);
+ const claimer = await createTestAccount(harness);
+ const originalTransactionId = seedSubscription({environment: 'sandbox', expiresDate: Date.now() + ms('1 day')});
+ await claim(
+ tester,
+ await signStoredTransaction('sandbox', originalTransactionId),
+ 403,
+ APIErrorCodes.STORE_PURCHASE_SANDBOX_NOT_ENTITLED,
+ );
+ fake.updateTransaction('sandbox', originalTransactionId, {appAccountToken: await accountToken(tokenHolder)});
+ Config.storeBilling.sandboxSubscriptions = true;
+ const result = await claim(claimer, await signStoredTransaction('sandbox', originalTransactionId));
+ expect(result.purchase).toMatchObject({environment: 'sandbox', entitled: true});
+ expect((await findUser(claimer.userId)).isPremium()).toBe(true);
+ expect(await service.listStorePurchases((await findUser(tester.userId)).id)).toHaveLength(0);
+ });
+
it('blocks a lifetime account from a subscription without granting anything', async () => {
const account = await createTestAccount(harness);
await setTestPremium(harness, account.token, account.userId, {premium_type: UserPremiumTypes.LIFETIME});
diff --git a/fluxer_api/src/api/store_billing/tests/StoreBillingConfig.test.ts b/fluxer_api/src/api/store_billing/tests/StoreBillingConfig.test.ts
index c09da1db7..b0638d130 100644
--- a/fluxer_api/src/api/store_billing/tests/StoreBillingConfig.test.ts
+++ b/fluxer_api/src/api/store_billing/tests/StoreBillingConfig.test.ts
@@ -60,17 +60,32 @@ describe('store billing config', () => {
expect(isAppStoreConfigured()).toBe(false);
});
- it('entitles sandbox purchases only for allowed users unless every user is allowed', () => {
+ it('entitles sandbox gifts only for allowed users unless every user is allowed', () => {
const allowed = createUserID(4242n);
const other = createUserID(4343n);
- expect(isSandboxEntitlementAllowed(allowed)).toBe(false);
+ const now = Date.now();
+ Config.storeBilling.sandboxSubscriptions = true;
+ expect(isSandboxEntitlementAllowed(allowed, 'gift', new Date(now), now)).toBe(false);
Config.storeBilling.sandboxUserIds = ['4242'];
- expect(isSandboxEntitlementAllowed(allowed)).toBe(true);
- expect(isSandboxEntitlementAllowed(other)).toBe(false);
+ expect(isSandboxEntitlementAllowed(allowed, 'gift', new Date(now), now)).toBe(true);
+ expect(isSandboxEntitlementAllowed(other, 'gift', new Date(now), now)).toBe(false);
Config.storeBilling.sandboxEntitlesAll = true;
- expect(isSandboxEntitlementAllowed(other)).toBe(true);
+ expect(isSandboxEntitlementAllowed(other, 'gift', new Date(now), now)).toBe(true);
+ });
+
+ it('entitles sandbox subscriptions for every account for seven days after each purchase', () => {
+ const user = createUserID(4242n);
+ const now = Date.now();
+ const day = 24 * 60 * 60 * 1000;
+ Config.storeBilling.sandboxSubscriptions = true;
+ expect(isSandboxEntitlementAllowed(user, 'subscription', new Date(now - 7 * day), now)).toBe(true);
+ expect(isSandboxEntitlementAllowed(user, 'subscription', new Date(now - 7 * day - 1), now)).toBe(false);
+ expect(isSandboxEntitlementAllowed(user, 'subscription', null, now)).toBe(false);
+
+ Config.storeBilling.sandboxSubscriptions = false;
+ expect(isSandboxEntitlementAllowed(user, 'subscription', new Date(now), now)).toBe(false);
});
});
diff --git a/fluxer_api/src/api/stripe/services/StripeDisputeWebhookHandler.ts b/fluxer_api/src/api/stripe/services/StripeDisputeWebhookHandler.ts
index 1aa803954..0e0bb5ad9 100644
--- a/fluxer_api/src/api/stripe/services/StripeDisputeWebhookHandler.ts
+++ b/fluxer_api/src/api/stripe/services/StripeDisputeWebhookHandler.ts
@@ -33,7 +33,7 @@ import type {StripeGiftReversalHandler} from '@app/api/stripe/services/StripeGif
import type {StripePaymentFraudService} from '@app/api/stripe/services/StripePaymentFraudService';
import type {StripeSubscriptionService} from '@app/api/stripe/services/StripeSubscriptionService';
import type {UserRepository} from '@app/api/user/repositories/UserRepository';
-import {clearPendingDeletion} from '@app/api/user/services/PendingDeletionCoordinator';
+import {clearPendingDeletion, resetTiedBulkMessageDeletion} from '@app/api/user/services/PendingDeletionCoordinator';
import {DeletionReasons} from '@fluxer/constants/src/Core';
import {UserFlags} from '@fluxer/constants/src/UserConstants';
import {StripeError} from '@fluxer/errors/src/domains/payment/StripeError';
@@ -365,6 +365,7 @@ export class StripeDisputeWebhookHandler {
deletion_reason_code: null,
deletion_public_reason: null,
deletion_audit_log_reason: null,
+ ...resetTiedBulkMessageDeletion(user),
});
await followOperatorPassWallStanding(user, updatedUser);
await clearPendingDeletion({userId, deletionQueue: this.kvDeletionQueue});
diff --git a/fluxer_api/src/api/test/Setup.ts b/fluxer_api/src/api/test/Setup.ts
index 8b8ef82c7..1eef1a737 100644
--- a/fluxer_api/src/api/test/Setup.ts
+++ b/fluxer_api/src/api/test/Setup.ts
@@ -183,6 +183,7 @@ const testApiConfig: APIConfig = {
storeBilling: {
sandboxUserIds: [],
sandboxEntitlesAll: false,
+ sandboxSubscriptions: false,
},
};
testApiConfig.dev.relaxRegistrationRateLimits = true;
diff --git a/fluxer_api/src/api/user/DateOfBirth.ts b/fluxer_api/src/api/user/DateOfBirth.ts
index 1c1c3b023..8c332d30d 100644
--- a/fluxer_api/src/api/user/DateOfBirth.ts
+++ b/fluxer_api/src/api/user/DateOfBirth.ts
@@ -68,7 +68,12 @@ function settingsForAge(settings: UserSettings, adult: boolean): UserSettings |
const [from, to] = adult ? [teen, adultDefaults] : [adultDefaults, teen];
const row = settings.toRow();
let changed = false;
- for (const key of ['explicit_content_filter', 'friend_source_flags', 'sensitive_content_friend_dm_filter'] as const) {
+ for (const key of [
+ 'explicit_content_filter',
+ 'friend_source_flags',
+ 'sensitive_content_friend_dm_filter',
+ 'default_guilds_restricted',
+ ] as const) {
if (row[key] === from[key] && row[key] !== to[key]) {
Object.assign(row, {[key]: to[key]});
changed = true;
@@ -85,6 +90,10 @@ function settingsForAge(settings: UserSettings, adult: boolean): UserSettings |
changed = true;
}
}
+ if (row.allow_mature_content_on_ios === true) {
+ row.allow_mature_content_on_ios = false;
+ changed = true;
+ }
}
return changed ? new UserSettings(row) : null;
}
diff --git a/fluxer_api/src/api/user/UserMappers.ts b/fluxer_api/src/api/user/UserMappers.ts
index f5c222964..b548bd853 100644
--- a/fluxer_api/src/api/user/UserMappers.ts
+++ b/fluxer_api/src/api/user/UserMappers.ts
@@ -359,6 +359,7 @@ export function mapUserSettingsToResponse(params: {settings: UserSettings}): Use
sensitive_content_friend_dm_filter: settings.sensitiveContentFriendDmFilter,
sensitive_content_non_friend_dm_filter: settings.sensitiveContentNonFriendDmFilter,
sensitive_content_guild_filter: settings.sensitiveContentGuildFilter as 0 | 1,
+ allow_mature_content_on_ios: settings.allowMatureContentOnIos,
suppress_unprivileged_self_mentions: settings.suppressUnprivilegedSelfMentions,
suppress_unprivileged_self_mentions_bypass_user_ids: sortUserIds(
settings.suppressUnprivilegedSelfMentionBypassUserIds,
diff --git a/fluxer_api/src/api/user/controllers/UserAccountController.ts b/fluxer_api/src/api/user/controllers/UserAccountController.ts
index 8bc354d17..2e73f907e 100644
--- a/fluxer_api/src/api/user/controllers/UserAccountController.ts
+++ b/fluxer_api/src/api/user/controllers/UserAccountController.ts
@@ -69,6 +69,7 @@ import {
RegisterMobileDeviceRequest,
SubscriptionIdParam,
UnregisterMobileDeviceRequest,
+ UserAccountDeleteRequest,
UserGuildSettingsUpdateRequest,
UserNoteUpdateRequest,
UserPasswordUpdateRequest,
@@ -91,6 +92,7 @@ import {
PushSubscribeResponse,
PushSubscriptionsListResponse,
RegisterMobileDeviceResponse,
+ UserAccountDeleteResponse,
UserGuildSettingsResponse,
UserNoteResponse,
UserNotesRecordResponse,
@@ -951,24 +953,27 @@ export function UserAccountController(app: HonoApp) {
LoginRequired,
DefaultUserOnly,
SudoModeMiddleware,
- Validator('json', SudoVerificationSchema),
+ Validator('json', UserAccountDeleteRequest),
OpenAPI({
operationId: 'delete_current_user_account',
summary: 'Delete current user account',
- responseSchema: null,
- statusCode: 204,
+ responseSchema: UserAccountDeleteResponse,
+ statusCode: 200,
security: ['bearerToken', 'sessionToken'],
tags: ['Users'],
description:
- "Permanently deletes the current user's account and all associated data. Requires sudo mode verification. This action is irreversible and will remove all user data, messages, and connections.",
+ "Schedules the deletion of the current user's account and personal data after the instance's grace period, or right away when immediate is true. Signing in before the deletion runs cancels it. Messages the account sent are anonymized unless delete_messages is true, in which case they are deleted with the account. Requires sudo mode verification. The response has the time the deletion runs.",
}),
async (ctx) => {
const userService = ctx.get('userService');
const user = ctx.get('user');
const body = ctx.req.valid('json');
await requireSudoMode(ctx, user, body);
- await userService.accountService.lifecycleService.selfDelete(user.id);
- return ctx.body(null, 204);
+ const pendingDeletionAt = await userService.accountService.lifecycleService.selfDelete(user.id, {
+ immediate: body.immediate === true,
+ deleteMessages: body.delete_messages === true,
+ });
+ return ctx.json({pending_deletion_at: pendingDeletionAt.toISOString()}, 200);
},
);
app.post(
diff --git a/fluxer_api/src/api/user/repositories/account/UserAccountRepository.ts b/fluxer_api/src/api/user/repositories/account/UserAccountRepository.ts
index cd6d09e2a..9a8cc9f48 100644
--- a/fluxer_api/src/api/user/repositories/account/UserAccountRepository.ts
+++ b/fluxer_api/src/api/user/repositories/account/UserAccountRepository.ts
@@ -38,6 +38,9 @@ export interface UserDeletionScheduleUpdate {
temp_banned_until?: Date | null;
enforcement_decision_id?: bigint | null;
first_refund_at?: Date | null;
+ pending_bulk_message_deletion_at?: Date | null;
+ pending_bulk_message_deletion_channel_count?: number | null;
+ pending_bulk_message_deletion_message_count?: number | null;
}
const USER_FLAGS_WRITE_ATTEMPTS = 3;
diff --git a/fluxer_api/src/api/user/services/PendingDeletionCoordinator.ts b/fluxer_api/src/api/user/services/PendingDeletionCoordinator.ts
index aaf253b1f..84b9820cb 100644
--- a/fluxer_api/src/api/user/services/PendingDeletionCoordinator.ts
+++ b/fluxer_api/src/api/user/services/PendingDeletionCoordinator.ts
@@ -34,6 +34,17 @@ interface PendingDeletionEligibilityUserLike {
flags: bigint;
}
+interface TiedBulkMessageDeletionUserLike {
+ pendingDeletionAt: Date | null;
+ pendingBulkMessageDeletionAt: Date | null;
+}
+
+interface TiedBulkMessageDeletionReset {
+ pending_bulk_message_deletion_at?: null;
+ pending_bulk_message_deletion_channel_count?: null;
+ pending_bulk_message_deletion_message_count?: null;
+}
+
export async function reschedulePendingDeletion({
userId,
currentPendingDeletionAt,
@@ -74,3 +85,17 @@ export function isPendingDeletionBlocked(user: PendingDeletionEligibilityUserLik
}
return (user.flags & UserFlags.APP_STORE_REVIEWER) !== 0n;
}
+
+export function resetTiedBulkMessageDeletion(user: TiedBulkMessageDeletionUserLike): TiedBulkMessageDeletionReset {
+ if (
+ user.pendingBulkMessageDeletionAt === null ||
+ user.pendingBulkMessageDeletionAt.getTime() !== user.pendingDeletionAt?.getTime()
+ ) {
+ return {};
+ }
+ return {
+ pending_bulk_message_deletion_at: null,
+ pending_bulk_message_deletion_channel_count: null,
+ pending_bulk_message_deletion_message_count: null,
+ };
+}
diff --git a/fluxer_api/src/api/user/services/UserAccountLifecycleService.ts b/fluxer_api/src/api/user/services/UserAccountLifecycleService.ts
index 68d97a01a..50e62dd0a 100644
--- a/fluxer_api/src/api/user/services/UserAccountLifecycleService.ts
+++ b/fluxer_api/src/api/user/services/UserAccountLifecycleService.ts
@@ -11,7 +11,7 @@ import {
type PartialUserChangePropagationDeps,
propagateUserUpdate,
} from '@app/api/user/services/PartialUserChangePropagation';
-import {reschedulePendingDeletion} from '@app/api/user/services/PendingDeletionCoordinator';
+import {isPendingDeletionBlocked, reschedulePendingDeletion} from '@app/api/user/services/PendingDeletionCoordinator';
import {DeletionReasons} from '@fluxer/constants/src/Core';
import {UserFlags} from '@fluxer/constants/src/UserConstants';
import {UserOwnsGuildsError} from '@fluxer/errors/src/domains/guild/UserOwnsGuildsError';
@@ -27,6 +27,11 @@ interface UserAccountLifecycleServiceDeps {
kvDeletionQueue: KVAccountDeletionQueueService;
}
+interface SelfDeleteOptions {
+ immediate: boolean;
+ deleteMessages: boolean;
+}
+
export class UserAccountLifecycleService {
constructor(private readonly deps: UserAccountLifecycleServiceDeps) {}
@@ -42,20 +47,27 @@ export class UserAccountLifecycleService {
}
}
- async selfDelete(userId: UserID): Promise<void> {
+ async selfDelete(userId: UserID, options: SelfDeleteOptions): Promise<Date> {
const user = await this.deps.userAccountRepository.findUniqueAssert(userId);
const ownedGuildIds = await this.deps.guildRepository.listOwnedGuildIds(userId);
if (ownedGuildIds.length > 0) {
throw new UserOwnsGuildsError();
}
- const gracePeriodMs = Config.deletionGracePeriodHours * ms('1 hour');
- const pendingDeletionAt = new Date(Date.now() + gracePeriodMs);
+ const now = Date.now();
+ const pendingDeletionAt = new Date(options.immediate ? now : now + Config.deletionGracePeriodHours * ms('1 hour'));
const updatedUser = await this.deps.userAccountRepository.updateDeletionSchedule(user, {
flags: user.flags | UserFlags.SELF_DELETED,
pending_deletion_at: pendingDeletionAt,
deletion_reason_code: DeletionReasons.USER_REQUESTED,
deletion_scheduled_by: userId,
- deletion_scheduled_at: new Date(),
+ deletion_scheduled_at: new Date(now),
+ ...(options.deleteMessages && user.pendingBulkMessageDeletionAt === null && !isPendingDeletionBlocked(user)
+ ? {
+ pending_bulk_message_deletion_at: pendingDeletionAt,
+ pending_bulk_message_deletion_channel_count: null,
+ pending_bulk_message_deletion_message_count: null,
+ }
+ : {}),
});
await reschedulePendingDeletion({
userId,
@@ -65,7 +77,7 @@ export class UserAccountLifecycleService {
deletionQueue: this.deps.kvDeletionQueue,
});
await revokeAllAuthSessions(this.deps.apiContext.services, userId);
- if (user.email) {
+ if (user.email && !options.immediate) {
await this.deps.emailService.send(
'self_deletion_scheduled',
user.email,
@@ -76,5 +88,6 @@ export class UserAccountLifecycleService {
if (updatedUser) {
await propagateUserUpdate(this.deps.userUpdateDeps, user, updatedUser);
}
+ return pendingDeletionAt;
}
}
diff --git a/fluxer_api/src/api/user/services/UserAccountSettingsService.ts b/fluxer_api/src/api/user/services/UserAccountSettingsService.ts
index f6ca433e0..bcf6a7e48 100644
--- a/fluxer_api/src/api/user/services/UserAccountSettingsService.ts
+++ b/fluxer_api/src/api/user/services/UserAccountSettingsService.ts
@@ -217,6 +217,9 @@ export class UserAccountSettingsService {
if (data.sensitive_content_guild_filter !== undefined) {
updatedRowData.sensitive_content_guild_filter = data.sensitive_content_guild_filter;
}
+ if (data.allow_mature_content_on_ios !== undefined) {
+ updatedRowData.allow_mature_content_on_ios = data.allow_mature_content_on_ios;
+ }
} else {
if (data.sensitive_content_friend_dm_filter !== undefined) {
const allowed =
@@ -251,6 +254,16 @@ export class UserAccountSettingsService {
'Non-adult users cannot modify the guild content filter',
);
}
+ if (data.allow_mature_content_on_ios === true) {
+ throw ValidationError.fromPath(
+ 'allow_mature_content_on_ios',
+ 'AGE_RESTRICTED',
+ 'Non-adult users cannot allow 18+ content on iOS',
+ );
+ }
+ if (data.allow_mature_content_on_ios === false) {
+ updatedRowData.allow_mature_content_on_ios = false;
+ }
}
if (isStaffUser) {
if (data.suppress_unprivileged_self_mentions !== undefined) {
diff --git a/fluxer_api/src/api/user/services/UserDeletionService.ts b/fluxer_api/src/api/user/services/UserDeletionService.ts
index 6458b6f5c..e310f1e5d 100644
--- a/fluxer_api/src/api/user/services/UserDeletionService.ts
+++ b/fluxer_api/src/api/user/services/UserDeletionService.ts
@@ -44,8 +44,10 @@ import {
} from '@app/api/user/UserHelpers';
import type {WorkerTaskName} from '@app/api/worker/WorkerLaneConfig';
import {ChannelTypes, MessageTypes} from '@fluxer/constants/src/ChannelConstants';
+import {DeletionReasons} from '@fluxer/constants/src/Core';
import * as BucketUtils from '@fluxer/snowflake/src/SnowflakeBuckets';
import type {ICacheService} from '@pkgs/cache/src/ICacheService';
+import type {IEmailService} from '@pkgs/email/src/IEmailService';
import type {IWorkerService} from '@pkgs/worker/src/contracts/IWorkerService';
import {ms} from 'itty-time';
import type Stripe from 'stripe';
@@ -73,6 +75,7 @@ interface UserDeletionDependencies {
storeEntitlementService: StoreEntitlementService;
adminRepository: AdminRepository;
cacheService: ICacheService;
+ emailService: IEmailService;
}
async function releaseSsoIdentitiesOf(user: User, deletionReasonCode: number): Promise<void> {
@@ -215,6 +218,10 @@ export async function processUserDeletion(
Logger.info({userId, pendingDeletionAt}, 'Account deletion schedule is no longer eligible');
return;
}
+ const completionNotice =
+ deletionReasonCode === DeletionReasons.USER_REQUESTED && user.email
+ ? {email: user.email, locale: user.locale}
+ : null;
await removeNetworkBlocksOf(userId, deps);
await releaseSsoIdentitiesOf(user, deletionReasonCode);
await withdrawPendingRegistrationOf(user);
@@ -496,6 +503,13 @@ export async function processUserDeletion(
await userCacheService.setUserPartialResponseFromUser(anonymisedUser);
await userRepository.completeDeletion(anonymisedUser);
+ if (completionNotice) {
+ await deps.emailService
+ .send('account_deletion_completed', completionNotice.email, {}, completionNotice.locale)
+ .catch((error: unknown) => {
+ Logger.error({userId, error}, 'Failed to send the account deletion confirmation email');
+ });
+ }
await emitActivity('account_deleted', userId.toString(), {user_id: userId.toString()}, null, userId.toString());
Logger.debug({userId, deletionReasonCode}, 'User account anonymization completed successfully');
}
diff --git a/fluxer_api/src/api/user/services/UserRelationshipService.ts b/fluxer_api/src/api/user/services/UserRelationshipService.ts
index c9c1056e5..f51f282bc 100644
--- a/fluxer_api/src/api/user/services/UserRelationshipService.ts
+++ b/fluxer_api/src/api/user/services/UserRelationshipService.ts
@@ -571,9 +571,6 @@ export class UserRelationshipService {
if (targetUser.isBot && !targetIsFriendlyBot) {
throw new FriendRequestBlockedError();
}
- if (targetUser.flags & UserFlags.APP_STORE_REVIEWER) {
- throw new FriendRequestBlockedError();
- }
const requesterBlockedTarget = await this.userRepository.getRelationship(
userId,
targetId,
diff --git a/fluxer_api/src/api/user/tests/AccountClosureSessions.test.ts b/fluxer_api/src/api/user/tests/AccountClosureSessions.test.ts
index d23e1823c..101418c26 100644
--- a/fluxer_api/src/api/user/tests/AccountClosureSessions.test.ts
+++ b/fluxer_api/src/api/user/tests/AccountClosureSessions.test.ts
@@ -329,7 +329,7 @@ describe('Account closure and credentials', () => {
smtp.release();
const response = await deletionRequest;
const respondedAt = Date.now();
- expect(response.status).toBe(HTTP_STATUS.NO_CONTENT);
+ expect(response.status).toBe(HTTP_STATUS.OK);
expect(smtp.delivered).toEqual([]);
expect(await new AuthSessionRepository().listAuthSessions(userId)).toEqual([]);
const user = await storedUser(userId);
diff --git a/fluxer_api/src/api/user/tests/AccountSelfDeleteOptions.test.ts b/fluxer_api/src/api/user/tests/AccountSelfDeleteOptions.test.ts
new file mode 100644
index 000000000..dcf771a26
--- /dev/null
+++ b/fluxer_api/src/api/user/tests/AccountSelfDeleteOptions.test.ts
@@ -0,0 +1,126 @@
+// SPDX-License-Identifier: AGPL-3.0-or-later
+
+import {
+ clearTestEmails,
+ createTestAccount,
+ findLastTestEmail,
+ listTestEmails,
+ loginAccount,
+ type TestAccount,
+} from '@app/api/auth/tests/AuthTestUtils';
+import {createUserID} from '@app/api/BrandedTypes';
+import {acceptInvite, createChannelInvite, createGuild} from '@app/api/guild/tests/GuildTestUtils';
+import {ensureSessionStarted, sendMessage} from '@app/api/message/tests/MessageTestUtils';
+import {getUserRepository} from '@app/api/middleware/ServiceSingletons';
+import {type ApiTestHarness, createApiTestHarness} from '@app/api/test/ApiTestHarness';
+import {HTTP_STATUS} from '@app/api/test/TestConstants';
+import {createBuilder, createBuilderWithoutAuth} from '@app/api/test/TestRequestBuilder';
+import {
+ expectDataExists,
+ setPendingDeletionAt,
+ triggerDeletionWorker,
+ waitForDeletionCompletion,
+} from '@app/api/user/tests/UserTestUtils';
+import {UserFlags} from '@fluxer/constants/src/UserConstants';
+import type {UserAccountDeleteResponse} from '@fluxer/schema/src/domains/user/UserResponseSchemas';
+import {afterEach, beforeEach, describe, expect, test} from 'vitest';
+
+describe('Self-requested account deletion options', () => {
+ let harness: ApiTestHarness;
+ beforeEach(async () => {
+ harness = await createApiTestHarness();
+ await clearTestEmails(harness);
+ });
+ afterEach(async () => {
+ await harness?.shutdown();
+ });
+
+ async function readUser(account: TestAccount) {
+ return (await getUserRepository().findUnique(createUserID(BigInt(account.userId))))!;
+ }
+
+ async function sendMessagesInAnotherCommunity(account: TestAccount, count: number): Promise<void> {
+ const owner = await createTestAccount(harness);
+ const guild = await createGuild(harness, owner.token, 'Deletion options');
+ const channelId = guild.system_channel_id!;
+ const invite = await createChannelInvite(harness, owner.token, channelId);
+ await acceptInvite(harness, account.token, invite.code);
+ await ensureSessionStarted(harness, account.token);
+ for (let i = 0; i < count; i++) {
+ await sendMessage(harness, account.token, channelId, `Message ${i + 1}`);
+ }
+ }
+
+ async function countMessages(account: TestAccount): Promise<number> {
+ const json = await createBuilderWithoutAuth<{count: number}>(harness)
+ .get(`/test/users/${account.userId}/messages/count`)
+ .expect(HTTP_STATUS.OK)
+ .execute();
+ return json.count;
+ }
+
+ async function requestDeletion(
+ account: TestAccount,
+ options: {immediate?: boolean; delete_messages?: boolean},
+ ): Promise<UserAccountDeleteResponse> {
+ return createBuilder<UserAccountDeleteResponse>(harness, account.token)
+ .post('/users/@me/delete')
+ .body({password: account.password, ...options})
+ .expect(HTTP_STATUS.OK)
+ .execute();
+ }
+
+ test('delete_messages deletes the messages with the account', async () => {
+ const account = await createTestAccount(harness);
+ await sendMessagesInAnotherCommunity(account, 3);
+ expect(await countMessages(account)).toBeGreaterThanOrEqual(3);
+ await requestDeletion(account, {delete_messages: true});
+ await setPendingDeletionAt(harness, account.userId, new Date(Date.now() - 60_000));
+ await triggerDeletionWorker(harness);
+ await waitForDeletionCompletion(harness, account.userId);
+ expect(await countMessages(account)).toBe(0);
+ }, 60000);
+
+ test('signing in cancels the message deletion together with the account deletion', async () => {
+ const account = await createTestAccount(harness);
+ await sendMessagesInAnotherCommunity(account, 2);
+ const sent = await countMessages(account);
+ const response = await requestDeletion(account, {delete_messages: true});
+ const scheduled = await readUser(account);
+ expect(scheduled.pendingBulkMessageDeletionAt?.toISOString()).toBe(response.pending_deletion_at);
+ await loginAccount(harness, account);
+ const reactivated = await readUser(account);
+ expect(reactivated.flags & UserFlags.SELF_DELETED).toBe(0n);
+ expect(reactivated.pendingDeletionAt).toBeNull();
+ expect(reactivated.pendingBulkMessageDeletionAt).toBeNull();
+ expect(await countMessages(account)).toBe(sent);
+ }, 60000);
+
+ test('immediate deletes without the scheduled email and confirms when done', async () => {
+ const account = await createTestAccount(harness);
+ const requestedAt = Date.now();
+ const response = await requestDeletion(account, {immediate: true});
+ expect(Math.abs(Date.parse(response.pending_deletion_at) - requestedAt)).toBeLessThan(5_000);
+ const before = await listTestEmails(harness, {recipient: account.email});
+ expect(findLastTestEmail(before, 'self_deletion_scheduled')).toBeNull();
+ await triggerDeletionWorker(harness);
+ await waitForDeletionCompletion(harness, account.userId);
+ expect((await expectDataExists(harness, account.userId)).hasDeletedFlag).toBe(true);
+ const after = await listTestEmails(harness, {recipient: account.email});
+ expect(after.filter((email) => email.type === 'account_deletion_completed')).toHaveLength(1);
+ }, 60000);
+
+ test('immediate never deletes an App Store reviewer account', async () => {
+ const account = await createTestAccount(harness);
+ await createBuilderWithoutAuth(harness)
+ .post(`/test/users/${account.userId}/security-flags`)
+ .body({set_flags: ['APP_STORE_REVIEWER']})
+ .execute();
+ await requestDeletion(account, {immediate: true, delete_messages: true});
+ expect((await readUser(account)).pendingBulkMessageDeletionAt).toBeNull();
+ await triggerDeletionWorker(harness);
+ expect((await expectDataExists(harness, account.userId)).hasDeletedFlag).toBe(false);
+ const login = await loginAccount(harness, account);
+ await createBuilder(harness, login.token).get('/users/@me').expect(HTTP_STATUS.OK).execute();
+ }, 60000);
+});
diff --git a/fluxer_api/src/api/user/tests/FavoriteMemeOperations.test.ts b/fluxer_api/src/api/user/tests/FavoriteMemeOperations.test.ts
index d3c24c6cd..6cf1c9d3e 100644
--- a/fluxer_api/src/api/user/tests/FavoriteMemeOperations.test.ts
+++ b/fluxer_api/src/api/user/tests/FavoriteMemeOperations.test.ts
@@ -1,11 +1,17 @@
// SPDX-License-Identifier: AGPL-3.0-or-later
import {AttachmentDecayRepository} from '@app/api/attachment/AttachmentDecayRepository';
-import {createAttachmentID} from '@app/api/BrandedTypes';
+import {createAttachmentID, createMemeID, createUserID} from '@app/api/BrandedTypes';
+import {Config} from '@app/api/Config';
import {
createTestAccountForAttachmentTests,
+ loadFixture,
+ sendMessageWithAttachments,
setupTestGuildAndChannel,
} from '@app/api/channel/tests/AttachmentTestUtils';
+import {FavoriteMemeRepository} from '@app/api/favorite_meme/FavoriteMemeRepository';
+import {getMessages} from '@app/api/message/tests/MessageTestUtils';
+import {fileShaCache} from '@app/api/middleware/FileShaCache';
import {type ApiTestHarness, createApiTestHarness} from '@app/api/test/ApiTestHarness';
import {HTTP_STATUS} from '@app/api/test/TestConstants';
import {createBuilder} from '@app/api/test/TestRequestBuilder';
@@ -14,6 +20,8 @@ import {
createMessageWithImageAttachment,
} from '@app/api/user/tests/FavoriteMemeTestUtils';
import {getExpiryBucket} from '@app/api/utils/AttachmentDecay';
+import {APIErrorCodes} from '@fluxer/constants/src/ApiErrorCodes';
+import {MessageAttachmentFlags} from '@fluxer/constants/src/ChannelConstants';
import {afterEach, beforeEach, describe, expect, test} from 'vitest';
interface MessageWithDecayAttachment {
@@ -102,4 +110,55 @@ describe('Favorite Meme Operations', () => {
expect(repairedRow?.channel_id.toString()).toBe(channel.id);
expect(repairedRow?.message_id.toString()).toBe(sent.id);
});
+ test('a favorite meme goes through the same content checks as an upload', async () => {
+ const account = await createTestAccountForAttachmentTests(harness);
+ const {channel} = await setupTestGuildAndChannel(harness, account);
+ const message = await createMessageWithImageAttachment(harness, account.token, channel.id);
+ const meme = await createFavoriteMemeFromMessage(harness, account.token, channel.id, message.id, {
+ attachment_id: message.attachments[0].id,
+ name: 'Banned Meme',
+ });
+ const stored = await new FavoriteMemeRepository().findById(
+ createUserID(BigInt(account.userId)),
+ createMemeID(BigInt(meme.id)),
+ );
+ expect(stored).not.toBeNull();
+ const bannedSha =
+ stored!.contentHash ??
+ (await harness.storageService.computeObjectSha256(Config.s3.buckets.cdn, stored!.storageKey));
+ fileShaCache.add(bannedSha);
+ try {
+ await createBuilder(harness, account.token)
+ .post(`/channels/${channel.id}/messages`)
+ .body({favorite_meme_id: meme.id})
+ .expect(403, APIErrorCodes.CONTENT_BLOCKED)
+ .execute();
+ } finally {
+ fileShaCache.remove(bannedSha);
+ }
+ const messages = await getMessages(harness, account.token, channel.id);
+ expect(messages.map((entry) => entry.id)).toEqual([message.id]);
+ });
+ test('an explicit attachment stays flagged when saved and sent again', async () => {
+ const account = await createTestAccountForAttachmentTests(harness);
+ const {channel} = await setupTestGuildAndChannel(harness, account);
+ const {json} = await sendMessageWithAttachments(
+ harness,
+ account.token,
+ channel.id,
+ {attachments: [{id: 0, filename: 'yeah.png', flags: MessageAttachmentFlags.CONTAINS_EXPLICIT_MEDIA}]},
+ [{index: 0, filename: 'yeah.png', data: loadFixture('yeah.png')}],
+ );
+ const meme = await createFavoriteMemeFromMessage(harness, account.token, channel.id, json.id, {
+ attachment_id: json.attachments![0].id,
+ name: 'Explicit Meme',
+ });
+ expect(meme.nsfw).toBe(true);
+ const sent = await createBuilder<{attachments: Array<{flags: number}>}>(harness, account.token)
+ .post(`/channels/${channel.id}/messages`)
+ .body({favorite_meme_id: meme.id})
+ .expect(HTTP_STATUS.OK)
+ .execute();
+ expect(sent.attachments[0].flags & MessageAttachmentFlags.CONTAINS_EXPLICIT_MEDIA).not.toBe(0);
+ });
});
diff --git a/fluxer_api/src/api/user/tests/UserSettingsSensitiveContentFilter.test.ts b/fluxer_api/src/api/user/tests/UserSettingsSensitiveContentFilter.test.ts
index 83c7564b4..868c72081 100644
--- a/fluxer_api/src/api/user/tests/UserSettingsSensitiveContentFilter.test.ts
+++ b/fluxer_api/src/api/user/tests/UserSettingsSensitiveContentFilter.test.ts
@@ -1,7 +1,8 @@
// SPDX-License-Identifier: AGPL-3.0-or-later
import {createTestAccount} from '@app/api/auth/tests/AuthTestUtils';
-import {getInstanceConfigRepository} from '@app/api/middleware/ServiceSingletons';
+import {createUserID} from '@app/api/BrandedTypes';
+import {getInstanceConfigRepository, getUserRepository} from '@app/api/middleware/ServiceSingletons';
import {type ApiTestHarness, createApiTestHarness} from '@app/api/test/ApiTestHarness';
import {HTTP_STATUS} from '@app/api/test/TestConstants';
import {createBuilder} from '@app/api/test/TestRequestBuilder';
@@ -29,6 +30,7 @@ describe('User Settings - Sensitive Content Filters', () => {
expect(json.sensitive_content_friend_dm_filter).toBe(SensitiveMediaFilterLevel.SHOW);
expect(json.sensitive_content_non_friend_dm_filter).toBe(SensitiveMediaFilterLevel.BLOCK);
expect(json.sensitive_content_guild_filter).toBe(SensitiveMediaFilterLevel.BLUR);
+ expect(json.default_guilds_restricted).toBe(false);
});
test('teen account has correct defaults', async () => {
const account = await createTestAccount(harness, {dateOfBirth: '2010-01-01'});
@@ -36,6 +38,43 @@ describe('User Settings - Sensitive Content Filters', () => {
expect(json.sensitive_content_friend_dm_filter).toBe(SensitiveMediaFilterLevel.BLUR);
expect(json.sensitive_content_non_friend_dm_filter).toBe(SensitiveMediaFilterLevel.BLOCK);
expect(json.sensitive_content_guild_filter).toBe(SensitiveMediaFilterLevel.BLUR);
+ expect(json.default_guilds_restricted).toBe(true);
+ });
+ });
+ describe('allow_mature_content_on_ios', () => {
+ test('adult can turn on allow_mature_content_on_ios and it defaults to false', async () => {
+ const account = await createTestAccount(harness, {dateOfBirth: '2000-01-01'});
+ const {json} = await fetchUserSettings(harness, account.token);
+ expect(json.allow_mature_content_on_ios).toBe(false);
+ const {json: updated} = await updateUserSettings(harness, account.token, {allow_mature_content_on_ios: true});
+ expect(updated.allow_mature_content_on_ios).toBe(true);
+ });
+ test('teen gets AGE_RESTRICTED for allow_mature_content_on_ios true', async () => {
+ const account = await createTestAccount(harness, {dateOfBirth: '2010-01-01'});
+ const response = await createBuilder<{
+ code: string;
+ errors: Array<{path: string; code: string}>;
+ }>(harness, account.token)
+ .patch('/users/@me/settings')
+ .body({allow_mature_content_on_ios: true})
+ .expect(HTTP_STATUS.BAD_REQUEST)
+ .execute();
+ expect(response.errors[0]?.path).toBe('allow_mature_content_on_ios');
+ expect(response.errors[0]?.code).toBe(ValidationErrorCodes.AGE_RESTRICTED);
+ });
+ test('setting a teen date of birth turns allow_mature_content_on_ios off', async () => {
+ const account = await createTestAccount(harness, {dateOfBirth: '2000-01-01'});
+ await updateUserSettings(harness, account.token, {allow_mature_content_on_ios: true});
+ const user = await getUserRepository().findUniqueAssert(createUserID(BigInt(account.userId)));
+ await getUserRepository().patchUpsert(user.id, {date_of_birth: null}, user.toRow());
+ const teenBirthday = new Date();
+ teenBirthday.setUTCFullYear(teenBirthday.getUTCFullYear() - 15);
+ await createBuilder(harness, account.token)
+ .put('/users/@me/date-of-birth')
+ .body({date_of_birth: teenBirthday.toISOString().slice(0, 10)})
+ .execute();
+ const {json} = await fetchUserSettings(harness, account.token);
+ expect(json.allow_mature_content_on_ios).toBe(false);
});
});
describe('validation', () => {
diff --git a/fluxer_api/src/api/user/tests/UserTestUtils.ts b/fluxer_api/src/api/user/tests/UserTestUtils.ts
index 7b33ec701..0e8b50aa5 100644
--- a/fluxer_api/src/api/user/tests/UserTestUtils.ts
+++ b/fluxer_api/src/api/user/tests/UserTestUtils.ts
@@ -122,7 +122,7 @@ export async function fetchUserSettings(
}
export async function deleteAccount(harness: ApiTestHarness, token: string, password: string): Promise<void> {
- await createBuilder<void>(harness, token).post('/users/@me/delete').body({password}).expect(204).execute();
+ await createBuilder<void>(harness, token).post('/users/@me/delete').body({password}).expect(200).execute();
}
export async function expectDataExists(
diff --git a/fluxer_api/src/api/utils/EmojiUtils.ts b/fluxer_api/src/api/utils/EmojiUtils.ts
index 66bcd40b0..070ac8c1f 100644
--- a/fluxer_api/src/api/utils/EmojiUtils.ts
+++ b/fluxer_api/src/api/utils/EmojiUtils.ts
@@ -6,11 +6,13 @@ import type {GuildRepository} from '@app/api/guild/repositories/GuildRepository'
import type {LimitConfigService} from '@app/api/limits/LimitConfigService';
import {resolveLimitSafe} from '@app/api/limits/LimitConfigUtils';
import {createLimitMatchContext} from '@app/api/limits/LimitMatchContextBuilder';
+import type {Guild} from '@app/api/models/Guild';
import type {GuildEmoji} from '@app/api/models/GuildEmoji';
import type {UserRepository} from '@app/api/user/repositories/UserRepository';
import {Permissions} from '@fluxer/constants/src/ChannelConstants';
+import {GuildNSFWLevel} from '@fluxer/constants/src/GuildConstants';
-type EmojiGuildRepository = Pick<GuildRepository, 'getEmoji' | 'getEmojiById'>;
+type EmojiGuildRepository = Pick<GuildRepository, 'getEmoji' | 'getEmojiById' | 'findUnique'>;
type EmojiUserRepository = Pick<UserRepository, 'findUnique'>;
const CUSTOM_EMOJI_MARKDOWN_REGEX = /<(a)?:([^:]+):(\d+)>/g;
@@ -108,6 +110,17 @@ function collectEmojiMatches(content: string, isInEscapedContext: (index: number
return matches;
}
+function isAgeRestrictedGuild(guild: Guild | null): boolean {
+ return guild != null && (guild.nsfw || guild.nsfwLevel === GuildNSFWLevel.AGE_RESTRICTED);
+}
+
+export async function isExpressionSourceAgeRestricted(
+ guildRepository: Pick<GuildRepository, 'findUnique'>,
+ sourceGuildId: GuildID,
+): Promise<boolean> {
+ return isAgeRestrictedGuild(await guildRepository.findUnique(sourceGuildId));
+}
+
export async function checkUserGlobalExpressions(
userId: UserID,
userRepository: EmojiUserRepository,
@@ -122,6 +135,7 @@ interface EmojiLookupResult {
emojiId: EmojiID;
guildEmoji: GuildEmoji | null;
globalEmoji: GuildEmoji | null;
+ sourceAgeRestricted: boolean;
}
async function batchFetchEmojis(
@@ -136,7 +150,11 @@ async function batchFetchEmojis(
guildId ? guildRepository.getEmoji(emojiId, guildId) : Promise.resolve(null),
guildRepository.getEmojiById(emojiId),
]);
- return {emojiId, guildEmoji, globalEmoji};
+ const sourceAgeRestricted =
+ guildEmoji === null && globalEmoji !== null
+ ? await isExpressionSourceAgeRestricted(guildRepository, globalEmoji.guildId)
+ : false;
+ return {emojiId, guildEmoji, globalEmoji, sourceAgeRestricted};
}),
);
const lookupMap = new Map<EmojiID, EmojiLookupResult>();
@@ -191,6 +209,7 @@ async function shouldReplaceEmoji(params: {
canUseExternalEmojis: boolean | null;
}): Promise<boolean> {
const {lookup, guildId, isWebhook, hasGlobalExpressions, canUseExternalEmojis} = params;
+ if (lookup.sourceAgeRestricted) return true;
if (!guildId) {
if (!lookup.globalEmoji) return true;
if (!isWebhook && hasGlobalExpressions === 0) return true;
diff --git a/fluxer_api/src/api/utils/SessionClientIdentity.ts b/fluxer_api/src/api/utils/SessionClientIdentity.ts
index 84f85ae61..e0320cf21 100644
--- a/fluxer_api/src/api/utils/SessionClientIdentity.ts
+++ b/fluxer_api/src/api/utils/SessionClientIdentity.ts
@@ -100,6 +100,13 @@ function decodeClientProperties(headerValue: string | null): Record<string, unkn
}
}
+export function isFluxerIosAppRequest(userAgent: string | null, clientPropertiesHeader: string | null): boolean {
+ const nativeMatch = NATIVE_UA_REGEX.exec(userAgent?.trim() ?? '');
+ if (!nativeMatch) return false;
+ if (nativeMatch[1] === 'iOS') return true;
+ return parseReportedClientApp(clientPropertiesHeader)?.platform === 'ios';
+}
+
export function parseReportedClientOs(headerValue: string | null): OsToken | null {
const os = decodeClientProperties(headerValue)?.os;
return typeof os === 'string' ? narrowOsToken(os) : null;
diff --git a/fluxer_api/src/api/voice/tests/VoiceCallRinging.test.ts b/fluxer_api/src/api/voice/tests/VoiceCallRinging.test.ts
index 7d2fb9df8..8b5180275 100644
--- a/fluxer_api/src/api/voice/tests/VoiceCallRinging.test.ts
+++ b/fluxer_api/src/api/voice/tests/VoiceCallRinging.test.ts
@@ -1,10 +1,14 @@
// SPDX-License-Identifier: AGPL-3.0-or-later
import {createTestAccount} from '@app/api/auth/tests/AuthTestUtils';
-import {createFriendship, createGroupDmChannel} from '@app/api/channel/tests/ChannelTestUtils';
+import type {ChannelID} from '@app/api/BrandedTypes';
+import {blockUser, createFriendship, createGroupDmChannel} from '@app/api/channel/tests/ChannelTestUtils';
+import {setInjectedGatewayService} from '@app/api/middleware/ServiceRegistry';
import {type ApiTestHarness, createApiTestHarness} from '@app/api/test/ApiTestHarness';
+import {NoopGatewayService} from '@app/api/test/NoopGatewayService';
import {HTTP_STATUS} from '@app/api/test/TestConstants';
import {createBuilder} from '@app/api/test/TestRequestBuilder';
+import {IncomingCallFlags} from '@fluxer/constants/src/UserConstants';
import {afterAll, beforeAll, beforeEach, describe, expect, it} from 'vitest';
interface ErrorResponse {
@@ -14,6 +18,21 @@ interface ErrorResponse {
}>;
}
+class RingRecordingGateway extends NoopGatewayService {
+ readonly ringing: Array<Array<string>> = [];
+
+ override async createCall(
+ channelId: ChannelID,
+ messageId: string,
+ region: string,
+ ringing: Array<string>,
+ recipients: Array<string>,
+ ) {
+ this.ringing.push(ringing);
+ return super.createCall(channelId, messageId, region, ringing, recipients);
+ }
+}
+
describe('Voice Call Ringing', () => {
let harness: ApiTestHarness;
beforeAll(async () => {
@@ -58,5 +77,26 @@ describe('Voice Call Ringing', () => {
.execute();
expect(error.errors?.[0]?.code).toBe('USER_NOT_IN_CHANNEL');
});
+ it('a group DM call does not ring a member who blocked the caller', async () => {
+ const gateway = new RingRecordingGateway();
+ setInjectedGatewayService(gateway);
+ try {
+ const {owner, memberOne, memberTwo, groupDm} = await setupGroupDmUsers();
+ await createBuilder(harness, memberOne.token)
+ .patch('/users/@me/settings')
+ .body({incoming_call_flags: IncomingCallFlags.EVERYONE})
+ .expect(HTTP_STATUS.OK)
+ .execute();
+ await blockUser(harness, memberOne, owner.userId);
+ await createBuilder(harness, owner.token)
+ .post(`/channels/${groupDm.id}/call/ring`)
+ .body({})
+ .expect(HTTP_STATUS.NO_CONTENT)
+ .execute();
+ expect(gateway.ringing).toEqual([[memberTwo.userId]]);
+ } finally {
+ setInjectedGatewayService(new NoopGatewayService());
+ }
+ });
});
});
diff --git a/fluxer_api/src/api/worker/WorkerLaneConfig.ts b/fluxer_api/src/api/worker/WorkerLaneConfig.ts
index f9794861c..b1204853c 100644
--- a/fluxer_api/src/api/worker/WorkerLaneConfig.ts
+++ b/fluxer_api/src/api/worker/WorkerLaneConfig.ts
@@ -105,6 +105,7 @@ const LANE_CONFIG = {
'syncThreadSearchDocument',
'backfillThreadSearch',
'backfillPasskeyTrait',
+ 'backfillFavoriteMemeNsfw',
'backfillUserAclIndex',
'backfillDeletedUsers',
'backfillHiddenProfileBadges',
diff --git a/fluxer_api/src/api/worker/WorkerMain.ts b/fluxer_api/src/api/worker/WorkerMain.ts
index a37a03941..6db42a729 100644
--- a/fluxer_api/src/api/worker/WorkerMain.ts
+++ b/fluxer_api/src/api/worker/WorkerMain.ts
@@ -46,6 +46,7 @@ import {queueBlocklistFeedStartupJobs} from '@app/api/worker/BlocklistFeedStartu
import {CronScheduler} from '@app/api/worker/CronScheduler';
import {JetStreamWorkerQueue, JOBS_STREAM_MAX_AGE_MS} from '@app/api/worker/JetStreamWorkerQueue';
import {queueDeletedUsersBackfill} from '@app/api/worker/tasks/BackfillDeletedUsers';
+import {queueFavoriteMemeNsfwBackfill} from '@app/api/worker/tasks/BackfillFavoriteMemeNsfw';
import {queueHiddenProfileBadgesBackfill} from '@app/api/worker/tasks/BackfillHiddenProfileBadges';
import {queuePasskeyTraitBackfill} from '@app/api/worker/tasks/BackfillPasskeyTrait';
import {queueUserAclIndexBackfill} from '@app/api/worker/tasks/BackfillUserAclIndex';
@@ -255,6 +256,7 @@ export async function startWorkerRuntime(options: WorkerRuntimeOptions): Promise
await queueUserAclIndexBackfill(dependencies.kvClient, workerService);
await queueDeletedUsersBackfill(dependencies.kvClient, workerService);
await queueHiddenProfileBadgesBackfill(dependencies.kvClient, workerService);
+ await queueFavoriteMemeNsfwBackfill(dependencies.kvClient, workerService);
try {
const normalized = await getInstanceConfigRepository().normalizeStoredBrandingAssets(dependencies.storageService);
if (normalized > 0) {
diff --git a/fluxer_api/src/api/worker/WorkerTaskRegistry.ts b/fluxer_api/src/api/worker/WorkerTaskRegistry.ts
index 662fb670c..c175e9b8d 100644
--- a/fluxer_api/src/api/worker/WorkerTaskRegistry.ts
+++ b/fluxer_api/src/api/worker/WorkerTaskRegistry.ts
@@ -8,6 +8,7 @@ import bulkScheduleUserDeletion from '@app/api/worker/tasks/admin_bulk/BulkSched
import bulkUpdateGuildFeatures from '@app/api/worker/tasks/admin_bulk/BulkUpdateGuildFeatures';
import bulkUpdateUserFlags from '@app/api/worker/tasks/admin_bulk/BulkUpdateUserFlags';
import backfillDeletedUsers from '@app/api/worker/tasks/BackfillDeletedUsers';
+import backfillFavoriteMemeNsfw from '@app/api/worker/tasks/BackfillFavoriteMemeNsfw';
import backfillHiddenProfileBadges from '@app/api/worker/tasks/BackfillHiddenProfileBadges';
import backfillPasskeyTrait from '@app/api/worker/tasks/BackfillPasskeyTrait';
import backfillUserAclIndex from '@app/api/worker/tasks/BackfillUserAclIndex';
@@ -102,6 +103,7 @@ export const workerTasks: Record<WorkerTaskName, WorkerTaskHandler> = {
syncThreadSearchDocument,
backfillThreadSearch,
backfillDeletedUsers,
+ backfillFavoriteMemeNsfw,
backfillHiddenProfileBadges,
backfillPasskeyTrait,
backfillUserAclIndex,
diff --git a/fluxer_api/src/api/worker/tasks/BackfillFavoriteMemeNsfw.ts b/fluxer_api/src/api/worker/tasks/BackfillFavoriteMemeNsfw.ts
new file mode 100644
index 000000000..b0e6c1d4f
--- /dev/null
+++ b/fluxer_api/src/api/worker/tasks/BackfillFavoriteMemeNsfw.ts
@@ -0,0 +1,118 @@
+// SPDX-License-Identifier: AGPL-3.0-or-later
+
+import type {ApiContext} from '@app/api/ApiContext';
+import type {MemeID, UserID} from '@app/api/BrandedTypes';
+import {Config} from '@app/api/Config';
+import {createApiContext} from '@app/api/CreateApiContext';
+import {fetchMany} from '@app/api/database/CassandraQueryExecution';
+import {mapFavoriteMemeToResponse} from '@app/api/favorite_meme/FavoriteMemeModel';
+import {FavoriteMemeRepository} from '@app/api/favorite_meme/FavoriteMemeRepository';
+import {Logger} from '@app/api/Logger';
+import {FavoriteMemesByMemeId} from '@app/api/Tables';
+import {getWorkerDependencies} from '@app/api/worker/WorkerContext';
+import {WorkerQueueOverflowError} from '@app/api/worker/WorkerQueueOverflowError';
+import type {WorkerService} from '@app/api/worker/WorkerService';
+import type {IKVProvider} from '@pkgs/kv_client/src/IKVProvider';
+import type {WorkerTaskHandler} from '@pkgs/worker/src/contracts/WorkerTask';
+import {ms} from 'itty-time';
+
+const FAVORITE_MEME_NSFW_BACKFILL_DONE_KEY = 'backfill:favorite_meme_nsfw:done';
+const CLAIM_KEY = 'backfill:favorite_meme_nsfw:queued';
+const CLAIM_TTL_SECONDS = ms('6 hours') / 1000;
+const DEFAULT_PAGE_SIZE = 500;
+
+interface FavoriteMemeOwnerRow {
+ meme_id: MemeID;
+ user_id: UserID;
+}
+
+interface FavoriteMemeNsfwBackfillSummary {
+ checked: number;
+ flagged: number;
+ failed: number;
+}
+
+const firstPageQuery = (limit: number) => FavoriteMemesByMemeId.select({limit});
+const nextPageQuery = (limit: number) =>
+ FavoriteMemesByMemeId.select({
+ where: FavoriteMemesByMemeId.where.tokenGt('meme_id', 'last_meme_id'),
+ limit,
+ });
+
+async function fetchMemeOwners(limit: number, after: MemeID | undefined): Promise<Array<FavoriteMemeOwnerRow>> {
+ if (after === undefined) return fetchMany<FavoriteMemeOwnerRow>(firstPageQuery(limit).bind({}));
+ return fetchMany<FavoriteMemeOwnerRow>(nextPageQuery(limit).bind({last_meme_id: after}));
+}
+
+function isProbeableMedia(contentType: string): boolean {
+ return contentType.startsWith('image/') || contentType.startsWith('video/');
+}
+
+async function backfillFavoriteMemeNsfw(
+ ctx: ApiContext,
+ repository: FavoriteMemeRepository,
+ pageSize = DEFAULT_PAGE_SIZE,
+): Promise<FavoriteMemeNsfwBackfillSummary> {
+ const summary: FavoriteMemeNsfwBackfillSummary = {checked: 0, flagged: 0, failed: 0};
+ let cursor: MemeID | undefined;
+ while (true) {
+ const page = await fetchMemeOwners(pageSize, cursor);
+ for (const row of page) {
+ const meme = await repository.findById(row.user_id, row.meme_id);
+ if (!meme || meme.nsfw !== null) continue;
+ summary.checked++;
+ try {
+ const metadata = isProbeableMedia(meme.contentType)
+ ? await ctx.services.media.getMetadata({
+ type: 's3',
+ bucket: Config.s3.buckets.cdn,
+ key: meme.storageKey,
+ nsfw: 'allow',
+ })
+ : null;
+ const nsfw = metadata?.nsfw === true;
+ await repository.updateNsfw(meme.userId, meme.id, nsfw);
+ if (nsfw) {
+ summary.flagged++;
+ const updated = await repository.findById(meme.userId, meme.id);
+ if (updated) {
+ await ctx.services.gateway.dispatchPresence({
+ userId: meme.userId,
+ event: 'FAVORITE_MEME_UPDATE',
+ data: mapFavoriteMemeToResponse(updated),
+ });
+ }
+ }
+ } catch (error) {
+ summary.failed++;
+ Logger.warn({error, memeId: meme.id.toString()}, 'Failed to check a favorite meme for explicit media');
+ }
+ }
+ if (page.length < pageSize) break;
+ cursor = page[page.length - 1]!.meme_id;
+ }
+ Logger.info(summary, 'Backfilled the explicit media flag of favorite memes');
+ return summary;
+}
+
+export async function queueFavoriteMemeNsfwBackfill(
+ kvClient: Pick<IKVProvider, 'get' | 'setnx' | 'del'>,
+ workerService: Pick<WorkerService, 'addJob'>,
+): Promise<void> {
+ if ((await kvClient.get(FAVORITE_MEME_NSFW_BACKFILL_DONE_KEY)) !== null) return;
+ if (!(await kvClient.setnx(CLAIM_KEY, '1', CLAIM_TTL_SECONDS))) return;
+ try {
+ await workerService.addJob('backfillFavoriteMemeNsfw', {});
+ } catch (error) {
+ await kvClient.del(CLAIM_KEY);
+ if (!(error instanceof WorkerQueueOverflowError)) throw error;
+ Logger.warn('Dropped the favorite meme explicit flag backfill job, jobs stream is at its limit');
+ }
+}
+
+const backfillFavoriteMemeNsfwTask: WorkerTaskHandler = async () => {
+ await backfillFavoriteMemeNsfw(createApiContext(), new FavoriteMemeRepository());
+ await getWorkerDependencies().kvClient.set(FAVORITE_MEME_NSFW_BACKFILL_DONE_KEY, new Date().toISOString());
+};
+
+export default backfillFavoriteMemeNsfwTask;
diff --git a/fluxer_api/src/api/worker/tasks/HarvestUserData.test.ts b/fluxer_api/src/api/worker/tasks/HarvestUserData.test.ts
index 6b7d7bd78..9452448e8 100644
--- a/fluxer_api/src/api/worker/tasks/HarvestUserData.test.ts
+++ b/fluxer_api/src/api/worker/tasks/HarvestUserData.test.ts
@@ -402,6 +402,7 @@ describe('harvested user settings', () => {
sensitive_content_friend_dm_filter: 0,
sensitive_content_non_friend_dm_filter: 0,
sensitive_content_guild_filter: 0,
+ allow_mature_content_on_ios: true,
suppress_unprivileged_self_mentions: true,
suppress_unprivileged_self_mentions_bypass_user_ids: new Set([createUserID(6000000000000000000n)]),
staff_dm_access_user_ids: new Set([createUserID(7000000000000000000n)]),
@@ -431,6 +432,7 @@ describe('harvested user settings', () => {
inline_embed_media: false,
explicit_content_filter: 2,
friend_source_flags: 3,
+ allow_mature_content_on_ios: true,
default_guilds_restricted: true,
bot_default_guilds_restricted: false,
restricted_guilds: ['2000000000000000000'],
diff --git a/fluxer_api/src/api/worker/tests/ExpireReportSnapshots.test.ts b/fluxer_api/src/api/worker/tests/ExpireReportSnapshots.test.ts
index da7542212..9df890a28 100644
--- a/fluxer_api/src/api/worker/tests/ExpireReportSnapshots.test.ts
+++ b/fluxer_api/src/api/worker/tests/ExpireReportSnapshots.test.ts
@@ -247,6 +247,7 @@ describe('report retention', () => {
global_name: null,
bio: 'bio at report time',
pronouns: null,
+ custom_status: null,
avatar: {hash: `abc${id}`, key: profileKey},
banner: null,
},
diff --git a/fluxer_api/src/api/worker/utils/HarvestDataMappers.ts b/fluxer_api/src/api/worker/utils/HarvestDataMappers.ts
index b12837e6a..a671aae5a 100644
--- a/fluxer_api/src/api/worker/utils/HarvestDataMappers.ts
+++ b/fluxer_api/src/api/worker/utils/HarvestDataMappers.ts
@@ -73,6 +73,7 @@ interface ArchivedUserSettings {
inline_embed_media: boolean;
explicit_content_filter: number;
friend_source_flags: number;
+ allow_mature_content_on_ios: boolean;
default_guilds_restricted: boolean;
bot_default_guilds_restricted: boolean;
restricted_guilds: Array<string>;
@@ -370,6 +371,7 @@ export function buildUserDataJson(params: UserDataJsonParams) {
inline_embed_media: userSettings.inlineEmbedMedia,
explicit_content_filter: userSettings.explicitContentFilter,
friend_source_flags: userSettings.friendSourceFlags,
+ allow_mature_content_on_ios: userSettings.allowMatureContentOnIos,
default_guilds_restricted: userSettings.defaultGuildsRestricted,
bot_default_guilds_restricted: userSettings.botDefaultGuildsRestricted,
restricted_guilds: Array.from(userSettings.restrictedGuilds).map((id) => id.toString()),
diff --git a/fluxer_docs/src/content/docs/admin-api/reports.mdx b/fluxer_docs/src/content/docs/admin-api/reports.mdx
index 768f481e8..e30183474 100644
--- a/fluxer_docs/src/content/docs/admin-api/reports.mdx
+++ b/fluxer_docs/src/content/docs/admin-api/reports.mdx
@@ -242,6 +242,7 @@ The reported profile as it was when the report was filed, with copies of its ima
| global_name | ?string | The display name |
| bio | ?string | The profile bio |
| pronouns | ?string | The pronouns |
+| custom_status | ?string | The custom status text, null when none was set or it had expired |
| avatar | ?[snapshot asset](#snapshot-asset-object) object | The avatar |
| banner | ?[snapshot asset](#snapshot-asset-object) object | The profile banner |
diff --git a/fluxer_docs/src/content/docs/http-api/memes.mdx b/fluxer_docs/src/content/docs/http-api/memes.mdx
index 59ce3ef65..837908e94 100644
--- a/fluxer_docs/src/content/docs/http-api/memes.mdx
+++ b/fluxer_docs/src/content/docs/http-api/memes.mdx
@@ -39,6 +39,7 @@ A meme object is one saved file. You can change only `name`, `alt_text` and `tag
| gif_provider<sup>2</sup> | ?string | The name of the GIF provider that issued `gif_slug` |
| media<sup>3</sup> | ?map[string, [GIF media format](#gif-media-format-object) object] | The provider formats for a GIF-sourced meme |
| placeholder | ?string | The thumbhash placeholder recorded at save time |
+| nsfw | boolean | Whether the media is flagged as explicit, from the source message or the media scan |
<sup>1</sup> A new [signed attachment URL](/http-api/messages/#signed-attachment-urls) on every read
@@ -67,7 +68,8 @@ A meme object is one saved file. You can change only `name`, `alt_text` and `tag
"is_gifv": true,
"gif_slug": "party-parrot-1234",
"gif_provider": "klipy",
- "placeholder": "3PcNNYYONWQPFxrsUeUcRh4"
+ "placeholder": "3PcNNYYONWQPFxrsUeUcRh4",
+ "nsfw": false
}
```
diff --git a/fluxer_docs/src/content/docs/http-api/reports.mdx b/fluxer_docs/src/content/docs/http-api/reports.mdx
index ee329010b..241d9e7dd 100644
--- a/fluxer_docs/src/content/docs/http-api/reports.mdx
+++ b/fluxer_docs/src/content/docs/http-api/reports.mdx
@@ -6,7 +6,7 @@ description: Report flows, report submission, the reason catalog and Digital Ser
import RouteHeader from '@/components/RouteHeader.astro';
-A report tells the instance's moderators that a message, a user profile or a guild breaks the rules. A signed-in user reports a message or a profile by answering a [report flow](#report-flows), and anyone with a verified email address can file a Digital Services Act notice without an account. Moderators work with stored reports through the [Admin Reports API](/admin-api/reports/).
+A report tells the instance's moderators that a message, a user profile or a guild breaks the rules. A signed-in user reports a message, a profile or a guild by answering a [report flow](#report-flows), and anyone with a verified email address can file a Digital Services Act notice without an account. Moderators work with stored reports through the [Admin Reports API](/admin-api/reports/).
A Digital Services Act notice takes three calls, [Send DSA report email](#send-dsa-report-email), [Verify DSA report email](#verify-dsa-report-email) and [Create DSA report](#create-dsa-report), and the reporter gets a receipt email with the report ID when the notice is filed.
@@ -205,7 +205,7 @@ A step is one answered screen in a submission. A choice screen's step sends `opt
| --- | --- |
| message | A message |
| user | A user profile |
-| guild | A guild, on the `dsa` surface only |
+| guild | A guild |
## Report flow surfaces
@@ -284,6 +284,7 @@ A report filed through a flow stores one of these reasons. Each reason maps to a
| ban_evasion | Getting around a ban |
| permits_violations | Community allows serious rule-breaking |
| copyright | Copyright or trademark complaint |
+| rude_language | Swearing or rude remarks |
| other | Something not listed |
## Report categories
@@ -361,7 +362,7 @@ Returns the [report flow object](#report-flow-object) for one [target type](#rep
| Status | Body | Condition |
| --- | --- | --- |
| 200 | [report flow](#report-flow-object) object | The flow was returned |
-| 400 | [error response](/http-api/#error-response) | `INVALID_FORM_BODY` for an unknown target type or surface, or `guild` outside the `dsa` surface |
+| 400 | [error response](/http-api/#error-response) | `INVALID_FORM_BODY` for an unknown target type or surface |
The rate limit is 40 requests per 10 seconds, on the `report:list` bucket.
@@ -397,7 +398,7 @@ Files a report about a message from the reporter's answers to the `in_app` messa
| 409 | [error response](/http-api/#error-response) | `REPORT_FLOW_OUTDATED` when the answers came from an outdated flow |
| 409 | [error response](/http-api/#error-response) | `CONFLICT` when the reporter reported this message in the last 365 days |
-The rate limit is 10 requests per hour, on the `report:create` bucket. One reporter can file at most 5 reports an hour across the report routes, and [Rate limits](/topics/rate-limits/#limits-that-return-429) lists the lower limits for one channel, guild or message. When [`interaction_tier`](/http-api/users/#account-tiers) is `enforced`, an account that isn't verified can still report, up to 5 reports a day for the account and 10 a day from one IP address.
+The rate limit is 10 requests per hour, on the `report:create` bucket. One reporter can file at most 5 reports an hour across the report routes, and [Rate limits](/topics/rate-limits/#limits-that-return-429) lists the lower limits for one channel, guild or message. A report whose reason is one of the highest-priority reasons doesn't count toward the reporter's hourly, channel or guild limits. When [`interaction_tier`](/http-api/users/#account-tiers) is `enforced`, an account that isn't verified can still report, up to 5 reports a day for the account and 10 a day from one IP address. On any instance, an account that isn't verified can still file a report whose reason is one of the highest-priority reasons, such as child safety, threats, intimate image abuse or self-harm, within the same daily limits.
## Submit user report flow
@@ -430,7 +431,40 @@ Files a report about a user's profile from the reporter's answers to the `in_app
| 409 | [error response](/http-api/#error-response) | `REPORT_FLOW_OUTDATED` when the answers came from an outdated flow |
| 409 | [error response](/http-api/#error-response) | `CONFLICT` when the reporter reported this user in the last 24 hours |
-The rate limit is 10 requests per hour, on the `report:create` bucket. One reporter can file at most 5 reports an hour across the report routes. When [`interaction_tier`](/http-api/users/#account-tiers) is `enforced`, an account that isn't verified can still report, up to 5 reports a day for the account and 10 a day from one IP address.
+The rate limit is 10 requests per hour, on the `report:create` bucket. One reporter can file at most 5 reports an hour across the report routes, and a report whose reason is one of the highest-priority reasons doesn't count toward that limit. When [`interaction_tier`](/http-api/users/#account-tiers) is `enforced`, an account that isn't verified can still report, up to 5 reports a day for the account and 10 a day from one IP address. On any instance, an account that isn't verified can still file a report whose reason is one of the highest-priority reasons, such as child safety, threats, intimate image abuse or self-harm, within the same daily limits.
+
+## Submit community report flow
+
+<RouteHeader method="POST" path="/v1/reports/flows/guild/submissions" />
+
+Files a report about a guild from the reporter's answers to the `in_app` guild flow and returns a [report object](#report-object). It needs a user session token, and the reporter must be a member of the guild, the guild must be discoverable, or the request must include an invite code for the guild.
+
+### JSON body
+
+| Field | Type | Description |
+| --- | --- | --- |
+| guild_id | snowflake | The ID of the reported guild |
+| invite_code? | string | An invite code for the guild that the reporter used to see it (1-64 characters) |
+| revision_hash | string | The [revision hash](#revision-hash) of the flow the reporter answered (1-64 characters) |
+| steps | array[[report flow step](#report-flow-step-object) object] | The answered screens in walk order (1-16 steps) |
+| locale? | string | The language tag the reporter saw the flow in (1-35 characters) |
+
+### Response
+
+| Status | Body | Condition |
+| --- | --- | --- |
+| 200 | [report](#report-object) object | The report was filed |
+| 400 | [error response](/http-api/#error-response) | `INVALID_REPORT_FLOW_ANSWERS` when the answers don't fit the current flow |
+| 400 | [error response](/http-api/#error-response) | `UNCLAIMED_ACCOUNT_CANNOT_SUBMIT_REPORTS` for an unclaimed account while `interaction_tier` is `legacy` |
+| 400 | [error response](/http-api/#error-response) | `CANNOT_REPORT_OWN_GUILD` when the reporter owns the guild |
+| 403 | [error response](/http-api/#error-response) | `REPORT_EMAIL_VERIFICATION_REQUIRED` for an unverified email while `interaction_tier` is `legacy` |
+| 403 | [error response](/http-api/#error-response) | `REPORT_BANNED` when the account is banned from reporting |
+| 403 | [error response](/http-api/#error-response) | `CANNOT_REPORT_GUILD` when the reporter isn't a member, the guild isn't discoverable and no invite code for it was sent |
+| 404 | [error response](/http-api/#error-response) | `UNKNOWN_GUILD` when `guild_id` isn't a guild |
+| 409 | [error response](/http-api/#error-response) | `REPORT_FLOW_OUTDATED` when the answers came from an outdated flow |
+| 409 | [error response](/http-api/#error-response) | `CONFLICT` when the reporter reported this guild in the last 24 hours |
+
+The rate limit is 10 requests per hour, on the `report:create` bucket. One reporter can file at most 5 reports an hour across the report routes, and a report whose reason is one of the highest-priority reasons doesn't count toward that limit. When [`interaction_tier`](/http-api/users/#account-tiers) is `enforced`, an account that isn't verified can still report, up to 5 reports a day for the account and 10 a day from one IP address. On any instance, an account that isn't verified can still file a report whose reason is one of the highest-priority reasons, such as child safety, threats, intimate image abuse or self-harm, within the same daily limits.
## Send DSA report email
@@ -482,7 +516,7 @@ The rate limit is 10 requests per hour, on the `dsa:report:email:verify` bucket.
<RouteHeader method="POST" path="/v1/reports/dsa" unauthenticated />
-Files a Digital Services Act notice about a message, user or guild and returns a [report object](#report-object). This is the only way to report a guild. Walk the flow with `surface=dsa` and send the fields for your `report_type`. The ticket is used up only when the notice is filed.
+Files a Digital Services Act notice about a message, user or guild and returns a [report object](#report-object). Walk the flow with `surface=dsa` and send the fields for your `report_type`. The ticket is used up only when the notice is filed.
### JSON body
diff --git a/fluxer_docs/src/content/docs/http-api/users.mdx b/fluxer_docs/src/content/docs/http-api/users.mdx
index 5663fc623..900473af6 100644
--- a/fluxer_docs/src/content/docs/http-api/users.mdx
+++ b/fluxer_docs/src/content/docs/http-api/users.mdx
@@ -272,6 +272,7 @@ The account-wide settings, returned by [Get current user settings](/http-api/use
| sensitive_content_friend_dm_filter | integer | [Sensitive media filter](#sensitive-media-filters) for DMs from friends |
| sensitive_content_non_friend_dm_filter | integer | [Sensitive media filter](#sensitive-media-filters) for DMs from others |
| sensitive_content_guild_filter | integer | [Guild sensitive media filter](#guild-sensitive-media-filters) |
+| allow_mature_content_on_ios | boolean | Whether the iOS app allows 18+ communities, channels and the "Show" media option. Only adults can turn it on |
| suppress_unprivileged_self_mentions<sup>1</sup> | boolean | Whether direct and reply mentions from unprivileged users are suppressed |
| suppress_unprivileged_self_mentions_bypass_user_ids<sup>1</sup> | array[snowflake] | The users exempt from mention suppression |
| staff_dm_access_user_ids<sup>1</sup> | array[snowflake] | The users granted staff DM access |
diff --git a/fluxer_docs/src/content/docs/http-api/users/current-user.mdx b/fluxer_docs/src/content/docs/http-api/users/current-user.mdx
index 00c5479da..98127c01c 100644
--- a/fluxer_docs/src/content/docs/http-api/users/current-user.mdx
+++ b/fluxer_docs/src/content/docs/http-api/users/current-user.mdx
@@ -325,21 +325,26 @@ Schedules deletion of the account and deletes every session. Needs [sudo verific
### JSON body
-The [sudo verification object](/http-api/users/mfa/#sudo-verification-object), which can be empty when you send a sudo token.
+The [sudo verification object](/http-api/users/mfa/#sudo-verification-object), which can be empty when you send a sudo token, and these fields.
+
+| Field | Type | Description |
+| --- | --- | --- |
+| immediate? | boolean | Delete the account now instead of after the grace period |
+| delete_messages? | boolean | Delete every message the account sent along with the account. Otherwise the messages stay, with the author removed |
:::caution[Signing in cancels the deletion]
-The deletion happens 14 days later by default. Signing in before then cancels it, and once erasure starts it can't be cancelled.
+The deletion happens 14 days later by default, or within about a minute with `immediate`. Signing in before then cancels it, together with the message deletion, and once erasure starts it can't be cancelled.
:::
### Response
| Status | Body | Condition |
| --- | --- | --- |
-| 204 | empty | The deletion was scheduled |
+| 200 | object with `pending_deletion_at`, an ISO 8601 timestamp | The deletion was scheduled for that time |
| 400 | [error response](/http-api/#error-response) | The account owns a guild, `USER_OWNS_GUILDS` |
| 409 | [error response](/http-api/#error-response) | `CONFLICT` when erasure has started |
-Fluxer emails the account when it has an address.
+Fluxer emails the account when it has an address, once when the deletion is scheduled for later and once when the deletion is done.
The rate limit is 5 requests per hour, on the `user:account:delete` bucket.
diff --git a/fluxer_docs/src/content/docs/http-api/users/settings.mdx b/fluxer_docs/src/content/docs/http-api/users/settings.mdx
index dead137e0..a3fde8ad8 100644
--- a/fluxer_docs/src/content/docs/http-api/users/settings.mdx
+++ b/fluxer_docs/src/content/docs/http-api/users/settings.mdx
@@ -198,6 +198,7 @@ The input form of the [user settings object](/http-api/users/#user-settings-obje
| sensitive_content_friend_dm_filter?<sup>7</sup> | integer | [Sensitive media filter](/http-api/users/#sensitive-media-filters) for friend direct messages |
| sensitive_content_non_friend_dm_filter?<sup>7</sup> | integer | [Sensitive media filter](/http-api/users/#sensitive-media-filters) for non-friend direct messages |
| sensitive_content_guild_filter?<sup>8</sup> | integer | [Guild sensitive media filter](/http-api/users/#guild-sensitive-media-filters) |
+| allow_mature_content_on_ios? | boolean | Whether the iOS app allows 18+ communities, channels and the "Show" media option. Only adults can turn it on |
| suppress_unprivileged_self_mentions?<sup>9</sup> | boolean | Whether direct and reply mentions from unprivileged users are suppressed |
| suppress_unprivileged_self_mentions_bypass_user_ids?<sup>9</sup> | ?array[snowflake] | The users exempt from mention suppression |
| staff_dm_access_user_ids?<sup>9</sup> | ?array[snowflake] | The users granted staff direct message access |
diff --git a/fluxer_docs/src/content/docs/operator/environment.mdx b/fluxer_docs/src/content/docs/operator/environment.mdx
index 158669a0f..ab2ab8aa7 100644
--- a/fluxer_docs/src/content/docs/operator/environment.mdx
+++ b/fluxer_docs/src/content/docs/operator/environment.mdx
@@ -2423,7 +2423,11 @@ When account closures for payment disputes take effect.
#### `FLUXER_STORE_BILLING_SANDBOX_ENTITLES_ALL`
-Whether sandbox store purchases count for every account.
+Whether sandbox store purchases, gifts included, count for every account with no time limit.
+
+#### `FLUXER_STORE_BILLING_SANDBOX_SUBSCRIPTIONS`
+
+Whether sandbox App Store and Google Play subscriptions count for every account for 7 days after each purchase. On by default.
#### `FLUXER_STORE_BILLING_SANDBOX_USER_IDS`
diff --git a/fluxer_docs/src/content/docs/topics/rate-limits.md b/fluxer_docs/src/content/docs/topics/rate-limits.md
index 2027b8c4e..323978c44 100644
--- a/fluxer_docs/src/content/docs/topics/rate-limits.md
+++ b/fluxer_docs/src/content/docs/topics/rate-limits.md
@@ -91,7 +91,7 @@ These return 429 with the [rate limit response object](#rate-limit-response-obje
| [Request password recovery](/http-api/authentication/#request-password-recovery) | 5 per 30 minutes for one email address and 20 per 30 minutes for one IP address |
| [Start email change](/http-api/users/email-and-password/#start-email-change) | 3 code sends to the current address and 5 to the new one per 15 minutes, and one every 30 seconds per ticket |
| [Start password change](/http-api/users/email-and-password/#start-password-change) | 3 code sends per 15 minutes, and one every 30 seconds per ticket |
-| [Submit message report flow](/http-api/reports/#submit-message-report-flow) | 5 reports per hour for one reporter, 3 in one channel, 4 in one community and 20 for one message from all reporters |
+| [Submit message report flow](/http-api/reports/#submit-message-report-flow) | 5 reports per hour for one reporter, 3 in one channel, 4 in one community and 20 for one message from all reporters. A report with a highest-priority reason only counts toward the limit for one message |
| [Create DSA report](/http-api/reports/#create-dsa-report) | 5 reports per hour for one reporter, shared with the other report routes |
On an instance where people sign in with a username, a password login allows 5 attempts per 15 minutes for one username from one IP address and 100 failed logins per hour for one username, and the IP address limit still applies.
diff --git a/fluxer_rexctl/internal/instance/envvars.go b/fluxer_rexctl/internal/instance/envvars.go
index 36b996fde..1b370ad11 100644
--- a/fluxer_rexctl/internal/instance/envvars.go
+++ b/fluxer_rexctl/internal/instance/envvars.go
@@ -618,7 +618,8 @@ var envVars = []envVar{
{"FLUXER_S3_BUCKET_STATIC", "internal", "The bucket the media proxy serves files from when FLUXER_MEDIA_PROXY_MODE is `static`. The stack runs the media proxy in `upload` mode."},
{"FLUXER_SNOWFLAKE_SERVICE_SUBJECT", "internal", "The NATS subject the API sends snowflakes service requests to. The snowflakes service always listens on `svc.snowflakes`, and any other value breaks ID generation."},
{"FLUXER_STATIC_DIR", "internal", "The directory the app-proxy service serves static files from. The app-proxy image has its static files built in."},
- {"FLUXER_STORE_BILLING_SANDBOX_ENTITLES_ALL", "hosted", "Whether sandbox store purchases count for every account."},
+ {"FLUXER_STORE_BILLING_SANDBOX_ENTITLES_ALL", "hosted", "Whether sandbox store purchases, gifts included, count for every account with no time limit."},
+ {"FLUXER_STORE_BILLING_SANDBOX_SUBSCRIPTIONS", "hosted", "Whether sandbox App Store and Google Play subscriptions count for every account for 7 days after each purchase. On by default."},
{"FLUXER_STORE_BILLING_SANDBOX_USER_IDS", "hosted", "The accounts whose sandbox store purchases count."},
{"FLUXER_STRIPE_PRICE_GIFT_1_MONTH_BRL", "prices", "The price ID of the one-month gift in BRL."},
{"FLUXER_STRIPE_PRICE_GIFT_1_MONTH_DKK", "prices", "The price ID of the one-month gift in DKK."},
diff --git a/packages/config/src/ConfigLoader.ts b/packages/config/src/ConfigLoader.ts
index cf3ca6506..22ac41c57 100644
--- a/packages/config/src/ConfigLoader.ts
+++ b/packages/config/src/ConfigLoader.ts
@@ -253,6 +253,7 @@ function defaultConfig(): MasterConfig {
store_billing: {
sandbox_user_ids: [],
sandbox_entitles_all: false,
+ sandbox_subscriptions: true,
},
},
instance: {
@@ -646,6 +647,7 @@ function validateStoreBillingConfig(config: MasterConfig): void {
}
}
assertBoolean(config.integrations.store_billing.sandbox_entitles_all, 'FLUXER_STORE_BILLING_SANDBOX_ENTITLES_ALL');
+ assertBoolean(config.integrations.store_billing.sandbox_subscriptions, 'FLUXER_STORE_BILLING_SANDBOX_SUBSCRIPTIONS');
}
const AGE_POLICY_REGION_PATTERN = /^[A-Z]{2}(?:-[A-Z0-9]{1,3})?$/u;
diff --git a/packages/config/src/MasterConfig.ts b/packages/config/src/MasterConfig.ts
index 906846371..e1f3d9926 100644
--- a/packages/config/src/MasterConfig.ts
+++ b/packages/config/src/MasterConfig.ts
@@ -315,6 +315,7 @@ export interface MasterConfig {
store_billing: {
sandbox_user_ids?: Array<string>;
sandbox_entitles_all: boolean;
+ sandbox_subscriptions: boolean;
};
};
instance: {
diff --git a/packages/config/src/config_loader/EnvironmentOverrides.ts b/packages/config/src/config_loader/EnvironmentOverrides.ts
index aa72a286c..9ea51a1a8 100644
--- a/packages/config/src/config_loader/EnvironmentOverrides.ts
+++ b/packages/config/src/config_loader/EnvironmentOverrides.ts
@@ -309,6 +309,10 @@ const NAMED_FLUXER_ENV_OVERRIDES: Record<string, NamedEnvOverride> = {
path: ['integrations', 'store_billing', 'sandbox_entitles_all'],
parse: parseBoolean,
},
+ FLUXER_STORE_BILLING_SANDBOX_SUBSCRIPTIONS: {
+ path: ['integrations', 'store_billing', 'sandbox_subscriptions'],
+ parse: parseBoolean,
+ },
FLUXER_SELF_HOSTED: {path: ['instance', 'self_hosted'], parse: parseBoolean},
FLUXER_AUTO_JOIN_INVITE_CODE: {path: ['instance', 'auto_join_invite_code']},
FLUXER_VISIONARIES_GUILD_ID: {path: ['instance', 'visionaries_guild_id']},
diff --git a/packages/schema/src/domains/admin/AdminSchemas.ts b/packages/schema/src/domains/admin/AdminSchemas.ts
index 25dd47277..f5afeb97a 100644
--- a/packages/schema/src/domains/admin/AdminSchemas.ts
+++ b/packages/schema/src/domains/admin/AdminSchemas.ts
@@ -1743,6 +1743,7 @@ const ReportProfileSnapshotUserSchema = z.object({
global_name: z.string().nullable(),
bio: z.string().nullable(),
pronouns: z.string().nullable(),
+ custom_status: z.string().nullable(),
avatar: ReportProfileSnapshotAssetSchema.nullable(),
banner: ReportProfileSnapshotAssetSchema.nullable(),
});
diff --git a/packages/schema/src/domains/meme/MemeSchemas.ts b/packages/schema/src/domains/meme/MemeSchemas.ts
index 9169f772d..6946dce97 100644
--- a/packages/schema/src/domains/meme/MemeSchemas.ts
+++ b/packages/schema/src/domains/meme/MemeSchemas.ts
@@ -99,6 +99,12 @@ export const FavoriteMemeResponse = z.object({
.describe(
'Compact thumbhash placeholder produced by the media proxy at favorite-time. Clients render it as a low-res preview while the full media loads. Null when the proxy did not emit one.',
),
+ nsfw: z
+ .boolean()
+ .default(false)
+ .describe(
+ 'Whether the media is flagged as explicit. Clients apply the same sensitive media rules as for chat media.',
+ ),
});
export type FavoriteMemeResponse = z.infer<typeof FavoriteMemeResponse>;
diff --git a/packages/schema/src/domains/report/ReportFlowSchemas.ts b/packages/schema/src/domains/report/ReportFlowSchemas.ts
index 25f3cd9fe..88024c2c5 100644
--- a/packages/schema/src/domains/report/ReportFlowSchemas.ts
+++ b/packages/schema/src/domains/report/ReportFlowSchemas.ts
@@ -156,3 +156,11 @@ export const ReportFlowUserSubmissionRequest = z.object({
});
export type ReportFlowUserSubmissionRequest = z.infer<typeof ReportFlowUserSubmissionRequest>;
+
+export const ReportFlowGuildSubmissionRequest = z.object({
+ ...ReportFlowAnswerFields,
+ guild_id: SnowflakeType,
+ invite_code: z.optional(createStringType(1, 64)).describe('Invite code used to access the guild'),
+});
+
+export type ReportFlowGuildSubmissionRequest = z.infer<typeof ReportFlowGuildSubmissionRequest>;
diff --git a/packages/schema/src/domains/report/ReportProfileSnapshotSchemas.test.ts b/packages/schema/src/domains/report/ReportProfileSnapshotSchemas.test.ts
index 7f5759a1f..bc359ad4f 100644
--- a/packages/schema/src/domains/report/ReportProfileSnapshotSchemas.test.ts
+++ b/packages/schema/src/domains/report/ReportProfileSnapshotSchemas.test.ts
@@ -17,6 +17,7 @@ const fullSnapshot: ReportProfileSnapshot = {
global_name: 'Target',
bio: 'Original bio',
pronouns: 'they/them',
+ custom_status: 'Status',
avatar: {hash: 'a_user', key: 'reports/1/profile/avatar/a_user'},
banner: {hash: 'user-banner', key: null},
},
@@ -54,6 +55,7 @@ describe('ReportProfileSnapshot', () => {
global_name: null,
bio: null,
pronouns: null,
+ custom_status: null,
avatar: null,
banner: null,
},
@@ -63,6 +65,12 @@ describe('ReportProfileSnapshot', () => {
expect(parseReportProfileSnapshot(JSON.stringify(userOnly))).toEqual(userOnly);
});
+ it('reads a snapshot stored before custom status as having none', () => {
+ const {custom_status: _omitted, ...storedUser} = fullSnapshot.user!;
+ const parsed = parseReportProfileSnapshot(JSON.stringify({...fullSnapshot, user: storedUser}));
+ expect(parsed?.user?.custom_status).toBeNull();
+ });
+
it('drops unknown keys', () => {
const parsed = parseReportProfileSnapshot(JSON.stringify({...fullSnapshot, extra: true}));
expect(parsed).toEqual(fullSnapshot);
diff --git a/packages/schema/src/domains/report/ReportProfileSnapshotSchemas.ts b/packages/schema/src/domains/report/ReportProfileSnapshotSchemas.ts
index 4d4b6157c..8234ae4de 100644
--- a/packages/schema/src/domains/report/ReportProfileSnapshotSchemas.ts
+++ b/packages/schema/src/domains/report/ReportProfileSnapshotSchemas.ts
@@ -16,6 +16,7 @@ export const ReportProfileUserSnapshot = z.object({
global_name: z.string().nullable(),
bio: z.string().nullable(),
pronouns: z.string().nullable(),
+ custom_status: z.string().nullable().default(null),
avatar: ReportProfileAssetSnapshot.nullable(),
banner: ReportProfileAssetSnapshot.nullable(),
});
diff --git a/packages/schema/src/domains/rpc/RpcSchemas.ts b/packages/schema/src/domains/rpc/RpcSchemas.ts
index ef1a992ac..0e431ad16 100644
--- a/packages/schema/src/domains/rpc/RpcSchemas.ts
+++ b/packages/schema/src/domains/rpc/RpcSchemas.ts
@@ -125,6 +125,12 @@ export const RpcRequest = z.discriminatedUnion('type', [
type: z.literal('get_user_blocked_ids').describe('Request type for fetching blocked user IDs'),
user_ids: z.array(SnowflakeType).max(RPC_USER_BATCH_MAX).describe('IDs of users to fetch blocked lists for'),
}),
+ z.object({
+ type: z
+ .literal('get_users_adult_content_allowed')
+ .describe('Request type for checking which users may see 18+ content'),
+ user_ids: z.array(SnowflakeType).max(RPC_USER_BATCH_MAX).describe('IDs of users to check'),
+ }),
z.object({
type: z.literal('voice_get_token').describe('Request type for getting voice connection token'),
guild_id: SnowflakeType.optional().describe('ID of the guild for the voice channel'),
@@ -455,6 +461,12 @@ export const RpcResponse = z.discriminatedUnion('type', [
type: z.literal('get_user_blocked_ids').describe('Response type for blocked user IDs'),
data: z.record(SnowflakeStringType, z.array(SnowflakeStringType)).describe('Blocked user IDs keyed by user ID'),
}),
+ z.object({
+ type: z.literal('get_users_adult_content_allowed').describe('Response type for the 18+ content check'),
+ data: z
+ .object({user_ids: z.array(SnowflakeStringType).describe('IDs of the requested users who may see 18+ content')})
+ .describe('Users who may see 18+ content'),
+ }),
z.object({
type: z.literal('voice_get_token').describe('Response type for voice connection token'),
data: z
diff --git a/packages/schema/src/domains/user/UserRequestSchemas.ts b/packages/schema/src/domains/user/UserRequestSchemas.ts
index 8a47c9791..34a274edd 100644
--- a/packages/schema/src/domains/user/UserRequestSchemas.ts
+++ b/packages/schema/src/domains/user/UserRequestSchemas.ts
@@ -397,6 +397,11 @@ export const UserSettingsUpdateRequest = z
SensitiveMediaGuildFilterLevelSchema,
'Sensitive media filter level for community channels',
),
+ allow_mature_content_on_ios: z
+ .boolean()
+ .describe(
+ 'Whether 18+ communities, channels and the "Show" sensitive media option are allowed in the iOS app. Only adults can turn this on. The iOS app never offers this setting.',
+ ),
suppress_unprivileged_self_mentions: z
.boolean()
.describe('Suppress direct mentions and reply mentions from unprivileged users'),
@@ -813,6 +818,13 @@ export const BulkDeleteSelfMessagesFilter = z
export type BulkDeleteSelfMessagesFilter = z.infer<typeof BulkDeleteSelfMessagesFilter>;
+export const UserAccountDeleteRequest = SudoVerificationSchema.extend({
+ immediate: z.boolean().optional().describe('Delete the account now instead of after the grace period'),
+ delete_messages: z.boolean().optional().describe('Also delete every message the account sent'),
+});
+
+export type UserAccountDeleteRequest = z.infer<typeof UserAccountDeleteRequest>;
+
export const BulkDeleteSelfMessagesRequest = BulkDeleteSelfMessagesFilter.safeExtend(SudoVerificationSchema.shape);
export type BulkDeleteSelfMessagesRequest = z.infer<typeof BulkDeleteSelfMessagesRequest>;
diff --git a/packages/schema/src/domains/user/UserResponseSchemas.ts b/packages/schema/src/domains/user/UserResponseSchemas.ts
index 96d3a5fac..a61d18bc6 100644
--- a/packages/schema/src/domains/user/UserResponseSchemas.ts
+++ b/packages/schema/src/domains/user/UserResponseSchemas.ts
@@ -303,6 +303,12 @@ export const UserPasswordUpdateResponse = z.object({
export type UserPasswordUpdateResponse = z.infer<typeof UserPasswordUpdateResponse>;
+export const UserAccountDeleteResponse = z.object({
+ pending_deletion_at: z.string().describe('ISO8601 timestamp of when the account is deleted'),
+});
+
+export type UserAccountDeleteResponse = z.infer<typeof UserAccountDeleteResponse>;
+
export const RecoveryKitStatusResponse = z.object({
has_recovery_kit: z.boolean().describe('Whether the account has a recovery kit'),
created_at: z.iso.datetime().nullable().describe('ISO 8601 timestamp when the current recovery kit was created'),
@@ -411,6 +417,11 @@ export const UserSettingsResponse = z.object({
SensitiveMediaGuildFilterLevelSchema,
'Sensitive media filter level for community channels',
),
+ allow_mature_content_on_ios: z
+ .boolean()
+ .describe(
+ 'Whether 18+ communities, channels and the "Show" sensitive media option are allowed in the iOS app. Only adults can turn this on. The iOS app never offers this setting.',
+ ),
suppress_unprivileged_self_mentions: z
.boolean()
.describe('Whether direct mentions and reply mentions from unprivileged users are suppressed'),
diff --git a/tools/dev/cassandra_target_schema.json b/tools/dev/cassandra_target_schema.json
index f936d6de9..22efbec7f 100644
--- a/tools/dev/cassandra_target_schema.json
+++ b/tools/dev/cassandra_target_schema.json
@@ -4533,6 +4533,10 @@
{
"name": "placeholder",
"type": "text"
+ },
+ {
+ "name": "nsfw",
+ "type": "boolean"
}
],
"primary_key": "((user_id), meme_id)",
@@ -10081,6 +10085,10 @@
"name": "sensitive_content_guild_filter",
"type": "int"
},
+ {
+ "name": "allow_mature_content_on_ios",
+ "type": "boolean"
+ },
{
"name": "version",
"type": "int"