Skip to content

Commit d019d4b

Browse files
aleksandernsilvadiegolmello
aleksandernsilva
and
diegolmello
authored
feat(federation): Added room license and settings validations (#6859)
Co-authored-by: aleksandernsilva <[email protected]> Co-authored-by: Diego Mello <[email protected]>
1 parent 5e1dc7e commit d019d4b

35 files changed

+150
-4
lines changed

‎app/definitions/IRoom.ts‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,12 @@ export interface IServerRoom extends IRocketChatRecord {
163163

164164
username?: string;
165165
nickname?: string;
166-
federation?: any;
166+
federation?: {
167+
version: number;
168+
mrid: string;
169+
origin: string;
170+
peer?: string;
171+
};
167172
roomsCount?: number;
168173

169174
u: Pick<IUser, '_id' | 'username' | 'name'>;

‎app/definitions/ISubscription.ts‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,11 @@ export interface ISubscription {
116116
uploads: RelationModified<TUploadModel>;
117117
disableNotifications?: boolean;
118118
federated?: boolean;
119+
federation?: {
120+
version: number;
121+
mrid: string;
122+
origin: string;
123+
};
119124
inviter?: Required<Pick<IUser, '_id' | 'username'>> & Pick<IUser, 'name'>;
120125
}
121126

‎app/i18n/locales/ar.json‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -206,6 +206,9 @@
206206
"Expiration_Days": "انتهاء (أيام)",
207207
"Favorite": "مفضل",
208208
"Favorites": "مفضلات",
209+
"Federation_Matrix_room_description_disabled": "الاتحاد معطل حاليًا في مساحة العمل هذه",
210+
"Federation_Matrix_room_description_invalid_version": "تم إنشاء هذه الغرفة بواسطة إصدار قديم من الاتحاد وهي محظورة بشكل غير محدد.",
211+
"Federation_Matrix_room_description_missing_module": "الانضمام إلى الغرف المتصلة هو ميزة متميزة",
209212
"Fetch_image_from_URL": "جلب الصورة من الرابط",
210213
"Field_are_required": "{{field}} مطلوبة",
211214
"Field_is_required": "{{field}} مطلوب",

‎app/i18n/locales/bn-IN.json‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -313,6 +313,9 @@
313313
"Expiration_Days": "মেয়াদ শেষ (দিন)",
314314
"Favorite": "প্রিয়",
315315
"Favorites": "প্রিয়সমূহ",
316+
"Federation_Matrix_room_description_disabled": "এই ওয়ার্কস্পেসে ফেডারেশন বর্তমানে নিষ্ক্রিয়",
317+
"Federation_Matrix_room_description_invalid_version": "এই রুমটি একটি পুরানো ফেডারেশন সংস্করণ দ্বারা তৈরি করা হয়েছিল এবং এটি অনির্দিষ্টকালের জন্য অবরুদ্ধ।",
318+
"Federation_Matrix_room_description_missing_module": "ফেডারেটেড রুমে যোগদান একটি প্রিমিয়াম বৈশিষ্ট্য",
316319
"Fetch_image_from_URL": "URL থেকে ছবি আনুন",
317320
"Field_are_required": "{{field}} প্রয়োজনীয়।",
318321
"Field_is_required": "{{field}} প্রয়োজনীয়",

‎app/i18n/locales/cs.json‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -333,6 +333,9 @@
333333
"Expiration_Days": "Vypršení platnosti (dny)",
334334
"Favorite": "Oblíbený",
335335
"Favorites": "Oblíbené",
336+
"Federation_Matrix_room_description_disabled": "Federace je v tomto pracovním prostoru aktuálně zakázána",
337+
"Federation_Matrix_room_description_invalid_version": "Tato místnost byla vytvořena starou verzí Federace a je na neurčito blokována.",
338+
"Federation_Matrix_room_description_missing_module": "Připojení k federovaným místnostem je prémiová funkce",
336339
"Fetch_image_from_URL": "Načíst obrázek z URL",
337340
"Field_are_required": "{{field}} jsou povinné.",
338341
"Field_is_required": "{{field}} je povinný.",

‎app/i18n/locales/de.json‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -307,6 +307,9 @@
307307
"Expiration_Days": "läuft ab (Tage)",
308308
"Favorite": "Lieblings-",
309309
"Favorites": "Favoriten",
310+
"Federation_Matrix_room_description_disabled": "Föderation ist derzeit in diesem Arbeitsbereich deaktiviert",
311+
"Federation_Matrix_room_description_invalid_version": "Dieser Raum wurde mit einer alten Föderationsversion erstellt und ist unbestimmt blockiert.",
312+
"Federation_Matrix_room_description_missing_module": "Beitritt zu föderierten Räumen ist eine Premium-Funktion",
310313
"Fetch_image_from_URL": "Bild von URL abrufen",
311314
"Field_are_required": "{{field}} sind erforderlich",
312315
"Field_is_required": "{{field}} ist erforderlich",

‎app/i18n/locales/en.json‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -352,6 +352,9 @@
352352
"Expiration_Days": "Expiration (days)",
353353
"Favorite": "Favorite",
354354
"Favorites": "Favorites",
355+
"Federation_Matrix_room_description_disabled": "Federation is currently disabled on this workspace",
356+
"Federation_Matrix_room_description_invalid_version": "This room was created by an old Federation version and it's blocked indeterminately.",
357+
"Federation_Matrix_room_description_missing_module": "Joining federated rooms is a Premium feature",
355358
"Fetch_image_from_URL": "Fetch image from URL",
356359
"Field_are_required": "{{field}} are required",
357360
"Field_is_required": "{{field}} is required",

‎app/i18n/locales/es.json‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -167,6 +167,9 @@
167167
"Everyone_can_access_this_channel": "Todos los usuarios pueden acceder a este canal",
168168
"Favorite": "Favorito",
169169
"Favorites": "Favoritos",
170+
"Federation_Matrix_room_description_disabled": "La federación está actualmente deshabilitada en este espacio de trabajo",
171+
"Federation_Matrix_room_description_invalid_version": "Esta sala fue creada por una versión antigua de Federación y está bloqueada indefinidamente.",
172+
"Federation_Matrix_room_description_missing_module": "Unirse a salas federadas es una función Premium",
170173
"Fetch_image_from_URL": "Obtener imagen desde URL",
171174
"Field_are_required": "{{field}} son obligatorios",
172175
"Field_is_required": "{{field}} es obligatorio",

‎app/i18n/locales/fi.json‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -292,6 +292,9 @@
292292
"Expiration_Days": "Vanheneminen (päivää)",
293293
"Favorite": "Suosikki",
294294
"Favorites": "Suosikit",
295+
"Federation_Matrix_room_description_disabled": "Federointi on tällä hetkellä poistettu käytöstä tässä työtilassa",
296+
"Federation_Matrix_room_description_invalid_version": "Tämä huone luotiin vanhalla Federointi-versiolla ja se on estetty määrittelemättömästi.",
297+
"Federation_Matrix_room_description_missing_module": "Liittyminen federoiduihin huoneisiin on Premium-ominaisuus",
295298
"Fetch_image_from_URL": "Hae kuva URL-osoitteesta",
296299
"Field_are_required": "{{field}} ovat pakollisia.",
297300
"Field_is_required": "{{field}} on pakollinen",

‎app/i18n/locales/fr.json‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -258,6 +258,9 @@
258258
"Expiration_Days": "Expiration (Jours)",
259259
"Favorite": "Favori",
260260
"Favorites": "Favoris",
261+
"Federation_Matrix_room_description_disabled": "La fédération est actuellement désactivée sur cet espace de travail",
262+
"Federation_Matrix_room_description_invalid_version": "Cette salle a été créée par une ancienne version de Fédération et est bloquée indéfiniment.",
263+
"Federation_Matrix_room_description_missing_module": "Rejoindre les salles fédérées est une fonctionnalité Premium",
261264
"Fetch_image_from_URL": "Récupérer l'image depuis l'URL",
262265
"Field_are_required": "Les {{field}} sont requis.",
263266
"Field_is_required": "Le champ {{field}} est requis.",

0 commit comments

Comments
 (0)