diff --git a/internal/db/gdocs.go b/internal/db/gdocs.go index 89136f2f..d2db6b9e 100644 --- a/internal/db/gdocs.go +++ b/internal/db/gdocs.go @@ -28,12 +28,12 @@ type GDocsMetadata struct { } const ( - ImageEmbedTag = "image" - RawEmbedTag = "raw" - ToCEmbedTag = "toc" - SpotlightRawEmbedTag = "spl" - PartnerRawEmbedTag = "partner-embed" - PartnerTextTag = "partner-text" + ImageEmbedTag = "image" + RawEmbedTag = "raw" + ToCEmbedTag = "toc" + SpotlightRawEmbedOrTextTag = "spl" + PartnerRawEmbedTag = "partner-embed" + PartnerTextTag = "partner-text" ) type Embed struct { @@ -58,7 +58,7 @@ func (em *Embed) UnmarshalJSON(data []byte) error { return err } em.Value = img - case RawEmbedTag, ToCEmbedTag, SpotlightRawEmbedTag, PartnerRawEmbedTag, PartnerTextTag: + case RawEmbedTag, ToCEmbedTag, SpotlightRawEmbedOrTextTag, PartnerRawEmbedTag, PartnerTextTag: var s string if err := json.Unmarshal(temp.Value, &s); err != nil { return err diff --git a/pkg/almanack/service-gdocs.go b/pkg/almanack/service-gdocs.go index 58793a6a..d22fcd7b 100644 --- a/pkg/almanack/service-gdocs.go +++ b/pkg/almanack/service-gdocs.go @@ -146,13 +146,13 @@ func (svc Services) ProcessGDocsDoc(ctx context.Context, dbDoc db.GDocsDoc) (err n++ case "spl", "spl-embed": embedHTML := xhtml.InnerText(rows.At(1, 0)) - embed.Type = db.SpotlightRawEmbedTag + embed.Type = db.SpotlightRawEmbedOrTextTag embed.Value = embedHTML value := must.Get(json.Marshal(embed)) data := xhtml.New("data", "value", string(value)) xhtml.ReplaceWith(tbl, data) case "spl-text": - embed.Type = db.SpotlightRawEmbedTag + embed.Type = db.SpotlightRawEmbedOrTextTag n := xhtml.Clone(rows.At(1, 0)) blocko.MergeSiblings(n) blocko.RemoveEmptyP(n) @@ -539,7 +539,7 @@ func fixRichTextPlaceholders(richText *html.Node) { for _, dataEl := range embeds { embed := extractEmbed(dataEl) switch embed.Type { - case db.SpotlightRawEmbedTag: + case db.SpotlightRawEmbedOrTextTag: dataEl.Parent.RemoveChild(dataEl) continue case db.PartnerTextTag: @@ -569,7 +569,7 @@ func fixRawHTMLPlaceholders(rawHTML *html.Node) { for _, dataEl := range embeds { embed := extractEmbed(dataEl) switch embed.Type { - case db.SpotlightRawEmbedTag: + case db.SpotlightRawEmbedOrTextTag: dataEl.Parent.RemoveChild(dataEl) case db.RawEmbedTag, db.ToCEmbedTag, db.PartnerRawEmbedTag, db.PartnerTextTag: xhtml.ReplaceWith(dataEl, &html.Node{ @@ -593,7 +593,7 @@ func fixMarkdownPlaceholders(rawHTML *html.Node) { switch embed.Type { case db.PartnerRawEmbedTag, db.PartnerTextTag: dataEl.Parent.RemoveChild(dataEl) - case db.RawEmbedTag, db.SpotlightRawEmbedTag: + case db.RawEmbedTag, db.SpotlightRawEmbedOrTextTag: xhtml.ReplaceWith(dataEl, &html.Node{ Type: html.RawNode, Data: embed.Value.(string),