Merge remote-tracking branch 'origin/main'

locale/de/translations.suml

@@ -443,7 +443,7 @@ profile:
         header: 'Visitenkarte-Editor'
         save: 'Visitenkarte speichern'
         defaults: 'Standardwerte wiederherstellen'
-        propagate: 'Propagate this change to your cards in all languages'  # TODO
+        propagate: 'Diese Änderung in allen Visitenkarten in allen Sprachen speichern'
     opinion:
         yes: 'Ja'
         jokingly: 'Scherzhaft'

locale/fr/translations.suml

@@ -449,7 +449,7 @@ profile:
         header: 'Éditeur de carte'
         save: 'Sauvegarder votre carte'
         defaults: 'Restaurer les valeurs par défaut'
-        propagate: 'Propagate this change to your cards in all languages'  # TODO
+        propagate: 'Sauvegarder ce changement sur vos cartes dans tous les langages'
     opinion:
         yes: 'Oui'
         jokingly: 'Pour plaisanter'

locale/nl/translations.suml

@@ -449,7 +449,7 @@ profile:
         header: 'Kaart editor'
         save: 'Sla jouw kaart op'
         defaults: 'Zet terug naar standaardwaarden'
-        propagate: 'Propagate this change to your cards in all languages'  # TODO
+        propagate: 'Sla deze verandering op voor jouw kaarten in alle talen'
     opinion:
         yes: 'Ja'
         jokingly: 'Voor de grap'

locale/ru/translations.suml

@@ -482,7 +482,7 @@ profile:
         header: 'Редактор карточек'
         save: 'Сохранить Вашу карточку'
         defaults: 'Вернуть слова по умолчанию'
-        propagate: 'Propagate this change to your cards in all languages'  # TODO
+        propagate: 'Изменения в этой колонке будут распространяться на все языки'
     opinion:
         yes: 'Да'
         jokingly: 'В шутку'

plugins/link.js

@@ -75,6 +75,10 @@ const LINK_PROVIDERS = {
         icon: 'mastodon',
         iconSet: 'b',
     },
+    matrix: {
+        regex: '^https?://(?:www.)?matrix\\.to/#/([^/?]+)',
+        icon: 'https://raw.githubusercontent.com/vector-im/logos/master/matrix/matrix-favicon.png',
+    },
 };
 
 export default {

src/socialProviders.js

@@ -2,7 +2,7 @@ export const socialProviders = {
     mastodon: {
         name: 'Mastodon',
         instanceRequired: true,
-        linkRegex: (p) => `^https?://(?:www.)?${p.name.split('@')[1]}/(?:web/)?@${p.name.split('@')[0]}/?$`,
+        linkRegex: (p) => `^https?://(?:www.)?${p.name.split('@')[1]}/(?:(?:web/)?@|users/)?${p.name.split('@')[0]}/?$`,
     },
     twitter: {
         name: 'Twitter',