Skip to content

Commit e871329

Browse files
bigcat88bigcat88
authored
Refactoring + Talk api(first small part) (#95)
More Talk API will come tomorrow. --------- Signed-off-by: Alexander Piskun <bigcat88@icloud.com>
1 parent a9c2e30 commit e871329

35 files changed

+1112
-375
lines changed

‎.github/workflows/analysis-coverage.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ jobs:
136136
cd ..
137137
php occ app_ecosystem_v2:daemon:register manual_install "Manual Install" manual-install 0 0 0
138138
php occ app_ecosystem_v2:app:register $APP_ID manual_install --json-info \
139-
"{\"appid\":\"$APP_ID\",\"name\":\"$APP_ID\",\"daemon_config_name\":\"manual_install\",\"version\":\"$APP_VERSION\",\"secret\":\"$APP_SECRET\",\"host\":\"localhost\",\"scopes\":{\"required\":[2, 10, 11],\"optional\":[30, 31, 32, 33]},\"port\":$APP_PORT,\"protocol\":\"http\",\"system_app\":1}" \
139+
"{\"appid\":\"$APP_ID\",\"name\":\"$APP_ID\",\"daemon_config_name\":\"manual_install\",\"version\":\"$APP_VERSION\",\"secret\":\"$APP_SECRET\",\"host\":\"localhost\",\"scopes\":{\"required\":[2, 10, 11],\"optional\":[30, 31, 32, 33, 50]},\"port\":$APP_PORT,\"protocol\":\"http\",\"system_app\":1}" \
140140
-e --force-scopes
141141
kill -15 $(cat /tmp/_install.pid)
142142
timeout 3m tail --pid=$(cat /tmp/_install.pid) -f /dev/null
@@ -290,7 +290,7 @@ jobs:
290290
cd ..
291291
php occ app_ecosystem_v2:daemon:register manual_install "Manual Install" manual-install 0 0 0
292292
php occ app_ecosystem_v2:app:register $APP_ID manual_install --json-info \
293-
"{\"appid\":\"$APP_ID\",\"name\":\"$APP_ID\",\"daemon_config_name\":\"manual_install\",\"version\":\"$APP_VERSION\",\"secret\":\"$APP_SECRET\",\"host\":\"localhost\",\"scopes\":{\"required\":[2, 10, 11],\"optional\":[30, 31, 32, 33]},\"port\":$APP_PORT,\"protocol\":\"http\",\"system_app\":1}" \
293+
"{\"appid\":\"$APP_ID\",\"name\":\"$APP_ID\",\"daemon_config_name\":\"manual_install\",\"version\":\"$APP_VERSION\",\"secret\":\"$APP_SECRET\",\"host\":\"localhost\",\"scopes\":{\"required\":[2, 10, 11],\"optional\":[30, 31, 32, 33, 50]},\"port\":$APP_PORT,\"protocol\":\"http\",\"system_app\":1}" \
294294
-e --force-scopes
295295
kill -15 $(cat /tmp/_install.pid)
296296
timeout 3m tail --pid=$(cat /tmp/_install.pid) -f /dev/null
@@ -429,7 +429,7 @@ jobs:
429429
cd ..
430430
php occ app_ecosystem_v2:daemon:register manual_install "Manual Install" manual-install 0 0 0
431431
php occ app_ecosystem_v2:app:register $APP_ID manual_install --json-info \
432-
"{\"appid\":\"$APP_ID\",\"name\":\"$APP_ID\",\"daemon_config_name\":\"manual_install\",\"version\":\"$APP_VERSION\",\"secret\":\"$APP_SECRET\",\"host\":\"localhost\",\"scopes\":{\"required\":[2, 10, 11],\"optional\":[30, 31, 32, 33]},\"port\":$APP_PORT,\"protocol\":\"http\",\"system_app\":1}" \
432+
"{\"appid\":\"$APP_ID\",\"name\":\"$APP_ID\",\"daemon_config_name\":\"manual_install\",\"version\":\"$APP_VERSION\",\"secret\":\"$APP_SECRET\",\"host\":\"localhost\",\"scopes\":{\"required\":[2, 10, 11],\"optional\":[30, 31, 32, 33, 50]},\"port\":$APP_PORT,\"protocol\":\"http\",\"system_app\":1}" \
433433
-e --force-scopes
434434
kill -15 $(cat /tmp/_install.pid)
435435
timeout 3m tail --pid=$(cat /tmp/_install.pid) -f /dev/null
@@ -549,7 +549,7 @@ jobs:
549549
cd ..
550550
php occ app_ecosystem_v2:daemon:register manual_install "Manual Install" manual-install 0 0 0
551551
php occ app_ecosystem_v2:app:register $APP_ID manual_install --json-info \
552-
"{\"appid\":\"$APP_ID\",\"name\":\"$APP_ID\",\"daemon_config_name\":\"manual_install\",\"version\":\"$APP_VERSION\",\"secret\":\"$APP_SECRET\",\"host\":\"localhost\",\"scopes\":{\"required\":[2, 10, 11],\"optional\":[30, 31, 32, 33]},\"port\":$APP_PORT,\"protocol\":\"http\",\"system_app\":1}" \
552+
"{\"appid\":\"$APP_ID\",\"name\":\"$APP_ID\",\"daemon_config_name\":\"manual_install\",\"version\":\"$APP_VERSION\",\"secret\":\"$APP_SECRET\",\"host\":\"localhost\",\"scopes\":{\"required\":[2, 10, 11],\"optional\":[30, 31, 32, 33, 50]},\"port\":$APP_PORT,\"protocol\":\"http\",\"system_app\":1}" \
553553
-e --force-scopes
554554
kill -15 $(cat /tmp/_install.pid)
555555
timeout 3m tail --pid=$(cat /tmp/_install.pid) -f /dev/null
@@ -795,7 +795,7 @@ jobs:
795795
cd ..
796796
php occ app_ecosystem_v2:daemon:register manual_install "Manual Install" manual-install 0 0 0
797797
php occ app_ecosystem_v2:app:register $APP_ID manual_install --json-info \
798-
"{\"appid\":\"$APP_ID\",\"name\":\"$APP_ID\",\"daemon_config_name\":\"manual_install\",\"version\":\"$APP_VERSION\",\"secret\":\"$APP_SECRET\",\"host\":\"localhost\",\"scopes\":{\"required\":[2, 10, 11],\"optional\":[30, 31, 32, 33]},\"protocol\":\"http\",\"port\":$APP_PORT,\"system_app\":1}" \
798+
"{\"appid\":\"$APP_ID\",\"name\":\"$APP_ID\",\"daemon_config_name\":\"manual_install\",\"version\":\"$APP_VERSION\",\"secret\":\"$APP_SECRET\",\"host\":\"localhost\",\"scopes\":{\"required\":[2, 10, 11],\"optional\":[30, 31, 32, 33, 50]},\"protocol\":\"http\",\"port\":$APP_PORT,\"system_app\":1}" \
799799
-e --force-scopes
800800
kill -15 $(cat /tmp/_install.pid)
801801
timeout 3m tail --pid=$(cat /tmp/_install.pid) -f /dev/null

‎CHANGELOG.md‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,20 @@
22

33
All notable changes to this project will be documented in this file.
44

5-
## [0.0.32 - 2023-08-2x]
5+
## [0.0.40 - 2023-08-22]
6+
7+
### Added
8+
9+
- Basic APIs for Nextcloud Talk(Part 1)
610

711
### Changed
812

913
- `require_capabilities`/`check_capabilities` can accept value with `dot`: like `files_sharing.api_enabled` and check for sub-values.
14+
- Refactored all API(except `Files`) again.
15+
16+
### Fixed
17+
18+
- `options.NPA_NC_CERT` bug, when setting throw `.env` file.
1019

1120
## [0.0.31 - 2023-08-17]
1221

‎docs/reference/Apps.rst‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,32 @@
11
Applications Management
22
-----------------------
33

4-
.. autoclass:: nc_py_api.apps.apps.AppsAPI
4+
.. autoclass:: nc_py_api.apps._AppsAPI
55
:members:
66

7-
.. autoclass:: nc_py_api.apps.apps.ExAppInfo
7+
.. autoclass:: nc_py_api.apps.ExAppInfo
88
:members:
99

1010
Preferences
1111
^^^^^^^^^^^
1212

13-
.. autoclass:: nc_py_api.apps.preferences_ex.CfgRecord
13+
.. autoclass:: nc_py_api._preferences_ex.CfgRecord
1414
:members:
1515
:undoc-members:
1616

1717
User specific
1818
"""""""""""""
1919

20-
.. autoclass:: nc_py_api.apps.preferences.PreferencesAPI
20+
.. autoclass:: nc_py_api._preferences.PreferencesAPI
2121
:members:
2222

23-
.. autoclass:: nc_py_api.apps.preferences_ex.PreferencesExAPI
23+
.. autoclass:: nc_py_api._preferences_ex.PreferencesExAPI
2424
:members:
2525
:inherited-members:
2626

2727
Non-user specific
2828
"""""""""""""""""
2929

30-
.. autoclass:: nc_py_api.apps.preferences_ex.AppConfigExAPI
30+
.. autoclass:: nc_py_api._preferences_ex.AppConfigExAPI
3131
:members:
3232
:inherited-members:

‎docs/reference/Talk.rst‎

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
Talk API
2+
--------
3+
4+
.. autoclass:: nc_py_api.talk.Conversation
5+
:members:
6+
:inherited-members:
7+
8+
.. autoclass:: nc_py_api.talk._TalkAPI
9+
:members:
10+
11+
.. autoclass:: nc_py_api.talk.ConversationType
12+
:members:
13+
14+
.. autoclass:: nc_py_api.talk.ParticipantType
15+
:members:
16+
17+
.. autoclass:: nc_py_api.talk.AttendeePermissions
18+
:members:
19+
20+
.. autoclass:: nc_py_api.talk.InCallFlags
21+
:members:
22+
:undoc-members:
23+
24+
.. autoclass:: nc_py_api.talk.ListableScope
25+
:members:
26+
:undoc-members:
27+
28+
.. autoclass:: nc_py_api.talk.NotificationLevel
29+
:members:
30+
:undoc-members:
31+
32+
.. autoclass:: nc_py_api.talk.WebinarLobbyStates
33+
:members:
34+
:undoc-members:
35+
36+
.. autoclass:: nc_py_api.talk.SipEnabledStatus
37+
:members:
38+
:undoc-members:
39+
40+
.. autoclass:: nc_py_api.talk.CallRecordingStatus
41+
:members:
42+
:undoc-members:
43+
44+
.. autoclass:: nc_py_api.talk.BreakoutRoomMode
45+
:members:
46+
:undoc-members:
47+
48+
.. autoclass:: nc_py_api.talk.BreakoutRoomStatus
49+
:members:
50+
:undoc-members:

‎docs/reference/Users/Notifications.rst‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
Notifications
22
-------------
33

4-
.. autoclass:: nc_py_api.users.notifications._NotificationsAPI
4+
.. autoclass:: nc_py_api.notifications._NotificationsAPI
55
:members:
66

7-
.. autoclass:: nc_py_api.users.notifications.Notification
7+
.. autoclass:: nc_py_api.notifications.Notification
88
:members:
99

10-
.. autoclass:: nc_py_api.users.notifications.NotificationInfo
10+
.. autoclass:: nc_py_api.notifications.NotificationInfo
1111
:members:

‎docs/reference/Users/Users.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
User Management
22
---------------
33

4-
.. autoclass:: nc_py_api.users.users.UsersAPI
4+
.. autoclass:: nc_py_api.users._UsersAPI
55
:members:

‎docs/reference/Users/UsersGroups.rst‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
User Groups Management
22
----------------------
33

4-
.. autoclass:: nc_py_api.users.groups._UserGroupsAPI
4+
.. autoclass:: nc_py_api.users_groups._UsersGroupsAPI
55
:members:
66

7-
.. autoclass:: nc_py_api.users.groups.GroupDetails
7+
.. autoclass:: nc_py_api.users_groups.GroupDetails
88
:members:

‎docs/reference/Users/UsersStatus.rst‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,18 @@
11
User Status
22
-----------
33

4-
.. autoclass:: nc_py_api.users.status._UserStatusAPI
4+
.. autoclass:: nc_py_api.user_status._UserStatusAPI
55
:members:
66

7-
.. autoclass:: nc_py_api.users.status.CurrentUserStatus
7+
.. autoclass:: nc_py_api.user_status.CurrentUserStatus
88
:members:
99

10-
.. autoclass:: nc_py_api.users.status.UserStatus
10+
.. autoclass:: nc_py_api.user_status.UserStatus
1111
:members:
12+
:inherited-members:
1213

13-
.. autoclass:: nc_py_api.users.status.PredefinedStatus
14+
.. autoclass:: nc_py_api.user_status.PredefinedStatus
1415
:members:
1516

16-
.. autoclass:: nc_py_api.users.status.ClearAt
17+
.. autoclass:: nc_py_api.user_status.ClearAt
1718
:members:

‎docs/reference/Users/WeatherStatus.rst‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
Weather Status
22
--------------
33

4-
.. autoclass:: nc_py_api.users.weather._WeatherStatusAPI
4+
.. autoclass:: nc_py_api.weather_status._WeatherStatusAPI
55
:members:
66

7-
.. autoclass:: nc_py_api.users.weather.WeatherLocation
7+
.. autoclass:: nc_py_api.weather_status.WeatherLocation
88
:members:
99

10-
.. autoclass:: nc_py_api.users.weather.WeatherLocationMode
10+
.. autoclass:: nc_py_api.weather_status.WeatherLocationMode
1111
:members:

‎docs/reference/index.rst‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,5 @@ Reference
1010
Users/index.rst
1111
ExApp
1212
Exceptions
13+
Talk
1314
Session

0 commit comments

Comments
 (0)