nutomic/ibis
1
0
Fork 0
mirror of https://github.com/Nutomic/ibis.git synced 2024-11-21 19:21:10 +00:00
Code Projects Releases Packages Activity

less unwrap

Browse source
This commit is contained in:
Felix Ableitner 2023-11-15 01:32:46 +01:00
parent 8477c07014
commit de2607e531
5 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/federation/activities/accept.rs
View file

@ -20,7 +20,7 @@ pub struct Accept {
impl Accept { impl Accept {
pub fn new(actor: ObjectId<DbInstance>, object: Follow) -> MyResult<Accept> { pub fn new(actor: ObjectId<DbInstance>, object: Follow) -> MyResult<Accept> {
let id = generate_object_id(actor.inner().domain().unwrap())?; let id = generate_object_id(actor.inner())?;
Ok(Accept { Ok(Accept {
actor, actor,
object, object,

2
src/federation/activities/follow.rs
View file

@ -22,7 +22,7 @@ pub struct Follow {
impl Follow { impl Follow {
pub fn new(actor: ObjectId<DbInstance>, object: ObjectId<DbInstance>) -> MyResult<Follow> { pub fn new(actor: ObjectId<DbInstance>, object: ObjectId<DbInstance>) -> MyResult<Follow> {
let id = generate_object_id(actor.inner().domain().unwrap())?; let id = generate_object_id(actor.inner())?;
Ok(Follow { Ok(Follow {
actor, actor,
object, object,

2
src/federation/activities/update.rs
View file

@ -25,7 +25,7 @@ pub struct Update {
impl Update { impl Update {
pub fn new(actor: ObjectId<DbUser>, object: ObjectId<DbArticle>) -> MyResult<Update> { pub fn new(actor: ObjectId<DbUser>, object: ObjectId<DbArticle>) -> MyResult<Update> {
let id = generate_object_id(actor.inner().domain().unwrap())?; let id = generate_object_id(actor.inner())?;
Ok(Update { Ok(Update {
actor, actor,
object, object,

2
src/federation/objects/article.rs
View file

@ -21,7 +21,7 @@ pub struct DbArticle {
impl DbArticle { impl DbArticle {
pub fn new(text: String, attributed_to: ObjectId<DbInstance>) -> Result<DbArticle, Error> { pub fn new(text: String, attributed_to: ObjectId<DbInstance>) -> Result<DbArticle, Error> {
let ap_id = generate_object_id(attributed_to.inner().domain().unwrap())?.into(); let ap_id = generate_object_id(attributed_to.inner())?.into();
Ok(DbArticle { Ok(DbArticle {
text, text,
ap_id, ap_id,

3
src/utils.rs
View file

@ -3,7 +3,8 @@ use url::{ParseError, Url};
/// Just generate random url as object id. In a real project, you probably want to use /// Just generate random url as object id. In a real project, you probably want to use
/// an url which contains the database id for easy retrieval (or store the random id in db). /// an url which contains the database id for easy retrieval (or store the random id in db).
pub fn generate_object_id(domain: &str) -> Result<Url, ParseError> { pub fn generate_object_id(domain: &Url) -> Result<Url, ParseError> {
let domain = domain.domain().unwrap();
let id: String = thread_rng() let id: String = thread_rng()
.sample_iter(&Alphanumeric) .sample_iter(&Alphanumeric)
.take(7) .take(7)