mirror of
https://github.com/superseriousbusiness/gotosocial.git
synced 2025-10-29 12:52:27 -05:00
Thread views on the web (#207)
* Webviews for status threads * fix up templates * add ForkAwesome and gotosocial-styling into repo * clean up gotosocial-styling, old styling * update CONTRIBUTING with new css building, and nodemon recommendation * update Dockerfile with new css bundling * those weren't supposed to make it in * upgrade gotosocial-styling deps * update authorize template with main wrapper * update css pipeline * abstract status from thread to avoid copy-pasting * basic CW implementation * fix PR review suggestions * fix no-image-desc icon alignment * remove template loading println * remove println * remove changes to testmodels * reset changes to testmodels
This commit is contained in:
parent
635281f133
commit
026674bc2c
29 changed files with 1742 additions and 190 deletions
|
|
@ -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"
|
||||
)
|
||||
|
||||
|
|
@ -41,12 +43,51 @@ func loadTemplates(cfg *config.Config, engine *gin.Engine) error {
|
|||
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(`<i aria-label="Visiblity: %v" class="fa fa-%v"></i>`, icon.label, icon.faIcon))
|
||||
}
|
||||
|
||||
func loadTemplateFunctions(engine *gin.Engine) {
|
||||
engine.SetFuncMap(template.FuncMap{
|
||||
"noescape": noescape,
|
||||
"noescape": noescape,
|
||||
"oddOrEven": oddOrEven,
|
||||
"visibilityIcon": visibilityIcon,
|
||||
"timestamp": timestamp,
|
||||
})
|
||||
}
|
||||
|
|
|
|||
|
|
@ -57,13 +57,8 @@ func (m *Module) baseHandler(c *gin.Context) {
|
|||
return
|
||||
}
|
||||
|
||||
// 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 +96,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.threadTemplateHandler)
|
||||
|
||||
// 404 handler
|
||||
s.AttachNoRouteHandler(m.NotFoundHandler)
|
||||
|
||||
|
|
|
|||
83
internal/web/thread.go
Normal file
83
internal/web/thread.go
Normal file
|
|
@ -0,0 +1,83 @@
|
|||
/*
|
||||
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 <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
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) threadTemplateHandler(c *gin.Context) {
|
||||
l := m.log.WithField("func", "threadTemplateGET")
|
||||
l.Trace("rendering thread template")
|
||||
|
||||
ctx := c.Request.Context()
|
||||
|
||||
var uriParts statusLink
|
||||
|
||||
if err := c.ShouldBindUri(&uriParts); err != nil {
|
||||
c.JSON(http.StatusBadRequest, gin.H{"error": "status not found"})
|
||||
return
|
||||
}
|
||||
|
||||
authed, err := oauth.Authed(c, false, false, false, false)
|
||||
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(ctx, 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(ctx, authed, uriParts.ID)
|
||||
if err != nil {
|
||||
c.JSON(http.StatusBadRequest, gin.H{"error": "status not found"})
|
||||
return
|
||||
}
|
||||
|
||||
if uriParts.User[:1] != "@" || uriParts.User[1:] != status.Account.Username {
|
||||
c.JSON(http.StatusBadRequest, gin.H{"error": "status not found"})
|
||||
return
|
||||
}
|
||||
|
||||
context, err := m.processor.StatusGetContext(ctx, authed, uriParts.ID)
|
||||
if err != nil {
|
||||
c.JSON(http.StatusBadRequest, gin.H{"error": "status not found"})
|
||||
return
|
||||
}
|
||||
|
||||
c.HTML(http.StatusOK, "thread.tmpl", gin.H{
|
||||
"instance": instance,
|
||||
"status": status,
|
||||
"context": context,
|
||||
"stylesheets": []string{"/assets/Fork-Awesome/css/fork-awesome.min.css", "/assets/status.css"},
|
||||
})
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue