7be011a30d
The topic list cache can handle more groups now, but don't go too crazy with groups (e.g. thousands of them). Make the suspicious request logs more descriptive. Added the phrases API endpoint. Split the template phrases up by prefix, more work on this coming up. Removed #dash_saved and part of #dash_username. Removed some temporary artifacts from trying to implement FA5 in Nox. Removed some commented CSS. Fixed template artifact deletion on Windows. Tweaked HTTPSRedirect to make it more compact. Fixed NullUserCache not complying with the expectations for BulkGet. Swapped out a few RunVhook calls for more appropriate RunVhookNoreturn calls. Removed a few redundant IsAdmin checks when IsMod would suffice. Commented out a few pushers. Desktop notification permission requests are no longer served to guests. Split topics.html into topics.html and topics_topic.html RunThemeTemplate should now fallback to interpreted templates properly when the transpiled variants aren't avaialb.e Changed TopicsRow.CreatedAt from a string to a time.Time Added SkipTmplPtrMap to CTemplateConfig. Added SetBuildTags to CTemplateSet. A bit more data is dumped when something goes wrong while transpiling templates now. topics_topic, topic_posts, and topic_alt_posts are now transpiled for the client, although not all of them are ready to be served to the client yet. Client rendered templates now support phrases. Client rendered templates now support loops. Fixed loadAlerts in global.js Refactored some of the template initialisation code to make it less repetitive. Split topic.html into topic.html and topic_posts.html Split topic_alt.html into topic_alt.html and topic_alt_posts.html Added comments for PollCache. Fixed a data race in the MemoryPollCache. The writer is now closed properly in WsHubImpl.broadcastMessage. Fixed a potential deadlock in WsHubImpl.broadcastMessage. Removed some old commented code in websockets.go Added the DisableLiveTopicList config setting.
415 lines
7.1 KiB
Go
415 lines
7.1 KiB
Go
package common
|
|
|
|
import (
|
|
"html/template"
|
|
"net/http"
|
|
"sync"
|
|
"time"
|
|
)
|
|
|
|
// TODO: Allow resources in spots other than /static/ and possibly even external domains (e.g. CDNs)
|
|
// TODO: Preload Trumboyg on Cosora on the forum list
|
|
type Header struct {
|
|
Title string
|
|
NoticeList []string
|
|
Scripts []string
|
|
//Preload []string
|
|
Stylesheets []string
|
|
Widgets PageWidgets
|
|
Site *site
|
|
Settings SettingMap
|
|
Themes map[string]*Theme // TODO: Use a slice containing every theme instead of the main map for speed?
|
|
Theme *Theme
|
|
//TemplateName string // TODO: Use this to move template calls to the router rather than duplicating them over and over and over?
|
|
CurrentUser User // TODO: Deprecate CurrentUser on the page structs and use a pointer here
|
|
Zone string
|
|
MetaDesc string
|
|
Writer http.ResponseWriter
|
|
ExtData ExtData
|
|
}
|
|
|
|
func (header *Header) AddScript(name string) {
|
|
header.Scripts = append(header.Scripts, name)
|
|
}
|
|
|
|
/*func (header *Header) Preload(name string) {
|
|
header.Preload = append(header.Preload, name)
|
|
}*/
|
|
|
|
func (header *Header) AddSheet(name string) {
|
|
header.Stylesheets = append(header.Stylesheets, name)
|
|
}
|
|
|
|
func (header *Header) AddNotice(name string) {
|
|
header.NoticeList = append(header.NoticeList, GetNoticePhrase(name))
|
|
}
|
|
|
|
// TODO: Add this to routes which don't use templates. E.g. Json APIs.
|
|
type HeaderLite struct {
|
|
Site *site
|
|
Settings SettingMap
|
|
ExtData ExtData
|
|
}
|
|
|
|
type PageWidgets struct {
|
|
LeftSidebar template.HTML
|
|
RightSidebar template.HTML
|
|
}
|
|
|
|
// TODO: Add a ExtDataHolder interface with methods for manipulating the contents?
|
|
// ? - Could we use a sync.Map instead?
|
|
type ExtData struct {
|
|
Items map[string]interface{} // Key: pluginname
|
|
sync.RWMutex
|
|
}
|
|
|
|
type Page struct {
|
|
*Header
|
|
ItemList []interface{}
|
|
Something interface{}
|
|
}
|
|
|
|
type SimplePage struct {
|
|
*Header
|
|
}
|
|
|
|
type ErrorPage struct {
|
|
*Header
|
|
Message string
|
|
}
|
|
|
|
type Paginator struct {
|
|
PageList []int
|
|
Page int
|
|
LastPage int
|
|
}
|
|
|
|
type CustomPagePage struct {
|
|
*Header
|
|
Page *CustomPage
|
|
}
|
|
|
|
type TopicPage struct {
|
|
*Header
|
|
ItemList []ReplyUser
|
|
Topic TopicUser
|
|
Poll Poll
|
|
Page int
|
|
LastPage int
|
|
}
|
|
|
|
type TopicListPage struct {
|
|
*Header
|
|
TopicList []*TopicsRow
|
|
ForumList []Forum
|
|
DefaultForum int
|
|
Paginator
|
|
}
|
|
|
|
type ForumPage struct {
|
|
*Header
|
|
ItemList []*TopicsRow
|
|
Forum *Forum
|
|
Paginator
|
|
}
|
|
|
|
type ForumsPage struct {
|
|
*Header
|
|
ItemList []Forum
|
|
}
|
|
|
|
type ProfilePage struct {
|
|
*Header
|
|
ItemList []ReplyUser
|
|
ProfileOwner User
|
|
}
|
|
|
|
type CreateTopicPage struct {
|
|
*Header
|
|
ItemList []Forum
|
|
FID int
|
|
}
|
|
|
|
type IPSearchPage struct {
|
|
*Header
|
|
ItemList map[int]*User
|
|
IP string
|
|
}
|
|
|
|
type EmailListPage struct {
|
|
*Header
|
|
ItemList []Email
|
|
Something interface{}
|
|
}
|
|
|
|
type AccountDashPage struct {
|
|
*Header
|
|
MFASetup bool
|
|
}
|
|
|
|
type PanelStats struct {
|
|
Users int
|
|
Groups int
|
|
Forums int
|
|
Pages int
|
|
Settings int
|
|
WordFilters int
|
|
Themes int
|
|
Reports int
|
|
}
|
|
|
|
type BasePanelPage struct {
|
|
*Header
|
|
Stats PanelStats
|
|
Zone string
|
|
ReportForumID int
|
|
}
|
|
|
|
type PanelPage struct {
|
|
*BasePanelPage
|
|
ItemList []interface{}
|
|
Something interface{}
|
|
}
|
|
|
|
type GridElement struct {
|
|
ID string
|
|
Body string
|
|
Order int // For future use
|
|
Class string
|
|
Background string
|
|
TextColour string
|
|
Note string
|
|
}
|
|
|
|
type PanelDashboardPage struct {
|
|
*BasePanelPage
|
|
GridItems []GridElement
|
|
}
|
|
|
|
type PanelSetting struct {
|
|
*Setting
|
|
FriendlyName string
|
|
}
|
|
|
|
type PanelSettingPage struct {
|
|
*BasePanelPage
|
|
ItemList []OptionLabel
|
|
Setting *PanelSetting
|
|
}
|
|
|
|
type PanelCustomPagesPage struct {
|
|
*BasePanelPage
|
|
ItemList []*CustomPage
|
|
Paginator
|
|
}
|
|
|
|
type PanelCustomPageEditPage struct {
|
|
*BasePanelPage
|
|
Page *CustomPage
|
|
}
|
|
|
|
type PanelTimeGraph struct {
|
|
Series []int64 // The counts on the left
|
|
Labels []int64 // unixtimes for the bottom, gets converted into 1:00, 2:00, etc. with JS
|
|
}
|
|
|
|
type PanelAnalyticsItem struct {
|
|
Time int64
|
|
Count int64
|
|
}
|
|
|
|
type PanelAnalyticsPage struct {
|
|
*BasePanelPage
|
|
PrimaryGraph PanelTimeGraph
|
|
ViewItems []PanelAnalyticsItem
|
|
TimeRange string
|
|
}
|
|
|
|
type PanelAnalyticsRoutesItem struct {
|
|
Route string
|
|
Count int
|
|
}
|
|
|
|
type PanelAnalyticsRoutesPage struct {
|
|
*BasePanelPage
|
|
ItemList []PanelAnalyticsRoutesItem
|
|
TimeRange string
|
|
}
|
|
|
|
type PanelAnalyticsAgentsItem struct {
|
|
Agent string
|
|
FriendlyAgent string
|
|
Count int
|
|
}
|
|
|
|
type PanelAnalyticsAgentsPage struct {
|
|
*BasePanelPage
|
|
ItemList []PanelAnalyticsAgentsItem
|
|
TimeRange string
|
|
}
|
|
|
|
type PanelAnalyticsRoutePage struct {
|
|
*BasePanelPage
|
|
Route string
|
|
PrimaryGraph PanelTimeGraph
|
|
ViewItems []PanelAnalyticsItem
|
|
TimeRange string
|
|
}
|
|
|
|
type PanelAnalyticsAgentPage struct {
|
|
*BasePanelPage
|
|
Agent string
|
|
FriendlyAgent string
|
|
PrimaryGraph PanelTimeGraph
|
|
TimeRange string
|
|
}
|
|
|
|
type PanelThemesPage struct {
|
|
*BasePanelPage
|
|
PrimaryThemes []*Theme
|
|
VariantThemes []*Theme
|
|
}
|
|
|
|
type PanelMenuListItem struct {
|
|
Name string
|
|
ID int
|
|
ItemCount int
|
|
}
|
|
|
|
type PanelMenuListPage struct {
|
|
*BasePanelPage
|
|
ItemList []PanelMenuListItem
|
|
}
|
|
|
|
type PanelMenuPage struct {
|
|
*BasePanelPage
|
|
MenuID int
|
|
ItemList []MenuItem
|
|
}
|
|
|
|
type PanelMenuItemPage struct {
|
|
*BasePanelPage
|
|
Item MenuItem
|
|
}
|
|
|
|
type PanelUserPage struct {
|
|
*BasePanelPage
|
|
ItemList []*User
|
|
Paginator
|
|
}
|
|
|
|
type PanelGroupPage struct {
|
|
*BasePanelPage
|
|
ItemList []GroupAdmin
|
|
Paginator
|
|
}
|
|
|
|
type PanelEditGroupPage struct {
|
|
*BasePanelPage
|
|
ID int
|
|
Name string
|
|
Tag string
|
|
Rank string
|
|
DisableRank bool
|
|
}
|
|
|
|
type GroupForumPermPreset struct {
|
|
Group *Group
|
|
Preset string
|
|
}
|
|
|
|
type PanelEditForumPage struct {
|
|
*BasePanelPage
|
|
ID int
|
|
Name string
|
|
Desc string
|
|
Active bool
|
|
Preset string
|
|
Groups []GroupForumPermPreset
|
|
}
|
|
|
|
type NameLangToggle struct {
|
|
Name string
|
|
LangStr string
|
|
Toggle bool
|
|
}
|
|
|
|
type PanelEditForumGroupPage struct {
|
|
*BasePanelPage
|
|
ForumID int
|
|
GroupID int
|
|
Name string
|
|
Desc string
|
|
Active bool
|
|
Preset string
|
|
Perms []NameLangToggle
|
|
}
|
|
|
|
type PanelEditGroupPermsPage struct {
|
|
*BasePanelPage
|
|
ID int
|
|
Name string
|
|
LocalPerms []NameLangToggle
|
|
GlobalPerms []NameLangToggle
|
|
}
|
|
|
|
type BackupItem struct {
|
|
SQLURL string
|
|
|
|
// TODO: Add an easier to parse format here for Gosora to be able to more easily reimport portions of the dump and to strip unnecessary data (e.g. table defs and parsed post data)
|
|
|
|
Timestamp time.Time
|
|
}
|
|
|
|
type PanelBackupPage struct {
|
|
*BasePanelPage
|
|
Backups []BackupItem
|
|
}
|
|
|
|
type PageLogItem struct {
|
|
Action template.HTML
|
|
IPAddress string
|
|
DoneAt string
|
|
}
|
|
|
|
type PanelLogsPage struct {
|
|
*BasePanelPage
|
|
Logs []PageLogItem
|
|
Paginator
|
|
}
|
|
|
|
type PageRegLogItem struct {
|
|
RegLogItem
|
|
ParsedReason string
|
|
}
|
|
|
|
type PanelRegLogsPage struct {
|
|
*BasePanelPage
|
|
Logs []PageRegLogItem
|
|
Paginator
|
|
}
|
|
|
|
type PanelDebugPage struct {
|
|
*BasePanelPage
|
|
GoVersion string
|
|
DBVersion string
|
|
Uptime string
|
|
OpenConns int
|
|
DBAdapter string
|
|
}
|
|
|
|
type PageSimple struct {
|
|
Title string
|
|
Something interface{}
|
|
}
|
|
|
|
type AreYouSure struct {
|
|
URL string
|
|
Message string
|
|
}
|
|
|
|
// TODO: Write a test for this
|
|
func DefaultHeader(w http.ResponseWriter, user User) *Header {
|
|
return &Header{Site: Site, Theme: Themes[fallbackTheme], CurrentUser: user, Writer: w}
|
|
}
|