From 3cf787cf988f6e6cb74b94f2c431f5f6472fb045 Mon Sep 17 00:00:00 2001 From: spikecodes <19519553+spikecodes@users.noreply.github.com> Date: Wed, 14 Apr 2021 21:53:17 -0700 Subject: [PATCH] Fix #195 --- Cargo.lock | 2 +- Cargo.toml | 2 +- src/main.rs | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index de8e5f4..b9dcd9f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -605,7 +605,7 @@ checksum = "9385f66bf6105b241aa65a61cb923ef20efc665cb9f9bb50ac2f0c4b7f378d41" [[package]] name = "libreddit" -version = "0.10.2" +version = "0.10.3" dependencies = [ "askama", "async-recursion", diff --git a/Cargo.toml b/Cargo.toml index cf27af9..3b65522 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -3,7 +3,7 @@ name = "libreddit" description = " Alternative private front-end to Reddit" license = "AGPL-3.0" repository = "https://github.com/spikecodes/libreddit" -version = "0.10.2" +version = "0.10.3" authors = ["spikecodes <19519553+spikecodes@users.noreply.github.com>"] edition = "2018" diff --git a/src/main.rs b/src/main.rs index 543aa60..1aa08d2 100644 --- a/src/main.rs +++ b/src/main.rs @@ -205,10 +205,10 @@ async fn main() { .at("/r/:sub/w") .get(|r| async move { Ok(redirect(format!("/r/{}/wiki", r.param("sub").unwrap_or_default()))) }.boxed()); app - .at("/r/:sub/w/:page") + .at("/r/:sub/w/*page") .get(|r| async move { Ok(redirect(format!("/r/{}/wiki/{}", r.param("sub").unwrap_or_default(), r.param("wiki").unwrap_or_default()))) }.boxed()); app.at("/r/:sub/wiki").get(|r| subreddit::wiki(r).boxed()); - app.at("/r/:sub/wiki/:page").get(|r| subreddit::wiki(r).boxed()); + app.at("/r/:sub/wiki/*page").get(|r| subreddit::wiki(r).boxed()); app.at("/r/:sub/about/sidebar").get(|r| subreddit::sidebar(r).boxed()); @@ -223,10 +223,10 @@ async fn main() { // View Reddit wiki app.at("/w").get(|_| async { Ok(redirect("/wiki".to_string())) }.boxed()); app - .at("/w/:page") + .at("/w/*page") .get(|r| async move { Ok(redirect(format!("/wiki/{}", r.param("page").unwrap_or_default()))) }.boxed()); app.at("/wiki").get(|r| subreddit::wiki(r).boxed()); - app.at("/wiki/:page").get(|r| subreddit::wiki(r).boxed()); + app.at("/wiki/*page").get(|r| subreddit::wiki(r).boxed()); // Search all of Reddit app.at("/search").get(|r| search::find(r).boxed());