Fetch messages route.

This commit is contained in:
Paul Makles
2021-01-18 20:26:09 +00:00
parent c6ba72d924
commit bd789b6825
6 changed files with 82 additions and 13 deletions

View File

@@ -4,7 +4,7 @@ use crate::util::result::{Error, Result};
use validator::Validate;
use rocket::http::RawStr;
use rocket::request::FromParam;
use mongodb::bson::{doc, from_bson, Bson};
use mongodb::bson::{Bson, doc, from_bson, from_document};
use serde::{Deserialize, Serialize, de::DeserializeOwned};
#[derive(Validate, Serialize, Deserialize)]
@@ -34,8 +34,8 @@ impl Ref {
.ok_or_else(|| Error::UnknownUser)?;
Ok(
from_bson::<T>(Bson::Document(doc)).map_err(|_| Error::DatabaseError {
operation: "from_bson",
from_document::<T>(doc).map_err(|_| Error::DatabaseError {
operation: "from_document",
with: &collection,
})?,
)

View File

@@ -1,6 +1,6 @@
use crate::database::*;
use mongodb::bson::{doc, from_bson, Bson};
use mongodb::bson::{Bson, doc, from_bson, from_document};
use rauth::auth::Session;
use rocket::http::Status;
use rocket::request::{self, FromRequest, Outcome, Request};
@@ -22,7 +22,7 @@ impl<'a, 'r> FromRequest<'a, 'r> for User {
.await
{
if let Some(doc) = result {
Outcome::Success(from_bson(Bson::Document(doc)).unwrap())
Outcome::Success(from_document(doc).unwrap())
} else {
Outcome::Failure((Status::Forbidden, rauth::util::Error::InvalidSession))
}

View File

@@ -2,7 +2,7 @@ use super::super::{get_collection, get_db};
use crate::rocket::futures::StreamExt;
use log::info;
use mongodb::bson::{doc, from_bson, Bson};
use mongodb::bson::{Bson, doc, from_bson, from_document};
use mongodb::options::FindOptions;
use serde::{Deserialize, Serialize};
@@ -23,7 +23,7 @@ pub async fn migrate_database() {
if let Some(doc) = data {
let info: MigrationInfo =
from_bson(Bson::Document(doc)).expect("Failed to read migration information.");
from_document(doc).expect("Failed to read migration information.");
let revision = run_migrations(info.revision).await;