fix association.service

totegamma · Jul 19, 2024 · 05482a7 · 05482a7
1 parent 0a9fd20
commit 05482a7
Showing 1 changed file with 56 additions and 55 deletions.
diff --git a/x/association/service.go b/x/association/service.go
@@ -330,79 +330,80 @@ func (s *service) Create(ctx context.Context, mode core.CommitMode, document str
 		}
 	}
 
-	if doc.Target[0] == 'm' {
-		destinations := make(map[string][]string)
-		for _, timeline := range doc.Timelines {
-			normalized, err := s.timeline.NormalizeTimelineID(ctx, timeline)
-			if err != nil {
-				span.RecordError(err)
-				continue
-			}
-			split := strings.Split(normalized, "@")
-			if len(split) <= 1 {
-				span.RecordError(fmt.Errorf("invalid timeline id: %s", normalized))
-				continue
-			}
-			domain := split[len(split)-1]
-
-			if _, ok := destinations[domain]; !ok {
-				destinations[domain] = []string{}
-			}
-			destinations[domain] = append(destinations[domain], timeline)
+	destinations := make(map[string][]string)
+	for _, timeline := range doc.Timelines {
+		normalized, err := s.timeline.NormalizeTimelineID(ctx, timeline)
+		if err != nil {
+			span.RecordError(err)
+			continue
 		}
+		split := strings.Split(normalized, "@")
+		if len(split) <= 1 {
+			span.RecordError(fmt.Errorf("invalid timeline id: %s", normalized))
+			continue
+		}
+		domain := split[len(split)-1]
 
-		for domain, timelines := range destinations {
-			if domain == s.config.FQDN {
-				// localなら、timelineのエントリを生成→Eventを発行
-				for _, timeline := range timelines {
-					posted, err := s.timeline.PostItem(ctx, timeline, core.TimelineItem{
-						ResourceID: association.ID,
-						Owner:      association.Owner,
-						Author:     &association.Author,
-					}, document, signature)
-					if err != nil {
-						span.RecordError(err)
-						continue
-					}
+		if _, ok := destinations[domain]; !ok {
+			destinations[domain] = []string{}
+		}
+		destinations[domain] = append(destinations[domain], timeline)
+	}
 
-					event := core.Event{
-						Timeline:  timeline,
-						Item:      posted,
-						Document:  document,
-						Signature: signature,
-						Resource:  association,
-					}
+	for domain, timelines := range destinations {
+		if domain == s.config.FQDN {
+			// localなら、timelineのエントリを生成→Eventを発行
+			for _, timeline := range timelines {
 
-					err = s.timeline.PublishEvent(ctx, event)
-					if err != nil {
-						slog.ErrorContext(ctx, "failed to publish event", slog.String("error", err.Error()), slog.String("module", "timeline"))
-						span.RecordError(err)
-						continue
-					}
+				posted, err := s.timeline.PostItem(ctx, timeline, core.TimelineItem{
+					ResourceID: association.ID,
+					Owner:      association.Owner,
+					Author:     &association.Author,
+				}, document, signature)
+				if err != nil {
+					span.RecordError(err)
+					continue
 				}
-			} else if owner.Domain == s.config.FQDN && mode != core.CommitModeLocalOnlyExec { // ここでリソースを作成したなら、リモートにもリレー
-				// send to remote
-				packet := core.Commit{
+
+				event := core.Event{
+					Timeline:  timeline,
+					Item:      posted,
 					Document:  document,
 					Signature: signature,
+					Resource:  association,
 				}
 
-				packetStr, err := json.Marshal(packet)
+				err = s.timeline.PublishEvent(ctx, event)
 				if err != nil {
+					slog.ErrorContext(ctx, "failed to publish event", slog.String("error", err.Error()), slog.String("module", "timeline"))
 					span.RecordError(err)
 					continue
 				}
+			}
+		} else if owner.Domain == s.config.FQDN && mode != core.CommitModeLocalOnlyExec { // ここでリソースを作成したなら、リモートにもリレー
+			// send to remote
+			packet := core.Commit{
+				Document:  document,
+				Signature: signature,
+			}
 
-				_, err = s.domain.GetByFQDN(ctx, domain)
-				if err != nil {
-					span.RecordError(err)
-					continue
-				}
+			packetStr, err := json.Marshal(packet)
+			if err != nil {
+				span.RecordError(err)
+				continue
+			}
 
-				s.client.Commit(ctx, domain, string(packetStr), nil, nil)
+			_, err = s.domain.GetByFQDN(ctx, domain)
+			if err != nil {
+				span.RecordError(err)
+				continue
 			}
+
+			s.client.Commit(ctx, domain, string(packetStr), nil, nil)
 		}
+	}
 
+	if doc.Target[0] == 'm' {
 		// Associationだけの追加対応
 		// メッセージの場合は、ターゲットのタイムラインにも追加する
 		if owner.Domain == s.config.FQDN && mode != core.CommitModeLocalOnlyExec {