Merge f8fa187fe8 into 6754d434e9

Signed-off-by: Nextcloud bot <bot@nextcloud.com>

.github/workflows/phpunit-pgsql.yml

@@ -39,7 +39,7 @@ jobs:
     strategy:
       matrix:
         php-versions: ['8.0']
-        server-versions: ['master']
+        server-versions: ['master', 'stable29']
 
     services:
       postgres:

.github/workflows/psalm.yml

@@ -24,7 +24,7 @@ jobs:
       # do not stop on another job's failure
       fail-fast: false
       matrix:
-        ocp-version: [ 'dev-master', 'dev-stable27', 'dev-stable26' ]
+        ocp-version: [ 'dev-master', 'dev-stable29', 'dev-stable28', 'dev-stable27', 'dev-stable26' ]
 
     name: Nextcloud
     steps:

appinfo/info.xml

@@ -17,7 +17,7 @@
 
 **🕸 Open standards:** We use the established ActivityPub standard!
 	]]></description>
-	<version>0.7.0</version>
+	<version>0.8.0</version>
 	<licence>agpl</licence>
 	<author mail="maxence@artificial-owl.com" homepage="https://artificial-owl.com/">Maxence Lange</author>
 	<author mail="jus@bitgrid.net">Julius Härtl</author>
@@ -35,7 +35,7 @@
 		<database>pgsql</database>
 		<database>sqlite</database>
 		<database>mysql</database>
-		<nextcloud min-version="28" max-version="28" />
+		<nextcloud min-version="28" max-version="29" />
 	</dependencies>
 
 	<background-jobs>

composer.json

@@ -28,7 +28,7 @@
     "kornrunner/blurhash": "^1.2"
   },
   "require-dev": {
-    "phpunit/phpunit": "^9.5",
+    "phpunit/phpunit": "^10.4",
     "nextcloud/coding-standard": "^1.0.0",
     "nextcloud/ocp": "dev-master",
     "vimeo/psalm": "^5.1.0"

l10n/ast.js

@@ -3,13 +3,53 @@ OC.L10N.register(
     {
     "Help" : "Ayuda",
     "Open documentation" : "Abrir la documentación",
+    "Finish setup" : "Finar la configuración",
     "Home" : "Aniciu",
+    "Direct messages" : "Mensaxes direutos",
     "Notifications" : "Avisos",
+    "Profile" : "Perfil",
+    "Local timeline" : "Llinia de tiempu llocal",
+    "Global timeline" : "Llinia de tiempu global",
+    "Following" : "Siguiendo",
+    "In reply to" : "En rempuesta a",
+    "Close reply" : "Zarrar la rempuesta",
+    "Add emoji" : "Amestar un fustaxe",
+    "Uploading..." : "Xubiendo…",
     "Delete" : "Desaniciar",
+    "Post" : "Espublizar",
+    "Post to followers" : "Espublizar pa los siguidores",
+    "Post publicly" : "Espublizar públicamente",
+    "Post to recipients" : "Espublizar pa los destinatarios",
+    "Unfollow" : "Dexar de siguir",
+    "Follow" : "Siguir",
+    "posts" : "artículos",
+    "following" : "siguiendo a",
+    "followers" : "siguidores",
     "Website" : "Sitiu web",
+    "No results found" : "Nun s'atopó nengún resultáu",
+    "There were no results for your search:" : "Nun hebo nengún resultáu pa la busca:",
+    "No posts found" : "Nun s'atopó nengún artliculu",
+    "Posts from people you follow will show up here" : "Equí apaecen los artículos de les cuentes a les que sigues",
+    "No direct messages found" : "Nun s'atopó nengún mensaxes direutos",
+    "No local posts found" : "Nun s'atopó nengún artículu llocal",
+    "Posts from other people on this instance will show up here" : "Equí apaecen los artículos de les cuentes d'esta instancia",
+    "No notifications found" : "Nun s'atopó nengún avisu",
+    "No global posts found" : "Nun s'atopó nengún artículu global",
+    "No posts found for this tag" : "Nun s'atopó nengún artículu pa esta etiqueta",
     "No replies found" : "Nun s'atopó nenguna rempuesta",
+    "Reply" : "Responder",
+    "{appDisplayName} would like permission to access your account. It is a third party application." : "«{appDisplayName}» pide permisu p'acceder a la cuenta. Ye una aplicación de terceros.",
+    "If you do not trust it, then you should not authorize it." : "SI nun t'enfotes nella, nun habríes autorizala.",
+    "Authorize" : "Autorizar",
+    "Deny" : "Negar",
     "Hello" : "Hola",
+    "Please confirm that you want to follow this account:" : "Confirma que quies siguir a esta cuenta:",
+    "You are following this account" : "Tas siguiendo a esta cuenta",
     "Close" : "Zarrar",
-    "Continue" : "Siguir"
+    "You are going to follow:" : "Vas siguir a:",
+    "Continue" : "Siguir",
+    "User not found" : "Nun s'atopó l'usuariu",
+    "Sorry, we could not find the account of {userId}" : "Nun podemos atopar la cuenta de: {userId}",
+    "This application is currently in beta stage." : "Esta aplicación ta en fas beta."
 },
 "nplurals=2; plural=(n != 1);");

l10n/ast.json

@@ -1,13 +1,53 @@
 { "translations": {
     "Help" : "Ayuda",
     "Open documentation" : "Abrir la documentación",
+    "Finish setup" : "Finar la configuración",
     "Home" : "Aniciu",
+    "Direct messages" : "Mensaxes direutos",
     "Notifications" : "Avisos",
+    "Profile" : "Perfil",
+    "Local timeline" : "Llinia de tiempu llocal",
+    "Global timeline" : "Llinia de tiempu global",
+    "Following" : "Siguiendo",
+    "In reply to" : "En rempuesta a",
+    "Close reply" : "Zarrar la rempuesta",
+    "Add emoji" : "Amestar un fustaxe",
+    "Uploading..." : "Xubiendo…",
     "Delete" : "Desaniciar",
+    "Post" : "Espublizar",
+    "Post to followers" : "Espublizar pa los siguidores",
+    "Post publicly" : "Espublizar públicamente",
+    "Post to recipients" : "Espublizar pa los destinatarios",
+    "Unfollow" : "Dexar de siguir",
+    "Follow" : "Siguir",
+    "posts" : "artículos",
+    "following" : "siguiendo a",
+    "followers" : "siguidores",
     "Website" : "Sitiu web",
+    "No results found" : "Nun s'atopó nengún resultáu",
+    "There were no results for your search:" : "Nun hebo nengún resultáu pa la busca:",
+    "No posts found" : "Nun s'atopó nengún artliculu",
+    "Posts from people you follow will show up here" : "Equí apaecen los artículos de les cuentes a les que sigues",
+    "No direct messages found" : "Nun s'atopó nengún mensaxes direutos",
+    "No local posts found" : "Nun s'atopó nengún artículu llocal",
+    "Posts from other people on this instance will show up here" : "Equí apaecen los artículos de les cuentes d'esta instancia",
+    "No notifications found" : "Nun s'atopó nengún avisu",
+    "No global posts found" : "Nun s'atopó nengún artículu global",
+    "No posts found for this tag" : "Nun s'atopó nengún artículu pa esta etiqueta",
     "No replies found" : "Nun s'atopó nenguna rempuesta",
+    "Reply" : "Responder",
+    "{appDisplayName} would like permission to access your account. It is a third party application." : "«{appDisplayName}» pide permisu p'acceder a la cuenta. Ye una aplicación de terceros.",
+    "If you do not trust it, then you should not authorize it." : "SI nun t'enfotes nella, nun habríes autorizala.",
+    "Authorize" : "Autorizar",
+    "Deny" : "Negar",
     "Hello" : "Hola",
+    "Please confirm that you want to follow this account:" : "Confirma que quies siguir a esta cuenta:",
+    "You are following this account" : "Tas siguiendo a esta cuenta",
     "Close" : "Zarrar",
-    "Continue" : "Siguir"
+    "You are going to follow:" : "Vas siguir a:",
+    "Continue" : "Siguir",
+    "User not found" : "Nun s'atopó l'usuariu",
+    "Sorry, we could not find the account of {userId}" : "Nun podemos atopar la cuenta de: {userId}",
+    "This application is currently in beta stage." : "Esta aplicación ta en fas beta."
 },"pluralForm" :"nplurals=2; plural=(n != 1);"
 }

l10n/es.js

@@ -9,7 +9,7 @@ OC.L10N.register(
     "🎉 Nextcloud becomes part of the federated social networks!" : "¡🎉 Nextcloud pasa a ser parte de las redes sociales federadas!",
     "**Disclaimer: this is a BETA version**\n\n**🎉 Nextcloud becomes part of the federated social networks!**\n\n**🙋 Find your friends:** No matter if they use Nextcloud, 🐘 Mastodon, 🇫 Friendica, and soon ✱ Diaspora, 👹 MediaGoblin and more – you can follow them!\n\n**📜 Profile info:** No need to fill out more profiles – your info from Nextcloud will be used and extended.\n\n**👐 Own your posts:** Everything you post stays on your Nextcloud!\n\n**🕸 Open standards:** We use the established ActivityPub standard!" : "** AVISO: Esta es una versión BETA **\n\n**🎉 ¡Nextcloud pasa a ser parte de las redes sociales federadas!**\n\n**🙋 Encuentra a tus amigos:** No importa si usan Nextcloud, 🐘 Mastodon, 🇫 Friendica, y pronto ✱ Diaspora, 👹 MediaGoblin y más, – ¡Puedes seguirlos!\n\n**📜 Información de perfil:** No hay necesidad de rellenar más perfiles – se usará y extenderá la información de tu perfil de Nextcloud. \n\n**👐 Sé el dueño de tu material:** ¡Todo lo que cuelgues permanece en tu Nextcloud!\n\n**🕸 Estándares abiertos:** ¡Usamos el estándar establecido ActivityPub! ",
     ".well-known/webfinger isn't properly set up!" : ".well-known/webfinger no está bien configurado",
-    "Social needs the .well-known automatic discovery to be properly set up. If Nextcloud is not installed in the root of the domain, it is often the case that Nextcloud cannot configure this automatically. To use Social, the administrator of this Nextcloud instance needs to manually configure the .well-known redirects:" : "Social necesita la detección automática con .well-known para estar correctamente configurado. Si Nextcloud no está instalado en la raíz del dominio, se suele dar el caso que Nextcloud no puede configurarlo automáticamente. Para usar Social, el administrador de esta instancia de Nextcloud necesita configurar manualmente las redirecciones .well-known:",
+    "Social needs the .well-known automatic discovery to be properly set up. If Nextcloud is not installed in the root of the domain, it is often the case that Nextcloud cannot configure this automatically. To use Social, the administrator of this Nextcloud instance needs to manually configure the .well-known redirects:" : "Social necesita que la detección automática .well-known esté correctamente configurada. Si Nextcloud no está instalado en la raíz del dominio, a menudo se presenta el caso de que Nextcloud no puede configurar la misma automáticamente. Para usar Social, el administrador de esta instancia de Nextcloud necesita configurar manualmente las redirecciones .well-known:",
     "Open documentation" : "Abrir la documentación",
     "Social app setup" : "Configuración de la app Social",
     "ActivityPub requires a fixed URL to make entries unique. Note that this cannot be changed later without resetting the Social app." : "ActivityPub necesita una URL fija para hacer únicas las entradas. Nota: esto no puede cambiarse más tarde sin reiniciar la app Social.",

l10n/es.json

@@ -7,7 +7,7 @@
     "🎉 Nextcloud becomes part of the federated social networks!" : "¡🎉 Nextcloud pasa a ser parte de las redes sociales federadas!",
     "**Disclaimer: this is a BETA version**\n\n**🎉 Nextcloud becomes part of the federated social networks!**\n\n**🙋 Find your friends:** No matter if they use Nextcloud, 🐘 Mastodon, 🇫 Friendica, and soon ✱ Diaspora, 👹 MediaGoblin and more – you can follow them!\n\n**📜 Profile info:** No need to fill out more profiles – your info from Nextcloud will be used and extended.\n\n**👐 Own your posts:** Everything you post stays on your Nextcloud!\n\n**🕸 Open standards:** We use the established ActivityPub standard!" : "** AVISO: Esta es una versión BETA **\n\n**🎉 ¡Nextcloud pasa a ser parte de las redes sociales federadas!**\n\n**🙋 Encuentra a tus amigos:** No importa si usan Nextcloud, 🐘 Mastodon, 🇫 Friendica, y pronto ✱ Diaspora, 👹 MediaGoblin y más, – ¡Puedes seguirlos!\n\n**📜 Información de perfil:** No hay necesidad de rellenar más perfiles – se usará y extenderá la información de tu perfil de Nextcloud. \n\n**👐 Sé el dueño de tu material:** ¡Todo lo que cuelgues permanece en tu Nextcloud!\n\n**🕸 Estándares abiertos:** ¡Usamos el estándar establecido ActivityPub! ",
     ".well-known/webfinger isn't properly set up!" : ".well-known/webfinger no está bien configurado",
-    "Social needs the .well-known automatic discovery to be properly set up. If Nextcloud is not installed in the root of the domain, it is often the case that Nextcloud cannot configure this automatically. To use Social, the administrator of this Nextcloud instance needs to manually configure the .well-known redirects:" : "Social necesita la detección automática con .well-known para estar correctamente configurado. Si Nextcloud no está instalado en la raíz del dominio, se suele dar el caso que Nextcloud no puede configurarlo automáticamente. Para usar Social, el administrador de esta instancia de Nextcloud necesita configurar manualmente las redirecciones .well-known:",
+    "Social needs the .well-known automatic discovery to be properly set up. If Nextcloud is not installed in the root of the domain, it is often the case that Nextcloud cannot configure this automatically. To use Social, the administrator of this Nextcloud instance needs to manually configure the .well-known redirects:" : "Social necesita que la detección automática .well-known esté correctamente configurada. Si Nextcloud no está instalado en la raíz del dominio, a menudo se presenta el caso de que Nextcloud no puede configurar la misma automáticamente. Para usar Social, el administrador de esta instancia de Nextcloud necesita configurar manualmente las redirecciones .well-known:",
     "Open documentation" : "Abrir la documentación",
     "Social app setup" : "Configuración de la app Social",
     "ActivityPub requires a fixed URL to make entries unique. Note that this cannot be changed later without resetting the Social app." : "ActivityPub necesita una URL fija para hacer únicas las entradas. Nota: esto no puede cambiarse más tarde sin reiniciar la app Social.",

l10n/ru.js

@@ -35,7 +35,7 @@ OC.L10N.register(
     "Unfollow" : "Отписаться",
     "Follow" : "Следить",
     "posts" : "записи",
-    "following" : "вы подписаны",
+    "following" : "вы отслеживаете",
     "followers" : "ваши подписчики",
     "Website" : "Сайт",
     "No results found" : "Результаты отсутствуют",

l10n/ru.json

@@ -33,7 +33,7 @@
     "Unfollow" : "Отписаться",
     "Follow" : "Следить",
     "posts" : "записи",
-    "following" : "вы подписаны",
+    "following" : "вы отслеживаете",
     "followers" : "ваши подписчики",
     "Website" : "Сайт",
     "No results found" : "Результаты отсутствуют",

l10n/uk.js

@@ -10,7 +10,7 @@ OC.L10N.register(
     "In reply to" : "У відповідь",
     "Add attachment" : "Додати вкладення",
     "Add emoji" : "Додати емоційку",
-    "Uploading..." : "Завантажується...",
+    "Uploading..." : "Завантаження...",
     "Delete" : "Вилучити",
     "Post" : "Розмістити",
     "Website" : "Вебсайт",

l10n/uk.json

@@ -8,7 +8,7 @@
     "In reply to" : "У відповідь",
     "Add attachment" : "Додати вкладення",
     "Add emoji" : "Додати емоційку",
-    "Uploading..." : "Завантажується...",
+    "Uploading..." : "Завантаження...",
     "Delete" : "Вилучити",
     "Post" : "Розмістити",
     "Website" : "Вебсайт",

l10n/zh_HK.js

@@ -71,25 +71,25 @@ OC.L10N.register(
     "No Social notifications!" : "無 Social 通告！",
     "Failed to get Social notifications" : "未能獲取 Social 通告",
     "Authorization required" : "需要授權",
-    "{appDisplayName} would like permission to access your account. It is a third party application." : "{appDisplayName} 想要存取您賬戶的權限。它是第三方應用程式。",
+    "{appDisplayName} would like permission to access your account. It is a third party application." : "{appDisplayName} 想要存取您帳戶的權限。它是第三方應用程式。",
     "If you do not trust it, then you should not authorize it." : "如果您不信任它，那麼您不應該授權它。",
     "Authorize" : "授權",
     "Deny" : "拒絕",
     "Follow on Nextcloud Social" : "在 Nextcloud Social 上關注",
     "Hello" : "嗨",
-    "Please confirm that you want to follow this account:" : "請確認您要關注此賬戶：",
-    "You are following this account" : "您正在關注此賬戶",
+    "Please confirm that you want to follow this account:" : "請確認您要關注此帳戶：",
+    "You are following this account" : "您正在關注此帳戶",
     "Close" : "關閉",
     "You are going to follow:" : "您將要關注：",
-    "name@domain of your federation account" : "您聯盟賬戶的 name@domain",
+    "name@domain of your federation account" : "您聯盟帳戶的 name@domain",
     "Continue" : "繼續",
-    "This step is needed as the user is probably not registered on the same server as you are. We will redirect you to your homeserver to follow this account." : "此步驟是必要的，因為此用戶可能和您不在同一部伺服器上註冊。我們將把您重定向到您的家伺服器來關注此賬戶。",
+    "This step is needed as the user is probably not registered on the same server as you are. We will redirect you to your homeserver to follow this account." : "此步驟是必要的，因為此用戶可能和您不在同一部伺服器上註冊。我們將把您重定向到您的家伺服器來關注此帳戶。",
     "User not found" : "未找到用戶",
-    "Sorry, we could not find the account of {userId}" : "非常抱歉，我們無法找到 {userid} 對應的賬戶",
+    "Sorry, we could not find the account of {userId}" : "非常抱歉，我們無法找到 {userid} 對應的帳戶",
     "Nextcloud becomes part of the federated social networks!" : "Nextcloud 成為聯盟社交網絡的一部分！",
     "This application is currently in beta stage." : "此應用程式目前處於 beta 測試階段。",
-    "We automatically created a Social account for you. Your Social ID is the same as your Federated Cloud ID:" : "我們會自動為您創建一個社交賬戶。您的 Social ID 與您的聯盟式雲端 ID 相同：",
-    "Since you are new to Social, start by following the official Nextcloud account so you don't miss any news" : "鑑於您剛來到 Social，請先關注 Nextcloud 官方賬戶，這樣您將不會錯過任何新聞",
+    "We automatically created a Social account for you. Your Social ID is the same as your Federated Cloud ID:" : "我們會自動為您創建一個社交帳戶。您的 Social ID 與您的聯盟式雲端 ID 相同：",
+    "Since you are new to Social, start by following the official Nextcloud account so you don't miss any news" : "鑑於您剛來到 Social，請先關注 Nextcloud 官方帳戶，這樣您將不會錯過任何新聞",
     "Follow Nextcloud on mastodon.xyz" : "在 mastodon.xyz 上關注 Nextcloud",
     "Public" : "公開",
     "Visible for all" : "所有人均可看見",

l10n/zh_HK.json

@@ -69,25 +69,25 @@
     "No Social notifications!" : "無 Social 通告！",
     "Failed to get Social notifications" : "未能獲取 Social 通告",
     "Authorization required" : "需要授權",
-    "{appDisplayName} would like permission to access your account. It is a third party application." : "{appDisplayName} 想要存取您賬戶的權限。它是第三方應用程式。",
+    "{appDisplayName} would like permission to access your account. It is a third party application." : "{appDisplayName} 想要存取您帳戶的權限。它是第三方應用程式。",
     "If you do not trust it, then you should not authorize it." : "如果您不信任它，那麼您不應該授權它。",
     "Authorize" : "授權",
     "Deny" : "拒絕",
     "Follow on Nextcloud Social" : "在 Nextcloud Social 上關注",
     "Hello" : "嗨",
-    "Please confirm that you want to follow this account:" : "請確認您要關注此賬戶：",
-    "You are following this account" : "您正在關注此賬戶",
+    "Please confirm that you want to follow this account:" : "請確認您要關注此帳戶：",
+    "You are following this account" : "您正在關注此帳戶",
     "Close" : "關閉",
     "You are going to follow:" : "您將要關注：",
-    "name@domain of your federation account" : "您聯盟賬戶的 name@domain",
+    "name@domain of your federation account" : "您聯盟帳戶的 name@domain",
     "Continue" : "繼續",
-    "This step is needed as the user is probably not registered on the same server as you are. We will redirect you to your homeserver to follow this account." : "此步驟是必要的，因為此用戶可能和您不在同一部伺服器上註冊。我們將把您重定向到您的家伺服器來關注此賬戶。",
+    "This step is needed as the user is probably not registered on the same server as you are. We will redirect you to your homeserver to follow this account." : "此步驟是必要的，因為此用戶可能和您不在同一部伺服器上註冊。我們將把您重定向到您的家伺服器來關注此帳戶。",
     "User not found" : "未找到用戶",
-    "Sorry, we could not find the account of {userId}" : "非常抱歉，我們無法找到 {userid} 對應的賬戶",
+    "Sorry, we could not find the account of {userId}" : "非常抱歉，我們無法找到 {userid} 對應的帳戶",
     "Nextcloud becomes part of the federated social networks!" : "Nextcloud 成為聯盟社交網絡的一部分！",
     "This application is currently in beta stage." : "此應用程式目前處於 beta 測試階段。",
-    "We automatically created a Social account for you. Your Social ID is the same as your Federated Cloud ID:" : "我們會自動為您創建一個社交賬戶。您的 Social ID 與您的聯盟式雲端 ID 相同：",
-    "Since you are new to Social, start by following the official Nextcloud account so you don't miss any news" : "鑑於您剛來到 Social，請先關注 Nextcloud 官方賬戶，這樣您將不會錯過任何新聞",
+    "We automatically created a Social account for you. Your Social ID is the same as your Federated Cloud ID:" : "我們會自動為您創建一個社交帳戶。您的 Social ID 與您的聯盟式雲端 ID 相同：",
+    "Since you are new to Social, start by following the official Nextcloud account so you don't miss any news" : "鑑於您剛來到 Social，請先關注 Nextcloud 官方帳戶，這樣您將不會錯過任何新聞",
     "Follow Nextcloud on mastodon.xyz" : "在 mastodon.xyz 上關注 Nextcloud",
     "Public" : "公開",
     "Visible for all" : "所有人均可看見",

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "social",
-  "version": "0.0.1",
+  "version": "0.8.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "social",
-      "version": "0.0.1",
+      "version": "0.8.0",
       "license": "agpl",
       "dependencies": {
         "@nextcloud/auth": "^2.0.0",

package.json

@@ -1,7 +1,7 @@
 {
   "name": "social",
   "description": "🎉 Nextcloud becomes part of the federated social networks!",
-  "version": "0.0.1",
+  "version": "0.8.0",
   "authors": [
     {
       "name": "John Molakvoæ",