From aabb7cbda14bce0b7e84892974525e7e63b08068 Mon Sep 17 00:00:00 2001 From: jld3103 Date: Fri, 12 Aug 2022 16:52:11 +0200 Subject: [PATCH] Update nextcloud news to 18.1.1 --- external/nextcloud-news | 2 +- specs/news.json | 2 +- specs/templates/news.json | 782 ++++++++++++++++++-------------------- 3 files changed, 366 insertions(+), 420 deletions(-) diff --git a/external/nextcloud-news b/external/nextcloud-news index 01e4adfe..71d635db 160000 --- a/external/nextcloud-news +++ b/external/nextcloud-news @@ -1 +1 @@ -Subproject commit 01e4adfee2307a7a4c51b1f793e50d7d4f9325b8 +Subproject commit 71d635db76068f791e10b97bd351b385d76bc482 diff --git a/specs/news.json b/specs/news.json index 32bc7b74..a3af5c3c 100644 --- a/specs/news.json +++ b/specs/news.json @@ -2,7 +2,7 @@ "openapi": "3.0.3", "info": { "title": "News", - "version": "18.1.0", + "version": "18.1.1", "description": "An RSS/Atom feed reader", "license": { "name": "agpl" diff --git a/specs/templates/news.json b/specs/templates/news.json index ad6f4280..724c7874 100644 --- a/specs/templates/news.json +++ b/specs/templates/news.json @@ -2,7 +2,7 @@ "openapi": "3.0.3", "info": { "title": "News", - "version": "18.1.0", + "version": "18.1.1", "description": "An RSS/Atom feed reader", "license": { "name": "agpl" @@ -610,66 +610,17 @@ } } }, - "/api/v2/folders": { - "post": { - "operationId": "folder_api_v2-create-TODO", - "responses": { - "200": { - "description": "", - "content": { - "application/json": { - "schema": { - "type": "string" - } - } - } - } - } - } - }, - "/api/v2/folders/{folderId}": { + "/api/{apiVersion}/version": { "parameters": [ { - "name": "folderId", + "name": "apiVersion", "in": "path", "required": true, "schema": { - "type": "integer" + "type": "TODO" } } ], - "delete": { - "operationId": "folder_api_v2-delete-TODO", - "responses": { - "200": { - "description": "", - "content": { - "application/json": { - "schema": { - "type": "string" - } - } - } - } - } - }, - "patch": { - "operationId": "folder_api_v2-update-TODO", - "responses": { - "200": { - "description": "", - "content": { - "application/json": { - "schema": { - "type": "string" - } - } - } - } - } - } - }, - "/api/v1-3/version": { "get": { "operationId": "utility_api-version-TODO", "responses": { @@ -686,7 +637,17 @@ } } }, - "/api/v1-3/status": { + "/api/{apiVersion}/status": { + "parameters": [ + { + "name": "apiVersion", + "in": "path", + "required": true, + "schema": { + "type": "TODO" + } + } + ], "get": { "operationId": "utility_api-status-TODO", "responses": { @@ -703,7 +664,17 @@ } } }, - "/api/v1-3/cleanup/before-update": { + "/api/{apiVersion}/cleanup/before-update": { + "parameters": [ + { + "name": "apiVersion", + "in": "path", + "required": true, + "schema": { + "type": "TODO" + } + } + ], "get": { "operationId": "utility_api-before_update-TODO", "responses": { @@ -720,7 +691,17 @@ } } }, - "/api/v1-3/cleanup/after-update": { + "/api/{apiVersion}/cleanup/after-update": { + "parameters": [ + { + "name": "apiVersion", + "in": "path", + "required": true, + "schema": { + "type": "TODO" + } + } + ], "get": { "operationId": "utility_api-after_update-TODO", "responses": { @@ -737,7 +718,17 @@ } } }, - "/api/v1-3/folders": { + "/api/{apiVersion}/folders": { + "parameters": [ + { + "name": "apiVersion", + "in": "path", + "required": true, + "schema": { + "type": "TODO" + } + } + ], "get": { "operationId": "folder_api-index-TODO", "responses": { @@ -769,8 +760,16 @@ } } }, - "/api/v1-3/folders/{folderId}": { + "/api/{apiVersion}/folders/{folderId}": { "parameters": [ + { + "name": "apiVersion", + "in": "path", + "required": true, + "schema": { + "type": "TODO" + } + }, { "name": "folderId", "in": "path", @@ -811,8 +810,16 @@ } } }, - "/api/v1-3/folders/{folderId}/read": { + "/api/{apiVersion}/folders/{folderId}/read": { "parameters": [ + { + "name": "apiVersion", + "in": "path", + "required": true, + "schema": { + "type": "TODO" + } + }, { "name": "folderId", "in": "path", @@ -839,7 +846,45 @@ } } }, - "/api/v1-3/feeds": { + "/api/v1-2/folders/{folderId}/read": { + "parameters": [ + { + "name": "folderId", + "in": "path", + "description": "ID of the folder", + "required": true, + "schema": { + "type": "integer" + } + } + ], + "put": { + "operationId": "folder_api-read-TODO", + "responses": { + "200": { + "description": "", + "content": { + "application/json": { + "schema": { + "type": "string" + } + } + } + } + } + } + }, + "/api/{apiVersion}/feeds": { + "parameters": [ + { + "name": "apiVersion", + "in": "path", + "required": true, + "schema": { + "type": "TODO" + } + } + ], "get": { "operationId": "feed_api-index-TODO", "responses": { @@ -871,8 +916,16 @@ } } }, - "/api/v1-3/feeds/{feedId}": { + "/api/{apiVersion}/feeds/{feedId}": { "parameters": [ + { + "name": "apiVersion", + "in": "path", + "required": true, + "schema": { + "type": "TODO" + } + }, { "name": "feedId", "in": "path", @@ -913,7 +966,17 @@ } } }, - "/api/v1-3/feeds/all": { + "/api/{apiVersion}/feeds/all": { + "parameters": [ + { + "name": "apiVersion", + "in": "path", + "required": true, + "schema": { + "type": "TODO" + } + } + ], "get": { "operationId": "feed_api-from_all_users-TODO", "responses": { @@ -930,8 +993,16 @@ } } }, - "/api/v1-3/feeds/{feedId}/move": { + "/api/{apiVersion}/feeds/{feedId}/move": { "parameters": [ + { + "name": "apiVersion", + "in": "path", + "required": true, + "schema": { + "type": "TODO" + } + }, { "name": "feedId", "in": "path", @@ -957,7 +1028,7 @@ } } }, - "/api/v1-3/feeds/{feedId}/rename": { + "/api/v1-2/feeds/{feedId}/move": { "parameters": [ { "name": "feedId", @@ -968,8 +1039,8 @@ } } ], - "post": { - "operationId": "feed_api-rename-TODO", + "put": { + "operationId": "feed_api-move-TODO", "responses": { "200": { "description": "", @@ -984,8 +1055,16 @@ } } }, - "/api/v1-3/feeds/{feedId}/read": { + "/api/{apiVersion}/feeds/{feedId}/rename": { "parameters": [ + { + "name": "apiVersion", + "in": "path", + "required": true, + "schema": { + "type": "TODO" + } + }, { "name": "feedId", "in": "path", @@ -996,7 +1075,7 @@ } ], "post": { - "operationId": "feed_api-read-TODO", + "operationId": "feed_api-rename-TODO", "responses": { "200": { "description": "", @@ -1011,9 +1090,19 @@ } } }, - "/api/v1-3/feeds/update": { - "get": { - "operationId": "feed_api-update-TODO", + "/api/v1-2/feeds/{feedId}/rename": { + "parameters": [ + { + "name": "feedId", + "in": "path", + "required": true, + "schema": { + "type": "integer" + } + } + ], + "put": { + "operationId": "feed_api-rename-TODO", "responses": { "200": { "description": "", @@ -1028,9 +1117,27 @@ } } }, - "/api/v1-3/items": { - "get": { - "operationId": "item_api-index-TODO", + "/api/{apiVersion}/feeds/{feedId}/read": { + "parameters": [ + { + "name": "apiVersion", + "in": "path", + "required": true, + "schema": { + "type": "TODO" + } + }, + { + "name": "feedId", + "in": "path", + "required": true, + "schema": { + "type": "integer" + } + } + ], + "post": { + "operationId": "feed_api-read-TODO", "responses": { "200": { "description": "", @@ -1045,9 +1152,19 @@ } } }, - "/api/v1-3/items/updated": { - "get": { - "operationId": "item_api-updated-TODO", + "/api/v1-2/feeds/{feedId}/read": { + "parameters": [ + { + "name": "feedId", + "in": "path", + "required": true, + "schema": { + "type": "integer" + } + } + ], + "put": { + "operationId": "feed_api-read-TODO", "responses": { "200": { "description": "", @@ -1062,19 +1179,19 @@ } } }, - "/api/v1-3/items/{itemId}/read": { + "/api/{apiVersion}/feeds/update": { "parameters": [ { - "name": "itemId", + "name": "apiVersion", "in": "path", "required": true, "schema": { - "type": "integer" + "type": "TODO" } } ], - "post": { - "operationId": "item_api-read-TODO", + "get": { + "operationId": "feed_api-update-TODO", "responses": { "200": { "description": "", @@ -1089,19 +1206,19 @@ } } }, - "/api/v1-3/items/{itemId}/unread": { + "/api/{apiVersion}/items": { "parameters": [ { - "name": "itemId", + "name": "apiVersion", "in": "path", "required": true, "schema": { - "type": "integer" + "type": "TODO" } } ], - "post": { - "operationId": "item_api-unread-TODO", + "get": { + "operationId": "item_api-index-TODO", "responses": { "200": { "description": "", @@ -1116,9 +1233,19 @@ } } }, - "/api/v1-3/items/read": { - "post": { - "operationId": "item_api-read_all-TODO", + "/api/{apiVersion}/items/updated": { + "parameters": [ + { + "name": "apiVersion", + "in": "path", + "required": true, + "schema": { + "type": "TODO" + } + } + ], + "get": { + "operationId": "item_api-updated-TODO", "responses": { "200": { "description": "", @@ -1133,9 +1260,27 @@ } } }, - "/api/v1-3/items/read/multiple": { + "/api/{apiVersion}/items/{itemId}/read": { + "parameters": [ + { + "name": "apiVersion", + "in": "path", + "required": true, + "schema": { + "type": "TODO" + } + }, + { + "name": "itemId", + "in": "path", + "required": true, + "schema": { + "type": "integer" + } + } + ], "post": { - "operationId": "item_api-read_multiple_by_ids-TODO", + "operationId": "item_api-read-TODO", "responses": { "200": { "description": "", @@ -1150,24 +1295,7 @@ } } }, - "/api/v1-3/items/unread/multiple": { - "post": { - "operationId": "item_api-unread_multiple_by_ids-TODO", - "responses": { - "200": { - "description": "", - "content": { - "application/json": { - "schema": { - "type": "string" - } - } - } - } - } - } - }, - "/api/v1-3/items/{itemId}/star": { + "/api/v1-2/items/{itemId}/read": { "parameters": [ { "name": "itemId", @@ -1178,8 +1306,8 @@ } } ], - "post": { - "operationId": "item_api-star_by_item_id-TODO", + "put": { + "operationId": "item_api-read-TODO", "responses": { "200": { "description": "", @@ -1194,8 +1322,16 @@ } } }, - "/api/v1-3/items/{itemId}/unstar": { + "/api/{apiVersion}/items/{itemId}/unread": { "parameters": [ + { + "name": "apiVersion", + "in": "path", + "required": true, + "schema": { + "type": "TODO" + } + }, { "name": "itemId", "in": "path", @@ -1206,109 +1342,7 @@ } ], "post": { - "operationId": "item_api-unstar_by_item_id-TODO", - "responses": { - "200": { - "description": "", - "content": { - "application/json": { - "schema": { - "type": "string" - } - } - } - } - } - } - }, - "/api/v1-3/items/star/multiple": { - "post": { - "operationId": "item_api-star_multiple_by_item_ids-TODO", - "responses": { - "200": { - "description": "", - "content": { - "application/json": { - "schema": { - "type": "string" - } - } - } - } - } - } - }, - "/api/v1-3/items/unstar/multiple": { - "post": { - "operationId": "item_api-unstar_multiple_by_item_ids-TODO", - "responses": { - "200": { - "description": "", - "content": { - "application/json": { - "schema": { - "type": "string" - } - } - } - } - } - } - }, - "/api/v1-2/version": { - "get": { - "operationId": "utility_api-version-TODO", - "responses": { - "200": { - "description": "", - "content": { - "application/json": { - "schema": { - "type": "string" - } - } - } - } - } - } - }, - "/api/v1-2/status": { - "get": { - "operationId": "utility_api-status-TODO", - "responses": { - "200": { - "description": "", - "content": { - "application/json": { - "schema": { - "type": "string" - } - } - } - } - } - } - }, - "/api/v1-2/cleanup/before-update": { - "get": { - "operationId": "utility_api-before_update-TODO", - "responses": { - "200": { - "description": "", - "content": { - "application/json": { - "schema": { - "type": "string" - } - } - } - } - } - } - }, - "/api/v1-2/cleanup/after-update": { - "get": { - "operationId": "utility_api-after_update-TODO", + "operationId": "item_api-unread-TODO", "responses": { "200": { "description": "", @@ -1323,24 +1357,19 @@ } } }, - "/api/v1-2/folders": { - "get": { - "operationId": "folder_api-index-TODO", - "responses": { - "200": { - "description": "", - "content": { - "application/json": { - "schema": { - "type": "string" - } - } - } + "/api/v1-2/items/{itemId}/unread": { + "parameters": [ + { + "name": "itemId", + "in": "path", + "required": true, + "schema": { + "type": "integer" } } - }, - "post": { - "operationId": "folder_api-create-TODO", + ], + "put": { + "operationId": "item_api-unread-TODO", "responses": { "200": { "description": "", @@ -1355,19 +1384,19 @@ } } }, - "/api/v1-2/folders/{folderId}": { + "/api/{apiVersion}/items/read": { "parameters": [ { - "name": "folderId", + "name": "apiVersion", "in": "path", "required": true, "schema": { - "type": "integer" + "type": "TODO" } } ], - "put": { - "operationId": "folder_api-update-TODO", + "post": { + "operationId": "item_api-read_all-TODO", "responses": { "200": { "description": "", @@ -1380,9 +1409,11 @@ } } } - }, - "delete": { - "operationId": "folder_api-delete-TODO", + } + }, + "/api/v1-2/items/read": { + "put": { + "operationId": "item_api-read_all-TODO", "responses": { "200": { "description": "", @@ -1397,20 +1428,19 @@ } } }, - "/api/v1-2/folders/{folderId}/read": { + "/api/{apiVersion}/items/read/multiple": { "parameters": [ { - "name": "folderId", + "name": "apiVersion", "in": "path", - "description": "ID of the folder", "required": true, "schema": { - "type": "integer" + "type": "TODO" } } ], - "put": { - "operationId": "folder_api-read-TODO", + "post": { + "operationId": "item_api-read_multiple_by_ids-TODO", "responses": { "200": { "description": "", @@ -1425,24 +1455,9 @@ } } }, - "/api/v1-2/feeds": { - "get": { - "operationId": "feed_api-index-TODO", - "responses": { - "200": { - "description": "", - "content": { - "application/json": { - "schema": { - "type": "string" - } - } - } - } - } - }, - "post": { - "operationId": "feed_api-create-TODO", + "/api/v1-2/items/read/multiple": { + "put": { + "operationId": "item_api-read_multiple-TODO", "responses": { "200": { "description": "", @@ -1457,34 +1472,19 @@ } } }, - "/api/v1-2/feeds/{feedId}": { + "/api/{apiVersion}/items/unread/multiple": { "parameters": [ { - "name": "feedId", + "name": "apiVersion", "in": "path", "required": true, "schema": { - "type": "integer" + "type": "TODO" } } ], - "put": { - "operationId": "feed_api-update-TODO", - "responses": { - "200": { - "description": "", - "content": { - "application/json": { - "schema": { - "type": "string" - } - } - } - } - } - }, - "delete": { - "operationId": "feed_api-delete-TODO", + "post": { + "operationId": "item_api-unread_multiple_by_ids-TODO", "responses": { "200": { "description": "", @@ -1499,9 +1499,9 @@ } } }, - "/api/v1-2/feeds/all": { - "get": { - "operationId": "feed_api-from_all_users-TODO", + "/api/v1-2/items/unread/multiple": { + "put": { + "operationId": "item_api-unread_multiple-TODO", "responses": { "200": { "description": "", @@ -1516,10 +1516,18 @@ } } }, - "/api/v1-2/feeds/{feedId}/move": { + "/api/{apiVersion}/items/{itemId}/star": { "parameters": [ { - "name": "feedId", + "name": "apiVersion", + "in": "path", + "required": true, + "schema": { + "type": "TODO" + } + }, + { + "name": "itemId", "in": "path", "required": true, "schema": { @@ -1527,8 +1535,8 @@ } } ], - "put": { - "operationId": "feed_api-move-TODO", + "post": { + "operationId": "item_api-star_by_item_id-TODO", "responses": { "200": { "description": "", @@ -1543,7 +1551,7 @@ } } }, - "/api/v1-2/feeds/{feedId}/rename": { + "/api/v1-2/items/{feedId}/{guidHash}/star": { "parameters": [ { "name": "feedId", @@ -1552,10 +1560,18 @@ "schema": { "type": "integer" } + }, + { + "name": "guidHash", + "in": "path", + "required": true, + "schema": { + "type": "string" + } } ], "put": { - "operationId": "feed_api-rename-TODO", + "operationId": "item_api-star-TODO", "responses": { "200": { "description": "", @@ -1570,10 +1586,18 @@ } } }, - "/api/v1-2/feeds/{feedId}/read": { + "/api/{apiVersion}/items/{itemId}/unstar": { "parameters": [ { - "name": "feedId", + "name": "apiVersion", + "in": "path", + "required": true, + "schema": { + "type": "TODO" + } + }, + { + "name": "itemId", "in": "path", "required": true, "schema": { @@ -1581,59 +1605,8 @@ } } ], - "put": { - "operationId": "feed_api-read-TODO", - "responses": { - "200": { - "description": "", - "content": { - "application/json": { - "schema": { - "type": "string" - } - } - } - } - } - } - }, - "/api/v1-2/feeds/update": { - "get": { - "operationId": "feed_api-update-TODO", - "responses": { - "200": { - "description": "", - "content": { - "application/json": { - "schema": { - "type": "string" - } - } - } - } - } - } - }, - "/api/v1-2/items": { - "get": { - "operationId": "item_api-index-TODO", - "responses": { - "200": { - "description": "", - "content": { - "application/json": { - "schema": { - "type": "string" - } - } - } - } - } - } - }, - "/api/v1-2/items/updated": { - "get": { - "operationId": "item_api-updated-TODO", + "post": { + "operationId": "item_api-unstar_by_item_id-TODO", "responses": { "200": { "description": "", @@ -1648,19 +1621,27 @@ } } }, - "/api/v1-2/items/{itemId}/read": { + "/api/v1-2/items/{feedId}/{guidHash}/unstar": { "parameters": [ { - "name": "itemId", + "name": "feedId", "in": "path", "required": true, "schema": { "type": "integer" } + }, + { + "name": "guidHash", + "in": "path", + "required": true, + "schema": { + "type": "string" + } } ], "put": { - "operationId": "item_api-read-TODO", + "operationId": "item_api-unstar-TODO", "responses": { "200": { "description": "", @@ -1675,19 +1656,19 @@ } } }, - "/api/v1-2/items/{itemId}/unread": { + "/api/{apiVersion}/items/star/multiple": { "parameters": [ { - "name": "itemId", + "name": "apiVersion", "in": "path", "required": true, "schema": { - "type": "integer" + "type": "TODO" } } ], - "put": { - "operationId": "item_api-unread-TODO", + "post": { + "operationId": "item_api-star_multiple_by_item_ids-TODO", "responses": { "200": { "description": "", @@ -1702,9 +1683,9 @@ } } }, - "/api/v1-2/items/read": { + "/api/v1-2/items/star/multiple": { "put": { - "operationId": "item_api-read_all-TODO", + "operationId": "item_api-star_multiple-TODO", "responses": { "200": { "description": "", @@ -1719,9 +1700,19 @@ } } }, - "/api/v1-2/items/read/multiple": { - "put": { - "operationId": "item_api-read_multiple-TODO", + "/api/{apiVersion}/items/unstar/multiple": { + "parameters": [ + { + "name": "apiVersion", + "in": "path", + "required": true, + "schema": { + "type": "TODO" + } + } + ], + "post": { + "operationId": "item_api-unstar_multiple_by_item_ids-TODO", "responses": { "200": { "description": "", @@ -1736,9 +1727,9 @@ } } }, - "/api/v1-2/items/unread/multiple": { + "/api/v1-2/items/unstar/multiple": { "put": { - "operationId": "item_api-unread_multiple-TODO", + "operationId": "item_api-unstar_multiple-TODO", "responses": { "200": { "description": "", @@ -1753,27 +1744,9 @@ } } }, - "/api/v1-2/items/{feedId}/{guidHash}/star": { - "parameters": [ - { - "name": "feedId", - "in": "path", - "required": true, - "schema": { - "type": "integer" - } - }, - { - "name": "guidHash", - "in": "path", - "required": true, - "schema": { - "type": "string" - } - } - ], - "put": { - "operationId": "item_api-star-TODO", + "/api/v2/folders": { + "post": { + "operationId": "folder_api_v2-create-TODO", "responses": { "200": { "description": "", @@ -1788,44 +1761,19 @@ } } }, - "/api/v1-2/items/{feedId}/{guidHash}/unstar": { + "/api/v2/folders/{folderId}": { "parameters": [ { - "name": "feedId", + "name": "folderId", "in": "path", "required": true, "schema": { "type": "integer" } - }, - { - "name": "guidHash", - "in": "path", - "required": true, - "schema": { - "type": "string" - } } ], - "put": { - "operationId": "item_api-unstar-TODO", - "responses": { - "200": { - "description": "", - "content": { - "application/json": { - "schema": { - "type": "string" - } - } - } - } - } - } - }, - "/api/v1-2/items/star/multiple": { - "put": { - "operationId": "item_api-star_multiple-TODO", + "delete": { + "operationId": "folder_api_v2-delete-TODO", "responses": { "200": { "description": "", @@ -1838,11 +1786,9 @@ } } } - } - }, - "/api/v1-2/items/unstar/multiple": { - "put": { - "operationId": "item_api-unstar_multiple-TODO", + }, + "patch": { + "operationId": "folder_api_v2-update-TODO", "responses": { "200": { "description": "",