Merge pull request #12687 from nextcloud/backport/12685/stable29

[stable29] fix(federation): Also fix room::remote_server and pcm::remote_server_url

.github/workflows/integration-mysql.yml

@@ -57,7 +57,7 @@ jobs:
         test-suite: ['callapi', 'chat-1', 'chat-2', 'command', 'conversation-1', 'conversation-2', 'conversation-3', 'conversation-4', 'conversation-5', 'federation', 'integration', 'sharing-1', 'sharing-2', 'sharing-3', 'sharing-4']
         php-versions: ['8.2']
         server-versions: ['stable29']
-        guests-versions: ['master']
+        guests-versions: ['stable29']
         call-summary-bot-versions: ['main']
         notifications-versions: ['stable29']
 

.github/workflows/integration-oci.yml

@@ -57,7 +57,7 @@ jobs:
         test-suite: ['callapi', 'chat-1', 'chat-2', 'command', 'conversation-1', 'conversation-2', 'conversation-3', 'conversation-4', 'conversation-5', 'federation', 'integration', 'sharing-1', 'sharing-2', 'sharing-3', 'sharing-4']
         php-versions: ['8.2']
         server-versions: ['stable29']
-        guests-versions: ['master']
+        guests-versions: ['stable29']
         call-summary-bot-versions: ['main']
         notifications-versions: ['stable29']
 

.github/workflows/integration-pgsql.yml

@@ -54,7 +54,7 @@ jobs:
         test-suite: ['callapi', 'chat-1', 'chat-2', 'command', 'conversation-1', 'conversation-2', 'conversation-3', 'conversation-4', 'conversation-5', 'federation', 'integration', 'sharing-1', 'sharing-2', 'sharing-3', 'sharing-4']
         php-versions: ['8.3']
         server-versions: ['stable29']
-        guests-versions: ['master']
+        guests-versions: ['stable29']
         call-summary-bot-versions: ['main']
         notifications-versions: ['stable29']
 

.github/workflows/integration-sqlite.yml

@@ -57,7 +57,7 @@ jobs:
         test-suite: ['callapi', 'chat-1', 'chat-2', 'command', 'conversation-1', 'conversation-2', 'conversation-3', 'conversation-4', 'conversation-5', 'federation', 'integration', 'sharing-1', 'sharing-2', 'sharing-3', 'sharing-4']
         php-versions: ['8.2']
         server-versions: ['stable29']
-        guests-versions: ['master']
+        guests-versions: ['stable29']
         call-summary-bot-versions: ['main']
         notifications-versions: ['stable29']
 

appinfo/info.xml

@@ -14,7 +14,7 @@
 * 🌉 **Sync with other chat solutions** With [Matterbridge](https://github.com/42wim/matterbridge/) being integrated in Talk, you can easily sync a lot of other chat solutions to Nextcloud Talk and vice-versa.
 ]]></description>
 
-	<version>19.0.5</version>
+	<version>19.0.6-dev.1</version>
 	<licence>agpl</licence>
 
 	<author>Daniel Calviño Sánchez</author>

lib/Migration/Version19000Date20240709183937.php → lib/Migration/Version19000Date20240709183938.php

@@ -19,7 +19,7 @@
  * Heal federation from before Nextcloud 29.0.4 which sends requests
  * without the protocol on the remote in case it is https://
  */
-class Version19000Date20240709183937 extends SimpleMigrationStep {
+class Version19000Date20240709183938 extends SimpleMigrationStep {
 	public function __construct(
 		protected IDBConnection $connection,
 	) {
@@ -32,15 +32,22 @@ public function __construct(
 	 * @param array $options
 	 */
 	public function postSchemaChange(IOutput $output, Closure $schemaClosure, array $options): void {
+		$this->addMissingProtocol('talk_invitations', 'remote_server_url');
+		$this->addMissingProtocol('talk_proxy_messages', 'remote_server_url');
+		$this->addMissingProtocol('talk_rooms', 'remote_server');
+	}
+
+	protected function addMissingProtocol(string $table, string $column): void {
 		$query = $this->connection->getQueryBuilder();
-		$query->update('talk_invitations')
-			->set('remote_server_url', $query->func()->concat($query->createNamedParameter('https://'), 'remote_server_url'))
-			->where($query->expr()->notLike('remote_server_url', $query->createNamedParameter(
+		$query->update($table)
+			->set($column, $query->func()->concat($query->createNamedParameter('https://'), $column))
+			->where($query->expr()->notLike($column, $query->createNamedParameter(
 				$this->connection->escapeLikeParameter('http://'). '%'
 			)))
-			->andWhere($query->expr()->notLike('remote_server_url', $query->createNamedParameter(
+			->andWhere($query->expr()->notLike($column, $query->createNamedParameter(
 				$this->connection->escapeLikeParameter('https://'). '%'
-			)));
+			)))
+			->andWhere($query->expr()->nonEmptyString($column));
 		$query->executeStatement();
 	}
 }