8f2f47e8aa
Added the IsoCode field to phrase files. Rewrote a good portion of the widget system logic. Added some tests for the widget system. Added the Online Users widget. Added a few sealed incomplete widgets like the Search & Filter Widget. Added the AllUsers method to WsHubImpl for Online Users. Please don't abuse it. Added the optional *DBTableKey field to AddColumn. Added the panel_analytics_time_range template to reduce the amount of duplication. Failed registrations now show up in red in the registration logs for Nox. Failed logins now show up in red in the login logs for Nox. Added basic h2 CSS to the other themes. Added .show_on_block_edit and .hide_on_block_edit to the other themes. Updated contributing. Updated a bunch of dates to 2019. Replaced tblKey{} with nil where possible. Switched out some &s for &s to reduce the number of possible bugs. Fixed a bug with selector messages where the inspector would get really jittery due to unnecessary DOM updates. Moved header.Zone and associated fields to the bottom of ViewTopic to reduce the chances of problems arising. Added the ZoneData field to *Header. Added IDs to the items in the forum list template. Split the fetchPhrases function into the initPhrases and fetchPhrases functions in init.js Added .colstack_sub_head. Fixed the CSS in the menu list. Removed an inline style from the simple topic like and unlike buttons. Removed an inline style from the simple topic IP button. Simplified the LoginRequired error handler. Fixed a typo in the comment prior to DatabaseError() Reduce the number of false leaves for WebSocket page transitions. Added the error zone. De-duped the logic in WsHubImpl.getUsers. Fixed a potential widget security issue. Added twenty new phrases. Added the wid column to the widgets table. You will need to run the patcher / updater for this commit.
149 lines
3.9 KiB
Go
149 lines
3.9 KiB
Go
package common
|
|
|
|
import (
|
|
"database/sql"
|
|
"encoding/json"
|
|
"strings"
|
|
"sync/atomic"
|
|
|
|
"github.com/Azareal/Gosora/query_gen"
|
|
)
|
|
|
|
type WidgetStmts struct {
|
|
//getList *sql.Stmt
|
|
getDockList *sql.Stmt
|
|
delete *sql.Stmt
|
|
create *sql.Stmt
|
|
update *sql.Stmt
|
|
}
|
|
|
|
var widgetStmts WidgetStmts
|
|
|
|
func init() {
|
|
DbInits.Add(func(acc *qgen.Accumulator) error {
|
|
widgetStmts = WidgetStmts{
|
|
//getList: acc.Select("widgets").Columns("wid, position, side, type, active, location, data").Orderby("position ASC").Prepare(),
|
|
getDockList: acc.Select("widgets").Columns("wid, position, type, active, location, data").Where("side = ?").Orderby("position ASC").Prepare(),
|
|
delete: acc.Delete("widgets").Where("wid = ?").Prepare(),
|
|
create: acc.Insert("widgets").Columns("position, side, type, active, location, data").Fields("?,?,?,?,?,?").Prepare(),
|
|
update: acc.Update("widgets").Set("position = ?, side = ?, type = ?, active = ?, location = ?, data = ?").Where("wid = ?").Prepare(),
|
|
}
|
|
return acc.FirstError()
|
|
})
|
|
}
|
|
|
|
// TODO: Shrink this struct for common uses in the templates? Would that really make things go faster?
|
|
type Widget struct {
|
|
ID int
|
|
Enabled bool
|
|
Location string // Coming Soon: overview, topics, topic / topic_view, forums, forum, global
|
|
Position int
|
|
RawBody string
|
|
Body string
|
|
Side string
|
|
Type string
|
|
|
|
Literal bool
|
|
TickMask atomic.Value
|
|
InitFunc func(widget *Widget, schedule *WidgetScheduler) error
|
|
ShutdownFunc func(widget *Widget) error
|
|
BuildFunc func(widget *Widget, hvars interface{}) (string, error)
|
|
TickFunc func(widget *Widget) error
|
|
}
|
|
|
|
func (widget *Widget) Delete() error {
|
|
_, err := widgetStmts.delete.Exec(widget.ID)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
// Reload the dock
|
|
// TODO: Better synchronisation
|
|
Widgets.delete(widget.ID)
|
|
widgets, err := getDockWidgets(widget.Side)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
setDock(widget.Side, widgets)
|
|
return nil
|
|
}
|
|
|
|
func (widget *Widget) Copy() (owidget *Widget) {
|
|
owidget = &Widget{}
|
|
*owidget = *widget
|
|
return owidget
|
|
}
|
|
|
|
// TODO: Test this
|
|
// TODO: Add support for zone:id. Perhaps, carry a ZoneID property around in *Header? It might allow some weirdness like frontend[5] which matches any zone with an ID of 5 but it would be a tad faster than verifying each zone, although it might be problematic if users end up relying on this behaviour for areas which don't pass IDs to the widgets system but *probably* should
|
|
func (widget *Widget) Allowed(zone string) bool {
|
|
for _, loc := range strings.Split(widget.Location, "|") {
|
|
if loc == "global" || loc == zone {
|
|
return true
|
|
} else if len(loc) > 0 && loc[0] == '!' {
|
|
loc = loc[1:]
|
|
if loc != "global" && loc != zone {
|
|
return true
|
|
}
|
|
}
|
|
}
|
|
return false
|
|
}
|
|
|
|
// TODO: Refactor
|
|
func (widget *Widget) Build(hvars interface{}) (string, error) {
|
|
if widget.Literal {
|
|
return widget.Body, nil
|
|
}
|
|
if widget.BuildFunc != nil {
|
|
return widget.BuildFunc(widget, hvars)
|
|
}
|
|
|
|
var header = hvars.(*Header)
|
|
err := header.Theme.RunTmpl(widget.Body, hvars, header.Writer)
|
|
return "", err
|
|
}
|
|
|
|
type WidgetEdit struct {
|
|
*Widget
|
|
Data map[string]string
|
|
}
|
|
|
|
func (widget *WidgetEdit) Create() error {
|
|
data, err := json.Marshal(widget.Data)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
_, err = widgetStmts.create.Exec(widget.Position, widget.Side, widget.Type, widget.Enabled, widget.Location, data)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
// Reload the dock
|
|
widgets, err := getDockWidgets(widget.Side)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
setDock(widget.Side, widgets)
|
|
return nil
|
|
}
|
|
|
|
func (widget *WidgetEdit) Commit() error {
|
|
data, err := json.Marshal(widget.Data)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
_, err = widgetStmts.update.Exec(widget.Position, widget.Side, widget.Type, widget.Enabled, widget.Location, data, widget.ID)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
|
|
// Reload the dock
|
|
widgets, err := getDockWidgets(widget.Side)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
setDock(widget.Side, widgets)
|
|
return nil
|
|
}
|