localhost_frssoft/bloat
1
0
Fork 0
mirror of https://git.phreedom.club/localhost_frssoft/bloat.git synced 2024-11-21 19:41:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add WIP remote timeline

Browse source
This commit is contained in:
r 2021-01-14 09:41:53 +00:00
parent b35d62ecbb
commit 7ccffa8752
2 changed files with 32 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
service/service.go
View file

@ -155,8 +155,8 @@ func (s *service) NavPage(c *client) (err error) {
return s.renderer.Render(rCtx, c, renderer.NavPage, data) return s.renderer.Render(rCtx, c, renderer.NavPage, data)
} }
func (s *service) TimelinePage(c *client, tType string, func (s *service) TimelinePage(c *client, tType string, maxID string,
maxID string, minID string) (err error) { minID string, instance string) (err error) {
var nextLink, prevLink, title string var nextLink, prevLink, title string
var statuses []*mastodon.Status var statuses []*mastodon.Status
@ -181,6 +181,22 @@ func (s *service) TimelinePage(c *client, tType string,
case "twkn": case "twkn":
statuses, err = c.GetTimelinePublic(ctx, false, &pg) statuses, err = c.GetTimelinePublic(ctx, false, &pg)
title = "The Whole Known Network" title = "The Whole Known Network"
case "remote":
if len(instance) < 1 {
return errInvalidArgument
}
var instanceURL string
if strings.HasPrefix(instance, "https://") {
instanceURL = instance
instance = strings.TrimPrefix(instance, "https://")
} else {
instanceURL = "https://" + instance
}
c.Client = mastodon.NewClient(&mastodon.Config{
Server: instanceURL,
})
statuses, err = c.GetTimelinePublic(ctx, true, &pg)
title = "Remote Timeline of " + instance
} }
if err != nil { if err != nil {
return err return err
@ -192,32 +208,22 @@ func (s *service) TimelinePage(c *client, tType string,
} }
} }
if len(maxID) > 0 && len(statuses) > 0 { if (len(maxID) > 0 || len(minID) > 0) && len(statuses) > 0 {
prevLink = fmt.Sprintf("/timeline/%s?min_id=%s", tType, q := make(url.Values)
statuses[0].ID) q["min_id"] = []string{statuses[0].ID}
} if tType == "remote" {
q["instance"] = []string{instance}
if len(minID) > 0 && len(pg.MinID) > 0 {
newPg := &mastodon.Pagination{MinID: pg.MinID, Limit: 20}
newStatuses, err := c.GetTimelineHome(ctx, newPg)
if err != nil {
return err
}
newLen := len(newStatuses)
if newLen == 20 {
prevLink = fmt.Sprintf("/timeline/%s?min_id=%s",
tType, pg.MinID)
} else {
i := 20 - newLen - 1
if len(statuses) > i {
prevLink = fmt.Sprintf("/timeline/%s?min_id=%s",
tType, statuses[i].ID)
}
} }
prevLink = fmt.Sprintf("/timeline/%s?%s", tType, q.Encode())
} }
if len(pg.MaxID) > 0 && len(statuses) == 20 { if len(pg.MaxID) > 0 && len(statuses) == 20 {
nextLink = fmt.Sprintf("/timeline/%s?max_id=%s", tType, pg.MaxID) q := make(url.Values)
q["max_id"] = []string{pg.MaxID}
if tType == "remote" {
q["instance"] = []string{instance}
}
nextLink = fmt.Sprintf("/timeline/%s?%s", tType, q.Encode())
} }
commonData := s.getCommonData(c, tType+" timeline ") commonData := s.getCommonData(c, tType+" timeline ")

4
service/transport.go
View file

@ -188,8 +188,8 @@ func NewHandler(s *service, logger *log.Logger, staticDir string) http.Handler {
q := c.Req.URL.Query() q := c.Req.URL.Query()
maxID := q.Get("max_id") maxID := q.Get("max_id")
minID := q.Get("min_id") minID := q.Get("min_id")
return s.TimelinePage(c, tType, maxID, minID) instance := q.Get("instance")
return nil return s.TimelinePage(c, tType, maxID, minID, instance)
}, SESSION, HTML) }, SESSION, HTML)
defaultTimelinePage := handle(func(c *client) error { defaultTimelinePage := handle(func(c *client) error {