aitzol/Plume
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use new activitystreams APIs

Browse Source
This commit is contained in:
Kitaiti Makoto 2022-02-14 20:44:28 +09:00
parent 6b5a1d2130
commit a1a7acfe94
1 changed files with 4 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
plume-common/src/activity_pub/mod.rs
View File

@ -423,19 +423,9 @@ trait AsAsStr {
fn as_as_str(&self) -> Option<&str>; fn as_as_str(&self) -> Option<&str>;
} }
impl AsAsStr for &AnyString {
fn as_as_str(&self) -> Option<&str> {
self.as_xsd_string()
.or_else(|| self.as_rdf_lang_string().map(|ls| ls.value.as_str()))
}
}
impl AsAsStr for OneOrMany<&AnyString> { impl AsAsStr for OneOrMany<&AnyString> {
fn as_as_str(&self) -> Option<&str> { fn as_as_str(&self) -> Option<&str> {
self.as_one().and_then(|prop| prop.as_as_str()).or_else(|| { self.iter().next().map(|prop| prop.as_str())
self.as_many()
.and_then(|props| props.iter().next().and_then(|prop| prop.as_as_str()))
})
} }
} }
@ -445,13 +435,9 @@ pub trait ToAsUri {
impl ToAsUri for OneOrMany<AnyBase> { impl ToAsUri for OneOrMany<AnyBase> {
fn to_as_uri(&self) -> Option<String> { fn to_as_uri(&self) -> Option<String> {
self.as_one() self.iter()
.and_then(|prop| prop.as_xsd_any_uri()) .next()
.or_else(|| { .and_then(|prop| prop.as_xsd_any_uri().map(|uri| uri.to_string()))
self.as_many()
.and_then(|props| props.iter().next().and_then(|prop| prop.as_xsd_any_uri()))
})
.map(|uri| uri.to_string())
} }
} }