diff --git a/internal/router/template.go b/internal/router/template.go index e7bdc3edf..6dd0aba3a 100644 --- a/internal/router/template.go +++ b/internal/router/template.go @@ -23,8 +23,10 @@ import ( "html/template" "os" "path/filepath" + "time" "github.com/gin-gonic/gin" + "github.com/superseriousbusiness/gotosocial/internal/api/model" "github.com/superseriousbusiness/gotosocial/internal/config" ) @@ -37,16 +39,56 @@ func loadTemplates(cfg *config.Config, engine *gin.Engine) error { tmPath := filepath.Join(cwd, fmt.Sprintf("%s*", cfg.TemplateConfig.BaseDir)) + println("loading html templates") engine.LoadHTMLGlob(tmPath) return nil } +func oddOrEven(n int) string { + if n%2 == 0 { + return "even" + } else { + return "odd" + } +} + func noescape(str string) template.HTML { return template.HTML(str) } +func timestamp(stamp string) string { + t, _ := time.Parse(time.RFC3339, stamp) + return t.Format("January 2, 2006, 15:04:05") +} + +type IconWithLabel struct { + faIcon string + label string +} + +func visibilityIcon(visibility model.Visibility) template.HTML { + var icon IconWithLabel + + if visibility == model.VisibilityPublic { + icon = IconWithLabel{"globe", "public"} + } else if visibility == model.VisibilityUnlisted { + icon = IconWithLabel{"unlock", "unlisted"} + } else if visibility == model.VisibilityPrivate { + icon = IconWithLabel{"lock", "private"} + } else if visibility == model.VisibilityMutualsOnly { + icon = IconWithLabel{"handshake-o", "mutuals only"} + } else if visibility == model.VisibilityDirect { + icon = IconWithLabel{"envelope", "direct"} + } + + return template.HTML(fmt.Sprintf(``, icon.label, icon.faIcon)) +} + func loadTemplateFunctions(engine *gin.Engine) { engine.SetFuncMap(template.FuncMap{ - "noescape": noescape, + "noescape": noescape, + "oddOrEven": oddOrEven, + "visibilityIcon": visibilityIcon, + "timestamp": timestamp, }) } diff --git a/internal/web/base.go b/internal/web/base.go index eabde676c..305a04579 100644 --- a/internal/web/base.go +++ b/internal/web/base.go @@ -59,11 +59,7 @@ func (m *Module) baseHandler(c *gin.Context) { // FIXME: fill in more variables? c.HTML(http.StatusOK, "index.tmpl", gin.H{ - "instance": instance, - "countUsers": 3, - "countStatuses": 42069, - "version": "1.0.0", - "adminUsername": "@admin", + "instance": instance, }) } @@ -101,6 +97,9 @@ func (m *Module) Route(s router.Router) error { // serve front-page s.AttachHandler(http.MethodGet, "/", m.baseHandler) + // serve statuses + s.AttachHandler(http.MethodGet, "/:user/statuses/:id", m.statusTemplateHandler) + // 404 handler s.AttachNoRouteHandler(m.NotFoundHandler) diff --git a/internal/web/status.go b/internal/web/status.go new file mode 100644 index 000000000..a26f7bbbc --- /dev/null +++ b/internal/web/status.go @@ -0,0 +1,81 @@ +/* + GoToSocial + Copyright (C) 2021 GoToSocial Authors admin@gotosocial.org + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . +*/ + +package web + +import ( + "net/http" + + "github.com/gin-gonic/gin" + "github.com/superseriousbusiness/gotosocial/internal/oauth" +) + +type StatusLink struct { + User string `uri:"user" binding:"required"` + ID string `uri:"id" binding:"required"` +} + +func (m *Module) statusTemplateHandler(c *gin.Context) { + l := m.log.WithField("func", "statusTemplateGET") + l.Trace("rendering status template") + + var statusLink StatusLink + + if err := c.ShouldBindUri(&statusLink); err != nil { + c.JSON(http.StatusBadRequest, gin.H{"error": "status not found"}) + return + } + + authed, err := oauth.Authed(c, false, false, false, false) // we don't really need an app here but we want everything else + if err != nil { + l.Errorf("error authing status GET request: %s", err) + c.JSON(http.StatusBadRequest, gin.H{"error": "status not found"}) + return + } + + instance, err := m.processor.InstanceGet(c.Request.Context(), m.config.Host) + if err != nil { + l.Debugf("error getting instance from processor: %s", err) + c.JSON(http.StatusInternalServerError, gin.H{"error": "internal server error"}) + return + } + + status, err := m.processor.StatusGet(c.Request.Context(), authed, statusLink.ID) + if err != nil { + c.JSON(http.StatusBadRequest, gin.H{"error": "status not found"}) + return + } + + println(statusLink.User[:1], statusLink.User, status.Account.Username) + if statusLink.User[:1] != "@" || statusLink.User[1:] != status.Account.Username { + c.JSON(http.StatusBadRequest, gin.H{"error": "status not found"}) + return + } + + context, err := m.processor.StatusGetContext(c.Request.Context(), authed, statusLink.ID) + if err != nil { + c.JSON(http.StatusBadRequest, gin.H{"error": "status not found"}) + return + } + + c.HTML(http.StatusOK, "status.tmpl", gin.H{ + "instance": instance, + "status": status, + "context": context, + }) +} diff --git a/web/assets/logo.png b/web/assets/logo.png new file mode 100644 index 000000000..d6d485df1 Binary files /dev/null and b/web/assets/logo.png differ diff --git a/web/template/header.tmpl b/web/template/header.tmpl index 45d375ab8..a1b0bf372 100644 --- a/web/template/header.tmpl +++ b/web/template/header.tmpl @@ -1,19 +1,25 @@ - + + - - + + - + + {{.instance.Title}} - GoToSocial
-

- {{.instance.Title}} -

+ Instance Logo +
+

+ {{.instance.Title}} +

+
+
\ No newline at end of file diff --git a/web/template/status.tmpl b/web/template/status.tmpl new file mode 100644 index 000000000..b371c9017 --- /dev/null +++ b/web/template/status.tmpl @@ -0,0 +1,100 @@ +{{ template "header.tmpl" .}} +
+
+ {{range .context.Ancestors}} +
+ + {{.Account.DisplayName}} + @{{.Account.Username}} +
+ {{.Content |noescape}} +
+ {{with .MediaAttachments}} +
+ {{range .}} + + {{if not .Description}} + + {{end}} + {{.Description}} + + {{end}} +
+ {{end}} +
+
{{.CreatedAt | timestamp}}
+
+
{{.Visibility | visibilityIcon}}
+
{{.RepliesCount}}
+
{{.ReblogsCount}}
+
{{.FavouritesCount}}
+
+
+ View toot +
+ {{end}} +
+ + {{.status.Account.DisplayName}} + @{{.status.Account.Username}} +
+ {{.status.Content |noescape}} +
+ {{with .status.MediaAttachments}} +
+ {{range .}} + + {{if not .Description}} + + {{end}} + {{.Description}} + + {{end}} +
+ {{end}} +
+
{{.status.CreatedAt | timestamp}}
+
+
{{.status.Visibility | visibilityIcon}}
+
{{.status.RepliesCount}}
+
{{.status.ReblogsCount}}
+
{{.status.FavouritesCount}}
+
+
+ View toot +
+ {{range .context.Descendants}} +
+ + {{.Account.DisplayName}} + @{{.Account.Username}} +
+ {{.Content |noescape}} +
+ {{with .MediaAttachments}} +
+ {{range .}} + + {{if not .Description}} + + {{end}} + {{.Description}} + + {{end}} +
+ {{end}} +
+
{{.CreatedAt | timestamp}}
+
+
{{.Visibility | visibilityIcon}}
+
{{.RepliesCount}}
+
{{.ReblogsCount}}
+
{{.FavouritesCount}}
+
+
+ View toot +
+ {{end}} +
+
+{{ template "footer.tmpl" .}} \ No newline at end of file