From 4ccfec8019bd256a243978c5f85e842101d77ce3 Mon Sep 17 00:00:00 2001
From: Kitaiti Makoto <KitaitiMakoto@gmail.com>
Date: Sun, 13 Feb 2022 01:23:47 +0900
Subject: [PATCH] Use OneOrMany<AnyBase>::to_as_uri()

---
 plume-models/src/users.rs | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/plume-models/src/users.rs b/plume-models/src/users.rs
index b18bc037..5f1152be 100644
--- a/plume-models/src/users.rs
+++ b/plume-models/src/users.rs
@@ -27,7 +27,7 @@ use plume_common::{
         request::get,
         sign::{gen_keypair, Error as SignError, Result as SignResult, Signer},
         ActivityStream, ApSignature, CustomPerson as CustomPerson07, Id, IntoId, PublicKey,
-        ToAsString, PUBLIC_VISIBILITY,
+        ToAsString, ToAsUri, PUBLIC_VISIBILITY,
     },
     utils,
 };
@@ -1075,16 +1075,7 @@ impl FromId07<DbConn> for User {
         };
 
         let avatar_id = if let Some(icon) = acct.object_ref().icon() {
-            if let Some(prop) = icon.as_one() {
-                prop.as_xsd_any_uri().map(|uri| uri.to_string())
-            } else if let Some(prop) = icon.as_many() {
-                prop.iter()
-                    .next()
-                    .and_then(|p| p.as_xsd_any_uri())
-                    .map(|uri| uri.to_string())
-            } else {
-                None
-            }
+            icon.to_as_uri()
         } else {
             None
         };