Merge branch 'master' into fix/default-link-domain

Author: skjnldsv

.github/dependabot.yml

@@ -6,10 +6,14 @@ updates:
       interval: weekly
       time: "06:00"
     open-pull-requests-limit: 10
+    cooldown:
+      default-days: 10
   - package-ecosystem: "pip"
     directory: "/"
     schedule:
       interval: "weekly"
       time: "06:00"
     target-branch: master
     open-pull-requests-limit: 10
+    cooldown:
+      default-days: 10

.github/workflows/check-occ-command.yml

@@ -11,7 +11,7 @@ permissions:
 jobs:
   check-occ-command:
     name: Check occ command syntax
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-latest-low
     steps:
       - name: Checkout
         uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2

.github/workflows/sphinxbuild.yml

@@ -258,7 +258,7 @@ jobs:
 
   summary:
     needs: build
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-latest-low
     if: always()
 
     permissions:

.github/workflows/transifex.yml

@@ -21,9 +21,12 @@ jobs:
         with:
           github-token: "${{ secrets.GITHUB_TOKEN }}"
 
+      - uses: hmarr/auto-approve-action@f0939ea97e9205ef24d872e76833fa908a770363 # v4.0.0
+        with:
+          github-token: "${{ secrets.COMMAND_BOT_PAT }}"
+
       # Enable GitHub auto merge
       - name: Auto merge
         uses: alexwilson/enable-github-automerge-action@56e3117d1ae1540309dc8f7a9f2825bc3c5f06ff # v2.0.0
-        if: startsWith(steps.branchname.outputs.branch, 'translations_')
         with:
-          github-token: ${{ secrets.GITHUB_TOKEN }}
+          github-token: "${{ secrets.GITHUB_TOKEN }}"

developer_manual/app_publishing_maintenance/app_upgrade_guide/upgrade_to_34.rst

@@ -57,6 +57,8 @@ Added APIs
 
 - ``\OCP\DB\QueryBuilder\ITypedQueryBuilder`` is added in favour of ``\OCP\DB\QueryBuilder\IQueryBuilder`` and can be accessed through ``\OCP\IDBConnection::getTypedQueryBuilder``.
   This query builder has the benefit of accurately returning the selected columns in a query result, increasing type safety.
+- ``\OCP\Talk\IConversationOptions`` has been extended, to allow defining the newly created conversation as related to a meeting with it's start and end date.
+  The information is used by Talk to automatically clean up such conversations after a given time.
 
 Changed APIs
 ^^^^^^^^^^^^

developer_manual/digging_deeper/talk.rst

@@ -46,7 +46,12 @@ A new conversation needs a name and at least one moderator. By default this conv
 Customize the conversation
 ~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-It's possible to adjust the defaults.
+It's possible to adjust the defaults:
+
+- ``setPublic``: Make the conversation public (allowing anyone with the link to access the conversation).
+- ``setMeetingDate`` (since Nextcloud 32.0.9, 33.0.3 and 34.0.0): Mark a conversation as related to a meeting.
+  This will make Talk automatically expire the conversation 4 weeks (value is configurable)
+  after the meeting, unless the owner confirms the conversation should remain.
 
 .. code-block:: php
 
@@ -56,10 +61,16 @@ It's possible to adjust the defaults.
     /** @var \OCP\IUser $alice */
     /** @var \OCP\IUser $bob */
     $options = $broker->newConversationOptions();
+    $options->setPublic();
+    $options->setMeetingDate(
+        $this->timeFactory->getDateTime(new \DateTime('2026-04-07 13:00')),
+        $this->timeFactory->getDateTime(new \DateTime('2026-04-07 14:00')),
+    );
+
     $conversation = $broker->createConversation(
         'Weekly 1:1',
         [$alice, $bob],
-        $broker->newConversationOptions()->setPublic()
+        $options
     );
 
 Delete a conversation