From 2309088b036fd6e1aa4ff17967118f38f85a052a Mon Sep 17 00:00:00 2001 From: Dessalines Date: Mon, 29 Mar 2021 11:26:15 -0400 Subject: [PATCH] Renaming to api/v3 --- api_tests/package.json | 2 +- api_tests/prepare-drone-federation-test.sh | 10 +++++----- api_tests/src/shared.ts | 10 +++++----- api_tests/yarn.lock | 8 ++++---- crates/api/src/routes.rs | 2 +- 5 files changed, 16 insertions(+), 16 deletions(-) diff --git a/api_tests/package.json b/api_tests/package.json index 89585de21..7cb949594 100644 --- a/api_tests/package.json +++ b/api_tests/package.json @@ -16,7 +16,7 @@ "eslint": "^7.18.0", "eslint-plugin-jane": "^9.0.3", "jest": "^26.6.3", - "lemmy-js-client": "0.10.0-rc.12", + "lemmy-js-client": "0.10.0-rc.13", "node-fetch": "^2.6.1", "prettier": "^2.1.2", "ts-jest": "^26.4.4", diff --git a/api_tests/prepare-drone-federation-test.sh b/api_tests/prepare-drone-federation-test.sh index dd357db83..ae9c1293a 100755 --- a/api_tests/prepare-drone-federation-test.sh +++ b/api_tests/prepare-drone-federation-test.sh @@ -64,8 +64,8 @@ LEMMY_HOSTNAME=lemmy-epsilon:8581 \ target/lemmy_server >/tmp/lemmy_epsilon.out 2>&1 & echo "wait for all instances to start" -while [[ "$(curl -s -o /dev/null -w '%{http_code}' 'localhost:8541/api/v2/site')" != "200" ]]; do sleep 1; done -while [[ "$(curl -s -o /dev/null -w '%{http_code}' 'localhost:8551/api/v2/site')" != "200" ]]; do sleep 1; done -while [[ "$(curl -s -o /dev/null -w '%{http_code}' 'localhost:8561/api/v2/site')" != "200" ]]; do sleep 1; done -while [[ "$(curl -s -o /dev/null -w '%{http_code}' 'localhost:8571/api/v2/site')" != "200" ]]; do sleep 1; done -while [[ "$(curl -s -o /dev/null -w '%{http_code}' 'localhost:8581/api/v2/site')" != "200" ]]; do sleep 1; done +while [[ "$(curl -s -o /dev/null -w '%{http_code}' 'localhost:8541/api/v3/site')" != "200" ]]; do sleep 1; done +while [[ "$(curl -s -o /dev/null -w '%{http_code}' 'localhost:8551/api/v3/site')" != "200" ]]; do sleep 1; done +while [[ "$(curl -s -o /dev/null -w '%{http_code}' 'localhost:8561/api/v3/site')" != "200" ]]; do sleep 1; done +while [[ "$(curl -s -o /dev/null -w '%{http_code}' 'localhost:8571/api/v3/site')" != "200" ]]; do sleep 1; done +while [[ "$(curl -s -o /dev/null -w '%{http_code}' 'localhost:8581/api/v3/site')" != "200" ]]; do sleep 1; done diff --git a/api_tests/src/shared.ts b/api_tests/src/shared.ts index c11fa3b0e..df1624b8f 100644 --- a/api_tests/src/shared.ts +++ b/api_tests/src/shared.ts @@ -57,23 +57,23 @@ export interface API { } export let alpha: API = { - client: new LemmyHttp('http://localhost:8541/api/v2'), + client: new LemmyHttp('http://localhost:8541'), }; export let beta: API = { - client: new LemmyHttp('http://localhost:8551/api/v2'), + client: new LemmyHttp('http://localhost:8551'), }; export let gamma: API = { - client: new LemmyHttp('http://localhost:8561/api/v2'), + client: new LemmyHttp('http://localhost:8561'), }; export let delta: API = { - client: new LemmyHttp('http://localhost:8571/api/v2'), + client: new LemmyHttp('http://localhost:8571'), }; export let epsilon: API = { - client: new LemmyHttp('http://localhost:8581/api/v2'), + client: new LemmyHttp('http://localhost:8581'), }; export async function setupLogins() { diff --git a/api_tests/yarn.lock b/api_tests/yarn.lock index f1e0fbc04..8f8abf873 100644 --- a/api_tests/yarn.lock +++ b/api_tests/yarn.lock @@ -3233,10 +3233,10 @@ language-tags@^1.0.5: dependencies: language-subtag-registry "~0.3.2" -lemmy-js-client@0.10.0-rc.12: - version "0.10.0-rc.12" - resolved "https://registry.yarnpkg.com/lemmy-js-client/-/lemmy-js-client-0.10.0-rc.12.tgz#b00fc55f78e3544b2ecf35a363e4f6781c7acd1e" - integrity sha512-GKdSBsjSxiWe3bDPgJXiHU8WDWvTDAgYUtQah+2LSjbTxP6G1ARBoZZmIf1ZFIIEBVH6I3n5apkiECK5/veZdg== +lemmy-js-client@0.10.0-rc.13: + version "0.10.0-rc.13" + resolved "https://registry.yarnpkg.com/lemmy-js-client/-/lemmy-js-client-0.10.0-rc.13.tgz#ea2e88857243374d7fbd49ee6b4bb94c34359d85" + integrity sha512-zodvYkwBYR7iP27ah6L/QPUphUUdq38kCH7QF2CUYBrsSAEkGmq2kdz+iusnQ1Ht7Ad80GtYycFprsZBveV5eQ== leven@^3.1.0: version "3.1.0" diff --git a/crates/api/src/routes.rs b/crates/api/src/routes.rs index 6fc46ca4c..5c29073ea 100644 --- a/crates/api/src/routes.rs +++ b/crates/api/src/routes.rs @@ -7,7 +7,7 @@ use serde::Deserialize; pub fn config(cfg: &mut web::ServiceConfig, rate_limit: &RateLimit) { cfg.service( - web::scope("/api/v2") + web::scope("/api/v3") // Websockets .service(web::resource("/ws").to(chat_route)) // Site