mirrors/lemmy
1
0
Fork 0
mirror of https://github.com/LemmyNet/lemmy.git synced 2025-09-02 19:23:49 +00:00
Code Issues Projects Releases Wiki Activity

Properly parse icons federated from Peertube (fixes #5894) (#5895)

Browse source
This commit is contained in:
Nutomic 2025-07-28 15:03:47 +00:00 committed by GitHub
parent 398237b02a
commit 1ff2aec3c7
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 16 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Cargo.lock generated
View file

@ -10,9 +10,9 @@ checksum = "8f27d075294830fcab6f66e320dab524bc6d048f4a151698e153205559113772"
[[package]] [[package]]
name = "activitypub_federation" name = "activitypub_federation"
version = "0.7.0-beta.5" version = "0.7.0-beta.6"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e58f584c183501d7865b18d8b94c9477f750051ce99d54a399a2f4180667574c" checksum = "db2b37b4bda9656b5bcb0ee5fb45a616e98500207519d684305996c329bfd520"
dependencies = [ dependencies = [
"activitystreams-kinds", "activitystreams-kinds",
"actix-web", "actix-web",

2
Cargo.toml
View file

@ -140,7 +140,7 @@ lemmy_db_views_report_combined = { version = "=1.0.0-alpha.5", path = "./crates/
lemmy_db_views_search_combined = { version = "=1.0.0-alpha.5", path = "./crates/db_views/search_combined" } lemmy_db_views_search_combined = { version = "=1.0.0-alpha.5", path = "./crates/db_views/search_combined" }
lemmy_db_views_site = { version = "=1.0.0-alpha.5", path = "./crates/db_views/site" } lemmy_db_views_site = { version = "=1.0.0-alpha.5", path = "./crates/db_views/site" }
lemmy_db_views_vote = { version = "=1.0.0-alpha.5", path = "./crates/db_views/vote" } lemmy_db_views_vote = { version = "=1.0.0-alpha.5", path = "./crates/db_views/vote" }
activitypub_federation = { version = "0.7.0-beta.5", default-features = false, features = [ activitypub_federation = { version = "0.7.0-beta.6", default-features = false, features = [
"actix-web", "actix-web",
] } ] }
diesel = { version = "2.2.10", features = [ diesel = { version = "2.2.10", features = [

10
crates/apub_objects/src/protocol/group.rs
View file

@ -6,7 +6,11 @@ use crate::{
use activitypub_federation::{ use activitypub_federation::{
fetch::object_id::ObjectId, fetch::object_id::ObjectId,
kinds::actor::GroupType, kinds::actor::GroupType,
protocol::{helpers::deserialize_skip_error, public_key::PublicKey, values::MediaTypeHtml}, protocol::{
helpers::{deserialize_last, deserialize_skip_error},
public_key::PublicKey,
values::MediaTypeHtml,
},
}; };
use chrono::{DateTime, Utc}; use chrono::{DateTime, Utc};
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
@ -36,10 +40,10 @@ pub struct Group {
pub(crate) media_type: Option<MediaTypeHtml>, pub(crate) media_type: Option<MediaTypeHtml>,
// short instance description // short instance description
pub summary: Option<String>, pub summary: Option<String>,
#[serde(deserialize_with = "deserialize_skip_error", default)] #[serde(deserialize_with = "deserialize_last", default)]
pub icon: Option<ImageObject>, pub icon: Option<ImageObject>,
/// banner /// banner
#[serde(deserialize_with = "deserialize_skip_error", default)] #[serde(deserialize_with = "deserialize_last", default)]
pub image: Option<ImageObject>, pub image: Option<ImageObject>,
// lemmy extension // lemmy extension
pub sensitive: Option<bool>, pub sensitive: Option<bool>,

8
crates/apub_objects/src/protocol/person.rs
View file

@ -4,7 +4,10 @@ use crate::{
}; };
use activitypub_federation::{ use activitypub_federation::{
fetch::object_id::ObjectId, fetch::object_id::ObjectId,
protocol::{helpers::deserialize_skip_error, public_key::PublicKey}, protocol::{
helpers::{deserialize_last, deserialize_skip_error},
public_key::PublicKey,
},
}; };
use chrono::{DateTime, Utc}; use chrono::{DateTime, Utc};
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
@ -38,9 +41,10 @@ pub struct Person {
#[serde(deserialize_with = "deserialize_skip_error", default)] #[serde(deserialize_with = "deserialize_skip_error", default)]
pub(crate) source: Option<Source>, pub(crate) source: Option<Source>,
/// user avatar /// user avatar
#[serde(deserialize_with = "deserialize_skip_error", default)] #[serde(deserialize_with = "deserialize_last", default)]
pub(crate) icon: Option<ImageObject>, pub(crate) icon: Option<ImageObject>,
/// user banner /// user banner
#[serde(deserialize_with = "deserialize_last", default)]
pub(crate) image: Option<ImageObject>, pub(crate) image: Option<ImageObject>,
pub(crate) matrix_user_id: Option<String>, pub(crate) matrix_user_id: Option<String>,
pub(crate) endpoints: Option<Endpoints>, pub(crate) endpoints: Option<Endpoints>,