Replaced all other referenced to twt/twtxt
This commit is contained in:
James Mills
@@ -12,7 +12,6 @@ import (
|
||||
|
||||
rice "github.com/GeertJohan/go.rice"
|
||||
"github.com/NYTimes/gziphandler"
|
||||
humanize "github.com/dustin/go-humanize"
|
||||
"github.com/gabstv/merger"
|
||||
"github.com/justinas/nosurf"
|
||||
"github.com/prologic/observe"
|
||||
@@ -33,7 +32,7 @@ var (
|
||||
)
|
||||
|
||||
func init() {
|
||||
metrics = observe.NewMetrics("twtd")
|
||||
metrics = observe.NewMetrics("spyda")
|
||||
}
|
||||
|
||||
// Server ...
|
||||
@@ -234,45 +233,6 @@ func (s *Server) setupMetrics() {
|
||||
"Number of unique feeds in the global feed cache",
|
||||
)
|
||||
|
||||
// feed cache size
|
||||
metrics.NewGauge(
|
||||
"cache", "twts",
|
||||
"Number of active twts in the global feed cache",
|
||||
)
|
||||
|
||||
// blogs cache size
|
||||
metrics.NewGaugeFunc(
|
||||
"cache", "blogs",
|
||||
"Number of blogs in the blogs cache",
|
||||
func() float64 {
|
||||
return float64(s.blogs.Count())
|
||||
},
|
||||
)
|
||||
|
||||
// feed cache processing time
|
||||
metrics.NewGauge(
|
||||
"cache", "last_processed_seconds",
|
||||
"Number of seconds for a feed cache cycle",
|
||||
)
|
||||
|
||||
// feed cache limited fetch (feed exceeded MaxFetchLImit or unknown size)
|
||||
metrics.NewCounter(
|
||||
"cache", "limited",
|
||||
"Number of feed cache fetches affected by MaxFetchLimit",
|
||||
)
|
||||
|
||||
// archive size
|
||||
metrics.NewCounter(
|
||||
"archive", "size",
|
||||
"Number of items inserted into the global feed archive",
|
||||
)
|
||||
|
||||
// archive errors
|
||||
metrics.NewCounter(
|
||||
"archive", "error",
|
||||
"Number of items errored inserting into the global feed archive",
|
||||
)
|
||||
|
||||
// server info
|
||||
metrics.NewGaugeVec(
|
||||
"server", "info",
|
||||
@@ -353,140 +313,40 @@ func (s *Server) initRoutes() {
|
||||
s.router.GET("/privacy", s.PageHandler("privacy"))
|
||||
s.router.GET("/abuse", s.PageHandler("abuse"))
|
||||
|
||||
s.router.GET("/", s.TimelineHandler())
|
||||
s.router.HEAD("/", s.TimelineHandler())
|
||||
s.router.GET("/", s.IndexHandler())
|
||||
s.router.HEAD("/", s.IndexHandler())
|
||||
|
||||
s.router.GET("/robots.txt", s.RobotsHandler())
|
||||
s.router.HEAD("/robots.txt", s.RobotsHandler())
|
||||
|
||||
s.router.GET("/discover", s.am.MustAuth(s.DiscoverHandler()))
|
||||
s.router.GET("/mentions", s.am.MustAuth(s.MentionsHandler()))
|
||||
s.router.GET("/search", s.SearchHandler())
|
||||
|
||||
s.router.HEAD("/twt/:hash", s.PermalinkHandler())
|
||||
s.router.GET("/twt/:hash", s.PermalinkHandler())
|
||||
|
||||
s.router.GET("/bookmark/:hash", s.BookmarkHandler())
|
||||
s.router.POST("/bookmark/:hash", s.BookmarkHandler())
|
||||
|
||||
s.router.HEAD("/conv/:hash", s.ConversationHandler())
|
||||
s.router.GET("/conv/:hash", s.ConversationHandler())
|
||||
|
||||
s.router.GET("/feeds", s.am.MustAuth(s.FeedsHandler()))
|
||||
s.router.POST("/feed", s.am.MustAuth(s.FeedHandler()))
|
||||
|
||||
s.router.POST("/post", s.am.MustAuth(s.PostHandler()))
|
||||
s.router.PATCH("/post", s.am.MustAuth(s.PostHandler()))
|
||||
s.router.DELETE("/post", s.am.MustAuth(s.PostHandler()))
|
||||
|
||||
// Private Messages
|
||||
s.router.GET("/messages", s.am.MustAuth(s.ListMessagesHandler()))
|
||||
s.router.GET("/messages/:msgid", s.am.MustAuth(s.ViewMessageHandler()))
|
||||
s.router.POST("/messages/send", s.am.MustAuth(s.SendMessageHandler()))
|
||||
s.router.POST("/messages/delete", s.am.MustAuth(s.DeleteMessagesHandler()))
|
||||
|
||||
s.router.POST("/blog", s.am.MustAuth(s.CreateOrUpdateBlogHandler()))
|
||||
s.router.GET("/blogs/:author", s.ListBlogsHandler())
|
||||
s.router.GET("/blog/:author/:year/:month/:date/:slug", s.ViewBlogHandler())
|
||||
s.router.HEAD("/blog/:author/:year/:month/:date/:slug", s.ViewBlogHandler())
|
||||
s.router.GET("/blog/:author/:year/:month/:date/:slug/edit", s.EditBlogHandler())
|
||||
s.router.GET("/blog/:author/:year/:month/:date/:slug/delete", s.DeleteBlogHandler())
|
||||
s.router.GET("/blog/:author/:year/:month/:date/:slug/publish", s.PublishBlogHandler())
|
||||
|
||||
if s.config.OpenProfiles {
|
||||
s.router.GET("/user/:nick/", s.ProfileHandler())
|
||||
s.router.GET("/user/:nick/config.yaml", s.UserConfigHandler())
|
||||
} else {
|
||||
s.router.GET("/user/:nick/", s.am.MustAuth(s.ProfileHandler()))
|
||||
s.router.GET("/user/:nick/config.yaml", s.am.MustAuth(s.UserConfigHandler()))
|
||||
}
|
||||
s.router.GET("/user/:nick/avatar", s.AvatarHandler())
|
||||
s.router.HEAD("/user/:nick/avatar", s.AvatarHandler())
|
||||
s.router.GET("/user/:nick/followers", s.FollowersHandler())
|
||||
s.router.GET("/user/:nick/following", s.FollowingHandler())
|
||||
s.router.GET("/user/:nick/bookmarks", s.BookmarksHandler())
|
||||
|
||||
s.router.GET("/pod/avatar", s.PodAvatarHandler())
|
||||
|
||||
// WebMentions
|
||||
s.router.POST("/user/:nick/webmention", s.WebMentionHandler())
|
||||
|
||||
// External Feeds
|
||||
s.router.GET("/external", s.ExternalHandler())
|
||||
s.router.GET("/externalAvatar", s.ExternalAvatarHandler())
|
||||
s.router.HEAD("/externalAvatar", s.ExternalAvatarHandler())
|
||||
|
||||
// External Queries (protected by a short-lived token)
|
||||
s.router.GET("/whoFollows", s.WhoFollowsHandler())
|
||||
|
||||
// Syndication Formats (RSS, Atom, JSON Feed)
|
||||
s.router.HEAD("/atom.xml", s.SyndicationHandler())
|
||||
s.router.HEAD("/user/:nick/atom.xml", s.SyndicationHandler())
|
||||
s.router.GET("/atom.xml", s.SyndicationHandler())
|
||||
s.router.GET("/user/:nick/atom.xml", s.SyndicationHandler())
|
||||
|
||||
s.router.GET("/feed/:name/manage", s.am.MustAuth(s.ManageFeedHandler()))
|
||||
s.router.POST("/feed/:name/manage", s.am.MustAuth(s.ManageFeedHandler()))
|
||||
s.router.POST("/feed/:name/archive", s.am.MustAuth(s.ArchiveFeedHandler()))
|
||||
|
||||
s.router.GET("/login", s.am.HasAuth(s.LoginHandler()))
|
||||
s.router.POST("/login", s.LoginHandler())
|
||||
|
||||
s.router.GET("/logout", s.LogoutHandler())
|
||||
s.router.POST("/logout", s.LogoutHandler())
|
||||
|
||||
s.router.GET("/register", s.am.HasAuth(s.RegisterHandler()))
|
||||
s.router.POST("/register", s.RegisterHandler())
|
||||
|
||||
// Reset Password
|
||||
s.router.GET("/resetPassword", s.ResetPasswordHandler())
|
||||
s.router.POST("/resetPassword", s.ResetPasswordHandler())
|
||||
s.router.GET("/newPassword", s.ResetPasswordMagicLinkHandler())
|
||||
s.router.POST("/newPassword", s.NewPasswordHandler())
|
||||
s.router.GET("/pwreset", s.ResetPasswordHandler())
|
||||
s.router.POST("/pwreset", s.ResetPasswordHandler())
|
||||
s.router.GET("/chpasswd", s.ResetPasswordMagicLinkHandler())
|
||||
s.router.POST("/chpasswd", s.NewPasswordHandler())
|
||||
|
||||
// Media Handling
|
||||
s.router.GET("/media/:name", s.MediaHandler())
|
||||
s.router.HEAD("/media/:name", s.MediaHandler())
|
||||
s.router.POST("/upload", s.am.MustAuth(s.UploadMediaHandler()))
|
||||
|
||||
// Task State
|
||||
s.router.GET("/task/:uuid", s.TaskHandler())
|
||||
|
||||
// User/Feed Lookups
|
||||
s.router.GET("/lookup", s.am.MustAuth(s.LookupHandler()))
|
||||
|
||||
s.router.GET("/follow", s.am.MustAuth(s.FollowHandler()))
|
||||
s.router.POST("/follow", s.am.MustAuth(s.FollowHandler()))
|
||||
|
||||
s.router.GET("/import", s.am.MustAuth(s.ImportHandler()))
|
||||
s.router.POST("/import", s.am.MustAuth(s.ImportHandler()))
|
||||
|
||||
s.router.GET("/unfollow", s.am.MustAuth(s.UnfollowHandler()))
|
||||
s.router.POST("/unfollow", s.am.MustAuth(s.UnfollowHandler()))
|
||||
|
||||
s.router.GET("/mute", s.am.MustAuth(s.MuteHandler()))
|
||||
s.router.POST("/mute", s.am.MustAuth(s.MuteHandler()))
|
||||
s.router.GET("/unmute", s.am.MustAuth(s.UnmuteHandler()))
|
||||
s.router.POST("/unmute", s.am.MustAuth(s.UnmuteHandler()))
|
||||
|
||||
s.router.GET("/transferFeed/:name", s.TransferFeedHandler())
|
||||
s.router.GET("/transferFeed/:name/:transferTo", s.TransferFeedHandler())
|
||||
s.router.GET("/add", s.AddHandler())
|
||||
s.router.POST("/add", s.AddHandler())
|
||||
|
||||
s.router.GET("/settings", s.am.MustAuth(s.SettingsHandler()))
|
||||
s.router.POST("/settings", s.am.MustAuth(s.SettingsHandler()))
|
||||
s.router.POST("/token/delete/:signature", s.am.MustAuth(s.DeleteTokenHandler()))
|
||||
|
||||
s.router.GET("/config", s.am.MustAuth(s.PodConfigHandler()))
|
||||
s.router.GET("/manage/pod", s.ManagePodHandler())
|
||||
s.router.POST("/manage/pod", s.ManagePodHandler())
|
||||
s.router.GET("/manage", s.ManageHandler())
|
||||
s.router.POST("/manage", s.ManageHandler())
|
||||
|
||||
s.router.GET("/manage/users", s.ManageUsersHandler())
|
||||
s.router.POST("/manage/adduser", s.AddUserHandler())
|
||||
s.router.POST("/manage/deluser", s.DelUserHandler())
|
||||
|
||||
s.router.GET("/deleteFeeds", s.DeleteAccountHandler())
|
||||
s.router.POST("/delete", s.am.MustAuth(s.DeleteAllHandler()))
|
||||
|
||||
// Support / Report Abuse handlers
|
||||
|
||||
s.router.GET("/support", s.SupportHandler())
|
||||
@@ -687,25 +547,12 @@ func NewServer(bind string, options ...Option) (*Server, error) {
|
||||
log.Infof("Admin User: %s", server.config.AdminUser)
|
||||
log.Infof("Admin Name: %s", server.config.AdminName)
|
||||
log.Infof("Admin Email: %s", server.config.AdminEmail)
|
||||
log.Infof("Max Twts per Page: %d", server.config.TwtsPerPage)
|
||||
log.Infof("Max Cache TTL: %s", server.config.MaxCacheTTL)
|
||||
log.Infof("Max Cache Items: %d", server.config.MaxCacheItems)
|
||||
log.Infof("Maximum length of Posts: %d", server.config.MaxTwtLength)
|
||||
log.Infof("Open User Profiles: %t", server.config.OpenProfiles)
|
||||
log.Infof("Open Registrations: %t", server.config.OpenRegistrations)
|
||||
log.Infof("SMTP Host: %s", server.config.SMTPHost)
|
||||
log.Infof("SMTP Port: %d", server.config.SMTPPort)
|
||||
log.Infof("SMTP User: %s", server.config.SMTPUser)
|
||||
log.Infof("SMTP From: %s", server.config.SMTPFrom)
|
||||
log.Infof("Max Fetch Limit: %s", humanize.Bytes(uint64(server.config.MaxFetchLimit)))
|
||||
log.Infof("Max Upload Size: %s", humanize.Bytes(uint64(server.config.MaxUploadSize)))
|
||||
log.Infof("API Session Time: %s", server.config.APISessionTime)
|
||||
|
||||
// Warn about user registration being disabled.
|
||||
if !server.config.OpenRegistrations {
|
||||
log.Warn("Open Registrations are disabled as per configuration (no -R/--open-registrations)")
|
||||
}
|
||||
|
||||
server.initRoutes()
|
||||
api.initRoutes()
|
||||
|
||||
|
||||
Reference in New Issue
Block a user