From b3184e7ae2246756e71f6b3f6a162f05b751fbd8 Mon Sep 17 00:00:00 2001
From: alemi <me@alemi.dev>
Date: Sat, 22 Jun 2024 05:08:05 +0200
Subject: [PATCH] fix: iter after flat and unpack node

flat iter gives us only objects, but we want links...
---
 upub/core/src/traits/normalize.rs | 59 ++++++++++++++++---------------
 1 file changed, 31 insertions(+), 28 deletions(-)

diff --git a/upub/core/src/traits/normalize.rs b/upub/core/src/traits/normalize.rs
index 7869da0..ac346ce 100644
--- a/upub/core/src/traits/normalize.rs
+++ b/upub/core/src/traits/normalize.rs
@@ -124,34 +124,37 @@ impl Normalizer for crate::Context {
 				.await?;
 		}
 
-		for tag in object.tag() {
-			match tag.link_type() {
-				Ok(apb::LinkType::Mention) => {
-					let model = crate::model::mention::ActiveModel {
-						internal: NotSet,
-						object: Set(object_model.internal),
-						actor: Set(tag.href().to_string()),
-						published: Set(now),
-					};
-					crate::model::mention::Entity::insert(model)
-						.exec(tx)
-						.await?;
-				},
-				Ok(apb::LinkType::Hashtag) => {
-					let hashtag = tag.name()
-						.unwrap_or_else(|_| tag.href().split('/').last().unwrap_or_default())
-						.replace('#', "");
-					let model = crate::model::hashtag::ActiveModel {
-						internal: NotSet,
-						object: Set(object_model.internal),
-						name: Set(hashtag),
-						published: Set(now),
-					};
-					crate::model::hashtag::Entity::insert(model)
-						.exec(tx)
-						.await?;
-				},
-				_ => {},
+		for tag in object.tag().flat() {
+			match tag {
+				Node::Empty | Node::Object(_) | Node::Array(_) => {},
+				Node::Link(l) => match l.link_type() {
+					Ok(apb::LinkType::Mention) => {
+						let model = crate::model::mention::ActiveModel {
+							internal: NotSet,
+							object: Set(object_model.internal),
+							actor: Set(l.href().to_string()),
+							published: Set(now),
+						};
+						crate::model::mention::Entity::insert(model)
+							.exec(tx)
+							.await?;
+					},
+					Ok(apb::LinkType::Hashtag) => {
+						let hashtag = l.name()
+							.unwrap_or_else(|_| l.href().split('/').last().unwrap_or_default())
+							.replace('#', "");
+						let model = crate::model::hashtag::ActiveModel {
+							internal: NotSet,
+							object: Set(object_model.internal),
+							name: Set(hashtag),
+							published: Set(now),
+						};
+						crate::model::hashtag::Entity::insert(model)
+							.exec(tx)
+							.await?;
+					},
+					_ => {},
+				}
 			}
 		}