Skip to content

Commit 9f7d7d2

Browse files
bigcat88bigcat88
authored
Merge pull request #9 from nextcloud/chore/links-corrections
Maintenance PR
2 parents 105818a + 4990610 commit 9f7d7d2

File tree

7 files changed

+51
-55
lines changed

7 files changed

+51
-55
lines changed

‎.github/workflows/appstore-build-publish.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
runs-on: ubuntu-latest
1818

1919
# Only allowed to be run on nextcloud-releases repositories
20-
if: ${{ github.repository_owner == 'cloud-py-api' }}
20+
if: ${{ github.repository_owner == 'nextcloud' }}
2121

2222
steps:
2323
- name: Check actor permission

‎.github/workflows/publish-docker-cpu.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
name: Publish CPU
1+
name: Publish CPU Image
22

33
on:
44
workflow_dispatch:
55

66
jobs:
77
push_to_registry:
88
name: Build image
9-
runs-on: ubuntu-latest
10-
if: ${{ github.repository_owner == 'cloud-py-api' }}
9+
runs-on: ubuntu-22.04
10+
if: ${{ github.repository_owner == 'nextcloud' }}
1111
permissions:
1212
packages: write
1313
contents: read
@@ -87,7 +87,7 @@ jobs:
8787
with:
8888
push: true
8989
context: ./${{ env.APP_NAME }}
90-
platforms: linux/amd64,linux/arm64/v8
91-
tags: ghcr.io/cloud-py-api/talk_bot_ai:${{ env.VERSION }}
90+
platforms: linux/amd64,linux/arm64
91+
tags: ghcr.io/nextcloud/${{ env.APP_NAME }}:${{ env.VERSION }}
9292
build-args: |
9393
BUILD_TYPE=cpu

‎.nextcloudignore‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,6 @@
1616
/babel.config.js
1717
/build
1818
/APPS.md
19-
/AUTHORS.md
20-
/CHANGELOG.md
21-
/HOW_TO_INSTALL.md
2219
/README.md
2320
/composer.*
2421
/node_modules

‎HOW_TO_INSTALL.md‎

Lines changed: 0 additions & 8 deletions
This file was deleted.

‎Makefile‎

Lines changed: 27 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -2,51 +2,54 @@
22

33
APP_ID := talk_bot_ai
44
APP_NAME := AssistantTalkBot
5-
APP_VERSION := 3.0.0
6-
JSON_INFO := "{\"id\":\"$(APP_ID)\",\"name\":\"Assistant Talk Bot\",\"daemon_config_name\":\"manual_install\",\"version\":\"$(APP_VERSION)\",\"secret\":\"12345\",\"port\":10034,\"scopes\":[\"ALL\"]}"
5+
APP_VERSION := $$(xmlstarlet sel -t -v "//version" appinfo/info.xml)
6+
JSON_INFO := "{\"id\":\"$(APP_ID)\",\"name\":\"$(APP_NAME)\",\"daemon_config_name\":\"manual_install\",\"version\":\"$(APP_VERSION)\",\"secret\":\"12345\",\"port\":10034}"
77

88
.PHONY: help
99
help:
10-
@echo "Welcome to the Nextcloud Assistant talk bot. Please use \`make <target>\` where <target> is one of:"
10+
@echo " Welcome to Nextcloud $(APP_NAME) $(APP_VERSION)!"
1111
@echo " "
12-
@echo " Next commands are only for dev environment with nextcloud-docker-dev!"
13-
@echo " They should run from the host you are developing on (with activated venv) and not in the container with Nextcloud!"
14-
@echo " "
15-
@echo " build-push build image and upload to ghcr.io"
16-
@echo " "
17-
@echo " run install $(APP_NAME) for Nextcloud Latest"
18-
@echo " run30 install $(APP_NAME) for Nextcloud 30"
19-
@echo " "
20-
@echo " For development of this app use PyCharm run configurations. Development is always set for last Nextcloud."
21-
@echo " First run '$(APP_NAME)' and then 'make register', after that you can use/debug/develop it and easy test."
22-
@echo " "
23-
@echo " register perform registration of running '$(APP_NAME)' into the 'manual_install' deploy daemon."
24-
@echo " register30 perform registration of running '$(APP_NAME)' into the 'manual_install' deploy daemon."
12+
@echo " Please use \`make <target>\` where <target> is one of"
13+
@echo " "
14+
@echo " build-push builds CPU images and uploads them to ghcr.io"
15+
@echo " "
16+
@echo " > Next commands are only for the dev environment with nextcloud-docker-dev!"
17+
@echo " > They must be run from the host you are developing on, not in a Nextcloud container!"
18+
@echo " "
19+
@echo " run installs $(APP_NAME) for Nextcloud Latest"
20+
@echo " run30 installs $(APP_NAME) for Nextcloud 30"
21+
@echo " "
22+
@echo " > Commands for manual registration of ExApp ($(APP_NAME) should be running!):"
23+
@echo " "
24+
@echo " register performs registration of running $(APP_NAME) into the 'manual_install' deploy daemon."
25+
@echo " register30 performs registration of running $(APP_NAME) into the 'manual_install' deploy daemon."
26+
@echo " "
27+
2528

2629
.PHONY: build-push
2730
build-push:
2831
docker login ghcr.io
29-
docker buildx create --name $(APP_ID) --driver docker-container --platform linux/amd64,linux/arm64/v8 --use || true
30-
docker buildx build --push --platform linux/arm64/v8,linux/amd64 --tag ghcr.io/cloud-py-api/$(APP_ID):$(APP_VERSION) --tag ghcr.io/cloud-py-api/$(APP_ID):latest .
32+
docker buildx create --name $(APP_ID) --driver docker-container --platform linux/amd64,linux/arm64 --use || true
33+
docker buildx build --push --platform linux/arm64,linux/amd64 --tag ghcr.io/nextcloud/$(APP_ID):$(APP_VERSION) --tag ghcr.io/nextcloud/$(APP_ID):latest .
3134

3235
.PHONY: run
3336
run:
3437
docker exec master-nextcloud-1 sudo -u www-data php occ app_api:app:unregister $(APP_ID) --silent --force || true
35-
docker exec master-nextcloud-1 sudo -u www-data php occ app_api:app:register $(APP_ID) --force-scopes \
36-
--info-xml https://raw.githubusercontent.com/cloud-py-api/$(APP_ID)/main/appinfo/info.xml
38+
docker exec master-nextcloud-1 sudo -u www-data php occ app_api:app:register $(APP_ID) \
39+
--info-xml https://raw.githubusercontent.com/nextcloud/$(APP_ID)/main/appinfo/info.xml
3740

3841
.PHONY: run30
3942
run30:
4043
docker exec master-stable30-1 sudo -u www-data php occ app_api:app:unregister $(APP_ID) --silent --force || true
41-
docker exec master-stable30-1 sudo -u www-data php occ app_api:app:register $(APP_ID) --force-scopes \
42-
--info-xml https://raw.githubusercontent.com/cloud-py-api/$(APP_ID)/main/appinfo/info.xml
44+
docker exec master-stable30-1 sudo -u www-data php occ app_api:app:register $(APP_ID) \
45+
--info-xml https://raw.githubusercontent.com/nextcloud/$(APP_ID)/main/appinfo/info.xml
4346

4447
.PHONY: register
4548
register:
4649
docker exec master-nextcloud-1 sudo -u www-data php occ app_api:app:unregister $(APP_ID) --silent --force || true
47-
docker exec master-nextcloud-1 sudo -u www-data php occ app_api:app:register $(APP_ID) manual_install --json-info $(JSON_INFO) --force-scopes --wait-finish
50+
docker exec master-nextcloud-1 sudo -u www-data php occ app_api:app:register $(APP_ID) manual_install --json-info $(JSON_INFO) --wait-finish
4851

4952
.PHONY: register30
5053
register30:
5154
docker exec master-stable30-1 sudo -u www-data php occ app_api:app:unregister $(APP_ID) --silent --force || true
52-
docker exec master-stable30-1 sudo -u www-data php occ app_api:app:register $(APP_ID) manual_install --json-info $(JSON_INFO) --force-scopes --wait-finish
55+
docker exec master-stable30-1 sudo -u www-data php occ app_api:app:register $(APP_ID) manual_install --json-info $(JSON_INFO) --wait-finish

‎README.md‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,15 @@
11
## Nextcloud Assistant Talk Bot
22

3-
**A talk bot using [`AppAPI`](https://github.com/cloud-py-api/app_api), Task Processing API, and Talk Bot API.**
3+
**A talk bot using [`AppAPI`](https://github.com/nextcloud/app_api), Task Processing API, and Talk Bot API.**
44

5-
The bot is capable of answering questions in chat depending on the model set by Nextcloud Assistant.
5+
> **Note:**
6+
> The `AppAPI` application needs to be enabled to install and use this bot.
67
7-
Refer to [How to install](https://github.com/cloud-py-api/talk_bot_ai/blob/main/HOW_TO_INSTALL.md) to install the application.
8+
The bot answers questions in chat based on the model set by Nextcloud Assistant.
9+
10+
## How to install:
11+
12+
1. Set up a deployment daemon by following the [AppAPI instructions](https://nextcloud.github.io/app_api/CreationOfDeployDaemon.html). _(Automatically created with AIO)_
13+
2. Go to the `Apps` menu in Nextcloud, find this app (`Assistant Talk Bot`) in the `Tools` category, and click `Deploy and Enable`.
14+
3. In Nextcloud Talk, open a conversation and activate the bot in `Conversation settings`.
15+
4. Invoke the bot by typing `@assistant` followed by your question (e.g., `@assistant I have a question for you.`).

‎appinfo/info.xml‎

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55
<summary>Nextcloud Assistant Talk Bot</summary>
66
<description>
77
<![CDATA[
8-
**A talk bot using [`AppAPI`](https://github.com/cloud-py-api/app_api), Task Processing API, and Talk Bot API.**
8+
**A talk bot using [`AppAPI`](https://github.com/nextcloud/app_api), Task Processing API, and Talk Bot API.**
99
1010
The bot is capable of answering questions in chat depending on the model set by Nextcloud Assistant.
1111
12-
Refer to [How to install](https://github.com/cloud-py-api/talk_bot_ai/blob/main/HOW_TO_INSTALL.md) to install the application.
12+
**The [`AppAPI`](https://github.com/nextcloud/app_api) application needs to be enabled to install and use this bot.**
1313
]]></description>
1414
<version>3.0.0</version>
1515
<licence>MIT</licence>
@@ -18,22 +18,18 @@ Refer to [How to install](https://github.com/cloud-py-api/talk_bot_ai/blob/main/
1818
<author mail="[email protected]" homepage="https://github.com/edward-ly">Edward Ly</author>
1919
<namespace>AssistantTalkBot</namespace>
2020
<category>tools</category>
21-
<screenshot>https://raw.githubusercontent.com/cloud-py-api/talk_bot_ai/main/screenshots/talk_bot_ai.png</screenshot>
22-
<website>https://github.com/cloud-py-api/talk_bot_ai</website>
23-
<bugs>https://github.com/cloud-py-api/talk_bot_ai/issues</bugs>
24-
<repository type="git">https://github.com/cloud-py-api/talk_bot_ai.git</repository>
21+
<screenshot>https://raw.githubusercontent.com/nextcloud/talk_bot_ai/main/screenshots/talk_bot_ai.png</screenshot>
22+
<website>https://github.com/nextcloud/talk_bot_ai</website>
23+
<bugs>https://github.com/nextcloud/talk_bot_ai/issues</bugs>
24+
<repository type="git">https://github.com/nextcloud/talk_bot_ai.git</repository>
2525
<dependencies>
2626
<nextcloud min-version="30" max-version="31"/>
2727
</dependencies>
2828
<external-app>
2929
<docker-install>
3030
<registry>ghcr.io</registry>
31-
<image>cloud-py-api/talk_bot_ai</image>
31+
<image>nextcloud/talk_bot_ai</image>
3232
<image-tag>3.0.0</image-tag>
3333
</docker-install>
34-
<scopes>
35-
<value>ALL</value>
36-
</scopes>
37-
<system>false</system>
3834
</external-app>
3935
</info>

0 commit comments

Comments
 (0)