use circleci instead of travis (#511)
Upgrade rust-toolchain Upgrade Tantivy Warning: tantivy now use a different file format, search index may need to be deleted and recreated to work as intended try to run compile twice in a row because sometime oomk is evil
This commit is contained in:
@@ -11,9 +11,9 @@ use inbox::{Inbox, SignedJson};
|
||||
use plume_common::activity_pub::sign::{verify_http_headers, Signable};
|
||||
use plume_models::{
|
||||
admin::Admin, comments::Comment, db_conn::DbConn, headers::Headers, instance::*, posts::Post,
|
||||
safe_string::SafeString, users::User, Error, CONFIG
|
||||
safe_string::SafeString, users::User, Error, CONFIG,
|
||||
};
|
||||
use routes::{errors::ErrorPage, Page, rocket_uri_macro_static_files};
|
||||
use routes::{errors::ErrorPage, rocket_uri_macro_static_files, Page};
|
||||
use template_utils::Ructe;
|
||||
use Searcher;
|
||||
|
||||
|
||||
@@ -59,10 +59,10 @@ pub fn search(
|
||||
user: Option<User>,
|
||||
intl: I18n,
|
||||
) -> Ructe {
|
||||
let query = query.map(|f| f.into_inner()).unwrap_or_default();
|
||||
let query = query.map(Form::into_inner).unwrap_or_default();
|
||||
let page = query.page.unwrap_or_default();
|
||||
let mut parsed_query =
|
||||
Query::from_str(&query.q.as_ref().map(|q| q.as_str()).unwrap_or_default())
|
||||
Query::from_str(&query.q.as_ref().map(String::as_str).unwrap_or_default())
|
||||
.unwrap_or_default();
|
||||
|
||||
param_to_query!(query, parsed_query; normal: title, subtitle, content, tag,
|
||||
|
||||
@@ -95,7 +95,7 @@ pub fn create(
|
||||
.unwrap_or_else(|| "/".to_owned());
|
||||
|
||||
let uri = Uri::parse(&destination)
|
||||
.map(|x| x.into_owned())
|
||||
.map(IntoOwned::into_owned)
|
||||
.map_err(|_| {
|
||||
render!(session::login(
|
||||
&(&*conn, &intl.catalog, None),
|
||||
|
||||
Reference in New Issue
Block a user