Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion app/definitions/IRoom.ts
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,12 @@ export interface IServerRoom extends IRocketChatRecord {

username?: string;
nickname?: string;
federation?: any;
federation?: {
version: number;
mrid: string;
origin: string;
peer?: string;
};
roomsCount?: number;

u: Pick<IUser, '_id' | 'username' | 'name'>;
Expand Down
5 changes: 5 additions & 0 deletions app/definitions/ISubscription.ts
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,11 @@ export interface ISubscription {
uploads: RelationModified<TUploadModel>;
disableNotifications?: boolean;
federated?: boolean;
federation?: {
version: number;
mrid: string;
origin: string;
};
inviter?: Required<Pick<IUser, '_id' | 'username'>> & Pick<IUser, 'name'>;
}

Expand Down
3 changes: 3 additions & 0 deletions app/i18n/locales/ar.json
Original file line number Diff line number Diff line change
Expand Up @@ -206,6 +206,9 @@
"Expiration_Days": "انتهاء (أيام)",
"Favorite": "مفضل",
"Favorites": "مفضلات",
"Federation_Matrix_room_description_disabled": "الاتحاد معطل حاليًا في مساحة العمل هذه",
"Federation_Matrix_room_description_invalid_version": "تم إنشاء هذه الغرفة بواسطة إصدار قديم من الاتحاد وهي محظورة بشكل غير محدد.",
"Federation_Matrix_room_description_missing_module": "الانضمام إلى الغرف المتصلة هو ميزة متميزة",
"Fetch_image_from_URL": "جلب الصورة من الرابط",
"Field_are_required": "{{field}} مطلوبة",
"Field_is_required": "{{field}} مطلوب",
Expand Down
3 changes: 3 additions & 0 deletions app/i18n/locales/bn-IN.json
Original file line number Diff line number Diff line change
Expand Up @@ -313,6 +313,9 @@
"Expiration_Days": "মেয়াদ শেষ (দিন)",
"Favorite": "প্রিয়",
"Favorites": "প্রিয়সমূহ",
"Federation_Matrix_room_description_disabled": "এই ওয়ার্কস্পেসে ফেডারেশন বর্তমানে নিষ্ক্রিয়",
"Federation_Matrix_room_description_invalid_version": "এই রুমটি একটি পুরানো ফেডারেশন সংস্করণ দ্বারা তৈরি করা হয়েছিল এবং এটি অনির্দিষ্টকালের জন্য অবরুদ্ধ।",
"Federation_Matrix_room_description_missing_module": "ফেডারেটেড রুমে যোগদান একটি প্রিমিয়াম বৈশিষ্ট্য",
"Fetch_image_from_URL": "URL থেকে ছবি আনুন",
"Field_are_required": "{{field}} প্রয়োজনীয়।",
"Field_is_required": "{{field}} প্রয়োজনীয়",
Expand Down
3 changes: 3 additions & 0 deletions app/i18n/locales/cs.json
Original file line number Diff line number Diff line change
Expand Up @@ -333,6 +333,9 @@
"Expiration_Days": "Vypršení platnosti (dny)",
"Favorite": "Oblíbený",
"Favorites": "Oblíbené",
"Federation_Matrix_room_description_disabled": "Federace je v tomto pracovním prostoru aktuálně zakázána",
"Federation_Matrix_room_description_invalid_version": "Tato místnost byla vytvořena starou verzí Federace a je na neurčito blokována.",
"Federation_Matrix_room_description_missing_module": "Připojení k federovaným místnostem je prémiová funkce",
"Fetch_image_from_URL": "Načíst obrázek z URL",
"Field_are_required": "{{field}} jsou povinné.",
"Field_is_required": "{{field}} je povinný.",
Expand Down
3 changes: 3 additions & 0 deletions app/i18n/locales/de.json
Original file line number Diff line number Diff line change
Expand Up @@ -307,6 +307,9 @@
"Expiration_Days": "läuft ab (Tage)",
"Favorite": "Lieblings-",
"Favorites": "Favoriten",
"Federation_Matrix_room_description_disabled": "Föderation ist derzeit in diesem Arbeitsbereich deaktiviert",
"Federation_Matrix_room_description_invalid_version": "Dieser Raum wurde mit einer alten Föderationsversion erstellt und ist unbestimmt blockiert.",
"Federation_Matrix_room_description_missing_module": "Beitritt zu föderierten Räumen ist eine Premium-Funktion",
"Fetch_image_from_URL": "Bild von URL abrufen",
"Field_are_required": "{{field}} sind erforderlich",
"Field_is_required": "{{field}} ist erforderlich",
Expand Down
3 changes: 3 additions & 0 deletions app/i18n/locales/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -352,6 +352,9 @@
"Expiration_Days": "Expiration (days)",
"Favorite": "Favorite",
"Favorites": "Favorites",
"Federation_Matrix_room_description_disabled": "Federation is currently disabled on this workspace",
"Federation_Matrix_room_description_invalid_version": "This room was created by an old Federation version and it's blocked indeterminately.",
"Federation_Matrix_room_description_missing_module": "Joining federated rooms is a Premium feature",
"Fetch_image_from_URL": "Fetch image from URL",
"Field_are_required": "{{field}} are required",
"Field_is_required": "{{field}} is required",
Expand Down
3 changes: 3 additions & 0 deletions app/i18n/locales/es.json
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,9 @@
"Everyone_can_access_this_channel": "Todos los usuarios pueden acceder a este canal",
"Favorite": "Favorito",
"Favorites": "Favoritos",
"Federation_Matrix_room_description_disabled": "La federación está actualmente deshabilitada en este espacio de trabajo",
"Federation_Matrix_room_description_invalid_version": "Esta sala fue creada por una versión antigua de Federación y está bloqueada indefinidamente.",
"Federation_Matrix_room_description_missing_module": "Unirse a salas federadas es una función Premium",
"Fetch_image_from_URL": "Obtener imagen desde URL",
"Field_are_required": "{{field}} son obligatorios",
"Field_is_required": "{{field}} es obligatorio",
Expand Down
3 changes: 3 additions & 0 deletions app/i18n/locales/fi.json
Original file line number Diff line number Diff line change
Expand Up @@ -292,6 +292,9 @@
"Expiration_Days": "Vanheneminen (päivää)",
"Favorite": "Suosikki",
"Favorites": "Suosikit",
"Federation_Matrix_room_description_disabled": "Federointi on tällä hetkellä poistettu käytöstä tässä työtilassa",
"Federation_Matrix_room_description_invalid_version": "Tämä huone luotiin vanhalla Federointi-versiolla ja se on estetty määrittelemättömästi.",
"Federation_Matrix_room_description_missing_module": "Liittyminen federoiduihin huoneisiin on Premium-ominaisuus",
"Fetch_image_from_URL": "Hae kuva URL-osoitteesta",
"Field_are_required": "{{field}} ovat pakollisia.",
"Field_is_required": "{{field}} on pakollinen",
Expand Down
3 changes: 3 additions & 0 deletions app/i18n/locales/fr.json
Original file line number Diff line number Diff line change
Expand Up @@ -258,6 +258,9 @@
"Expiration_Days": "Expiration (Jours)",
"Favorite": "Favori",
"Favorites": "Favoris",
"Federation_Matrix_room_description_disabled": "La fédération est actuellement désactivée sur cet espace de travail",
"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.",
"Federation_Matrix_room_description_missing_module": "Rejoindre les salles fédérées est une fonctionnalité Premium",
"Fetch_image_from_URL": "Récupérer l'image depuis l'URL",
"Field_are_required": "Les {{field}} sont requis.",
"Field_is_required": "Le champ {{field}} est requis.",
Expand Down
3 changes: 3 additions & 0 deletions app/i18n/locales/hi-IN.json
Original file line number Diff line number Diff line change
Expand Up @@ -313,6 +313,9 @@
"Expiration_Days": "समाप्ति (दिन)",
"Favorite": "पसंदीदा",
"Favorites": "पसंदीदा",
"Federation_Matrix_room_description_disabled": "इस वर्कस्पेस पर फेडरेशन वर्तमान में अक्षम है",
"Federation_Matrix_room_description_invalid_version": "यह रूम फेडरेशन के पुराने संस्करण द्वारा बनाया गया था और यह अनिश्चित काल के लिए अवरुद्ध है।",
"Federation_Matrix_room_description_missing_module": "फेडरेटेड रूम में शामिल होना एक प्रीमियम सुविधा है",
"Fetch_image_from_URL": "URL से छवि प्राप्त करें",
"Field_are_required": "{{field}} आवश्यक हैं।",
"Field_is_required": "{{field}} आवश्यक है।",
Expand Down
3 changes: 3 additions & 0 deletions app/i18n/locales/hu.json
Original file line number Diff line number Diff line change
Expand Up @@ -313,6 +313,9 @@
"Expiration_Days": "Lejárat (napokban)",
"Favorite": "Kedvenc",
"Favorites": "Kedvencek",
"Federation_Matrix_room_description_disabled": "A federáció jelenleg le van tiltva ezen a munkaterületen",
"Federation_Matrix_room_description_invalid_version": "Ez a szoba egy régi Federáció verzióval lett létrehozva és határozatlan ideig blokkolva van.",
"Federation_Matrix_room_description_missing_module": "A federált szobákhoz való csatlakozás prémium funkció",
"Fetch_image_from_URL": "Kép betöltése az URL-ről",
"Field_are_required": "{{field}} kötelezőek",
"Field_is_required": "A {{field}} megadása kötelező.",
Expand Down
3 changes: 3 additions & 0 deletions app/i18n/locales/it.json
Original file line number Diff line number Diff line change
Expand Up @@ -231,6 +231,9 @@
"Expiration_Days": "Scadenza (giorni)",
"Favorite": "Preferito",
"Favorites": "Preferiti",
"Federation_Matrix_room_description_disabled": "La federazione è attualmente disabilitata in questo spazio di lavoro",
"Federation_Matrix_room_description_invalid_version": "Questa stanza è stata creata da una vecchia versione di Federazione ed è bloccata indefinitamente.",
"Federation_Matrix_room_description_missing_module": "Unirsi alle stanze federate è una funzionalità Premium",
"Fetch_image_from_URL": "Recupera immagine da URL",
"Field_are_required": "{{field}} sono obbligatori",
"Field_is_required": "Il campo {{field}} è obbligatorio",
Expand Down
3 changes: 3 additions & 0 deletions app/i18n/locales/ja.json
Original file line number Diff line number Diff line change
Expand Up @@ -206,6 +206,9 @@
"Expiration_Days": "期限切れ (日)",
"Favorite": "お気に入り",
"Favorites": "お気に入り",
"Federation_Matrix_room_description_disabled": "このワークスペースでは現在フェデレーションが無効になっています",
"Federation_Matrix_room_description_invalid_version": "このルームは古いフェデレーションバージョンで作成され、無期限にブロックされています。",
"Federation_Matrix_room_description_missing_module": "フェデレーションルームへの参加はプレミアム機能です",
"Fetch_image_from_URL": "URLから画像を取得する",
"Field_are_required": "{{field}}は必須です。",
"Field_is_required": "{{field}}は必須です。",
Expand Down
3 changes: 3 additions & 0 deletions app/i18n/locales/nl.json
Original file line number Diff line number Diff line change
Expand Up @@ -258,6 +258,9 @@
"Expiration_Days": "Vervaldatum (Dagen)",
"Favorite": "Favoriet",
"Favorites": "Favorieten",
"Federation_Matrix_room_description_disabled": "Federatie is momenteel uitgeschakeld op deze werkruimte",
"Federation_Matrix_room_description_invalid_version": "Deze ruimte is gemaakt met een oude Federatie-versie en is onbepaald geblokkeerd.",
"Federation_Matrix_room_description_missing_module": "Deelnemen aan gefedereerde ruimtes is een Premium-functie",
"Fetch_image_from_URL": "Afbeelding ophalen van URL",
"Field_are_required": "{{field}} zijn verplicht",
"Field_is_required": "{{field}} is vereist",
Expand Down
3 changes: 3 additions & 0 deletions app/i18n/locales/nn.json
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,9 @@
"Everyone_can_access_this_channel": "Alle kan få tilgang til denne kanalen",
"Favorite": "Favoritt",
"Favorites": "Favoritter",
"Federation_Matrix_room_description_disabled": "Federasjon er for tida deaktivert på dette arbeidsområdet",
"Federation_Matrix_room_description_invalid_version": "Dette rommet vart oppretta med ei gammal Federasjon-versjon og er blokkert på ubestemt tid.",
"Federation_Matrix_room_description_missing_module": "Å bli med i federerte rom er ein Premium-funksjon",
"Field_is_required": "{{field}} er påkrevd",
"File_description": "Filbeskrivelse",
"Files": "Filer",
Expand Down
3 changes: 3 additions & 0 deletions app/i18n/locales/no.json
Original file line number Diff line number Diff line change
Expand Up @@ -336,6 +336,9 @@
"Expanded": "Utvidet",
"Expiration_Days": "Utløp (dager)",
"Favorites": "Favoritter",
"Federation_Matrix_room_description_disabled": "Federasjon er for øyeblikket deaktivert på denne arbeidsområdet",
"Federation_Matrix_room_description_invalid_version": "Dette rommet ble opprettet med en gammel Federasjon-versjon og er blokkert på ubestemt tid.",
"Federation_Matrix_room_description_missing_module": "Bli med i federerte rom er en Premium-funksjon",
"Fetch_image_from_URL": "Hent bilde fra URL",
"Field_is_required": "{{field}} er påkrevd",
"File_description": "Filbeskrivelse",
Expand Down
3 changes: 3 additions & 0 deletions app/i18n/locales/pt-BR.json
Original file line number Diff line number Diff line change
Expand Up @@ -343,6 +343,9 @@
"Expiration_Days": "Expira em (dias)",
"Favorite": "Favorito",
"Favorites": "Favoritos",
"Federation_Matrix_room_description_disabled": "A federação está atualmente desabilitada neste espaço de trabalho",
"Federation_Matrix_room_description_invalid_version": "Esta sala foi criada por uma versão antiga da Federação e está bloqueada indefinidamente.",
"Federation_Matrix_room_description_missing_module": "Entrar em salas federadas é um recurso Premium",
"Fetch_image_from_URL": "Obter imagem da URL",
"Field_are_required": "{{field}} são obrigatórios",
"Field_is_required": "{{field}} é obrigatório",
Expand Down
3 changes: 3 additions & 0 deletions app/i18n/locales/pt-PT.json
Original file line number Diff line number Diff line change
Expand Up @@ -201,6 +201,9 @@
"Expiration_Days": "Validade (Dias)",
"Favorite": "Favorito",
"Favorites": "Favoritos",
"Federation_Matrix_room_description_disabled": "A federação está atualmente desativada neste espaço de trabalho",
"Federation_Matrix_room_description_invalid_version": "Esta sala foi criada por uma versão antiga da Federação e está bloqueada indefinidamente.",
"Federation_Matrix_room_description_missing_module": "Entrar em salas federadas é uma funcionalidade Premium",
"Fetch_image_from_URL": "Pesquisar imagem do URL",
"Field_are_required": "{{field}} são obrigatórios",
"Field_is_required": "{{campo}} é obrigatório",
Expand Down
3 changes: 3 additions & 0 deletions app/i18n/locales/ru.json
Original file line number Diff line number Diff line change
Expand Up @@ -283,6 +283,9 @@
"Expiration_Days": "Срок действия (Дни)",
"Favorite": "Любимый",
"Favorites": "Избранное",
"Federation_Matrix_room_description_disabled": "Федерация в настоящее время отключена в этом рабочем пространстве",
"Federation_Matrix_room_description_invalid_version": "Эта комната была создана старой версией Федерации и заблокирована на неопределенный срок.",
"Federation_Matrix_room_description_missing_module": "Присоединение к федеративным комнатам — это функция Premium",
"Fetch_image_from_URL": "получить изображение по URL",
"Field_are_required": "Поле {{field}} обязательно для заполнения.",
"Field_is_required": "Поле {{field}} является обязательным.",
Expand Down
3 changes: 3 additions & 0 deletions app/i18n/locales/sl-SI.json
Original file line number Diff line number Diff line change
Expand Up @@ -269,6 +269,9 @@
"Expiration_Days": "Iztek (dnevi)",
"Favorite": "Priljubljeno",
"Favorites": "Priljubljeno",
"Federation_Matrix_room_description_disabled": "Federacija je trenutno onemogočena v tem delovnem prostoru",
"Federation_Matrix_room_description_invalid_version": "Ta soba je bila ustvarjena s staro različico Federacije in je nedoločno blokirana.",
"Federation_Matrix_room_description_missing_module": "Pridružitev federiranim sobam je Premium funkcija",
"Fetch_image_from_URL": "Pridobi sliko iz URL",
"Field_are_required": "{{field}} so obvezna",
"Field_is_required": "{{field}} je obvezno",
Expand Down
3 changes: 3 additions & 0 deletions app/i18n/locales/sv.json
Original file line number Diff line number Diff line change
Expand Up @@ -292,6 +292,9 @@
"Expiration_Days": "Förfallotid (dagar)",
"Favorite": "Favorit",
"Favorites": "Favoriter",
"Federation_Matrix_room_description_disabled": "Federation är för närvarande inaktiverad på denna arbetsyta",
"Federation_Matrix_room_description_invalid_version": "Detta rum skapades med en gammal Federation-version och är blockerat på obestämd tid.",
"Federation_Matrix_room_description_missing_module": "Gå med i federerade rum är en Premium-funktion",
"Fetch_image_from_URL": "Hämta bild från URL",
"Field_are_required": "{{field}} är obligatoriska",
"Field_is_required": "{{fält}} är obligatoriskt",
Expand Down
3 changes: 3 additions & 0 deletions app/i18n/locales/ta-IN.json
Original file line number Diff line number Diff line change
Expand Up @@ -313,6 +313,9 @@
"Expiration_Days": "காலாவதி (நாட்கள்)",
"Favorite": "பிடித்தது",
"Favorites": "பிடித்தவை",
"Federation_Matrix_room_description_disabled": "இந்த பணியிடத்தில் இணைப்பு தற்போது முடக்கப்பட்டுள்ளது",
"Federation_Matrix_room_description_invalid_version": "இந்த அறை ஒரு பழைய இணைப்பு பதிப்பால் உருவாக்கப்பட்டது மற்றும் காலவரையின்றி தடுக்கப்பட்டுள்ளது.",
"Federation_Matrix_room_description_missing_module": "இணைக்கப்பட்ட அறைகளில் சேர்வது ஒரு பிரீமியம் அம்சமாகும்",
"Fetch_image_from_URL": "URL இலிருந்து படத்தைப் பெறவும்",
"Field_are_required": "{{field}} தேவை.",
"Field_is_required": "{{field}} தேவை.",
Expand Down
3 changes: 3 additions & 0 deletions app/i18n/locales/te-IN.json
Original file line number Diff line number Diff line change
Expand Up @@ -312,6 +312,9 @@
"Expiration_Days": "కాలాంతరం (రోజులు)",
"Favorite": "पसंदीदा",
"Favorites": "ఇష్టాలు",
"Federation_Matrix_room_description_disabled": "ఈ వర్క్‌స్పేస్‌లో ఫెడరేషన్ ప్రస్తుతం నిలిపివేయబడింది",
"Federation_Matrix_room_description_invalid_version": "ఈ గది పాత ఫెడరేషన్ వెర్షన్‌తో సృష్టించబడింది మరియు నిరవధికంగా నిరోధించబడింది.",
"Federation_Matrix_room_description_missing_module": "ఫెడరేటెడ్ గదులలో చేరడం ఒక ప్రీమియం ఫీచర్",
"Fetch_image_from_URL": "URL నుండి చిత్రాన్ని పొందండి",
"Field_are_required": "{{field}} आवश्यक हैं",
"Field_is_required": "{{field}} आवश्यक है।",
Expand Down
3 changes: 3 additions & 0 deletions app/i18n/locales/tr.json
Original file line number Diff line number Diff line change
Expand Up @@ -218,6 +218,9 @@
"Expiration_Days": "Geçerlilik Süresi (Gün)",
"Favorite": "Favori",
"Favorites": "Favoriler",
"Federation_Matrix_room_description_disabled": "Federasyon şu anda bu çalışma alanında devre dışı",
"Federation_Matrix_room_description_invalid_version": "Bu oda eski bir Federasyon sürümü tarafından oluşturuldu ve süresiz olarak engellendi.",
"Federation_Matrix_room_description_missing_module": "Federe odalara katılmak bir Premium özelliğidir",
"Fetch_image_from_URL": "URL'den resim al",
"Field_are_required": "{{field}} gereklidir.",
"Field_is_required": "{{field}} gerekli",
Expand Down
3 changes: 3 additions & 0 deletions app/i18n/locales/zh-CN.json
Original file line number Diff line number Diff line change
Expand Up @@ -214,6 +214,9 @@
"Expiration_Days": "到期 (日)",
"Favorite": "收藏",
"Favorites": "收藏",
"Federation_Matrix_room_description_disabled": "此工作区当前已禁用联合",
"Federation_Matrix_room_description_invalid_version": "此房间由旧版联合创建,已被无限期阻止。",
"Federation_Matrix_room_description_missing_module": "加入联合房间是高级功能",
"Fetch_image_from_URL": "从URL获取图片",
"Field_are_required": "{{field}}为必填项。",
"Field_is_required": "{{field}}为必填项。",
Expand Down
3 changes: 3 additions & 0 deletions app/i18n/locales/zh-TW.json
Original file line number Diff line number Diff line change
Expand Up @@ -222,6 +222,9 @@
"Expiration_Days": "到期 (日)",
"Favorite": "最愛",
"Favorites": "我的最愛",
"Federation_Matrix_room_description_disabled": "此工作區目前已停用聯合",
"Federation_Matrix_room_description_invalid_version": "此房間由舊版聯合建立,已被無限期封鎖。",
"Federation_Matrix_room_description_missing_module": "加入聯合房間是進階功能",
"Fetch_image_from_URL": "從URL獲取圖片",
"Field_are_required": "{{field}}為必填項目",
"Field_is_required": "{{field}} 是必填項目",
Expand Down
6 changes: 6 additions & 0 deletions app/lib/constants/defaultSettings.ts
Original file line number Diff line number Diff line change
Expand Up @@ -300,5 +300,11 @@ export const defaultSettings = {
Cloud_Workspace_AirGapped_Restrictions_Remaining_Days: {
type: 'valueAsNumber'
},
Federation_Service_Enabled: {
type: 'valueAsBoolean'
},
Federation_Matrix_enabled: {
type: 'valueAsBoolean'
},
...deprecatedSettings
} as const;
3 changes: 3 additions & 0 deletions app/lib/database/model/Subscription.js
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,8 @@ export default class Subscription extends Model {

@field('federated') federated;

@json('federation', sanitizer) federation;

@field('status') status;

@json('inviter', sanitizer) inviter;
Expand Down Expand Up @@ -224,6 +226,7 @@ export default class Subscription extends Model {
source: this.source,
disableNotifications: this.disableNotifications,
federated: this.federated,
federation: this.federation,
status: this.status,
inviter: this.inviter
};
Expand Down
1 change: 1 addition & 0 deletions app/lib/database/model/migrations.js
Original file line number Diff line number Diff line change
Expand Up @@ -338,6 +338,7 @@ export default schemaMigrations({
addColumns({
table: 'subscriptions',
columns: [
{ name: 'federation', type: 'string', isOptional: true },
{ name: 'status', type: 'string', isOptional: true },
{ name: 'inviter', type: 'string', isOptional: true }
]
Expand Down
Loading
Loading