Cleanup renderer.go
This commit is contained in:
r
parent
c2c5b641ca
commit
4ac5022cf1
|
|
@ -11,130 +11,32 @@ import (
|
|||
"bloat/mastodon"
|
||||
)
|
||||
|
||||
type Page string
|
||||
|
||||
const (
|
||||
SigninPage = "signin.tmpl"
|
||||
ErrorPage = "error.tmpl"
|
||||
NavPage = "nav.tmpl"
|
||||
RootPage = "root.tmpl"
|
||||
TimelinePage = "timeline.tmpl"
|
||||
ThreadPage = "thread.tmpl"
|
||||
NotificationPage = "notification.tmpl"
|
||||
UserPage = "user.tmpl"
|
||||
UserSearchPage = "usersearch.tmpl"
|
||||
AboutPage = "about.tmpl"
|
||||
EmojiPage = "emoji.tmpl"
|
||||
LikedByPage = "likedby.tmpl"
|
||||
RetweetedByPage = "retweetedby.tmpl"
|
||||
SearchPage = "search.tmpl"
|
||||
SettingsPage = "settings.tmpl"
|
||||
)
|
||||
|
||||
type TemplateData struct {
|
||||
Data interface{}
|
||||
Ctx *Context
|
||||
}
|
||||
|
||||
type Renderer interface {
|
||||
RenderSigninPage(ctx *Context, writer io.Writer, data *SigninData) (err error)
|
||||
RenderErrorPage(ctx *Context, writer io.Writer, data *ErrorData)
|
||||
RenderRootPage(ctx *Context, writer io.Writer, data *RootData) (err error)
|
||||
RenderNavPage(ctx *Context, writer io.Writer, data *NavData) (err error)
|
||||
RenderTimelinePage(ctx *Context, writer io.Writer, data *TimelineData) (err error)
|
||||
RenderThreadPage(ctx *Context, writer io.Writer, data *ThreadData) (err error)
|
||||
RenderNotificationPage(ctx *Context, writer io.Writer, data *NotificationData) (err error)
|
||||
RenderUserPage(ctx *Context, writer io.Writer, data *UserData) (err error)
|
||||
RenderUserSearchPage(ctx *Context, writer io.Writer, data *UserSearchData) (err error)
|
||||
RenderAboutPage(ctx *Context, writer io.Writer, data *AboutData) (err error)
|
||||
RenderEmojiPage(ctx *Context, writer io.Writer, data *EmojiData) (err error)
|
||||
RenderLikedByPage(ctx *Context, writer io.Writer, data *LikedByData) (err error)
|
||||
RenderRetweetedByPage(ctx *Context, writer io.Writer, data *RetweetedByData) (err error)
|
||||
RenderSearchPage(ctx *Context, writer io.Writer, data *SearchData) (err error)
|
||||
RenderSettingsPage(ctx *Context, writer io.Writer, data *SettingsData) (err error)
|
||||
}
|
||||
|
||||
type renderer struct {
|
||||
template *template.Template
|
||||
}
|
||||
|
||||
func NewRenderer(templateGlobPattern string) (r *renderer, err error) {
|
||||
t := template.New("default")
|
||||
t, err = t.Funcs(template.FuncMap{
|
||||
"EmojiFilter": EmojiFilter,
|
||||
"StatusContentFilter": StatusContentFilter,
|
||||
"DisplayInteractionCount": DisplayInteractionCount,
|
||||
"TimeSince": TimeSince,
|
||||
"TimeUntil": TimeUntil,
|
||||
"FormatTimeRFC3339": FormatTimeRFC3339,
|
||||
"FormatTimeRFC822": FormatTimeRFC822,
|
||||
"WithContext": WithContext,
|
||||
}).ParseGlob(templateGlobPattern)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
return &renderer{
|
||||
template: t,
|
||||
}, nil
|
||||
}
|
||||
|
||||
func (r *renderer) RenderSigninPage(ctx *Context, writer io.Writer,
|
||||
signinData *SigninData) (err error) {
|
||||
return r.template.ExecuteTemplate(writer, "signin.tmpl", WithContext(signinData, ctx))
|
||||
}
|
||||
|
||||
func (r *renderer) RenderErrorPage(ctx *Context, writer io.Writer,
|
||||
errorData *ErrorData) {
|
||||
r.template.ExecuteTemplate(writer, "error.tmpl", WithContext(errorData, ctx))
|
||||
return
|
||||
}
|
||||
|
||||
func (r *renderer) RenderNavPage(ctx *Context, writer io.Writer,
|
||||
data *NavData) (err error) {
|
||||
return r.template.ExecuteTemplate(writer, "nav.tmpl", WithContext(data, ctx))
|
||||
}
|
||||
|
||||
func (r *renderer) RenderRootPage(ctx *Context, writer io.Writer,
|
||||
data *RootData) (err error) {
|
||||
return r.template.ExecuteTemplate(writer, "root.tmpl", WithContext(data, ctx))
|
||||
}
|
||||
|
||||
func (r *renderer) RenderTimelinePage(ctx *Context, writer io.Writer,
|
||||
data *TimelineData) (err error) {
|
||||
return r.template.ExecuteTemplate(writer, "timeline.tmpl", WithContext(data, ctx))
|
||||
}
|
||||
|
||||
func (r *renderer) RenderThreadPage(ctx *Context, writer io.Writer,
|
||||
data *ThreadData) (err error) {
|
||||
return r.template.ExecuteTemplate(writer, "thread.tmpl", WithContext(data, ctx))
|
||||
}
|
||||
|
||||
func (r *renderer) RenderNotificationPage(ctx *Context, writer io.Writer,
|
||||
data *NotificationData) (err error) {
|
||||
return r.template.ExecuteTemplate(writer, "notification.tmpl", WithContext(data, ctx))
|
||||
}
|
||||
|
||||
func (r *renderer) RenderUserPage(ctx *Context, writer io.Writer,
|
||||
data *UserData) (err error) {
|
||||
return r.template.ExecuteTemplate(writer, "user.tmpl", WithContext(data, ctx))
|
||||
}
|
||||
|
||||
func (r *renderer) RenderUserSearchPage(ctx *Context, writer io.Writer,
|
||||
data *UserSearchData) (err error) {
|
||||
return r.template.ExecuteTemplate(writer, "usersearch.tmpl", WithContext(data, ctx))
|
||||
}
|
||||
|
||||
func (r *renderer) RenderAboutPage(ctx *Context, writer io.Writer,
|
||||
data *AboutData) (err error) {
|
||||
return r.template.ExecuteTemplate(writer, "about.tmpl", WithContext(data, ctx))
|
||||
}
|
||||
|
||||
func (r *renderer) RenderEmojiPage(ctx *Context, writer io.Writer,
|
||||
data *EmojiData) (err error) {
|
||||
return r.template.ExecuteTemplate(writer, "emoji.tmpl", WithContext(data, ctx))
|
||||
}
|
||||
|
||||
func (r *renderer) RenderLikedByPage(ctx *Context, writer io.Writer,
|
||||
data *LikedByData) (err error) {
|
||||
return r.template.ExecuteTemplate(writer, "likedby.tmpl", WithContext(data, ctx))
|
||||
}
|
||||
|
||||
func (r *renderer) RenderRetweetedByPage(ctx *Context, writer io.Writer,
|
||||
data *RetweetedByData) (err error) {
|
||||
return r.template.ExecuteTemplate(writer, "retweetedby.tmpl", WithContext(data, ctx))
|
||||
}
|
||||
|
||||
func (r *renderer) RenderSearchPage(ctx *Context, writer io.Writer,
|
||||
data *SearchData) (err error) {
|
||||
return r.template.ExecuteTemplate(writer, "search.tmpl", WithContext(data, ctx))
|
||||
}
|
||||
|
||||
func (r *renderer) RenderSettingsPage(ctx *Context, writer io.Writer,
|
||||
data *SettingsData) (err error) {
|
||||
return r.template.ExecuteTemplate(writer, "settings.tmpl", WithContext(data, ctx))
|
||||
}
|
||||
|
||||
func EmojiFilter(content string, emojis []mastodon.Emoji) string {
|
||||
func emojiFilter(content string, emojis []mastodon.Emoji) string {
|
||||
var replacements []string
|
||||
var r string
|
||||
for _, e := range emojis {
|
||||
|
|
@ -145,7 +47,7 @@ func EmojiFilter(content string, emojis []mastodon.Emoji) string {
|
|||
return strings.NewReplacer(replacements...).Replace(content)
|
||||
}
|
||||
|
||||
func StatusContentFilter(spoiler string, content string,
|
||||
func statusContentFilter(spoiler string, content string,
|
||||
emojis []mastodon.Emoji, mentions []mastodon.Mention) string {
|
||||
|
||||
var replacements []string
|
||||
|
|
@ -164,7 +66,7 @@ func StatusContentFilter(spoiler string, content string,
|
|||
return strings.NewReplacer(replacements...).Replace(content)
|
||||
}
|
||||
|
||||
func DisplayInteractionCount(c int64) string {
|
||||
func displayInteractionCount(c int64) string {
|
||||
if c > 0 {
|
||||
return strconv.Itoa(int(c))
|
||||
}
|
||||
|
|
@ -196,7 +98,7 @@ func DurToStr(dur time.Duration) string {
|
|||
return strconv.Itoa(int(y)) + "y"
|
||||
}
|
||||
|
||||
func TimeSince(t time.Time) string {
|
||||
func timeSince(t time.Time) string {
|
||||
d := time.Since(t)
|
||||
if d < 0 {
|
||||
d = 0
|
||||
|
|
@ -204,7 +106,7 @@ func TimeSince(t time.Time) string {
|
|||
return DurToStr(d)
|
||||
}
|
||||
|
||||
func TimeUntil(t time.Time) string {
|
||||
func timeUntil(t time.Time) string {
|
||||
d := time.Until(t)
|
||||
if d < 0 {
|
||||
d = 0
|
||||
|
|
@ -212,14 +114,47 @@ func TimeUntil(t time.Time) string {
|
|||
return DurToStr(d)
|
||||
}
|
||||
|
||||
func FormatTimeRFC3339(t time.Time) string {
|
||||
func formatTimeRFC3339(t time.Time) string {
|
||||
return t.Format(time.RFC3339)
|
||||
}
|
||||
|
||||
func FormatTimeRFC822(t time.Time) string {
|
||||
func formatTimeRFC822(t time.Time) string {
|
||||
return t.Format(time.RFC822)
|
||||
}
|
||||
|
||||
func WithContext(data interface{}, ctx *Context) TemplateData {
|
||||
func withContext(data interface{}, ctx *Context) TemplateData {
|
||||
return TemplateData{data, ctx}
|
||||
}
|
||||
|
||||
type Renderer interface {
|
||||
Render(ctx *Context, writer io.Writer, page string, data interface{}) (err error)
|
||||
}
|
||||
|
||||
type renderer struct {
|
||||
template *template.Template
|
||||
}
|
||||
|
||||
func NewRenderer(templateGlobPattern string) (r *renderer, err error) {
|
||||
t := template.New("default")
|
||||
t, err = t.Funcs(template.FuncMap{
|
||||
"EmojiFilter": emojiFilter,
|
||||
"StatusContentFilter": statusContentFilter,
|
||||
"DisplayInteractionCount": displayInteractionCount,
|
||||
"TimeSince": timeSince,
|
||||
"TimeUntil": timeUntil,
|
||||
"FormatTimeRFC3339": formatTimeRFC3339,
|
||||
"FormatTimeRFC822": formatTimeRFC822,
|
||||
"WithContext": withContext,
|
||||
}).ParseGlob(templateGlobPattern)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
return &renderer{
|
||||
template: t,
|
||||
}, nil
|
||||
}
|
||||
|
||||
func (r *renderer) Render(ctx *Context, writer io.Writer,
|
||||
page string, data interface{}) (err error) {
|
||||
return r.template.ExecuteTemplate(writer, page, withContext(data, ctx))
|
||||
}
|
||||
|
|
|
|||
|
|
@ -153,7 +153,7 @@ func (svc *service) ServeErrorPage(ctx context.Context, c *model.Client, err err
|
|||
}
|
||||
|
||||
rCtx := getRendererContext(c)
|
||||
svc.renderer.RenderErrorPage(rCtx, c.Writer, data)
|
||||
svc.renderer.Render(rCtx, c.Writer, renderer.ErrorPage, data)
|
||||
}
|
||||
|
||||
func (svc *service) ServeSigninPage(ctx context.Context, c *model.Client) (
|
||||
|
|
@ -165,7 +165,7 @@ func (svc *service) ServeSigninPage(ctx context.Context, c *model.Client) (
|
|||
}
|
||||
|
||||
rCtx := getRendererContext(nil)
|
||||
return svc.renderer.RenderSigninPage(rCtx, c.Writer, data)
|
||||
return svc.renderer.Render(rCtx, c.Writer, renderer.SigninPage, data)
|
||||
}
|
||||
|
||||
func (svc *service) ServeRootPage(ctx context.Context, c *model.Client) (err error) {
|
||||
|
|
@ -174,7 +174,7 @@ func (svc *service) ServeRootPage(ctx context.Context, c *model.Client) (err err
|
|||
}
|
||||
|
||||
rCtx := getRendererContext(c)
|
||||
return svc.renderer.RenderRootPage(rCtx, c.Writer, data)
|
||||
return svc.renderer.Render(rCtx, c.Writer, renderer.RootPage, data)
|
||||
}
|
||||
|
||||
func (svc *service) ServeNavPage(ctx context.Context, c *model.Client) (err error) {
|
||||
|
|
@ -197,7 +197,7 @@ func (svc *service) ServeNavPage(ctx context.Context, c *model.Client) (err erro
|
|||
}
|
||||
|
||||
rCtx := getRendererContext(c)
|
||||
return svc.renderer.RenderNavPage(rCtx, c.Writer, data)
|
||||
return svc.renderer.Render(rCtx, c.Writer, renderer.NavPage, data)
|
||||
}
|
||||
|
||||
func (svc *service) ServeTimelinePage(ctx context.Context, c *model.Client,
|
||||
|
|
@ -275,7 +275,7 @@ func (svc *service) ServeTimelinePage(ctx context.Context, c *model.Client,
|
|||
}
|
||||
|
||||
rCtx := getRendererContext(c)
|
||||
return svc.renderer.RenderTimelinePage(rCtx, c.Writer, data)
|
||||
return svc.renderer.Render(rCtx, c.Writer, renderer.TimelinePage, data)
|
||||
}
|
||||
|
||||
func (svc *service) ServeThreadPage(ctx context.Context, c *model.Client,
|
||||
|
|
@ -351,7 +351,7 @@ func (svc *service) ServeThreadPage(ctx context.Context, c *model.Client,
|
|||
}
|
||||
|
||||
rCtx := getRendererContext(c)
|
||||
return svc.renderer.RenderThreadPage(rCtx, c.Writer, data)
|
||||
return svc.renderer.Render(rCtx, c.Writer, renderer.ThreadPage, data)
|
||||
}
|
||||
|
||||
func (svc *service) ServeLikedByPage(ctx context.Context, c *model.Client,
|
||||
|
|
@ -369,7 +369,7 @@ func (svc *service) ServeLikedByPage(ctx context.Context, c *model.Client,
|
|||
}
|
||||
|
||||
rCtx := getRendererContext(c)
|
||||
return svc.renderer.RenderLikedByPage(rCtx, c.Writer, data)
|
||||
return svc.renderer.Render(rCtx, c.Writer, renderer.LikedByPage, data)
|
||||
}
|
||||
|
||||
func (svc *service) ServeRetweetedByPage(ctx context.Context, c *model.Client,
|
||||
|
|
@ -387,7 +387,7 @@ func (svc *service) ServeRetweetedByPage(ctx context.Context, c *model.Client,
|
|||
}
|
||||
|
||||
rCtx := getRendererContext(c)
|
||||
return svc.renderer.RenderRetweetedByPage(rCtx, c.Writer, data)
|
||||
return svc.renderer.Render(rCtx, c.Writer, renderer.RetweetedByPage, data)
|
||||
}
|
||||
|
||||
func (svc *service) ServeNotificationPage(ctx context.Context, c *model.Client,
|
||||
|
|
@ -432,7 +432,7 @@ func (svc *service) ServeNotificationPage(ctx context.Context, c *model.Client,
|
|||
CommonData: commonData,
|
||||
}
|
||||
rCtx := getRendererContext(c)
|
||||
return svc.renderer.RenderNotificationPage(rCtx, c.Writer, data)
|
||||
return svc.renderer.Render(rCtx, c.Writer, renderer.NotificationPage, data)
|
||||
}
|
||||
|
||||
func (svc *service) ServeUserPage(ctx context.Context, c *model.Client,
|
||||
|
|
@ -504,7 +504,7 @@ func (svc *service) ServeUserPage(ctx context.Context, c *model.Client,
|
|||
CommonData: commonData,
|
||||
}
|
||||
rCtx := getRendererContext(c)
|
||||
return svc.renderer.RenderUserPage(rCtx, c.Writer, data)
|
||||
return svc.renderer.Render(rCtx, c.Writer, renderer.UserPage, data)
|
||||
}
|
||||
|
||||
func (svc *service) ServeUserSearchPage(ctx context.Context, c *model.Client,
|
||||
|
|
@ -542,7 +542,7 @@ func (svc *service) ServeUserSearchPage(ctx context.Context, c *model.Client,
|
|||
}
|
||||
|
||||
rCtx := getRendererContext(c)
|
||||
return svc.renderer.RenderUserSearchPage(rCtx, c.Writer, data)
|
||||
return svc.renderer.Render(rCtx, c.Writer, renderer.UserSearchPage, data)
|
||||
}
|
||||
|
||||
func (svc *service) ServeAboutPage(ctx context.Context, c *model.Client) (err error) {
|
||||
|
|
@ -552,7 +552,7 @@ func (svc *service) ServeAboutPage(ctx context.Context, c *model.Client) (err er
|
|||
}
|
||||
|
||||
rCtx := getRendererContext(c)
|
||||
return svc.renderer.RenderAboutPage(rCtx, c.Writer, data)
|
||||
return svc.renderer.Render(rCtx, c.Writer, renderer.AboutPage, data)
|
||||
}
|
||||
|
||||
func (svc *service) ServeEmojiPage(ctx context.Context, c *model.Client) (err error) {
|
||||
|
|
@ -568,7 +568,7 @@ func (svc *service) ServeEmojiPage(ctx context.Context, c *model.Client) (err er
|
|||
}
|
||||
|
||||
rCtx := getRendererContext(c)
|
||||
return svc.renderer.RenderEmojiPage(rCtx, c.Writer, data)
|
||||
return svc.renderer.Render(rCtx, c.Writer, renderer.EmojiPage, data)
|
||||
}
|
||||
|
||||
func (svc *service) ServeSearchPage(ctx context.Context, c *model.Client,
|
||||
|
|
@ -603,7 +603,7 @@ func (svc *service) ServeSearchPage(ctx context.Context, c *model.Client,
|
|||
}
|
||||
|
||||
rCtx := getRendererContext(c)
|
||||
return svc.renderer.RenderSearchPage(rCtx, c.Writer, data)
|
||||
return svc.renderer.Render(rCtx, c.Writer, renderer.SearchPage, data)
|
||||
}
|
||||
|
||||
func (svc *service) ServeSettingsPage(ctx context.Context, c *model.Client) (err error) {
|
||||
|
|
@ -614,7 +614,7 @@ func (svc *service) ServeSettingsPage(ctx context.Context, c *model.Client) (err
|
|||
}
|
||||
|
||||
rCtx := getRendererContext(c)
|
||||
return svc.renderer.RenderSettingsPage(rCtx, c.Writer, data)
|
||||
return svc.renderer.Render(rCtx, c.Writer, renderer.SettingsPage, data)
|
||||
}
|
||||
|
||||
func (svc *service) NewSession(ctx context.Context, instance string) (
|
||||
|
|
|
|||
Loading…
Reference in New Issue