serv/surwiki
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Forward the edit-state when redirecting to renamed articles.

Browse source 
This improves usability with noscript
This commit is contained in:
Magnus Hovland Hoff 2018-09-24 23:01:01 +02:00
parent e92c9695be
commit a81a568ee2
2 changed files with 15 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/resources/temporary_redirect_resource.rs
View file

@ -14,14 +14,18 @@ impl TemporaryRedirectResource {
Self { location }
}
pub fn from_slug<S: AsRef<str>>(slug: S) -> Self {
pub fn from_slug<S: AsRef<str>>(slug: S, edit: bool) -> Self {
let base =
if slug.as_ref().is_empty() {
"."
} else {
slug.as_ref()
};
let tail = if edit { "?edit" } else { "" };
Self {
location:
if slug.as_ref().is_empty() {
"."
} else {
slug.as_ref()
}.to_owned()
location: format!("{}{}", base, tail)
}
}
}

7
src/wiki_lookup.rs
View file

@ -220,16 +220,17 @@ impl WikiLookup {
return Box::new(finished(None));
}
let edit = query == Some("edit");
// Normalize all user-generated slugs:
let slugified_slug = slugify(&slug);
if slugified_slug != slug {
return Box::new(finished(Some(
Box::new(TemporaryRedirectResource::from_slug(slugified_slug)) as BoxResource
Box::new(TemporaryRedirectResource::from_slug(slugified_slug, edit)) as BoxResource
)));
}
let state = self.state.clone();
let edit = query == Some("edit");
let slug = slug.into_owned();
use state::SlugLookup;
@ -240,7 +241,7 @@ impl WikiLookup {
SlugLookup::Hit { article_id, revision } =>
Box::new(ArticleResource::new(state, article_id, revision, edit)) as BoxResource,
SlugLookup::Redirect(slug) =>
Box::new(TemporaryRedirectResource::from_slug(slug)) as BoxResource,
Box::new(TemporaryRedirectResource::from_slug(slug, edit)) as BoxResource,
})))
)
}