Move require_logins from plume-common to plume
This commit is contained in:
+7
-6
@@ -14,8 +14,9 @@ use crate::routes::{
|
||||
email_signups::EmailSignupForm, errors::ErrorPage, Page, RemoteForm, RespondOrRedirect,
|
||||
};
|
||||
use crate::template_utils::{IntoContext, Ructe};
|
||||
use crate::utils::requires_login;
|
||||
use plume_common::activity_pub::{broadcast, ActivityStream, ApRequest, Id};
|
||||
use plume_common::utils;
|
||||
use plume_common::utils::md_to_html;
|
||||
use plume_models::{
|
||||
blogs::Blog, db_conn::DbConn, follows, headers::Headers, inbox::inbox as local_inbox,
|
||||
instance::Instance, medias::Media, posts::Post, reshares::Reshare, safe_string::SafeString,
|
||||
@@ -26,7 +27,7 @@ use plume_models::{
|
||||
pub fn me(user: Option<User>) -> RespondOrRedirect {
|
||||
match user {
|
||||
Some(user) => Redirect::to(uri!(details: name = user.username)).into(),
|
||||
None => utils::requires_login("", uri!(me)).into(),
|
||||
None => requires_login("", uri!(me)).into(),
|
||||
}
|
||||
}
|
||||
|
||||
@@ -71,7 +72,7 @@ pub fn dashboard(user: User, conn: DbConn, rockets: PlumeRocket) -> Result<Ructe
|
||||
|
||||
#[get("/dashboard", rank = 2)]
|
||||
pub fn dashboard_auth(i18n: I18n) -> Flash<Redirect> {
|
||||
utils::requires_login(
|
||||
requires_login(
|
||||
&i18n!(
|
||||
i18n.catalog,
|
||||
"To access your dashboard, you need to be logged in"
|
||||
@@ -187,7 +188,7 @@ pub fn follow_not_connected(
|
||||
|
||||
#[get("/@/<name>/follow?local", rank = 2)]
|
||||
pub fn follow_auth(name: String, i18n: I18n) -> Flash<Redirect> {
|
||||
utils::requires_login(
|
||||
requires_login(
|
||||
&i18n!(
|
||||
i18n.catalog,
|
||||
"To subscribe to someone, you need to be logged in"
|
||||
@@ -307,7 +308,7 @@ pub fn edit(
|
||||
|
||||
#[get("/@/<name>/edit", rank = 2)]
|
||||
pub fn edit_auth(name: String, i18n: I18n) -> Flash<Redirect> {
|
||||
utils::requires_login(
|
||||
requires_login(
|
||||
&i18n!(
|
||||
i18n.catalog,
|
||||
"To edit your profile, you need to be logged in"
|
||||
@@ -338,7 +339,7 @@ pub fn update(
|
||||
user.email = Some(form.email.clone());
|
||||
user.summary = form.summary.clone();
|
||||
user.summary_html = SafeString::new(
|
||||
&utils::md_to_html(
|
||||
&md_to_html(
|
||||
&form.summary,
|
||||
None,
|
||||
false,
|
||||
|
||||
Reference in New Issue
Block a user