mirror of
https://github.com/LemmyNet/lemmy.git
synced 2024-11-30 00:01:25 +00:00
replace occurences of v3, fix routes
This commit is contained in:
parent
c2ccff0b12
commit
1dc544107a
9 changed files with 34 additions and 34 deletions
|
|
@ -82,13 +82,13 @@ LEMMY_CONFIG_LOCATION=./docker/federation/lemmy_epsilon.hjson \
|
|||
target/lemmy_server >$LOG_DIR/lemmy_epsilon.out 2>&1 &
|
||||
|
||||
echo "wait for all instances to start"
|
||||
while [[ "$(curl -s -o /dev/null -w '%{http_code}' 'lemmy-alpha:8541/api/v3/site')" != "200" ]]; do sleep 1; done
|
||||
while [[ "$(curl -s -o /dev/null -w '%{http_code}' 'lemmy-alpha:8541/api/v4/site')" != "200" ]]; do sleep 1; done
|
||||
echo "alpha started"
|
||||
while [[ "$(curl -s -o /dev/null -w '%{http_code}' 'lemmy-beta:8551/api/v3/site')" != "200" ]]; do sleep 1; done
|
||||
while [[ "$(curl -s -o /dev/null -w '%{http_code}' 'lemmy-beta:8551/api/v4/site')" != "200" ]]; do sleep 1; done
|
||||
echo "beta started"
|
||||
while [[ "$(curl -s -o /dev/null -w '%{http_code}' 'lemmy-gamma:8561/api/v3/site')" != "200" ]]; do sleep 1; done
|
||||
while [[ "$(curl -s -o /dev/null -w '%{http_code}' 'lemmy-gamma:8561/api/v4/site')" != "200" ]]; do sleep 1; done
|
||||
echo "gamma started"
|
||||
while [[ "$(curl -s -o /dev/null -w '%{http_code}' 'lemmy-delta:8571/api/v3/site')" != "200" ]]; do sleep 1; done
|
||||
while [[ "$(curl -s -o /dev/null -w '%{http_code}' 'lemmy-delta:8571/api/v4/site')" != "200" ]]; do sleep 1; done
|
||||
echo "delta started"
|
||||
while [[ "$(curl -s -o /dev/null -w '%{http_code}' 'lemmy-epsilon:8581/api/v3/site')" != "200" ]]; do sleep 1; done
|
||||
while [[ "$(curl -s -o /dev/null -w '%{http_code}' 'lemmy-epsilon:8581/api/v4/site')" != "200" ]]; do sleep 1; done
|
||||
echo "epsilon started. All started"
|
||||
|
|
|
|||
|
|
@ -199,11 +199,11 @@ test("Images in remote image post are proxied if setting enabled", async () => {
|
|||
// remote image gets proxied after upload
|
||||
expect(
|
||||
post.thumbnail_url?.startsWith(
|
||||
"http://lemmy-gamma:8561/api/v3/image_proxy?url",
|
||||
"http://lemmy-gamma:8561/api/v4/image_proxy?url",
|
||||
),
|
||||
).toBeTruthy();
|
||||
expect(
|
||||
post.body?.startsWith("![](http://lemmy-gamma:8561/api/v3/image_proxy?url"),
|
||||
post.body?.startsWith("![](http://lemmy-gamma:8561/api/v4/image_proxy?url"),
|
||||
).toBeTruthy();
|
||||
|
||||
// Make sure that it ends with jpg, to be sure its an image
|
||||
|
|
@ -222,12 +222,12 @@ test("Images in remote image post are proxied if setting enabled", async () => {
|
|||
|
||||
expect(
|
||||
epsilonPost.thumbnail_url?.startsWith(
|
||||
"http://lemmy-epsilon:8581/api/v3/image_proxy?url",
|
||||
"http://lemmy-epsilon:8581/api/v4/image_proxy?url",
|
||||
),
|
||||
).toBeTruthy();
|
||||
expect(
|
||||
epsilonPost.body?.startsWith(
|
||||
"![](http://lemmy-epsilon:8581/api/v3/image_proxy?url",
|
||||
"![](http://lemmy-epsilon:8581/api/v4/image_proxy?url",
|
||||
),
|
||||
).toBeTruthy();
|
||||
|
||||
|
|
@ -249,7 +249,7 @@ test("Thumbnail of remote image link is proxied if setting enabled", async () =>
|
|||
// remote image gets proxied after upload
|
||||
expect(
|
||||
post.thumbnail_url?.startsWith(
|
||||
"http://lemmy-gamma:8561/api/v3/image_proxy?url",
|
||||
"http://lemmy-gamma:8561/api/v4/image_proxy?url",
|
||||
),
|
||||
).toBeTruthy();
|
||||
|
||||
|
|
@ -267,7 +267,7 @@ test("Thumbnail of remote image link is proxied if setting enabled", async () =>
|
|||
|
||||
expect(
|
||||
epsilonPost.thumbnail_url?.startsWith(
|
||||
"http://lemmy-epsilon:8581/api/v3/image_proxy?url",
|
||||
"http://lemmy-epsilon:8581/api/v4/image_proxy?url",
|
||||
),
|
||||
).toBeTruthy();
|
||||
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ Here is an example using [reqwest](https://crates.io/crates/reqwest):
|
|||
};
|
||||
let client = Client::new();
|
||||
let response = client
|
||||
.get("https://lemmy.ml/api/v3/post/list")
|
||||
.get("https://lemmy.ml/api/v4/post/list")
|
||||
.query(¶ms)
|
||||
.send()
|
||||
.await?;
|
||||
|
|
|
|||
|
|
@ -435,7 +435,7 @@ pub struct EditSite {
|
|||
/// The response for a site.
|
||||
pub struct SiteResponse {
|
||||
pub site_view: SiteView,
|
||||
/// deprecated, use field `tagline` or /api/v3/tagline/list
|
||||
/// deprecated, use field `tagline` or /api/4/tagline/list
|
||||
pub taglines: Vec<()>,
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1120,7 +1120,7 @@ async fn proxy_image_link_internal(
|
|||
}
|
||||
}
|
||||
|
||||
/// Rewrite a link to go through `/api/v3/image_proxy` endpoint. This is only for remote urls and
|
||||
/// Rewrite a link to go through `/api/v4/image_proxy` endpoint. This is only for remote urls and
|
||||
/// if image_proxy setting is enabled.
|
||||
pub async fn proxy_image_link(link: Url, context: &LemmyContext) -> LemmyResult<DbUrl> {
|
||||
proxy_image_link_internal(
|
||||
|
|
@ -1172,7 +1172,7 @@ fn build_proxied_image_url(
|
|||
protocol_and_hostname: &str,
|
||||
) -> Result<Url, url::ParseError> {
|
||||
Url::parse(&format!(
|
||||
"{}/api/v3/image_proxy?url={}",
|
||||
"{}/api/v4/image_proxy?url={}",
|
||||
protocol_and_hostname,
|
||||
encode(link.as_str())
|
||||
))
|
||||
|
|
@ -1251,7 +1251,7 @@ mod tests {
|
|||
)
|
||||
.await?;
|
||||
assert_eq!(
|
||||
"https://lemmy-alpha/api/v3/image_proxy?url=http%3A%2F%2Flemmy-beta%2Fimage.png",
|
||||
"https://lemmy-alpha/api/v4/image_proxy?url=http%3A%2F%2Flemmy-beta%2Fimage.png",
|
||||
proxied.as_str()
|
||||
);
|
||||
|
||||
|
|
|
|||
|
|
@ -111,7 +111,7 @@ pub enum PictrsImageMode {
|
|||
#[default]
|
||||
StoreLinkPreviews,
|
||||
/// If enabled, all images from remote domains are rewritten to pass through
|
||||
/// `/api/v3/image_proxy`, including embedded images in markdown. Images are stored temporarily
|
||||
/// `/api/v4/image_proxy`, including embedded images in markdown. Images are stored temporarily
|
||||
/// in pict-rs for caching. This improves privacy as users don't expose their IP to untrusted
|
||||
/// servers, and decreases load on other servers. However it increases bandwidth use for the
|
||||
/// local server.
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ use markdown_it::{plugins::cmark::inline::image::Image, NodeValue};
|
|||
use url::Url;
|
||||
use urlencoding::encode;
|
||||
|
||||
/// Rewrites all links to remote domains in markdown, so they go through `/api/v3/image_proxy`.
|
||||
/// Rewrites all links to remote domains in markdown, so they go through `/api/v4/image_proxy`.
|
||||
pub fn markdown_rewrite_image_links(mut src: String) -> (String, Vec<Url>) {
|
||||
let links_offsets = find_urls::<Image>(&src);
|
||||
|
||||
|
|
@ -18,7 +18,7 @@ pub fn markdown_rewrite_image_links(mut src: String) -> (String, Vec<Url>) {
|
|||
// If link points to remote domain, replace with proxied link
|
||||
if parsed.domain() != Some(&SETTINGS.hostname) {
|
||||
let mut proxied = format!(
|
||||
"{}/api/v3/image_proxy?url={}",
|
||||
"{}/api/v4/image_proxy?url={}",
|
||||
SETTINGS.get_protocol_and_hostname(),
|
||||
encode(url),
|
||||
);
|
||||
|
|
@ -115,7 +115,7 @@ mod tests {
|
|||
(
|
||||
"remote image proxied",
|
||||
"",
|
||||
"",
|
||||
"",
|
||||
),
|
||||
(
|
||||
"local image unproxied",
|
||||
|
|
@ -125,7 +125,7 @@ mod tests {
|
|||
(
|
||||
"multiple image links",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
),
|
||||
(
|
||||
"empty link handled",
|
||||
|
|
@ -135,7 +135,7 @@ mod tests {
|
|||
(
|
||||
"empty label handled",
|
||||
"",
|
||||
""
|
||||
""
|
||||
),
|
||||
(
|
||||
"invalid image link removed",
|
||||
|
|
@ -145,12 +145,12 @@ mod tests {
|
|||
(
|
||||
"label with nested markdown handled",
|
||||
"",
|
||||
""
|
||||
""
|
||||
),
|
||||
(
|
||||
"custom emoji support",
|
||||
r#""#,
|
||||
r#""#
|
||||
r#""#
|
||||
)
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -141,7 +141,7 @@ mod tests {
|
|||
(
|
||||
"remote image proxied",
|
||||
"",
|
||||
"",
|
||||
"",
|
||||
),
|
||||
(
|
||||
"local image unproxied",
|
||||
|
|
@ -151,7 +151,7 @@ mod tests {
|
|||
(
|
||||
"multiple image links",
|
||||
" ",
|
||||
" ",
|
||||
" ",
|
||||
),
|
||||
(
|
||||
"empty link handled",
|
||||
|
|
@ -161,7 +161,7 @@ mod tests {
|
|||
(
|
||||
"empty label handled",
|
||||
"",
|
||||
""
|
||||
""
|
||||
),
|
||||
(
|
||||
"invalid image link removed",
|
||||
|
|
@ -171,12 +171,12 @@ mod tests {
|
|||
(
|
||||
"label with nested markdown handled",
|
||||
"",
|
||||
""
|
||||
""
|
||||
),
|
||||
(
|
||||
"custom emoji support",
|
||||
r#""#,
|
||||
r#""#
|
||||
r#""#
|
||||
)
|
||||
];
|
||||
|
||||
|
|
|
|||
|
|
@ -162,7 +162,7 @@ use lemmy_utils::rate_limit::RateLimitCell;
|
|||
|
||||
pub fn config(cfg: &mut web::ServiceConfig, rate_limit: &RateLimitCell) {
|
||||
cfg.service(
|
||||
web::scope("/api/v3")
|
||||
web::scope("/api/v4")
|
||||
.wrap(rate_limit.message())
|
||||
.route("/image_proxy", web::get().to(image_proxy))
|
||||
// Site
|
||||
|
|
@ -283,11 +283,11 @@ pub fn config(cfg: &mut web::ServiceConfig, rate_limit: &RateLimitCell) {
|
|||
web::scope("/account/auth")
|
||||
.guard(guard::Post())
|
||||
.wrap(rate_limit.register())
|
||||
.route("register", web::post().to(register))
|
||||
.route("login", web::post().to(login))
|
||||
.route("/register", web::post().to(register))
|
||||
.route("/login", web::post().to(login))
|
||||
.route("/logout", web::post().to(logout))
|
||||
.route("password_reset", web::post().to(reset_password))
|
||||
.route("get_captcha", web::get().to(get_captcha))
|
||||
.route("/password_reset", web::post().to(reset_password))
|
||||
.route("/get_captcha", web::get().to(get_captcha))
|
||||
.route(
|
||||
"/password_change",
|
||||
web::post().to(change_password_after_reset),
|
||||
|
|
|
|||
Loading…
Reference in a new issue