add: journals + notes

crates/app/src/routes/api/v1/journals.rs

@@ -6,7 +6,7 @@ use axum::{
 use axum_extra::extract::CookieJar;
 use crate::{
     get_user_from_token,
-    routes::api::v1::{UpdateJournalView, CreateJournal, UpdateJournalTitle},
+    routes::api::v1::{UpdateJournalPrivacy, CreateJournal, UpdateJournalTitle},
     State,
 };
 use tetratto_core::model::{
@@ -81,7 +81,7 @@ pub async fn create_request(
         Ok(x) => Json(ApiReturn {
             ok: true,
             message: "Journal created".to_string(),
-            payload: Some(x),
+            payload: Some(x.id.to_string()),
         }),
         Err(e) => Json(e.into()),
     }
@@ -91,7 +91,7 @@ pub async fn update_title_request(
     jar: CookieJar,
     Path(id): Path<usize>,
     Extension(data): Extension<State>,
-    Json(props): Json<UpdateJournalTitle>,
+    Json(mut props): Json<UpdateJournalTitle>,
 ) -> impl IntoResponse {
     let data = &(data.read().await).0;
     let user = match get_user_from_token!(jar, data, oauth::AppScope::UserManageJournals) {
@@ -99,6 +99,18 @@ pub async fn update_title_request(
         None => return Json(Error::NotAllowed.into()),
     };
 
+    props.title = props.title.replace(" ", "_");
+
+    // make sure this title isn't already in use
+    if data
+        .get_journal_by_owner_title(user.id, &props.title)
+        .await
+        .is_ok()
+    {
+        return Json(Error::TitleInUse.into());
+    }
+
+    // ...
     match data.update_journal_title(id, &user, &props.title).await {
         Ok(_) => Json(ApiReturn {
             ok: true,
@@ -113,7 +125,7 @@ pub async fn update_privacy_request(
     jar: CookieJar,
     Path(id): Path<usize>,
     Extension(data): Extension<State>,
-    Json(props): Json<UpdateJournalView>,
+    Json(props): Json<UpdateJournalPrivacy>,
 ) -> impl IntoResponse {
     let data = &(data.read().await).0;
     let user = match get_user_from_token!(jar, data, oauth::AppScope::UserManageJournals) {
@@ -121,7 +133,7 @@ pub async fn update_privacy_request(
         None => return Json(Error::NotAllowed.into()),
     };
 
-    match data.update_journal_privacy(id, &user, props.view).await {
+    match data.update_journal_privacy(id, &user, props.privacy).await {
         Ok(_) => Json(ApiReturn {
             ok: true,
             message: "Journal updated".to_string(),

crates/app/src/routes/api/v1/mod.rs

@@ -563,6 +563,7 @@ pub fn routes() -> Router {
         .route("/notes/{id}/title", post(notes::update_title_request))
         .route("/notes/{id}/content", post(notes::update_content_request))
         .route("/notes/from_journal/{id}", get(notes::list_request))
+        .route("/notes/preview", post(notes::render_markdown_request))
         // uploads
         .route("/uploads/{id}", get(uploads::get_request))
         .route("/uploads/{id}", delete(uploads::delete_request))
@@ -887,8 +888,8 @@ pub struct UpdateJournalTitle {
 }
 
 #[derive(Deserialize)]
-pub struct UpdateJournalView {
-    pub view: JournalPrivacyPermission,
+pub struct UpdateJournalPrivacy {
+    pub privacy: JournalPrivacyPermission,
 }
 
 #[derive(Deserialize)]
@@ -900,3 +901,8 @@ pub struct UpdateNoteTitle {
 pub struct UpdateNoteContent {
     pub content: String,
 }
+
+#[derive(Deserialize)]
+pub struct RenderMarkdown {
+    pub content: String,
+}

crates/app/src/routes/api/v1/notes.rs

@@ -4,15 +4,17 @@ use axum::{
     Extension,
 };
 use axum_extra::extract::CookieJar;
+use tetratto_shared::unix_epoch_timestamp;
 use crate::{
     get_user_from_token,
-    routes::api::v1::{CreateNote, UpdateNoteContent, UpdateNoteTitle},
+    routes::api::v1::{CreateNote, RenderMarkdown, UpdateNoteContent, UpdateNoteTitle},
     State,
 };
 use tetratto_core::model::{
     journals::{JournalPrivacyPermission, Note},
     oauth,
     permissions::FinePermission,
+    uploads::CustomEmoji,
     ApiReturn, Error,
 };
 
@@ -110,7 +112,7 @@ pub async fn create_request(
         Ok(x) => Json(ApiReturn {
             ok: true,
             message: "Note created".to_string(),
-            payload: Some(x),
+            payload: Some(x.id.to_string()),
         }),
         Err(e) => Json(e.into()),
     }
@@ -120,7 +122,7 @@ pub async fn update_title_request(
     jar: CookieJar,
     Path(id): Path<usize>,
     Extension(data): Extension<State>,
-    Json(props): Json<UpdateNoteTitle>,
+    Json(mut props): Json<UpdateNoteTitle>,
 ) -> impl IntoResponse {
     let data = &(data.read().await).0;
     let user = match get_user_from_token!(jar, data, oauth::AppScope::UserManageNotes) {
@@ -128,6 +130,23 @@ pub async fn update_title_request(
         None => return Json(Error::NotAllowed.into()),
     };
 
+    let note = match data.get_note_by_id(id).await {
+        Ok(n) => n,
+        Err(e) => return Json(e.into()),
+    };
+
+    props.title = props.title.replace(" ", "_");
+
+    // make sure this title isn't already in use
+    if data
+        .get_note_by_journal_title(note.journal, &props.title)
+        .await
+        .is_ok()
+    {
+        return Json(Error::TitleInUse.into());
+    }
+
+    // ...
     match data.update_note_title(id, &user, &props.title).await {
         Ok(_) => Json(ApiReturn {
             ok: true,
@@ -151,11 +170,20 @@ pub async fn update_content_request(
     };
 
     match data.update_note_content(id, &user, &props.content).await {
-        Ok(_) => Json(ApiReturn {
-            ok: true,
-            message: "Note updated".to_string(),
-            payload: (),
-        }),
+        Ok(_) => {
+            if let Err(e) = data
+                .update_note_edited(id, unix_epoch_timestamp() as i64)
+                .await
+            {
+                return Json(e.into());
+            }
+
+            Json(ApiReturn {
+                ok: true,
+                message: "Note updated".to_string(),
+                payload: (),
+            })
+        }
         Err(e) => Json(e.into()),
     }
 }
@@ -180,3 +208,9 @@ pub async fn delete_request(
         Err(e) => Json(e.into()),
     }
 }
+
+pub async fn render_markdown_request(Json(req): Json<RenderMarkdown>) -> impl IntoResponse {
+    tetratto_shared::markdown::render_markdown(&CustomEmoji::replace(&req.content))
+        .replace("\\@", "@")
+        .replace("%5C@", "@")
+}