Merge branch 'master' of github.com:storytold/storyteller-web

This commit is contained in:
Brandon Thomas committed 2022-03-23 12:25:54 -04:00
commit ff2bc5e4fa
7 files changed
+30 -9

No files matched your search

+15
View File
@@ -56,5 +56,20 @@ order by number desc
limit 100;
select count(*) from tts_inference_jobs
where created_at > now() - interval 1 day ;
select count(distinct creator_ip_address) from tts_inference_jobs
where created_at > now() - interval 1 day ;
select j.creator_ip_address, count(*) as number
from tts_inference_jobs as j
where j.created_at > now() - interval 1 day
group by j.creator_ip_address
order by number desc
limit 100;
@@ -8,7 +8,7 @@ pub fn redirect_is_allowed(redirect_url: &str) -> bool {
"https://create.storyteller.io" => true,
"https://create.storyteller.io/" => true,
"https://fakeyou.com" => true,
"https://fakeyou.com/" => true,
"https://fakeyou.com/clone" => true,
"https://jungle.horse" => true,
"https://jungle.horse/" => true,
"https://storyteller.io" => true,
@@ -24,12 +24,13 @@ pub async fn disable_demo_mode_handler(
) -> impl Responder
{
let unsafe_redirect = query.redirect_to
.map(|r| r.clone())
.as_deref()
.map(|r| r.to_string())
.unwrap_or(DEFAULT_INVESTOR_REDIRECT.to_string());
let redirect_allowed = redirect_is_allowed(&unsafe_redirect);
let safe_redirect = if redirect_allowed {
let safe_redirect_url = if redirect_allowed {
unsafe_redirect
} else {
DEFAULT_INVESTOR_REDIRECT.to_string()
@@ -44,7 +45,7 @@ pub async fn disable_demo_mode_handler(
.finish();
HttpResponse::build(StatusCode::FOUND)
.append_header((header::LOCATION, url.to_string()))
.append_header((header::LOCATION, safe_redirect_url.to_string()))
.del_cookie(&cookie)
.finish()
}
@@ -24,12 +24,13 @@ pub async fn enable_demo_mode_handler(
) -> impl Responder
{
let unsafe_redirect = query.redirect_to
.map(|r| r.clone())
.as_deref()
.map(|r| r.to_string())
.unwrap_or(DEFAULT_INVESTOR_REDIRECT.to_string());
let redirect_allowed = redirect_is_allowed(&unsafe_redirect);
let safe_redirect = if redirect_allowed {
let safe_redirect_url = if redirect_allowed {
unsafe_redirect
} else {
DEFAULT_INVESTOR_REDIRECT.to_string()
@@ -43,7 +44,7 @@ pub async fn enable_demo_mode_handler(
.finish();
HttpResponse::build(StatusCode::FOUND)
.append_header((header::LOCATION, url.to_string()))
.append_header((header::LOCATION, safe_redirect_url.to_string()))
.cookie(cookie)
.finish()
}
+2 -2
View File
@@ -633,11 +633,11 @@ fn add_investor_demo_routes<T, B> (app: App<T, B>) -> App<T, B>
{
app.service(web::scope("/demo_mode")
.service(web::resource("/enable")
.route(web::post().to(enable_demo_mode_handler))
.route(web::get().to(enable_demo_mode_handler))
.route(web::head().to(|| HttpResponse::Ok()))
)
.service(web::resource("/disable")
.route(web::post().to(disable_demo_mode_handler))
.route(web::get().to(disable_demo_mode_handler))
.route(web::head().to(|| HttpResponse::Ok()))
)
)
@@ -124,6 +124,8 @@ impl BitsEventHandler {
.await?;
}
}
EventResponse::TtsCommandPresets { .. } => {} // TODO
EventResponse::TtsCommandCustom { .. } => {} // TODO
}
Ok(())
@@ -133,6 +133,8 @@ impl ChannelPointsEventHandler {
.await?;
}
}
EventResponse::TtsCommandPresets { .. } => {} // TODO
EventResponse::TtsCommandCustom { .. } => {} // TODO
}
Ok(())