grishka/lemmy
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Make sure my_vote is consistently missing if not voted. Fixes #3197 (#4075)

Browse source 
* Make sure my_vote is consistently missing if not voted. Fixes #3197

* Fix clippy.

* Fix tests.
This commit is contained in:
Dessalines 2023-10-23 12:40:29 -04:00 committed by GitHub
parent 6235ff45b5
commit 5bfa4e9358
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
crates/api_common/src/post.rs
View file

@ -47,6 +47,7 @@ pub struct GetPost {
pub comment_id: Option<CommentId>, pub comment_id: Option<CommentId>,
} }
#[skip_serializing_none]
#[derive(Debug, Serialize, Deserialize, Clone)] #[derive(Debug, Serialize, Deserialize, Clone)]
#[cfg_attr(feature = "full", derive(TS))] #[cfg_attr(feature = "full", derive(TS))]
#[cfg_attr(feature = "full", ts(export))] #[cfg_attr(feature = "full", ts(export))]

10
crates/db_views/src/post_view.rs
View file

@ -542,16 +542,10 @@ impl PostView {
my_person_id: Option<PersonId>, my_person_id: Option<PersonId>,
is_mod_or_admin: bool, is_mod_or_admin: bool,
) -> Result<Self, Error> { ) -> Result<Self, Error> {
let mut res = queries() let res = queries()
.read(pool, (post_id, my_person_id, is_mod_or_admin)) .read(pool, (post_id, my_person_id, is_mod_or_admin))
.await?; .await?;
// If a person is given, then my_vote, if None, should be 0, not null
// Necessary to differentiate between other person's votes
if my_person_id.is_some() && res.my_vote.is_none() {
res.my_vote = Some(0)
};
Ok(res) Ok(res)
} }
} }
@ -877,7 +871,7 @@ mod tests {
assert_eq!(1, read_post_listing.len()); assert_eq!(1, read_post_listing.len());
assert_eq!(expected_post_listing_with_user, read_post_listing[0]); assert_eq!(expected_post_listing_with_user, read_post_listing[0]);
expected_post_listing_with_user.my_vote = Some(0); expected_post_listing_with_user.my_vote = None;
assert_eq!( assert_eq!(
expected_post_listing_with_user, expected_post_listing_with_user,
post_listing_single_with_person post_listing_single_with_person