[stable29] Update nextcloud/ocp dependency

.github/workflows/integration-mariadb.yml

@@ -56,7 +56,6 @@ jobs:
         php-versions: ['8.2']
         server-versions: ['stable29']
         guests-versions: ['stable29']
-        call-summary-bot-versions: ['main']
         notifications-versions: ['stable29']
 
     services:
@@ -86,13 +85,6 @@ jobs:
         with:
           path: apps/${{ env.APP_NAME }}
 
-      - name: Checkout call_summary_bot app
-        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
-        with:
-          repository: nextcloud/call_summary_bot
-          path: apps/call_summary_bot
-          ref: ${{ matrix.call-summary-bot-versions }}
-
       - name: Checkout guests app
         uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
         with:
@@ -140,7 +132,6 @@ jobs:
           ./occ config:system:set debug --value=true --type=boolean
           ./occ config:system:set hashing_default_password --value=true --type=boolean
           ./occ app:enable --force ${{ env.APP_NAME }}
-          ./occ app:enable --force call_summary_bot
           ./occ app:enable --force guests
           ./occ app:enable --force notifications
 

.github/workflows/integration-mysql.yml

@@ -56,7 +56,6 @@ jobs:
         php-versions: ['8.2']
         server-versions: ['stable29']
         guests-versions: ['stable29']
-        call-summary-bot-versions: ['main']
         notifications-versions: ['stable29']
 
     services:
@@ -86,13 +85,6 @@ jobs:
         with:
           path: apps/${{ env.APP_NAME }}
 
-      - name: Checkout call_summary_bot app
-        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
-        with:
-          repository: nextcloud/call_summary_bot
-          path: apps/call_summary_bot
-          ref: ${{ matrix.call-summary-bot-versions }}
-
       - name: Checkout guests app
         uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
         with:
@@ -140,7 +132,6 @@ jobs:
           ./occ config:system:set debug --value=true --type=boolean
           ./occ config:system:set hashing_default_password --value=true --type=boolean
           ./occ app:enable --force ${{ env.APP_NAME }}
-          ./occ app:enable --force call_summary_bot
           ./occ app:enable --force guests
           ./occ app:enable --force notifications
 

.github/workflows/integration-oci.yml

@@ -56,7 +56,6 @@ jobs:
         php-versions: ['8.2']
         server-versions: ['stable29']
         guests-versions: ['stable29']
-        call-summary-bot-versions: ['main']
         notifications-versions: ['stable29']
 
     services:
@@ -98,13 +97,6 @@ jobs:
         with:
           path: apps/${{ env.APP_NAME }}
 
-      - name: Checkout call_summary_bot app
-        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
-        with:
-          repository: nextcloud/call_summary_bot
-          path: apps/call_summary_bot
-          ref: ${{ matrix.call-summary-bot-versions }}
-
       - name: Checkout guests app
         uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
         with:
@@ -147,7 +139,6 @@ jobs:
           ./occ config:system:set debug --value=true --type=boolean
           ./occ config:system:set hashing_default_password --value=true --type=boolean
           ./occ app:enable --force ${{ env.APP_NAME }}
-          ./occ app:enable --force call_summary_bot
           ./occ app:enable --force guests
           ./occ app:enable --force notifications
 

.github/workflows/integration-pgsql.yml

@@ -53,7 +53,6 @@ jobs:
         php-versions: ['8.3']
         server-versions: ['stable29']
         guests-versions: ['stable29']
-        call-summary-bot-versions: ['main']
         notifications-versions: ['stable29']
 
     services:
@@ -89,13 +88,6 @@ jobs:
         with:
           path: apps/${{ env.APP_NAME }}
 
-      - name: Checkout call_summary_bot app
-        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
-        with:
-          repository: nextcloud/call_summary_bot
-          path: apps/call_summary_bot
-          ref: ${{ matrix.call-summary-bot-versions }}
-
       - name: Checkout guests app
         uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
         with:
@@ -142,7 +134,6 @@ jobs:
           ./occ config:system:set memcache.local --value="\\OC\\Memcache\\APCu"
           ./occ config:system:set memcache.distributed --value="\\OC\\Memcache\\APCu"
           ./occ app:enable --force ${{ env.APP_NAME }}
-          ./occ app:enable --force call_summary_bot
           ./occ app:enable --force guests
           ./occ app:enable --force notifications
 

.github/workflows/integration-sqlite.yml

@@ -56,7 +56,6 @@ jobs:
         php-versions: ['8.2']
         server-versions: ['stable29']
         guests-versions: ['stable29']
-        call-summary-bot-versions: ['main']
         notifications-versions: ['stable29']
 
     steps:
@@ -77,13 +76,6 @@ jobs:
         with:
           path: apps/${{ env.APP_NAME }}
 
-      - name: Checkout call_summary_bot app
-        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
-        with:
-          repository: nextcloud/call_summary_bot
-          path: apps/call_summary_bot
-          ref: ${{ matrix.call-summary-bot-versions }}
-
       - name: Checkout guests app
         uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
         with:
@@ -126,7 +118,6 @@ jobs:
           ./occ config:system:set debug --value=true --type=boolean
           ./occ config:system:set hashing_default_password --value=true --type=boolean
           ./occ app:enable --force ${{ env.APP_NAME }}
-          ./occ app:enable --force call_summary_bot
           ./occ app:enable --force guests
           ./occ app:enable --force notifications
 

tests/integration/features/bootstrap/FeatureContext.php

@@ -188,6 +188,7 @@ public function setUp() {
 		self::$lastNotifications = [];
 		self::$phoneNumberToActorId = [];
 		self::$modifiedSince = [];
+		self::$botNameToId = [];
 
 		$this->createdUsers = [];
 		$this->createdGroups = [];

tests/integration/features/chat-1/bots.feature

@@ -2,32 +2,32 @@ Feature: chat/bots
   Background:
     Given user "participant1" exists
 
-  Scenario: Installing the call summary bot
+  Scenario: Installing the Webhook Demo bot
     Given invoking occ with "talk:bot:list"
     Then the command was successful
     And the command output is empty
-    Given invoking occ with "app:disable call_summary_bot"
+    Given invoking occ with "app:disable talk_webhook_demo"
     And the command was successful
-    And invoking occ with "app:enable call_summary_bot"
+    And invoking occ with "app:enable talk_webhook_demo"
     And the command was successful
     When invoking occ with "talk:bot:list"
     Then the command was successful
-    And the command output contains the text "Call summary"
+    And the command output contains the text "Webhook Demo"
     And read bot ids from OCC
-    And set state no-setup for bot "Call summary" via OCC
+    And set state no-setup for bot "Webhook Demo" via OCC
       | feature  |
       | webhook  |
       | response |
 
-  Scenario: Simple call summary bot run
+  Scenario: Simple Webhook Demo bot run
     # Populate default options again
-    And invoking occ with "app:disable call_summary_bot"
+    And invoking occ with "app:disable talk_webhook_demo"
     And the command was successful
-    And invoking occ with "app:enable call_summary_bot"
+    And invoking occ with "app:enable talk_webhook_demo"
     And the command was successful
     And invoking occ with "talk:bot:list"
     And the command was successful
-    And the command output contains the text "Call summary"
+    And the command output contains the text "Webhook Demo"
 
     # Set up in room
     Given invoking occ with "talk:bot:list room-name:room"
@@ -37,13 +37,13 @@ Feature: chat/bots
       | roomType | 2 |
       | roomName | room |
     And read bot ids from OCC
-    And setup bot "Call summary" for room "room" via OCC
+    And setup bot "Webhook Demo" for room "room" via OCC
     Given invoking occ with "talk:bot:list room-name:room"
     And the command was successful
-    And the command output contains the text "Call summary"
+    And the command output contains the text "Webhook Demo"
 
-    # Call summary
-    Given the following call_summary_bot app config is set
+    # Webhook Demo
+    Given the following talk_webhook_demo app config is set
       | min-length | -1 |
     And user "participant1" sends message "- [ ] Before call" to room "room" with 201
     And wait for 2 seconds
@@ -52,15 +52,15 @@ Feature: chat/bots
       | flags | 1 |
     And user "participant1" sends message "- [ ] Task 1" to room "room" with 201
     And user "participant1" sends message "- [ ] Task 2\n- [ ] Task 3" to room "room" with 201
-    And set state enabled for bot "Call summary" via OCC
+    And set state enabled for bot "Webhook Demo" via OCC
       | feature  |
       | webhook  |
     And user "participant1" sends message "- [ ] Received but no reaction permission" to room "room" with 201
-    And set state enabled for bot "Call summary" via OCC
+    And set state enabled for bot "Webhook Demo" via OCC
       | feature  |
       | none     |
     And user "participant1" sends message "- [ ] Not received due to permission" to room "room" with 201
-    And set state enabled for bot "Call summary" via OCC
+    And set state enabled for bot "Webhook Demo" via OCC
       | feature  |
       | webhook  |
       | response |
@@ -75,7 +75,7 @@ Feature: chat/bots
     Then user "participant1" leaves room "room" with 200 (v4)
     Then user "participant1" sees the following messages in room "room" with 200
       | room | actorType | actorId           | actorDisplayName         | message                                        | messageParameters |
-      | room | bots      | BOT(Call summary) | Call summary (Bot)       | # Call summary - room\n\n{DATE}\n\n## Attendees\n- participant1-displayname\n\n## Tasks\n- [ ] Task 1\n- [ ] Task 2\n- [ ] Task 3\n- [ ] Received but no reaction permission | []                |
+      | room | bots      | BOT(Webhook Demo) | Webhook Demo (Bot)       | # Call summary - room\n\n{DATE}\n\n## Attendees\n- participant1-displayname\n\n## Tasks\n- [ ] Task 1\n- [ ] Task 2\n- [ ] Task 3\n- [ ] Received but no reaction permission | []                |
       | room | users     | participant1      | participant1-displayname | - [ ] Not received due to permission           | []                |
       | room | users     | participant1      | participant1-displayname | - [ ] Received but no reaction permission      | []                |
       | room | users     | participant1      | participant1-displayname | - [ ] Task 2\n- [ ] Task 3                     | []                |
@@ -85,47 +85,47 @@ Feature: chat/bots
       | actorType | actorId           | actorDisplayName   | reaction |
     Then user "participant1" retrieve reactions "👍" of message "- [ ] Task 1" in room "room" with 200
       | actorType | actorId           | actorDisplayName   | reaction |
-      | bots      | BOT(Call summary) | Call summary (Bot) | 👍       |
+      | bots      | BOT(Webhook Demo) | Webhook Demo (Bot) | 👍       |
     Then user "participant1" retrieve reactions "👍" of message "- [ ] Task 2\n- [ ] Task 3" in room "room" with 200
       | actorType | actorId           | actorDisplayName   | reaction |
-      | bots      | BOT(Call summary) | Call summary (Bot) | 👍       |
+      | bots      | BOT(Webhook Demo) | Webhook Demo (Bot) | 👍       |
     Then user "participant1" retrieve reactions "👍" of message "- [ ] Received but no reaction permission" in room "room" with 200
       | actorType | actorId           | actorDisplayName   | reaction |
     Then user "participant1" retrieve reactions "👍" of message "- [ ] Not received due to permission" in room "room" with 200
       | actorType | actorId           | actorDisplayName   | reaction |
 
     # Different states bot
     # Already enabled
-    And user "participant1" sets up bot "Call summary" for room "room" with 200 (v1)
+    And user "participant1" sets up bot "Webhook Demo" for room "room" with 200 (v1)
     Given invoking occ with "talk:bot:list room-name:room"
     And the command was successful
-    And the command output contains the text "Call summary"
+    And the command output contains the text "Webhook Demo"
     # Disabling
-    And user "participant1" removes bot "Call summary" for room "room" with 200 (v1)
+    And user "participant1" removes bot "Webhook Demo" for room "room" with 200 (v1)
     Given invoking occ with "talk:bot:list room-name:room"
     And the command was successful
     And the command output is empty
     # Enabling
-    And user "participant1" sets up bot "Call summary" for room "room" with 201 (v1)
+    And user "participant1" sets up bot "Webhook Demo" for room "room" with 201 (v1)
     Given invoking occ with "talk:bot:list room-name:room"
     And the command was successful
-    And the command output contains the text "Call summary"
+    And the command output contains the text "Webhook Demo"
 
     # No-setup
-    And set state no-setup for bot "Call summary" via OCC
+    And set state no-setup for bot "Webhook Demo" via OCC
 
     ## Failed removing
-    And user "participant1" removes bot "Call summary" for room "room" with 400 (v1)
+    And user "participant1" removes bot "Webhook Demo" for room "room" with 400 (v1)
     Given invoking occ with "talk:bot:list room-name:room"
     And the command was successful
-    And the command output contains the text "Call summary"
+    And the command output contains the text "Webhook Demo"
 
     ## Failed adding
-    And remove bot "Call summary" for room "room" via OCC
+    And remove bot "Webhook Demo" for room "room" via OCC
     Given invoking occ with "talk:bot:list room-name:room"
     And the command was successful
     And the command output is empty
-    And user "participant1" sets up bot "Call summary" for room "room" with 400 (v1)
+    And user "participant1" sets up bot "Webhook Demo" for room "room" with 400 (v1)
     Given invoking occ with "talk:bot:list room-name:room"
     And the command was successful
     And the command output is empty
@@ -356,4 +356,3 @@ Feature: chat/bots
     When invoking occ with "talk:bot:uninstall --url=https://example.tld"
     Then the command failed with exit code 1
     And the command output contains the text "Bot not found"
-

tests/integration/run.sh

@@ -5,7 +5,6 @@ PROCESS_ID=$$
 APP_NAME=spreed
 NOTIFICATIONS_BRANCH="master"
 GUESTS_BRANCH="master"
-CSB_BRANCH="main"
 
 APP_INTEGRATION_DIR=$PWD
 ROOT_DIR=${APP_INTEGRATION_DIR}/../../../..
@@ -63,23 +62,24 @@ echo -e "\033[0;36m# Setting up apps\033[0m"
 echo -e "\033[0;36m#\033[0m"
 cp -R ./spreedcheats ../../../spreedcheats
 ${ROOT_DIR}/occ app:getpath spreedcheats
+cp -R ./talk_webhook_demo ../../../talk_webhook_demo
+${ROOT_DIR}/occ app:getpath talk_webhook_demo
 
 # Add apps to the parent directory of "spreed" (unless they are
 # already there or in "apps").
 ${ROOT_DIR}/occ app:getpath notifications || (cd ../../../ && git clone --depth 1 --branch ${NOTIFICATIONS_BRANCH} https://github.com/nextcloud/notifications)
 ${ROOT_DIR}/occ app:getpath guests || (cd ../../../ && git clone --depth 1 --branch ${GUESTS_BRANCH} https://github.com/nextcloud/guests)
-${ROOT_DIR}/occ app:getpath call_summary_bot || (cd ../../../ && git clone --depth 1 --branch ${CSB_BRANCH} https://github.com/nextcloud/call_summary_bot)
 
 ${ROOT_DIR}/occ app:enable spreed || exit 1
 ${ROOT_DIR}/occ app:enable --force spreedcheats || exit 1
+${ROOT_DIR}/occ app:enable --force talk_webhook_demo || exit 1
 ${ROOT_DIR}/occ app:enable --force notifications || exit 1
 ${ROOT_DIR}/occ app:enable --force guests || exit 1
-${ROOT_DIR}/occ app:enable --force call_summary_bot || exit 1
 
 ${ROOT_DIR}/occ app:list | grep spreed
+${ROOT_DIR}/occ app:list | grep talk_webhook_demo
 ${ROOT_DIR}/occ app:list | grep notifications
 ${ROOT_DIR}/occ app:list | grep guests
-${ROOT_DIR}/occ app:list | grep call_summary_bot
 
 echo ''
 echo -e "\033[0;36m#\033[0m"
@@ -125,11 +125,13 @@ echo -e "\033[0;36m#\033[0m"
 echo -e "\033[0;36m# Reverting configuration changes and disabling spreedcheats\033[0m"
 echo -e "\033[0;36m#\033[0m"
 ${ROOT_DIR}/occ app:disable spreedcheats
+${ROOT_DIR}/occ app:disable talk_webhook_demo
 ${ROOT_DIR}/occ config:system:set overwrite.cli.url --value $OVERWRITE_CLI_URL
 if [[ "$SKELETON_DIR" ]]; then
 	${ROOT_DIR}/occ config:system:set skeletondirectory --value "$SKELETON_DIR"
 fi
 rm -rf ../../../spreedcheats
+rm -rf ../../../talk_webhook_demo
 
 wait $PHPPID1
 wait $PHPPID2