Diesel 2.0.0 upgrade (#2452)

[lemmy.git] / crates / apub / src / protocol / activities / voting / vote.rs

diff --git a/crates/apub/src/protocol/activities/voting/vote.rs b/crates/apub/src/protocol/activities/voting/vote.rs
index fdc87a3bd7e497f5316643b87bb9d10f4a170eb2..8541b1369cec2115b9188b792d16c1005486a4d9 100644 (file)
--- a/crates/apub/src/protocol/activities/voting/vote.rs
+++ b/crates/apub/src/protocol/activities/voting/vote.rs
@@ -1,31 +1,31 @@
 use crate::{
-  fetcher::{object_id::ObjectId, post_or_comment::PostOrComment},
+  fetcher::post_or_comment::PostOrComment,
   objects::person::ApubPerson,
+  protocol::Unparsed,
 };
-use activitystreams::unparsed::Unparsed;
-use anyhow::anyhow;
-use lemmy_apub_lib::traits::ActivityFields;
-use lemmy_utils::LemmyError;
+use activitypub_federation::{core::object_id::ObjectId, deser::helpers::deserialize_one_or_many};
+use lemmy_utils::error::LemmyError;
 use serde::{Deserialize, Serialize};
 use std::convert::TryFrom;
-use strum_macros::ToString;
+use strum_macros::Display;
 use url::Url;
 
-#[derive(Clone, Debug, Deserialize, Serialize, ActivityFields)]
+#[derive(Clone, Debug, Deserialize, Serialize)]
 #[serde(rename_all = "camelCase")]
 pub struct Vote {
   pub(crate) actor: ObjectId<ApubPerson>,
-  pub(crate) to: Vec<Url>,
   pub(crate) object: ObjectId<PostOrComment>,
+  #[serde(deserialize_with = "deserialize_one_or_many", default)]
   pub(crate) cc: Vec<Url>,
   #[serde(rename = "type")]
   pub(crate) kind: VoteType,
   pub(crate) id: Url,
+
   #[serde(flatten)]
   pub(crate) unparsed: Unparsed,
 }
 
-#[derive(Clone, Debug, ToString, Deserialize, Serialize)]
+#[derive(Clone, Debug, Display, Deserialize, Serialize, PartialEq, Eq)]
 pub enum VoteType {
   Like,
   Dislike,
@@ -38,7 +38,7 @@ impl TryFrom<i16> for VoteType {
     match value {
       1 => Ok(VoteType::Like),
       -1 => Ok(VoteType::Dislike),
-      _ => Err(anyhow!("invalid vote value").into()),
+      _ => Err(LemmyError::from_message("invalid vote value")),
     }
   }
 }