remove Emoji method from page

extensions/gpg/page.go

@@ -12,7 +12,6 @@ import (
 	"time"
 
 	"github.com/emad-elsaid/xlog"
-	emojiAst "github.com/yuin/goldmark-emoji/ast"
 	"github.com/yuin/goldmark/ast"
 	"github.com/yuin/goldmark/text"
 )
@@ -100,11 +99,3 @@ func (p *page) AST() ([]byte, ast.Node) {
 
 	return []byte(src), p.ast
 }
-func (p *page) Emoji() string {
-	_, tree := p.AST()
-	if e, ok := xlog.FindInAST[*emojiAst.Emoji](tree); ok && e != nil {
-		return string(e.Value.Unicode)
-	}
-
-	return ""
-}

extensions/html/html.go

@@ -144,4 +144,3 @@ func (p *page) Write(content xlog.Markdown) bool {
 }
 
 func (p *page) AST() ([]byte, ast.Node) { return []byte{}, ast.NewDocument() }
-func (p *page) Emoji() string           { return "" }

extensions/pandoc/pandoc.go

@@ -156,4 +156,3 @@ func (p *page) Write(content xlog.Markdown) bool {
 }
 
 func (p *page) AST() ([]byte, ast.Node) { return []byte{}, ast.NewDocument() }
-func (p *page) Emoji() string           { return "" }

extensions/photos/photos.go

@@ -63,7 +63,6 @@ func (p *Photo) Name() string {
 	return base[:len(base)-len(ext)]
 }
 
-func (*Photo) Emoji() string            { return "" }
 func (*Photo) FileName() string         { return "" }
 func (*Photo) Exists() bool             { return false }
 func (*Photo) Content() xlog.Markdown   { return "" }

extensions/search/templates/search-result.html

@@ -3,7 +3,7 @@
   <a href="/{{.Page.Name}}">
     <strong class="is-block mb-1">
       {{ with .Page }}
-      {{.Emoji}}
+      {{ emoji . }}
       {{ $props := properties . }}
       {{ with $props.title }} {{ .Value }} {{ else }} {{ .Name }} {{ end }}
       {{ end }}

extensions/star/star.go

@@ -40,10 +40,10 @@ type starredPage struct {
 }
 
 func (s starredPage) Icon() string {
-	if s.Emoji() == "" {
+	if e := Emoji(s); e == "" {
 		return "fa-solid fa-star"
 	} else {
-		return s.Emoji()
+		return e
 	}
 }
 

handlers.go

@@ -102,8 +102,7 @@ func getPageHandler(r Request) Output {
 		Trigger(PageNotFound, page)
 
 		page = DynamicPage{
-			NameVal:  page.Name(),
-			EmojiVal: "",
+			NameVal: page.Name(),
 			RenderFn: func() template.HTML {
 				str := "Page doesn't exist"
 

helpers.go

@@ -8,6 +8,7 @@ import (
 	"strings"
 	"time"
 
+	emojiAst "github.com/yuin/goldmark-emoji/ast"
 	"github.com/yuin/goldmark/ast"
 	gast "github.com/yuin/goldmark/ast"
 )
@@ -23,6 +24,7 @@ var helpers = template.FuncMap{
 	"includeJS":      includeJS,
 	"scripts":        scripts,
 	"banner":         Banner,
+	"emoji":          Emoji,
 }
 
 var ErrHelperRegistered = errors.New("Helper already registered")
@@ -160,3 +162,12 @@ func Banner(p Page) string {
 
 	return string(image.Destination)
 }
+
+func Emoji(p Page) string {
+	_, tree := p.AST()
+	if e, ok := FindInAST[*emojiAst.Emoji](tree); ok && e != nil {
+		return string(e.Value.Unicode)
+	}
+
+	return ""
+}

page.go

@@ -10,7 +10,6 @@ import (
 	"sync"
 	"time"
 
-	emojiAst "github.com/yuin/goldmark-emoji/ast"
 	"github.com/yuin/goldmark/ast"
 	"github.com/yuin/goldmark/text"
 )
@@ -44,8 +43,6 @@ type Page interface {
 	// parts of the page. for example the following "Emoji" function uses it to
 	// extract the first emoji.
 	AST() ([]byte, ast.Node)
-	// Returns the first emoji of the page.
-	Emoji() string
 }
 
 type page struct {
@@ -155,15 +152,6 @@ func (p *page) AST() (source []byte, tree ast.Node) {
 	return []byte(content), p.ast
 }
 
-func (p *page) Emoji() string {
-	_, tree := p.AST()
-	if e, ok := FindInAST[*emojiAst.Emoji](tree); ok && e != nil {
-		return string(e.Value.Unicode)
-	}
-
-	return ""
-}
-
 func (p *page) clearCache() {
 	p.content = nil
 	p.ast = nil
@@ -174,7 +162,6 @@ func (p *page) clearCache() {
 // be passed to templates without having underlying file on desk
 type DynamicPage struct {
 	NameVal  string
-	EmojiVal string
 	RenderFn func() template.HTML
 }
 
@@ -186,7 +173,6 @@ func (DynamicPage) Write(Markdown) bool     { return false }
 func (DynamicPage) ModTime() time.Time      { return time.Time{} }
 func (DynamicPage) AST() ([]byte, ast.Node) { return nil, nil }
 func (d DynamicPage) Name() string          { return d.NameVal }
-func (d DynamicPage) Emoji() string         { return d.EmojiVal }
 func (d DynamicPage) Render() template.HTML {
 	if d.RenderFn != nil {
 		return d.RenderFn()

templates/layout.html

@@ -10,7 +10,7 @@
       {{ $props := properties .page }}
       {{- with .page -}}
         {{- if ne .Name $.config.Index -}}
-        {{ .Emoji }}
+        {{ emoji . }}
         {{ with $props.title }} {{ .Value }} {{ else }} {{ .Name }} {{ end }}
         |
       {{ end -}}
@@ -28,7 +28,7 @@
       {{- if ne .config.Index .page.Name -}}
       <div dir="auto" class="title is-1 has-text-weight-bold" style="view-transition-name: page-title;">
         {{- with .page -}}
-        {{- .Emoji }}
+        {{- emoji . }}
         {{ with $props.title }} {{ .Value }} {{ else }} {{ .Name }} {{ end }}
         {{- end -}}
       </div>

templates/pages.html

@@ -9,7 +9,7 @@
       {{ end }}
 
       <span class="is-block">
-        {{ .Emoji }}
+        {{ emoji . }}
         {{ $props := properties . }}
         {{ with $props.title }} {{ .Value }} {{ else }} {{ .Name }} {{ end }}
       </span>