mirror of
https://framagit.org/veretcle/oolatoocs.git
synced 2025-12-06 14:53:15 +01:00
♻️: better handle of quotes and media embedded into quotes
This commit is contained in:
76
src/lib.rs
76
src/lib.rs
@@ -19,7 +19,7 @@ use utils::{generate_multi_tweets, strip_everything};
|
||||
|
||||
mod bsky;
|
||||
use bsky::{
|
||||
build_post_record, generate_embed_records, generate_media_records, generate_quote_records,
|
||||
build_post_record, generate_media_records, generate_quote_records, generate_webcard_records,
|
||||
get_session, BskyReply,
|
||||
};
|
||||
|
||||
@@ -161,22 +161,66 @@ pub async fn run(config: &Config) {
|
||||
});
|
||||
};
|
||||
|
||||
// Don’t know how to union things so…
|
||||
// cards have the least priority (you cannot embed card and images anyway)
|
||||
// images have a higher priority
|
||||
// quotes have the highest priority
|
||||
|
||||
let record_embed = if toot.reblog.is_some() {
|
||||
let quote_record =
|
||||
read_state(&conn, Some(toot.reblog.unwrap().id.parse::<u64>().unwrap()));
|
||||
match quote_record {
|
||||
Ok(Some(q)) => generate_quote_records(&config.bluesky, &q.record_uri).await,
|
||||
_ => None,
|
||||
// handle quote if any
|
||||
let quote_embed = match toot.reblog {
|
||||
Some(r) => {
|
||||
let quote_record = read_state(&conn, Some(r.id.parse::<u64>().unwrap()));
|
||||
match quote_record {
|
||||
Ok(Some(q)) => generate_quote_records(&config.bluesky, &q.record_uri)
|
||||
.await
|
||||
.ok(),
|
||||
_ => None,
|
||||
}
|
||||
}
|
||||
} else if toot.media_attachments.len() > usize::from(0u8) {
|
||||
generate_media_records(&bluesky, &toot.media_attachments).await
|
||||
} else if toot.card.is_some() {
|
||||
generate_embed_records(&bluesky, &toot.card.unwrap()).await
|
||||
None => None,
|
||||
};
|
||||
|
||||
// handle medias if any
|
||||
let media_embed = if toot.media_attachments.len() > usize::from(0u8) {
|
||||
generate_media_records(&bluesky, &toot.media_attachments)
|
||||
.await
|
||||
.ok()
|
||||
} else {
|
||||
None
|
||||
};
|
||||
|
||||
// handle webcard if any
|
||||
let webcard_embed = match toot.card {
|
||||
Some(t) => generate_webcard_records(&bluesky, &t).await.ok(),
|
||||
None => None,
|
||||
};
|
||||
|
||||
let record_embed = if quote_embed.is_some() {
|
||||
if media_embed.is_some() {
|
||||
let medias_mapped = match media_embed.unwrap() {
|
||||
atrium_api::app::bsky::feed::post::RecordEmbedRefs::AppBskyEmbedImagesMain(a) => atrium_api::app::bsky::embed::record_with_media::MainMediaRefs::AppBskyEmbedImagesMain(a),
|
||||
atrium_api::app::bsky::feed::post::RecordEmbedRefs::AppBskyEmbedVideoMain(a) => atrium_api::app::bsky::embed::record_with_media::MainMediaRefs::AppBskyEmbedVideoMain(a),
|
||||
_ => continue, // this should NEVER happen as Media are either Video or
|
||||
// Images at this point
|
||||
};
|
||||
let quote_mapped = match quote_embed.unwrap() {
|
||||
atrium_api::app::bsky::feed::post::RecordEmbedRefs::AppBskyEmbedRecordMain(
|
||||
a,
|
||||
) => a,
|
||||
_ => continue, // again, this should NEVER happen
|
||||
};
|
||||
Some(atrium_api::types::Union::Refs(
|
||||
atrium_api::app::bsky::feed::post::RecordEmbedRefs::AppBskyEmbedRecordWithMediaMain(
|
||||
Box::new(
|
||||
atrium_api::app::bsky::embed::record_with_media::MainData {
|
||||
media: atrium_api::types::Union::Refs(medias_mapped),
|
||||
record: (*quote_mapped),
|
||||
}.into()
|
||||
)
|
||||
)
|
||||
))
|
||||
} else {
|
||||
quote_embed.map(atrium_api::types::Union::Refs)
|
||||
}
|
||||
} else if media_embed.is_some() {
|
||||
media_embed.map(atrium_api::types::Union::Refs)
|
||||
} else if webcard_embed.is_some() {
|
||||
webcard_embed.map(atrium_api::types::Union::Refs)
|
||||
} else {
|
||||
None
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user