versia-pub/activitypub
2
0
Fork 0
mirror of https://github.com/versia-pub/activitypub.git synced 2025-12-06 14:48:19 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: migration issues

Browse source
This commit is contained in:
aprilthepink 2024-07-21 21:48:49 +02:00
parent 9ce95c4b7a
commit e8b78e4d8d
1 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/lysand/conversion.rs
View file

@ -124,7 +124,7 @@ pub async fn lysand_user_from_db(
Some(icon) => { Some(icon) => {
let mut content_format = ContentFormat::default(); let mut content_format = ContentFormat::default();
let content_entry = ContentEntry::from_string(icon.url.to_string()); let content_entry = ContentEntry::from_string(icon.url.to_string());
content_format.x.insert(icon.type_, content_entry); content_format.x.insert(icon.media_type, content_entry);
Some(content_format) Some(content_format)
} }
None => None, None => None,
@ -133,7 +133,7 @@ pub async fn lysand_user_from_db(
Some(image) => { Some(image) => {
let mut content_format = ContentFormat::default(); let mut content_format = ContentFormat::default();
let content_entry = ContentEntry::from_string(image.url.to_string()); let content_entry = ContentEntry::from_string(image.url.to_string());
content_format.x.insert(image.type_, content_entry); content_format.x.insert(image.media_type, content_entry);
Some(content_format) Some(content_format)
} }
None => None, None => None,
@ -159,13 +159,19 @@ pub async fn lysand_user_from_db(
let mut emojis = Vec::new(); let mut emojis = Vec::new();
for tag in tags { for tag in tags {
let mut content_format = ContentFormat::default(); let mut content_format = ContentFormat::default();
if tag.id.is_none() { if tag.icon.is_none() {
continue; continue;
} }
let content_entry = ContentEntry::from_string(tag.id.unwrap().to_string()); let content_entry =
content_format.x.insert(tag.type_, content_entry); ContentEntry::from_string(tag.icon.clone().unwrap().url.to_string());
content_format
.x
.insert(tag.icon.unwrap().media_type, content_entry);
let mut name = tag.name.chars();
name.next();
name.next_back();
emojis.push(super::objects::CustomEmoji { emojis.push(super::objects::CustomEmoji {
name: tag.name, name: name.as_str().to_string(),
url: content_format, url: content_format,
}); });
} }
@ -318,7 +324,7 @@ pub async fn db_user_from_url(url: Url) -> anyhow::Result<entities::user::Model>
let touple = emoji.url.select_rich_img_touple().await?; let touple = emoji.url.select_rich_img_touple().await?;
tags.push(TagType { tags.push(TagType {
id: Some(Url::parse(&touple.1).unwrap()), id: Some(Url::parse(&touple.1).unwrap()),
name: emoji.name, name: ":".to_string() + &emoji.name + ":",
type_: "Emoji".to_string(), type_: "Emoji".to_string(),
updated: Some(Utc::now()), updated: Some(Utc::now()),
href: None, href: None,