Replaced all other referenced to twt/twtxt

internal/context.go

@@ -1,7 +1,6 @@
 package internal
 
 import (
-	"fmt"
 	"html/template"
 	"net/http"
 	"strings"
@@ -13,7 +12,6 @@ import (
 	"git.mills.io/prologic/spyda/internal/session"
 	"git.mills.io/prologic/spyda/types"
 	"github.com/justinas/nosurf"
-	"github.com/theplant-retired/timezones"
 )
 
 type Meta struct {
@@ -31,24 +29,15 @@ type Context struct {
 
 	Debug bool
 
-	BaseURL                 string
-	InstanceName            string
-	SoftwareVersion         string
-	TwtsPerPage             int
-	TwtPrompt               string
-	MaxTwtLength            int
-	RegisterDisabled        bool
-	OpenProfiles            bool
-	RegisterDisabledMessage string
+	BaseURL         string
+	InstanceName    string
+	SoftwareVersion string
 
-	Timezones []*timezones.Zoneinfo
+	SearchPrompt string
 
-	Reply         string
 	Username      string
 	User          *User
 	Tokens        []*Token
-	LastTwt       types.Twt
-	Profile       types.Profile
 	Authenticated bool
 	IsAdmin       bool
 
@@ -65,20 +54,10 @@ type Context struct {
 	Links        types.Links
 	Alternatives types.Alternatives
 
-	Messages    Messages
-	NewMessages int
-
-	Twter       types.Twter
-	Twts        types.Twts
-	BlogPost    *BlogPost
-	BlogPosts   BlogPosts
-	Feeds       []*Feed
-	FeedSources FeedSourceMap
-	Pager       *paginator.Paginator
+	Pager *paginator.Paginator
 
 	// Report abuse
-	ReportNick string
-	ReportURL  string
+	ReportURL string
 
 	// Reset Password Token
 	PasswordResetToken string
@@ -91,21 +70,15 @@ func NewContext(conf *Config, db Store, req *http.Request) *Context {
 	ctx := &Context{
 		Debug: conf.Debug,
 
-		BaseURL:          conf.BaseURL,
-		InstanceName:     conf.Name,
-		SoftwareVersion:  spyda.FullVersion(),
-		TwtsPerPage:      conf.TwtsPerPage,
-		TwtPrompt:        conf.RandomTwtPrompt(),
-		MaxTwtLength:     conf.MaxTwtLength,
-		RegisterDisabled: !conf.OpenRegistrations,
-		OpenProfiles:     conf.OpenProfiles,
-		LastTwt:          types.NilTwt,
+		BaseURL:         conf.BaseURL,
+		InstanceName:    conf.Name,
+		SoftwareVersion: spyda.FullVersion(),
+
+		SearchPrompt: conf.RandomSearchPrompt(),
 
 		Commit: spyda.Commit,
 		Theme:  conf.Theme,
 
-		Timezones: timezones.AllZones,
-
 		Title: "",
 		Meta: Meta{
 			Title:       DefaultMetaTitle,
@@ -113,14 +86,6 @@ func NewContext(conf *Config, db Store, req *http.Request) *Context {
 			Keywords:    DefaultMetaKeywords,
 			Description: conf.Description,
 		},
-
-		Alternatives: types.Alternatives{
-			types.Alternative{
-				Type:  "application/atom+xml",
-				Title: fmt.Sprintf("%s local feed", conf.Name),
-				URL:   fmt.Sprintf("%s/atom.xml", conf.BaseURL),
-			},
-		},
 	}
 
 	ctx.CSRFToken = nosurf.Token(req)
@@ -138,11 +103,6 @@ func NewContext(conf *Config, db Store, req *http.Request) *Context {
 			log.WithError(err).Warnf("error loading user object for %s", ctx.Username)
 		}
 
-		ctx.Twter = types.Twter{
-			Nick: user.Username,
-			URL:  URLForUser(conf, user.Username),
-		}
-
 		ctx.User = user
 
 		tokens, err := db.GetUserTokens(user)
@@ -153,7 +113,6 @@ func NewContext(conf *Config, db Store, req *http.Request) *Context {
 
 	} else {
 		ctx.User = &User{}
-		ctx.Twter = types.Twter{}
 	}
 
 	if ctx.Username == conf.AdminUser {