", "<meow>")
+ l.Add("<", "<")
+ l.Add("&", "&")
// Note: strings.TrimSpace strips newlines, if there's nothing before or after them
- msgList.Add("hi ", "hi ")
- msgList.Add("h ", "h ")
- msgList.Add("hi ", "hi")
- msgList.Add("hi", "hi")
- msgList.Add("hi ", "hi ")
- msgList.Add("hi ", "hi ")
- msgList.Add("hi ", "hi ")
- msgList.Add("hi ", "hi ")
- msgList.Add("hi hi hi hi hi hi hi hi hi
", "<div>hi</div>")
- msgList.Add("hi ", "hi") // This is stripped since the editor (Trumbowyg) likes blasting useless spans
- msgList.Add("hi ", "hi")
- msgList.Add("hi ", "hi")
- msgList.Add(">hi ", ">hi")
- msgList.Add("hi", "hi ")
- msgList.Add("hi ", "hi</b>")
- msgList.Add("", "</b>")
- msgList.Add("", "</del>")
- msgList.Add("", "</strong>")
- msgList.Add("", "hi", "hi")
- msgList.Add("hi ", "hi")
- msgList.Add("", "")
- msgList.Add("t ", "t ")
- msgList.Add("t ", "t ")
- msgList.Add("t ", "t ")
- msgList.Add("<>", "<></>")
- msgList.Add("<>", "</><>")
- msgList.Add("<>", "<>")
- msgList.Add("", "</>")
- msgList.Add(" hi
", "hi")
- msgList.Add("
", "")
- msgList.Add("hi ", "hi ")
- msgList.Add("hi hi hi <meow>hi</meow> ")
- msgList.Add("\\hi ", "<blockquote>hi</blockquote>")
- //msgList.Add("\\\\hi <meow>hi</meow> ") // TODO: Double escapes should print a literal backslash
- //msgList.Add("<blockquote>hi</blockquote>", "<blockquote>hi</blockquote>") // TODO: Stop double-entitising this
- msgList.Add("\\hi \\hi ", "<blockquote>hi</blockquote><blockquote>hi</blockquote>")
- msgList.Add("\\Admin ", "<a itemprop="author">Admin</a>")
- msgList.Add("\\Admin ", "<a itemprop="author">Admin</a> ")
- msgList.Add("\n\\Admin \n", "<a itemprop="author">Admin</a> ")
- msgList.Add("tt\n\\Admin \ntt", "tt\n<a itemprop="author">Admin</a> \ntt")
- msgList.Add("@", "@")
- msgList.Add("@Admin", "@1")
- msgList.Add("@Bah", "@Bah")
- msgList.Add(" @Admin", "@1")
- msgList.Add("\n@Admin", "@1")
- msgList.Add("@Admin\n", "@1")
- msgList.Add("@Admin\ndd", "@1\ndd")
- msgList.Add("d@Admin", "d@Admin")
- msgList.Add("\\@Admin", "@Admin")
- msgList.Add("@ε
ζ°", "@ε
ζ°")
+ l.Add("hi ", "hi ")
+ l.Add("h ", "h ")
+ l.Add("hi ", "hi")
+ l.Add("hi", "hi")
+ l.Add("hi ", "hi ")
+ l.Add("hi ", "hi ")
+ l.Add("hi ", "hi ")
+ l.Add("hi ", "hi ")
+ l.Add("hi hi hi hi hi hi hi hi hi
", "<div>hi</div>")
+ l.Add("hi ", "hi") // This is stripped since the editor (Trumbowyg) likes blasting useless spans
+ l.Add("hi ", "hi")
+ l.Add("hi ", "hi")
+ l.Add(">hi ", ">hi")
+ l.Add("hi", "hi ")
+ l.Add("hi ", "hi</b>")
+ l.Add("", "</b>")
+ l.Add("", "</del>")
+ l.Add("", "</strong>")
+ l.Add("", "hi", "hi")
+ l.Add("hi", "hi")
+ l.Add("hi ", "hi")
+ l.Add(" ", "")
+ l.Add("t ", "t ")
+ l.Add("t ", "t ")
+ l.Add("t ", "t ")
+ l.Add("<>", "<></>")
+ l.Add("<>", "</><>")
+ l.Add("<>", "<>")
+ l.Add("", "</>")
+ l.Add(" hi
", "hi")
+ l.Add("
", "")
+ l.Add("hi ", "hi ")
+ l.Add("hi hi hi <meow>hi</meow> ")
+ l.Add("\\hi ", "<blockquote>hi</blockquote>")
+ //l.Add("\\\\hi <meow>hi</meow> ") // TODO: Double escapes should print a literal backslash
+ //l.Add("<blockquote>hi</blockquote>", "<blockquote>hi</blockquote>") // TODO: Stop double-entitising this
+ l.Add("\\hi \\hi ", "<blockquote>hi</blockquote><blockquote>hi</blockquote>")
+ l.Add("\\Admin ", "<a itemprop="author">Admin</a>")
+ l.Add("\\Admin ", "<a itemprop="author">Admin</a> ")
+ l.Add("\n\\Admin \n", "<a itemprop="author">Admin</a> ")
+ l.Add("tt\n\\Admin \ntt", "tt\n<a itemprop="author">Admin</a> \ntt")
+ l.Add("@", "@")
+ l.Add("@Admin", "@1")
+ l.Add("@Bah", "@Bah")
+ l.Add(" @Admin", "@1")
+ l.Add("\n@Admin", "@1")
+ l.Add("@Admin\n", "@1")
+ l.Add("@Admin\ndd", "@1\ndd")
+ l.Add("d@Admin", "d@Admin")
+ l.Add("\\@Admin", "@Admin")
+ l.Add("@ε
ζ°", "@ε
ζ°")
// TODO: More tests for unicode names?
- //msgList.Add("\\\\@Admin", "@1")
- //msgList.Add("byte 0", string([]byte{0}), "")
- msgList.Add("byte 'a'", string([]byte{'a'}), "a")
- //msgList.Add("byte 255", string([]byte{255}), "")
- //msgList.Add("rune 0", string([]rune{0}), "")
+ //l.Add("\\\\@Admin", "@1")
+ //l.Add("byte 0", string([]byte{0}), "")
+ l.Add("byte 'a'", string([]byte{'a'}), "a")
+ //l.Add("byte 255", string([]byte{255}), "")
+ //l.Add("rune 0", string([]rune{0}), "")
// TODO: Do a test with invalid UTF-8 input
- for _, item := range msgList.Items {
+ for _, item := range l.Items {
res := c.PreparseMessage(item.Msg)
if res != item.Expects {
if item.Name != "" {
@@ -139,145 +140,148 @@ func TestParser(t *testing.T) {
if !c.PluginsInited {
c.InitPlugins()
}
- var msgList = &METriList{nil}
+ l := &METriList{nil}
url := "github.com/Azareal/Gosora"
- msgList.Add("", "")
- msgList.Add("haha", "haha")
- msgList.Add("t ", "t ")
- msgList.Add("//", "//")
- msgList.Add("http://", "[Invalid URL] ")
- msgList.Add("https://", "[Invalid URL] ")
- msgList.Add("ftp://", "[Invalid URL] ")
- msgList.Add("git://", "[Invalid URL] ")
- msgList.Add("ssh://", "ssh://")
+ l.Add("", "")
+ l.Add("haha", "haha")
+ l.Add("t ", "t ")
+ l.Add("//", "//")
+ l.Add("http://", "[Invalid URL] ")
+ l.Add("https://", "[Invalid URL] ")
+ l.Add("ftp://", "[Invalid URL] ")
+ l.Add("git://", "[Invalid URL] ")
+ l.Add("ssh://", "ssh://")
- msgList.Add("// ", "// ")
- msgList.Add("// //", "// //")
- msgList.Add("// // //", "// // //")
- msgList.Add("http:// ", "[Invalid URL] ")
- msgList.Add("https:// ", "[Invalid URL] ")
- msgList.Add("ftp:// ", "[Invalid URL] ")
- msgList.Add("git:// ", "[Invalid URL] ")
- msgList.Add("ssh:// ", "ssh:// ")
+ l.Add("// ", "// ")
+ l.Add("// //", "// //")
+ l.Add("// // //", "// // //")
+ l.Add("http:// ", "[Invalid URL] ")
+ l.Add("https:// ", "[Invalid URL] ")
+ l.Add("ftp:// ", "[Invalid URL] ")
+ l.Add("git:// ", "[Invalid URL] ")
+ l.Add("ssh:// ", "ssh:// ")
- msgList.Add("// t", "// t")
- msgList.Add("http:// t", "[Invalid URL] t")
+ l.Add("// t", "// t")
+ l.Add("http:// t", "[Invalid URL] t")
- msgList.Add("http:", "http:")
- msgList.Add("https:", "https:")
- msgList.Add("ftp:", "ftp:")
- msgList.Add("git:", "git:")
- msgList.Add("ssh:", "ssh:")
+ l.Add("http:", "http:")
+ l.Add("https:", "https:")
+ l.Add("ftp:", "ftp:")
+ l.Add("git:", "git:")
+ l.Add("ssh:", "ssh:")
- msgList.Add("http", "http")
- msgList.Add("https", "https")
- msgList.Add("ftp", "ftp")
- msgList.Add("git", "git")
- msgList.Add("ssh", "ssh")
+ l.Add("http", "http")
+ l.Add("https", "https")
+ l.Add("ftp", "ftp")
+ l.Add("git", "git")
+ l.Add("ssh", "ssh")
- msgList.Add("ht", "ht")
- msgList.Add("htt", "htt")
- msgList.Add("ft", "ft")
- msgList.Add("gi", "gi")
- msgList.Add("ss", "ss")
- msgList.Add("haha\nhaha\nhaha", "haha//"+url+" ")
- msgList.Add("//a", "//a ")
- msgList.Add(" //a", " //a ")
- msgList.Add("//a ", "//a ")
- msgList.Add(" //a ", " //a ")
- msgList.Add("d //a ", "d //a ")
- msgList.Add("ddd ddd //a ", "ddd ddd //a ")
- msgList.Add("https://"+url, "https://"+url+" ")
- msgList.Add("https://t", "https://t ")
- msgList.Add("http://"+url, "http://"+url+" ")
- msgList.Add("#http://"+url, "#http://"+url)
- msgList.Add("@http://"+url, "[Invalid Profile] ttp://"+url)
- msgList.Add("//"+url+"\n", "//"+url+" //"+url+" ")
- msgList.Add("\n//"+url+"\n", "//"+url+" //"+url+" //"+url+" //"+url+" ")
- msgList.Add("//"+url+"\n\n//"+url, "//"+url+" //"+url+" ")
- msgList.Add("//"+c.Site.URL, "//"+c.Site.URL+" ")
- msgList.Add("//"+c.Site.URL+"\n", "//"+c.Site.URL+" //"+c.Site.URL+" //"+c.Site.URL+" ")
+ l.Add("ht", "ht")
+ l.Add("htt", "htt")
+ l.Add("ft", "ft")
+ l.Add("gi", "gi")
+ l.Add("ss", "ss")
+ l.Add("haha\nhaha\nhaha", "haha//"+url+" ")
+ l.Add("//a", "//a ")
+ l.Add(" //a", " //a ")
+ l.Add("//a ", "//a ")
+ l.Add(" //a ", " //a ")
+ l.Add("d //a ", "d //a ")
+ l.Add("ddd ddd //a ", "ddd ddd //a ")
+ l.Add("https://"+url, "https://"+url+" ")
+ l.Add("https://t", "https://t ")
+ l.Add("http://"+url, "http://"+url+" ")
+ l.Add("#http://"+url, "#http://"+url)
+ l.Add("@http://"+url, "[Invalid Profile] ttp://"+url)
+ l.Add("//"+url+"\n", "//"+url+" //"+url+" ")
+ l.Add("\n//"+url+"\n", "//"+url+" //"+url+" //"+url+" //"+url+" ")
+ l.Add("//"+url+"\n\n//"+url, "//"+url+" //"+url+" ")
+ l.Add("//"+c.Site.URL, "//"+c.Site.URL+" ")
+ l.Add("//"+c.Site.URL+"\n", "//"+c.Site.URL+" //"+c.Site.URL+" //"+c.Site.URL+" ")
- var local = func(url string) {
- msgList.Add("//"+url, "//"+url+" ")
- msgList.Add("//"+url+"\n", "//"+url+" //"+url+" //"+url+" ")
+ local := func(url string) {
+ l.Add("//"+url, "//"+url+" ")
+ l.Add("//"+url+"\n", "//"+url+" //"+url+" //"+url+" ")
}
local("localhost")
local("127.0.0.1")
local("[::1]")
- msgList.Add("https://www.youtube.com/watch?v=lalalalala","")
- //msgList.Add("https://www.youtube.com/watch?v=;","")
- msgList.Add("https://www.youtube.com/watch?v=d;","")
- msgList.Add("https://www.youtube.com/watch?v=d;d","")
- msgList.Add("https://www.youtube.com/watch?v=alert()","[Invalid URL] ()")
- msgList.Add("https://www.youtube.com/watch?v=js:alert()","[Invalid URL] ()")
- msgList.Add("https://www.youtube.com/watch?v='+><+'","[Invalid URL] '+><+'")
- msgList.Add("https://www.youtube.com/watch?v='+onready='alert(\"\")'+'","[Invalid URL] '+onready='alert(\"\")'+'")
- msgList.Add(" https://www.youtube.com/watch?v=lalalalala"," ")
- msgList.Add("https://www.youtube.com/watch?v=lalalalala tt"," tt")
- msgList.Add("https://www.youtube.com/watch?v=lalalalala&d=haha","")
- msgList.Add("https://gaming.youtube.com/watch?v=lalalalala","")
- msgList.Add("https://gaming.youtube.com/watch?v=lalalalala&d=haha","")
- msgList.Add("https://m.youtube.com/watch?v=lalalalala","")
- msgList.Add("https://m.youtube.com/watch?v=lalalalala&d=haha","")
- msgList.Add("http://www.youtube.com/watch?v=lalalalala","")
- msgList.Add("//www.youtube.com/watch?v=lalalalala","")
- //msgList.Add("www.youtube.com/watch?v=lalalalala","")
+ l.Add("https://www.youtube.com/watch?v=lalalalala","")
+ //l.Add("https://www.youtube.com/watch?v=;","")
+ l.Add("https://www.youtube.com/watch?v=d;","")
+ l.Add("https://www.youtube.com/watch?v=d;d","")
+ l.Add("https://www.youtube.com/watch?v=alert()","[Invalid URL] ()")
+ l.Add("https://www.youtube.com/watch?v=alert()()","[Invalid URL] ()()")
+ l.Add("https://www.youtube.com/watch?v=js:alert()","[Invalid URL] ()")
+ l.Add("https://www.youtube.com/watch?v='+><+'","[Invalid URL] '+><+'")
+ l.Add("https://www.youtube.com/watch?v='+onready='alert(\"\")'+'","[Invalid URL] '+onready='alert(\"\")'+'")
+ l.Add(" https://www.youtube.com/watch?v=lalalalala"," ")
+ l.Add("https://www.youtube.com/watch?v=lalalalala tt"," tt")
+ l.Add("https://www.youtube.com/watch?v=lalalalala&d=haha","")
+ l.Add("https://gaming.youtube.com/watch?v=lalalalala","")
+ l.Add("https://gaming.youtube.com/watch?v=lalalalala&d=haha","")
+ l.Add("https://m.youtube.com/watch?v=lalalalala","")
+ l.Add("https://m.youtube.com/watch?v=lalalalala&d=haha","")
+ l.Add("http://www.youtube.com/watch?v=lalalalala","")
+ l.Add("//www.youtube.com/watch?v=lalalalala","")
+ //l.Add("www.youtube.com/watch?v=lalalalala","")
- msgList.Add("#tid-1", "#tid-1 ")
- msgList.Add("##tid-1", "##tid-1")
- msgList.Add("# #tid-1", "# #tid-1")
- msgList.Add("@ #tid-1", "[Invalid Profile] #tid-1")
- msgList.Add("@#tid-1", "[Invalid Profile] tid-1")
- msgList.Add("@ #tid-@", "[Invalid Profile] #tid-@")
- msgList.Add("#tid-1 #tid-1", "#tid-1 #tid-1 ")
- msgList.Add("#tid-0", "[Invalid Topic] ")
- msgList.Add("https://"+url+"/#tid-1", "https://"+url+"/#tid-1 ")
- msgList.Add("https://"+url+"/?hi=2", "https://"+url+"/?hi=2 ")
- msgList.Add("#fid-1", "#fid-1 ")
- msgList.Add(" #fid-1", " #fid-1 ")
- msgList.Add("#fid-0", "[Invalid Forum] ")
- msgList.Add(" #fid-0", " [Invalid Forum] ")
- msgList.Add("#", "#")
- msgList.Add("# ", "# ")
- msgList.Add(" @", " @")
- msgList.Add(" #", " #")
- msgList.Add("#@", "#@")
- msgList.Add("#@ ", "#@ ")
- msgList.Add("#@1", "#@1")
- msgList.Add("#f", "#f")
- msgList.Add("#ff", "#ff")
- msgList.Add("#ffffid-0", "#ffffid-0")
- //msgList.Add("#ffffid-0", "#ffffid-0")
- msgList.Add("#nid-0", "#nid-0")
- msgList.Add("#nnid-0", "#nnid-0")
- msgList.Add("@@", "[Invalid Profile] ")
- msgList.Add("@@ @@", "[Invalid Profile] [Invalid Profile] ")
- msgList.Add("@@1", "[Invalid Profile] 1")
- msgList.Add("@#1", "[Invalid Profile] 1")
- msgList.Add("@##1", "[Invalid Profile] #1")
- msgList.Add("@2", "[Invalid Profile] ")
- msgList.Add("@2t", "[Invalid Profile] t")
- msgList.Add("@2 t", "[Invalid Profile] t")
- msgList.Add("@2 ", "[Invalid Profile] ")
- msgList.Add("@2 @2", "[Invalid Profile] [Invalid Profile] ")
- msgList.Add("@1", "@Admin ")
- msgList.Add(" @1", " @Admin ")
- msgList.Add("@1t", "@Admin t")
- msgList.Add("@1 ", "@Admin ")
- msgList.Add("@1 @1", "@Admin @Admin ")
- msgList.Add("@0", "[Invalid Profile] ")
- msgList.Add("@-1", "[Invalid Profile] 1")
+ l.Add("#tid-1", "#tid-1 ")
+ l.Add("##tid-1", "##tid-1")
+ l.Add("# #tid-1", "# #tid-1")
+ l.Add("@ #tid-1", "[Invalid Profile] #tid-1")
+ l.Add("@#tid-1", "[Invalid Profile] tid-1")
+ l.Add("@ #tid-@", "[Invalid Profile] #tid-@")
+ l.Add("#tid-1 #tid-1", "#tid-1 #tid-1 ")
+ l.Add("#tid-0", "[Invalid Topic] ")
+ l.Add("https://"+url+"/#tid-1", "https://"+url+"/#tid-1 ")
+ l.Add("https://"+url+"/?hi=2", "https://"+url+"/?hi=2 ")
+ l.Add("#fid-1", "#fid-1 ")
+ l.Add(" #fid-1", " #fid-1 ")
+ l.Add("#fid-0", "[Invalid Forum] ")
+ l.Add(" #fid-0", " [Invalid Forum] ")
+ l.Add("#", "#")
+ l.Add("# ", "# ")
+ l.Add(" @", " @")
+ l.Add(" #", " #")
+ l.Add("#@", "#@")
+ l.Add("#@ ", "#@ ")
+ l.Add("#@1", "#@1")
+ l.Add("#f", "#f")
+ l.Add("f#f", "f#f")
+ l.Add("f#", "f#")
+ l.Add("#ff", "#ff")
+ l.Add("#ffffid-0", "#ffffid-0")
+ //l.Add("#ffffid-0", "#ffffid-0")
+ l.Add("#nid-0", "#nid-0")
+ l.Add("#nnid-0", "#nnid-0")
+ l.Add("@@", "[Invalid Profile] ")
+ l.Add("@@ @@", "[Invalid Profile] [Invalid Profile] ")
+ l.Add("@@1", "[Invalid Profile] 1")
+ l.Add("@#1", "[Invalid Profile] 1")
+ l.Add("@##1", "[Invalid Profile] #1")
+ l.Add("@2", "[Invalid Profile] ")
+ l.Add("@2t", "[Invalid Profile] t")
+ l.Add("@2 t", "[Invalid Profile] t")
+ l.Add("@2 ", "[Invalid Profile] ")
+ l.Add("@2 @2", "[Invalid Profile] [Invalid Profile] ")
+ l.Add("@1", "@Admin ")
+ l.Add(" @1", " @Admin ")
+ l.Add("@1t", "@Admin t")
+ l.Add("@1 ", "@Admin ")
+ l.Add("@1 @1", "@Admin @Admin ")
+ l.Add("@0", "[Invalid Profile] ")
+ l.Add("@-1", "[Invalid Profile] 1")
- for _, item := range msgList.Items {
+ for _, item := range l.Items {
res := c.ParseMessage(item.Msg, 1, "forums")
if res != item.Expects {
if item.Name != "" {
diff --git a/plugin_test.go b/plugin_test.go
index bb8cdf0f..a2bf52db 100644
--- a/plugin_test.go
+++ b/plugin_test.go
@@ -4,7 +4,7 @@ import (
"strconv"
"testing"
- "github.com/Azareal/Gosora/common"
+ c "github.com/Azareal/Gosora/common"
)
// go test -v
@@ -20,61 +20,61 @@ type MEPairList struct {
Items []MEPair
}
-func (tlist *MEPairList) Add(msg string, expects string) {
- tlist.Items = append(tlist.Items, MEPair{msg, expects})
+func (l *MEPairList) Add(msg string, expects string) {
+ l.Items = append(l.Items, MEPair{msg, expects})
}
func TestBBCodeRender(t *testing.T) {
//t.Skip()
- err := initBbcode(common.Plugins["bbcode"])
+ err := initBbcode(c.Plugins["bbcode"])
if err != nil {
t.Fatal(err)
}
var res string
- var msgList = &MEPairList{nil}
- msgList.Add("", "")
- msgList.Add(" ", " ")
- msgList.Add(" ", " ")
- msgList.Add(" ", " ")
- msgList.Add("[b]", "π ")
- msgList.Add("[b]πππ[/b]", "πππ ")
- msgList.Add("[b]hi[/b]", "hi ")
- msgList.Add("[u]hi[/u]", "hi ")
- msgList.Add("[i]hi[/i]", "hi ")
- msgList.Add("[s]hi[/s]", "hi ")
- msgList.Add("[c]hi[/c]", "[c]hi[/c]")
- msgList.Add("[h1]hi", "[h1]hi")
- msgList.Add("[h1]hi[/h1]", "hi ")
+ l := &MEPairList{nil}
+ l.Add("", "")
+ l.Add(" ", " ")
+ l.Add(" ", " ")
+ l.Add(" ", " ")
+ l.Add("[b]", "π ")
+ l.Add("[b]πππ[/b]", "πππ ")
+ l.Add("[b]hi[/b]", "hi ")
+ l.Add("[u]hi[/u]", "hi ")
+ l.Add("[i]hi[/i]", "hi ")
+ l.Add("[s]hi[/s]", "hi ")
+ l.Add("[c]hi[/c]", "[c]hi[/c]")
+ l.Add("[h1]hi", "[h1]hi")
+ l.Add("[h1]hi[/h1]", "hi ")
if !testing.Short() {
- //msgList.Add("[b]hi[/i]", "[b]hi[/i]")
- //msgList.Add("[/b]hi[b]", "[/b]hi[b]")
- //msgList.Add("[/b]hi[/b]", "[/b]hi[/b]")
- //msgList.Add("[b][b]hi[/b]", "hi ")
- //msgList.Add("[b][b]hi", "[b][b]hi")
- //msgList.Add("[b][b][b]hi", "[b][b][b]hi")
- //msgList.Add("[/b]hi", "[/b]hi")
+ //l.Add("[b]hi[/i]", "[b]hi[/i]")
+ //l.Add("[/b]hi[b]", "[/b]hi[b]")
+ //l.Add("[/b]hi[/b]", "[/b]hi[/b]")
+ //l.Add("[b][b]hi[/b]", "hi ")
+ //l.Add("[b][b]hi", "[b][b]hi")
+ //l.Add("[b][b][b]hi", "[b][b][b]hi")
+ //l.Add("[/b]hi", "[/b]hi")
}
- msgList.Add("[code]hi[/code]", "hi ")
- msgList.Add("[code][b]hi[/b][/code]", "[b]hi[/b] ")
- msgList.Add("[code][b]hi[/code][/b]", "[b]hi [/b]")
- msgList.Add("[quote]hi[/quote]", "hi ")
- msgList.Add("[quote][b]hi[/b][/quote]", "hi h https://github.com/Azareal/Gosora ")
- msgList.Add("[url]http://github.com/Azareal/Gosora[/url]", "http://github.com/Azareal/Gosora ")
- msgList.Add("[url]//github.com/Azareal/Gosora[/url]", "//github.com/Azareal/Gosora ")
- msgList.Add("-δ½ ε₯½-", "-δ½ ε₯½-")
- msgList.Add("[i]-δ½ ε₯½-[/i]", "-δ½ ε₯½- ") // TODO: More of these Unicode tests? Emoji, Chinese, etc.?
+ l.Add("[code]hi[/code]", "hi ")
+ l.Add("[code][b]hi[/b][/code]", "[b]hi[/b] ")
+ l.Add("[code][b]hi[/code][/b]", "[b]hi [/b]")
+ l.Add("[quote]hi[/quote]", "hi ")
+ l.Add("[quote][b]hi[/b][/quote]", "hi h https://github.com/Azareal/Gosora ")
+ l.Add("[url]http://github.com/Azareal/Gosora[/url]", "http://github.com/Azareal/Gosora ")
+ l.Add("[url]//github.com/Azareal/Gosora[/url]", "//github.com/Azareal/Gosora ")
+ l.Add("-δ½ ε₯½-", "-δ½ ε₯½-")
+ l.Add("[i]-δ½ ε₯½-[/i]", "-δ½ ε₯½- ") // TODO: More of these Unicode tests? Emoji, Chinese, etc.?
t.Log("Testing bbcodeFullParse")
- for _, item := range msgList.Items {
+ for _, item := range l.Items {
res = bbcodeFullParse(item.Msg)
if res != item.Expects {
t.Error("Testing string '" + item.Msg + "'")
@@ -83,77 +83,26 @@ func TestBBCodeRender(t *testing.T) {
}
}
- var msg string
- var expects string
-
- msg = "[rand][/rand]"
- expects = "[Invalid Number] [rand][/rand]"
- t.Log("Testing string '" + msg + "'")
- res = bbcodeFullParse(msg)
- if res != expects {
- t.Error("Bad output:", "'"+res+"'")
- t.Error("Expected:", "'"+expects+"'")
+ f := func(msg, expects string) {
+ t.Log("Testing string '" + msg + "'")
+ res := bbcodeFullParse(msg)
+ if res != expects {
+ t.Error("Bad output:", "'"+res+"'")
+ t.Error("Expected:", "'"+expects+"'")
+ }
}
+ f("[rand][/rand]","[Invalid Number] [rand][/rand]")
+ f("[rand]-1[/rand]","[No Negative Numbers] [rand]-1[/rand]")
+ f("[rand]-01[/rand]","[No Negative Numbers] [rand]-01[/rand]")
+ f("[rand]NaN[/rand]","[Invalid Number] [rand]NaN[/rand]")
+ f("[rand]Inf[/rand]","[Invalid Number] [rand]Inf[/rand]")
+ f("[rand]+[/rand]","[Invalid Number] [rand]+[/rand]")
+ f("[rand]1+1[/rand]","[Invalid Number] [rand]1+1[/rand]")
- msg = "[rand]-1[/rand]"
- expects = "[No Negative Numbers] [rand]-1[/rand]"
+ msg := "[rand]1[/rand]"
t.Log("Testing string '" + msg + "'")
res = bbcodeFullParse(msg)
- if res != expects {
- t.Error("Bad output:", "'"+res+"'")
- t.Error("Expected:", "'"+expects+"'")
- }
-
- msg = "[rand]-01[/rand]"
- expects = "[No Negative Numbers] [rand]-01[/rand]"
- t.Log("Testing string '" + msg + "'")
- res = bbcodeFullParse(msg)
- if res != expects {
- t.Error("Bad output:", "'"+res+"'")
- t.Error("Expected:", "'"+expects+"'")
- }
-
- msg = "[rand]NaN[/rand]"
- expects = "[Invalid Number] [rand]NaN[/rand]"
- t.Log("Testing string '" + msg + "'")
- res = bbcodeFullParse(msg)
- if res != expects {
- t.Error("Bad output:", "'"+res+"'")
- t.Error("Expected:", "'"+expects+"'")
- }
-
- msg = "[rand]Inf[/rand]"
- expects = "[Invalid Number] [rand]Inf[/rand]"
- t.Log("Testing string '" + msg + "'")
- res = bbcodeFullParse(msg)
- if res != expects {
- t.Error("Bad output:", "'"+res+"'")
- t.Error("Expected:", "'"+expects+"'")
- }
-
- msg = "[rand]+[/rand]"
- expects = "[Invalid Number] [rand]+[/rand]"
- t.Log("Testing string '" + msg + "'")
- res = bbcodeFullParse(msg)
- if res != expects {
- t.Error("Bad output:", "'"+res+"'")
- t.Error("Expected:", "'"+expects+"'")
- }
-
- msg = "[rand]1+1[/rand]"
- expects = "[Invalid Number] [rand]1+1[/rand]"
- t.Log("Testing string '" + msg + "'")
- res = bbcodeFullParse(msg)
- if res != expects {
- t.Error("Bad output:", "'"+res+"'")
- t.Error("Expected:", "'"+expects+"'")
- }
-
- var conv int
- msg = "[rand]1[/rand]"
- t.Log("Testing string '" + msg + "'")
- res = bbcodeFullParse(msg)
- conv, err = strconv.Atoi(res)
+ conv, err := strconv.Atoi(res)
if err != nil || (conv > 1 || conv < 0) {
t.Error("Bad output:", "'"+res+"'")
t.Error("Expected a number in the range 0-1")
@@ -205,7 +154,7 @@ func TestBBCodeRender(t *testing.T) {
}
/*t.Log("Testing bbcode_regex_parse")
- for _, item := range msgList {
+ for _, item := range l.Items {
t.Log("Testing string '" + item.Msg + "'")
res = bbcodeRegexParse(item.Msg)
if res != item.Expects {
@@ -217,94 +166,92 @@ func TestBBCodeRender(t *testing.T) {
func TestMarkdownRender(t *testing.T) {
//t.Skip()
- err := initMarkdown(common.Plugins["markdown"])
+ err := initMarkdown(c.Plugins["markdown"])
if err != nil {
t.Fatal(err)
}
- var res string
- var msgList = &MEPairList{nil}
- var msgList2 = &MEPairList{nil}
+ l := &MEPairList{nil}
+ l2 := &MEPairList{nil}
// TODO: Fix more of these odd cases
- msgList.Add("", "")
- msgList.Add(" ", " ")
- msgList.Add(" ", " ")
- msgList.Add(" ", " ")
- msgList.Add("\t", "\t")
- msgList.Add("\n", "\n")
- msgList.Add("*", "*")
- msgList.Add("`", "`")
- //msgList.Add("**", "h ")
- msgList.Add("**hi**", "hi ")
- msgList.Add("_h_", "h ")
- msgList.Add("_hi_", "hi ")
- msgList.Add("*h*", "h ")
- msgList.Add("*hi*", "hi ")
- msgList.Add("~h~", "h ")
- msgList.Add("~hi~", "hi ")
- msgList.Add("`hi`", "hi ")
+ l.Add("", "")
+ l.Add(" ", " ")
+ l.Add(" ", " ")
+ l.Add(" ", " ")
+ l.Add("\t", "\t")
+ l.Add("\n", "\n")
+ l.Add("*", "*")
+ l.Add("`", "`")
+ //l.Add("**", "h ")
+ l.Add("**hi**", "hi ")
+ l.Add("_h_", "h ")
+ l.Add("_hi_", "hi ")
+ l.Add("*h*", "h ")
+ l.Add("*hi*", "hi ")
+ l.Add("~h~", "h ")
+ l.Add("~hi~", "hi ")
+ l.Add("`hi`", "hi ")
// TODO: Hide the backslash after escaping the item
// TODO: Doesn't behave consistently with d in-front of it
- msgList2.Add("\\`hi`", "\\`hi`")
- msgList2.Add("#", "#")
- msgList2.Add("#h", "h ")
- msgList2.Add("#hi", "hi ")
- msgList2.Add("# hi", "hi ")
- msgList2.Add("# hi", "hi ")
- msgList.Add("\n#", "\n#")
- msgList.Add("\n#h", "\nh ")
- msgList.Add("\n#hi", "\nhi ")
- msgList.Add("\n#h\n", "\nh ")
- msgList.Add("\n#hi\n", "\nhi ")
- msgList.Add("*hi**", "hi *")
- msgList.Add("**hi***", "hi *")
- //msgList.Add("**hi*", "*hi ")
- msgList.Add("***hi***", "hi h h *")
- msgList.Add("\\*\\**h*\\*\\*", "**h **")
- msgList.Add("\\*hi\\*", "*hi*")
- msgList.Add("d\\*hi\\*", "d*hi*")
- msgList.Add("\\*hi\\*d", "*hi*d")
- msgList.Add("d\\*hi\\*d", "d*hi*d")
- msgList.Add("\\", "\\")
- msgList.Add("\\\\", "\\\\")
- msgList.Add("\\d", "\\d")
- msgList.Add("\\\\d", "\\\\d")
- msgList.Add("\\\\\\d", "\\\\\\d")
- msgList.Add("d\\", "d\\")
- msgList.Add("\\d\\", "\\d\\")
- msgList.Add("*_hi_*", "hi hi hi hi ")
- msgList.Add("_~hi~_", "hi hi ")
- msgList.Add("* *", " ")
- msgList.Add("** **", " ")
- msgList.Add("*** ***", " -δ½ ε₯½- ") // TODO: More of these Unicode tests? Emoji, Chinese, etc.?
+ l2.Add("\\`hi`", "\\`hi`")
+ l2.Add("#", "#")
+ l2.Add("#h", "h ")
+ l2.Add("#hi", "hi ")
+ l2.Add("# hi", "hi ")
+ l2.Add("# hi", "hi ")
+ l.Add("\n#", "\n#")
+ l.Add("\n#h", "\nh ")
+ l.Add("\n#hi", "\nhi ")
+ l.Add("\n#h\n", "\nh ")
+ l.Add("\n#hi\n", "\nhi ")
+ l.Add("*hi**", "hi *")
+ l.Add("**hi***", "hi *")
+ //l.Add("**hi*", "*hi ")
+ l.Add("***hi***", "hi h h *")
+ l.Add("\\*\\**h*\\*\\*", "**h **")
+ l.Add("\\*hi\\*", "*hi*")
+ l.Add("d\\*hi\\*", "d*hi*")
+ l.Add("\\*hi\\*d", "*hi*d")
+ l.Add("d\\*hi\\*d", "d*hi*d")
+ l.Add("\\", "\\")
+ l.Add("\\\\", "\\\\")
+ l.Add("\\d", "\\d")
+ l.Add("\\\\d", "\\\\d")
+ l.Add("\\\\\\d", "\\\\\\d")
+ l.Add("d\\", "d\\")
+ l.Add("\\d\\", "\\d\\")
+ l.Add("*_hi_*", "hi hi hi hi ")
+ l.Add("_~hi~_", "hi hi ")
+ l.Add("* *", " ")
+ l.Add("** **", " ")
+ l.Add("*** ***", " -δ½ ε₯½- ") // TODO: More of these Unicode tests? Emoji, Chinese, etc.?
- for _, item := range msgList.Items {
- res = markdownParse(item.Msg)
- if res != item.Expects {
+ for _, item := range l.Items {
+ if res := markdownParse(item.Msg); res != item.Expects {
t.Error("Testing string '" + item.Msg + "'")
t.Error("Bad output:", "'"+res+"'")
//t.Error("Ouput in bytes:", []byte(res))
@@ -312,9 +259,8 @@ func TestMarkdownRender(t *testing.T) {
}
}
- for _, item := range msgList2.Items {
- res = markdownParse(item.Msg)
- if res != item.Expects {
+ for _, item := range l2.Items {
+ if res := markdownParse(item.Msg); res != item.Expects {
t.Error("Testing string '" + item.Msg + "'")
t.Error("Bad output:", "'"+res+"'")
//t.Error("Ouput in bytes:", []byte(res))
@@ -322,9 +268,8 @@ func TestMarkdownRender(t *testing.T) {
}
}
- /*for _, item := range msgList.Items {
- res = markdownParse("\n" + item.Msg)
- if res != "\n"+item.Expects {
+ /*for _, item := range l.Items {
+ if res := markdownParse("\n" + item.Msg); res != "\n"+item.Expects {
t.Error("Testing string '\n" + item.Msg + "'")
t.Error("Bad output:", "'"+res+"'")
//t.Error("Ouput in bytes:", []byte(res))
@@ -332,9 +277,8 @@ func TestMarkdownRender(t *testing.T) {
}
}
- for _, item := range msgList.Items {
- res = markdownParse("\t" + item.Msg)
- if res != "\t"+item.Expects {
+ for _, item := range l.Items {
+ if res := markdownParse("\t" + item.Msg); res != "\t"+item.Expects {
t.Error("Testing string '\t" + item.Msg + "'")
t.Error("Bad output:", "'"+res+"'")
//t.Error("Ouput in bytes:", []byte(res))
@@ -342,9 +286,8 @@ func TestMarkdownRender(t *testing.T) {
}
}*/
- for _, item := range msgList.Items {
- res = markdownParse("d" + item.Msg)
- if res != "d"+item.Expects {
+ for _, item := range l.Items {
+ if res := markdownParse("d" + item.Msg); res != "d"+item.Expects {
t.Error("Testing string 'd" + item.Msg + "'")
t.Error("Bad output:", "'"+res+"'")
//t.Error("Ouput in bytes:", []byte(res))
diff --git a/routes/account.go b/routes/account.go
index 1e9e1648..981c98fe 100644
--- a/routes/account.go
+++ b/routes/account.go
@@ -13,19 +13,19 @@ import (
"strings"
c "github.com/Azareal/Gosora/common"
- "github.com/Azareal/Gosora/common/phrases"
+ p "github.com/Azareal/Gosora/common/phrases"
"github.com/Azareal/Gosora/query_gen"
)
// A blank list to fill out that parameter in Page for routes which don't use it
var tList []interface{}
-func AccountLogin(w http.ResponseWriter, r *http.Request, user c.User, header *c.Header) c.RouteError {
+func AccountLogin(w http.ResponseWriter, r *http.Request, user c.User, h *c.Header) c.RouteError {
if user.Loggedin {
return c.LocalError("You're already logged in.", w, r, user)
}
- header.Title = phrases.GetTitlePhrase("login")
- return renderTemplate("login", w, r, header, c.Page{header, tList, nil})
+ h.Title = p.GetTitlePhrase("login")
+ return renderTemplate("login", w, r, h, c.Page{h, tList, nil})
}
// TODO: Log failed attempted logins?
@@ -141,11 +141,11 @@ func mfaVerifySession(provSession string, signedSession string, uid int) bool {
return subtle.ConstantTimeCompare([]byte(signedSession), []byte(expected)) == 1
}
-func AccountLoginMFAVerify(w http.ResponseWriter, r *http.Request, user c.User, header *c.Header) c.RouteError {
+func AccountLoginMFAVerify(w http.ResponseWriter, r *http.Request, user c.User, h *c.Header) c.RouteError {
if user.Loggedin {
return c.LocalError("You're already logged in.", w, r, user)
}
- header.Title = phrases.GetTitlePhrase("login_mfa_verify")
+ h.Title = p.GetTitlePhrase("login_mfa_verify")
uid, provSession, signedSession, err := mfaGetCookies(r)
if err != nil {
@@ -155,7 +155,7 @@ func AccountLoginMFAVerify(w http.ResponseWriter, r *http.Request, user c.User,
return c.LocalError("Invalid session", w, r, user)
}
- return renderTemplate("login_mfa_verify", w, r, header, c.Page{header, tList, nil})
+ return renderTemplate("login_mfa_verify", w, r, h, c.Page{h, tList, nil})
}
func AccountLoginMFAVerifySubmit(w http.ResponseWriter, r *http.Request, user c.User) c.RouteError {
@@ -182,13 +182,13 @@ func AccountLogout(w http.ResponseWriter, r *http.Request, user c.User) c.RouteE
return nil
}
-func AccountRegister(w http.ResponseWriter, r *http.Request, user c.User, header *c.Header) c.RouteError {
+func AccountRegister(w http.ResponseWriter, r *http.Request, user c.User, h *c.Header) c.RouteError {
if user.Loggedin {
return c.LocalError("You're already logged in.", w, r, user)
}
- header.Title = phrases.GetTitlePhrase("register")
- header.AddScriptAsync("register.js")
- return renderTemplate("register", w, r, header, c.Page{header, tList, nil})
+ h.Title = p.GetTitlePhrase("register")
+ h.AddScriptAsync("register.js")
+ return renderTemplate("register", w, r, h, c.Page{h, tList, nil})
}
func isNumeric(data string) (numeric bool) {
@@ -204,10 +204,10 @@ func AccountRegisterSubmit(w http.ResponseWriter, r *http.Request, user c.User)
headerLite, _ := c.SimpleUserCheck(w, r, &user)
// TODO: Should we push multiple validation errors to the user instead of just one?
- var regSuccess = true
- var regErrMsg = ""
- var regErrReason = ""
- var regError = func(userMsg string, reason string) {
+ regSuccess := true
+ regErrMsg := ""
+ regErrReason := ""
+ regError := func(userMsg string, reason string) {
regSuccess = false
if regErrMsg == "" {
regErrMsg = userMsg
@@ -216,14 +216,14 @@ func AccountRegisterSubmit(w http.ResponseWriter, r *http.Request, user c.User)
}
if r.PostFormValue("tos") != "0" {
- regError(phrases.GetErrorPhrase("register_might_be_machine"), "trap-question")
+ regError(p.GetErrorPhrase("register_might_be_machine"), "trap-question")
}
if !c.Config.DisableJSAntispam {
h := sha256.New()
h.Write([]byte(c.JSTokenBox.Load().(string)))
h.Write([]byte(user.LastIP))
if r.PostFormValue("golden-watch") != hex.EncodeToString(h.Sum(nil)) {
- regError(phrases.GetErrorPhrase("register_might_be_machine"), "js-antispam")
+ regError(p.GetErrorPhrase("register_might_be_machine"), "js-antispam")
}
}
@@ -231,21 +231,20 @@ func AccountRegisterSubmit(w http.ResponseWriter, r *http.Request, user c.User)
// TODO: Add a dedicated function for validating emails
email := c.SanitiseSingleLine(r.PostFormValue("email"))
if username == "" {
- regError(phrases.GetErrorPhrase("register_need_username"), "no-username")
+ regError(p.GetErrorPhrase("register_need_username"), "no-username")
}
if email == "" {
- regError(phrases.GetErrorPhrase("register_need_email"), "no-email")
+ regError(p.GetErrorPhrase("register_need_email"), "no-email")
}
// This is so a numeric name won't interfere with mentioning a user by ID, there might be a better way of doing this like perhaps !@ to mean IDs and @ to mean usernames in the pre-parser
usernameBits := strings.Split(username, " ")
if isNumeric(usernameBits[0]) {
- regError(phrases.GetErrorPhrase("register_first_word_numeric"), "numeric-name")
+ regError(p.GetErrorPhrase("register_first_word_numeric"), "numeric-name")
}
- ok := c.HasSuspiciousEmail(email)
- if ok {
- regError(phrases.GetErrorPhrase("register_suspicious_email"), "suspicious-email")
+ if c.HasSuspiciousEmail(email) {
+ regError(p.GetErrorPhrase("register_suspicious_email"), "suspicious-email")
}
password := r.PostFormValue("password")
@@ -257,7 +256,7 @@ func AccountRegisterSubmit(w http.ResponseWriter, r *http.Request, user c.User)
// Do the two inputted passwords match..?
confirmPassword := r.PostFormValue("confirm_password")
if password != confirmPassword {
- regError(phrases.GetErrorPhrase("register_password_mismatch"), "password-mismatch")
+ regError(p.GetErrorPhrase("register_password_mismatch"), "password-mismatch")
}
}
@@ -290,14 +289,14 @@ func AccountRegisterSubmit(w http.ResponseWriter, r *http.Request, user c.User)
if err != nil {
return c.InternalError(err, w, r)
}
- return c.LocalError(phrases.GetErrorPhrase("register_username_unavailable"), w, r, user)
+ return c.LocalError(p.GetErrorPhrase("register_username_unavailable"), w, r, user)
} else if err == c.ErrLongUsername {
regLog.FailureReason += "username-too-long"
err = regLog.Commit()
if err != nil {
return c.InternalError(err, w, r)
}
- return c.LocalError(phrases.GetErrorPhrase("register_username_too_long_prefix")+strconv.Itoa(c.Config.MaxUsernameLength), w, r, user)
+ return c.LocalError(p.GetErrorPhrase("register_username_too_long_prefix")+strconv.Itoa(c.Config.MaxUsernameLength), w, r, user)
}
regLog.FailureReason += "internal-error"
err2 := regLog.Commit()
@@ -328,7 +327,7 @@ func AccountRegisterSubmit(w http.ResponseWriter, r *http.Request, user c.User)
err = c.SendValidationEmail(username, email, token)
if err != nil {
- return c.LocalError(phrases.GetErrorPhrase("register_email_fail"), w, r, user)
+ return c.LocalError(p.GetErrorPhrase("register_email_fail"), w, r, user)
}
}
@@ -337,11 +336,11 @@ func AccountRegisterSubmit(w http.ResponseWriter, r *http.Request, user c.User)
}
// TODO: Figure a way of making this into middleware?
-func accountEditHead(titlePhrase string, w http.ResponseWriter, r *http.Request, user *c.User, header *c.Header) {
- header.Title = phrases.GetTitlePhrase(titlePhrase)
- header.Path = "/user/edit/"
- header.AddSheet(header.Theme.Name + "/account.css")
- header.AddScriptAsync("account.js")
+func accountEditHead(titlePhrase string, w http.ResponseWriter, r *http.Request, user *c.User, h *c.Header) {
+ h.Title = p.GetTitlePhrase(titlePhrase)
+ h.Path = "/user/edit/"
+ h.AddSheet(h.Theme.Name + "/account.css")
+ h.AddScriptAsync("account.js")
}
func AccountEdit(w http.ResponseWriter, r *http.Request, user c.User, header *c.Header) c.RouteError {
@@ -356,7 +355,7 @@ func AccountEdit(w http.ResponseWriter, r *http.Request, user c.User, header *c.
}
// TODO: Find a more efficient way of doing this
- var mfaSetup = false
+ mfaSetup := false
_, err := c.MFAstore.Get(user.ID)
if err != sql.ErrNoRows && err != nil {
return c.InternalError(err, w, r)
@@ -375,9 +374,9 @@ func AccountEdit(w http.ResponseWriter, r *http.Request, user c.User, header *c.
}
//edit_password
-func AccountEditPassword(w http.ResponseWriter, r *http.Request, user c.User, header *c.Header) c.RouteError {
- accountEditHead("account_password", w, r, &user, header)
- return renderTemplate("account_own_edit_password", w, r, header, c.Page{header, tList, nil})
+func AccountEditPassword(w http.ResponseWriter, r *http.Request, user c.User, h *c.Header) c.RouteError {
+ accountEditHead("account_password", w, r, &user, h)
+ return renderTemplate("account_own_edit_password", w, r, h, c.Page{h, tList, nil})
}
// TODO: Require re-authentication if the user hasn't logged in in a while
@@ -479,8 +478,8 @@ func AccountEditUsernameSubmit(w http.ResponseWriter, r *http.Request, user c.Us
return nil
}
-func AccountEditMFA(w http.ResponseWriter, r *http.Request, user c.User, header *c.Header) c.RouteError {
- accountEditHead("account_mfa", w, r, &user, header)
+func AccountEditMFA(w http.ResponseWriter, r *http.Request, user c.User, h *c.Header) c.RouteError {
+ accountEditHead("account_mfa", w, r, &user, h)
mfaItem, err := c.MFAstore.Get(user.ID)
if err != sql.ErrNoRows && err != nil {
@@ -489,13 +488,13 @@ func AccountEditMFA(w http.ResponseWriter, r *http.Request, user c.User, header
return c.LocalError("Two-factor authentication hasn't been setup on your account", w, r, user)
}
- pi := c.Page{header, tList, mfaItem.Scratch}
- return renderTemplate("account_own_edit_mfa", w, r, header, pi)
+ pi := c.Page{h, tList, mfaItem.Scratch}
+ return renderTemplate("account_own_edit_mfa", w, r, h, pi)
}
// If not setup, generate a string, otherwise give an option to disable mfa given the right code
-func AccountEditMFASetup(w http.ResponseWriter, r *http.Request, user c.User, header *c.Header) c.RouteError {
- accountEditHead("account_mfa_setup", w, r, &user, header)
+func AccountEditMFASetup(w http.ResponseWriter, r *http.Request, user c.User, h *c.Header) c.RouteError {
+ accountEditHead("account_mfa_setup", w, r, &user, h)
// Flash an error if mfa is already setup
_, err := c.MFAstore.Get(user.ID)
@@ -511,8 +510,8 @@ func AccountEditMFASetup(w http.ResponseWriter, r *http.Request, user c.User, he
return c.InternalError(err, w, r)
}
- pi := c.Page{header, tList, c.FriendlyGAuthSecret(code)}
- return renderTemplate("account_own_edit_mfa_setup", w, r, header, pi)
+ pi := c.Page{h, tList, c.FriendlyGAuthSecret(code)}
+ return renderTemplate("account_own_edit_mfa_setup", w, r, h, pi)
}
// Form should bounce the random mfa secret back and the otp to be verified server-side to reduce the chances of a bug arising on the JS side which makes every code mismatch
@@ -530,8 +529,8 @@ func AccountEditMFASetupSubmit(w http.ResponseWriter, r *http.Request, user c.Us
return c.LocalError("You have already setup two-factor authentication", w, r, user)
}
- var code = r.PostFormValue("code")
- var otp = r.PostFormValue("otp")
+ code := r.PostFormValue("code")
+ otp := r.PostFormValue("otp")
ok, err := c.VerifyGAuthToken(code, otp)
if err != nil {
//fmt.Println("err: ", err)
@@ -576,8 +575,8 @@ func AccountEditMFADisableSubmit(w http.ResponseWriter, r *http.Request, user c.
return nil
}
-func AccountEditEmail(w http.ResponseWriter, r *http.Request, user c.User, header *c.Header) c.RouteError {
- accountEditHead("account_email", w, r, &user, header)
+func AccountEditEmail(w http.ResponseWriter, r *http.Request, user c.User, h *c.Header) c.RouteError {
+ accountEditHead("account_email", w, r, &user, h)
emails, err := c.Emails.GetEmailsByUser(&user)
if err != nil {
return c.InternalError(err, w, r)
@@ -586,22 +585,18 @@ func AccountEditEmail(w http.ResponseWriter, r *http.Request, user c.User, heade
// Was this site migrated from another forum software? Most of them don't have multiple emails for a single user.
// This also applies when the admin switches site.EnableEmails on after having it off for a while.
if len(emails) == 0 {
- email := c.Email{UserID: user.ID}
- email.Email = user.Email
- email.Validated = false
- email.Primary = true
- emails = append(emails, email)
+ emails = append(emails, c.Email{UserID: user.ID, Email: user.Email, Validated: false, Primary: true})
}
if !c.Site.EnableEmails {
- header.AddNotice("account_mail_disabled")
+ h.AddNotice("account_mail_disabled")
}
if r.FormValue("verified") == "1" {
- header.AddNotice("account_mail_verify_success")
+ h.AddNotice("account_mail_verify_success")
}
- pi := c.Account{header, "edit_emails", "account_own_edit_email", c.EmailListPage{header, emails}}
- return renderTemplate("account", w, r, header, pi)
+ pi := c.Account{h, "edit_emails", "account_own_edit_email", c.EmailListPage{h, emails}}
+ return renderTemplate("account", w, r, h, pi)
}
// TODO: Should we make this an AnonAction so someone can do this without being logged in?
@@ -649,9 +644,8 @@ func AccountEditEmailTokenSubmit(w http.ResponseWriter, r *http.Request, user c.
return nil
}
-func AccountLogins(w http.ResponseWriter, r *http.Request, user c.User, header *c.Header) c.RouteError {
- accountEditHead("account_logins", w, r, &user, header)
-
+func AccountLogins(w http.ResponseWriter, r *http.Request, user c.User, h *c.Header) c.RouteError {
+ accountEditHead("account_logins", w, r, &user, h)
logCount := c.LoginLogs.CountUser(user.ID)
page, _ := strconv.Atoi(r.FormValue("page"))
perPage := 12
@@ -663,15 +657,15 @@ func AccountLogins(w http.ResponseWriter, r *http.Request, user c.User, header *
}
pageList := c.Paginate(page, lastPage, 5)
- pi := c.Account{header, "logins", "account_logins", c.AccountLoginsPage{header, logs, c.Paginator{pageList, page, lastPage}}}
- return renderTemplate("account", w, r, header, pi)
+ pi := c.Account{h, "logins", "account_logins", c.AccountLoginsPage{h, logs, c.Paginator{pageList, page, lastPage}}}
+ return renderTemplate("account", w, r, h, pi)
}
-func LevelList(w http.ResponseWriter, r *http.Request, user c.User, header *c.Header) c.RouteError {
- header.Title = phrases.GetTitlePhrase("account_level_list")
+func LevelList(w http.ResponseWriter, r *http.Request, user c.User, h *c.Header) c.RouteError {
+ h.Title = p.GetTitlePhrase("account_level_list")
- var fScores = c.GetLevels(20)
- var levels = make([]c.LevelListItem, len(fScores))
+ fScores := c.GetLevels(20)
+ levels := make([]c.LevelListItem, len(fScores))
for i, fScore := range fScores {
var status string
if user.Level > i {
@@ -686,25 +680,25 @@ func LevelList(w http.ResponseWriter, r *http.Request, user c.User, header *c.He
levels[i] = c.LevelListItem{i, iScore, status, perc * 2}
}
- return renderTemplate("level_list", w, r, header, c.LevelListPage{header, levels[1:]})
+ return renderTemplate("level_list", w, r, h, c.LevelListPage{h, levels[1:]})
}
-func Alerts(w http.ResponseWriter, r *http.Request, user c.User, header *c.Header) c.RouteError {
+func Alerts(w http.ResponseWriter, r *http.Request, user c.User, h *c.Header) c.RouteError {
return nil
}
-func AccountPasswordReset(w http.ResponseWriter, r *http.Request, user c.User, header *c.Header) c.RouteError {
+func AccountPasswordReset(w http.ResponseWriter, r *http.Request, user c.User, h *c.Header) c.RouteError {
if user.Loggedin {
return c.LocalError("You're already logged in.", w, r, user)
}
if !c.Site.EnableEmails {
- return c.LocalError(phrases.GetNoticePhrase("account_mail_disabled"), w, r, user)
+ return c.LocalError(p.GetNoticePhrase("account_mail_disabled"), w, r, user)
}
if r.FormValue("email_sent") == "1" {
- header.AddNotice("password_reset_email_sent")
+ h.AddNotice("password_reset_email_sent")
}
- header.Title = phrases.GetTitlePhrase("password_reset")
- return renderTemplate("password_reset", w, r, header, c.Page{header, tList, nil})
+ h.Title = p.GetTitlePhrase("password_reset")
+ return renderTemplate("password_reset", w, r, h, c.Page{h, tList, nil})
}
// TODO: Ratelimit this
@@ -713,7 +707,7 @@ func AccountPasswordResetSubmit(w http.ResponseWriter, r *http.Request, user c.U
return c.LocalError("You're already logged in.", w, r, user)
}
if !c.Site.EnableEmails {
- return c.LocalError(phrases.GetNoticePhrase("account_mail_disabled"), w, r, user)
+ return c.LocalError(p.GetNoticePhrase("account_mail_disabled"), w, r, user)
}
username := r.PostFormValue("username")
@@ -767,9 +761,9 @@ func AccountPasswordResetSubmit(w http.ResponseWriter, r *http.Request, user c.U
schema = "s"
}
- err = c.SendEmail(tuser.Email, phrases.GetTmplPhrase("password_reset_subject"), phrases.GetTmplPhrasef("password_reset_body", tuser.Name, "http"+schema+"://"+c.Site.URL+"/accounts/password-reset/token/?uid="+strconv.Itoa(tuser.ID)+"&token="+token))
+ err = c.SendEmail(tuser.Email, p.GetTmplPhrase("password_reset_subject"), p.GetTmplPhrasef("password_reset_body", tuser.Name, "http"+schema+"://"+c.Site.URL+"/accounts/password-reset/token/?uid="+strconv.Itoa(tuser.ID)+"&token="+token))
if err != nil {
- return c.LocalError(phrases.GetErrorPhrase("password_reset_email_fail"), w, r, user)
+ return c.LocalError(p.GetErrorPhrase("password_reset_email_fail"), w, r, user)
}
http.Redirect(w, r, "/accounts/password-reset/?email_sent=1", http.StatusSeeOther)
@@ -804,7 +798,7 @@ func AccountPasswordResetToken(w http.ResponseWriter, r *http.Request, user c.Us
}
mfa := err != sql.ErrNoRows
- header.Title = phrases.GetTitlePhrase("password_reset_token")
+ header.Title = p.GetTitlePhrase("password_reset_token")
return renderTemplate("password_reset_token", w, r, header, c.ResetPage{header, uid, html.EscapeString(token), mfa})
}
@@ -812,8 +806,6 @@ func AccountPasswordResetTokenSubmit(w http.ResponseWriter, r *http.Request, use
if user.Loggedin {
return c.LocalError("You're already logged in.", w, r, user)
}
-
- token := r.FormValue("token")
uid, err := strconv.Atoi(r.FormValue("uid"))
if err != nil {
return c.LocalError("Invalid uid", w, r, user)
@@ -822,6 +814,7 @@ func AccountPasswordResetTokenSubmit(w http.ResponseWriter, r *http.Request, use
return c.LocalError("This reset token has expired.", w, r, user)
}
+ token := r.FormValue("token")
err = c.PasswordResetter.ValidateToken(uid, token)
if err == sql.ErrNoRows || err == c.ErrBadResetToken {
return c.LocalError("This reset token has expired.", w, r, user)
diff --git a/routes/convos.go b/routes/convos.go
index 42428f8c..97f09b9c 100644
--- a/routes/convos.go
+++ b/routes/convos.go
@@ -6,17 +6,18 @@ import (
"net/http"
"strconv"
"strings"
+
//"log"
c "github.com/Azareal/Gosora/common"
p "github.com/Azareal/Gosora/common/phrases"
)
-func Convos(w http.ResponseWriter, r *http.Request, user c.User, header *c.Header) c.RouteError {
- accountEditHead("convos", w, r, &user, header)
- header.AddScript("convo.js")
- header.AddSheet(header.Theme.Name + "/convo.css")
- header.AddNotice("convo_dev")
+func Convos(w http.ResponseWriter, r *http.Request, user c.User, h *c.Header) c.RouteError {
+ accountEditHead("convos", w, r, &user, h)
+ h.AddScript("convo.js")
+ h.AddSheet(h.Theme.Name + "/convo.css")
+ h.AddNotice("convo_dev")
ccount := c.Convos.GetUserCount(user.ID)
page, _ := strconv.Atoi(r.FormValue("page"))
offset, page, lastPage := c.PageOffset(ccount, page, c.Config.ItemsPerPage)
@@ -25,13 +26,13 @@ func Convos(w http.ResponseWriter, r *http.Request, user c.User, header *c.Heade
convos, err := c.Convos.GetUserExtra(user.ID, offset)
//log.Printf("convos: %+v\n", convos)
if err == sql.ErrNoRows {
- return c.NotFound(w, r, header)
+ return c.NotFound(w, r, h)
} else if err != nil {
return c.InternalError(err, w, r)
}
- pi := c.Account{header, "dashboard", "convos", c.ConvoListPage{header, convos, c.Paginator{pageList, page, lastPage}}}
- return renderTemplate("account", w, r, header, pi)
+ pi := c.Account{h, "dashboard", "convos", c.ConvoListPage{h, convos, c.Paginator{pageList, page, lastPage}}}
+ return renderTemplate("account", w, r, h, pi)
}
func Convo(w http.ResponseWriter, r *http.Request, user c.User, header *c.Header, scid string) c.RouteError {
@@ -99,12 +100,12 @@ func Convo(w http.ResponseWriter, r *http.Request, user c.User, header *c.Header
return renderTemplate("account", w, r, header, pi)
}
-func ConvosCreate(w http.ResponseWriter, r *http.Request, user c.User, header *c.Header) c.RouteError {
- accountEditHead("create_convo", w, r, &user, header)
- header.AddNotice("convo_dev")
+func ConvosCreate(w http.ResponseWriter, r *http.Request, user c.User, h *c.Header) c.RouteError {
+ accountEditHead("create_convo", w, r, &user, h)
+ h.AddNotice("convo_dev")
recpName := ""
- pi := c.Account{header, "dashboard", "create_convo", c.ConvoCreatePage{header, recpName}}
- return renderTemplate("account", w, r, header, pi)
+ pi := c.Account{h, "dashboard", "create_convo", c.ConvoCreatePage{h, recpName}}
+ return renderTemplate("account", w, r, h, pi)
}
func ConvosCreateSubmit(w http.ResponseWriter, r *http.Request, user c.User) c.RouteError {
@@ -112,7 +113,7 @@ func ConvosCreateSubmit(w http.ResponseWriter, r *http.Request, user c.User) c.R
if ferr != nil {
return ferr
}
- if user.IsBanned {
+ if !user.Perms.UseConvos {
return c.NoPermissions(w, r, user)
}
@@ -131,6 +132,10 @@ func ConvosCreateSubmit(w http.ResponseWriter, r *http.Request, user c.User) c.R
} else if err != nil {
return c.InternalError(err, w, r)
}
+ // TODO: Should we kick them out of existing conversations if they're moved into a group without permission or the permission is revoked from their group? We might want to give them a chance to delete their messages though to avoid privacy headaches here and it may only be temporarily to tackle a specific incident.
+ if !u.Perms.UseConvos {
+ return c.LocalError("One of the recipients doesn't have permission to use the conversations system", w, r, user)
+ }
rlist = append(rlist, u.ID)
}
@@ -168,7 +173,7 @@ func ConvosCreateReplySubmit(w http.ResponseWriter, r *http.Request, user c.User
if ferr != nil {
return ferr
}
- if user.IsBanned {
+ if !user.Perms.UseConvos {
return c.NoPermissions(w, r, user)
}
cid, err := strconv.Atoi(scid)
@@ -263,6 +268,9 @@ func ConvosEditReplySubmit(w http.ResponseWriter, r *http.Request, user c.User,
if err != nil {
return c.LocalError(p.GetErrorPhrase("id_must_be_integer"), w, r, user)
}
+ if !user.Perms.UseConvos {
+ return c.NoPermissions(w, r, user)
+ }
js := (r.PostFormValue("js") == "1")
post := &c.ConversationPost{ID: cpid}
diff --git a/routes/forum_list.go b/routes/forum_list.go
index 2f241d68..e4e0e4e7 100644
--- a/routes/forum_list.go
+++ b/routes/forum_list.go
@@ -38,15 +38,15 @@ func ForumList(w http.ResponseWriter, r *http.Request, user c.User, header *c.He
var forumList []c.Forum
for _, fid := range canSee {
// Avoid data races by copying the struct into something we can freely mold without worrying about breaking something somewhere else
- var forum = c.Forums.DirtyGet(fid).Copy()
- if forum.ParentID == 0 && forum.Name != "" && forum.Active {
- if forum.LastTopicID != 0 {
- if forum.LastTopic.ID != 0 && forum.LastReplyer.ID != 0 {
- forum.LastTopicTime = c.RelativeTime(forum.LastTopic.LastReplyAt)
+ f := c.Forums.DirtyGet(fid).Copy()
+ if f.ParentID == 0 && f.Name != "" && f.Active {
+ if f.LastTopicID != 0 {
+ if f.LastTopic.ID != 0 && f.LastReplyer.ID != 0 {
+ f.LastTopicTime = c.RelativeTime(f.LastTopic.LastReplyAt)
}
}
- header.Hooks.Hook("forums_frow_assign", &forum)
- forumList = append(forumList, forum)
+ header.Hooks.Hook("forums_frow_assign", &f)
+ forumList = append(forumList, f)
}
}
diff --git a/routes/misc.go b/routes/misc.go
index 8cdac1e8..143282b7 100644
--- a/routes/misc.go
+++ b/routes/misc.go
@@ -52,28 +52,28 @@ func StaticFile(w http.ResponseWriter, r *http.Request) {
// Other options instead of io.Copy: io.CopyN(), w.Write(), http.ServeContent()
}
-func Overview(w http.ResponseWriter, r *http.Request, user c.User, header *c.Header) c.RouteError {
- header.Title = phrases.GetTitlePhrase("overview")
- header.Zone = "overview"
- return renderTemplate("overview", w, r, header, c.Page{header, tList, nil})
+func Overview(w http.ResponseWriter, r *http.Request, user c.User, h *c.Header) c.RouteError {
+ h.Title = phrases.GetTitlePhrase("overview")
+ h.Zone = "overview"
+ return renderTemplate("overview", w, r, h, c.Page{h, tList, nil})
}
-func CustomPage(w http.ResponseWriter, r *http.Request, user c.User, header *c.Header, name string) c.RouteError {
- header.Zone = "custom_page"
+func CustomPage(w http.ResponseWriter, r *http.Request, user c.User, h *c.Header, name string) c.RouteError {
+ h.Zone = "custom_page"
name = c.SanitiseSingleLine(name)
page, err := c.Pages.GetByName(name)
if err == nil {
- header.Title = page.Title
- return renderTemplate("custom_page", w, r, header, c.CustomPagePage{header, page})
+ h.Title = page.Title
+ return renderTemplate("custom_page", w, r, h, c.CustomPagePage{h, page})
} else if err != sql.ErrNoRows {
return c.InternalError(err, w, r)
}
- header.Title = phrases.GetTitlePhrase("page")
+ h.Title = phrases.GetTitlePhrase("page")
// TODO: Pass the page name to the pre-render hook?
- err = renderTemplate3("page_"+name, "tmpl_page", w, r, header, c.Page{header, tList, nil})
+ err = renderTemplate3("page_"+name, "tmpl_page", w, r, h, c.Page{h, tList, nil})
if err == c.ErrBadDefaultTemplate {
- return c.NotFound(w, r, header)
+ return c.NotFound(w, r, h)
} else if err != nil {
return c.InternalError(err, w, r)
}
@@ -84,7 +84,7 @@ func CustomPage(w http.ResponseWriter, r *http.Request, user c.User, header *c.H
func ChangeTheme(w http.ResponseWriter, r *http.Request, user c.User) c.RouteError {
//headerLite, _ := SimpleUserCheck(w, r, &user)
// TODO: Rename js to something else, just in case we rewrite the JS side in WebAssembly?
- js := (r.PostFormValue("js") == "1")
+ js := r.PostFormValue("js") == "1"
newTheme := c.SanitiseSingleLine(r.PostFormValue("newTheme"))
theme, ok := c.Themes[newTheme]
diff --git a/routes/panel/groups.go b/routes/panel/groups.go
index 09e33cc1..78158d23 100644
--- a/routes/panel/groups.go
+++ b/routes/panel/groups.go
@@ -80,7 +80,7 @@ func GroupsEdit(w http.ResponseWriter, r *http.Request, user c.User, sgid string
//log.Print("aaaaa monsters")
return c.NotFound(w, r, basePage.Header)
}
- ferr = groupCheck(w,r,user,g,err)
+ ferr = groupCheck(w, r, user, g, err)
if ferr != nil {
return ferr
}
@@ -122,7 +122,7 @@ func GroupsEditPromotions(w http.ResponseWriter, r *http.Request, user c.User, s
//log.Print("aaaaa monsters")
return c.NotFound(w, r, basePage.Header)
}
- ferr = groupCheck(w,r,user,g,err)
+ ferr = groupCheck(w, r, user, g, err)
if ferr != nil {
return ferr
}
@@ -343,6 +343,7 @@ func GroupsEditPerms(w http.ResponseWriter, r *http.Request, user c.User, sgid s
addGlobalPerm("ViewIPs", g.Perms.ViewIPs)
addGlobalPerm("UploadFiles", g.Perms.UploadFiles)
addGlobalPerm("UploadAvatars", g.Perms.UploadAvatars)
+ addGlobalPerm("UseConvos", g.Perms.UseConvos)
pi := c.PanelEditGroupPermsPage{basePage, g.ID, g.Name, localPerms, globalPerms}
return renderTemplate("panel_group_edit_perms", w, r, basePage.Header, pi)
diff --git a/routes/panel/settings.go b/routes/panel/settings.go
index fc90a635..3cb81ff4 100644
--- a/routes/panel/settings.go
+++ b/routes/panel/settings.go
@@ -7,7 +7,7 @@ import (
"strings"
c "github.com/Azareal/Gosora/common"
- "github.com/Azareal/Gosora/common/phrases"
+ p "github.com/Azareal/Gosora/common/phrases"
)
func Settings(w http.ResponseWriter, r *http.Request, user c.User) c.RouteError {
@@ -24,33 +24,34 @@ func Settings(w http.ResponseWriter, r *http.Request, user c.User) c.RouteError
if err != nil {
return c.InternalError(err, w, r)
}
- settingPhrases := phrases.GetAllSettingPhrases()
+ settingPhrases := p.GetAllSettingPhrases()
var settingList []*c.PanelSetting
for _, settingPtr := range settings {
- setting := settingPtr.Copy()
- if setting.Type == "list" {
- llist := settingPhrases[setting.Name+"_label"]
+ s := settingPtr.Copy()
+ if s.Type == "list" {
+ llist := settingPhrases[s.Name+"_label"]
labels := strings.Split(llist, ",")
- conv, err := strconv.Atoi(setting.Content)
+ conv, err := strconv.Atoi(s.Content)
if err != nil {
- return c.LocalError("The setting '"+setting.Name+"' can't be converted to an integer", w, r, user)
+ return c.LocalError("The setting '"+s.Name+"' can't be converted to an integer", w, r, user)
}
- setting.Content = labels[conv-1]
- } else if setting.Type == "bool" {
- if setting.Content == "1" {
- setting.Content = "Yes"
+ s.Content = labels[conv-1]
+ // TODO: Localise this
+ } else if s.Type == "bool" {
+ if s.Content == "1" {
+ s.Content = "Yes"
} else {
- setting.Content = "No"
+ s.Content = "No"
}
- } else if setting.Type == "html-attribute" {
- setting.Type = "textarea"
+ } else if s.Type == "html-attribute" {
+ s.Type = "textarea"
}
- settingList = append(settingList, &c.PanelSetting{setting, phrases.GetSettingPhrase(setting.Name)})
+ settingList = append(settingList, &c.PanelSetting{s, p.GetSettingPhrase(s.Name)})
}
pi := c.PanelPage{basePage, tList, settingList}
- return renderTemplate("panel", w, r, basePage.Header, c.Panel{basePage,"","","panel_settings",&pi})
+ return renderTemplate("panel", w, r, basePage.Header, c.Panel{basePage, "", "", "panel_settings", &pi})
}
func SettingEdit(w http.ResponseWriter, r *http.Request, user c.User, sname string) c.RouteError {
@@ -71,7 +72,7 @@ func SettingEdit(w http.ResponseWriter, r *http.Request, user c.User, sname stri
var itemList []c.OptionLabel
if setting.Type == "list" {
- llist := phrases.GetSettingPhrase(setting.Name + "_label")
+ llist := p.GetSettingPhrase(setting.Name + "_label")
conv, err := strconv.Atoi(setting.Content)
if err != nil {
return c.LocalError("The value of this setting couldn't be converted to an integer", w, r, user)
@@ -88,9 +89,9 @@ func SettingEdit(w http.ResponseWriter, r *http.Request, user c.User, sname stri
setting.Type = "textarea"
}
- pSetting := &c.PanelSetting{setting, phrases.GetSettingPhrase(setting.Name)}
+ pSetting := &c.PanelSetting{setting, p.GetSettingPhrase(setting.Name)}
pi := c.PanelSettingPage{basePage, itemList, pSetting}
- return renderTemplate("panel", w, r, basePage.Header, c.Panel{basePage,"","","panel_setting",&pi})
+ return renderTemplate("panel", w, r, basePage.Header, c.Panel{basePage, "", "", "panel_setting", &pi})
}
func SettingEditSubmit(w http.ResponseWriter, r *http.Request, user c.User, sname string) c.RouteError {
diff --git a/routes/panel/themes.go b/routes/panel/themes.go
index 7d339dfe..de1a2327 100644
--- a/routes/panel/themes.go
+++ b/routes/panel/themes.go
@@ -34,7 +34,7 @@ func Themes(w http.ResponseWriter, r *http.Request, user c.User) c.RouteError {
}
pi := c.PanelThemesPage{basePage, pThemeList, vThemeList}
- return renderTemplate("panel", w, r, basePage.Header, c.Panel{basePage,"panel_themes","","panel_themes",&pi})
+ return renderTemplate("panel", w, r, basePage.Header, c.Panel{basePage, "panel_themes", "", "panel_themes", &pi})
}
func ThemesSetDefault(w http.ResponseWriter, r *http.Request, user c.User, uname string) c.RouteError {
@@ -74,7 +74,7 @@ func ThemesMenus(w http.ResponseWriter, r *http.Request, user c.User) c.RouteErr
var menuList []c.PanelMenuListItem
for mid, list := range c.Menus.GetAllMap() {
- var name = ""
+ name := ""
if mid == 1 {
name = p.GetTmplPhrase("panel_themes_menus_main")
}
@@ -85,7 +85,7 @@ func ThemesMenus(w http.ResponseWriter, r *http.Request, user c.User) c.RouteErr
})
}
- return renderTemplate("panel", w, r, basePage.Header, c.Panel{basePage,"","","panel_themes_menus", &c.PanelMenuListPage{basePage, menuList}})
+ return renderTemplate("panel", w, r, basePage.Header, c.Panel{basePage, "", "", "panel_themes_menus", &c.PanelMenuListPage{basePage, menuList}})
}
func ThemesMenusEdit(w http.ResponseWriter, r *http.Request, user c.User, smid string) c.RouteError {
@@ -132,7 +132,7 @@ func ThemesMenusEdit(w http.ResponseWriter, r *http.Request, user c.User, smid s
menuList = append(menuList, item)
}
- return renderTemplate("panel", w, r, basePage.Header, c.Panel{basePage,"","","panel_themes_menus_items", &c.PanelMenuPage{basePage, mid, menuList}})
+ return renderTemplate("panel", w, r, basePage.Header, c.Panel{basePage, "", "", "panel_themes_menus_items", &c.PanelMenuPage{basePage, mid, menuList}})
}
func ThemesMenuItemEdit(w http.ResponseWriter, r *http.Request, user c.User, sitemID string) c.RouteError {
@@ -157,53 +157,53 @@ func ThemesMenuItemEdit(w http.ResponseWriter, r *http.Request, user c.User, sit
return c.InternalError(err, w, r)
}
- return renderTemplate("panel", w, r, basePage.Header, c.Panel{basePage,"","","panel_themes_menus_item_edit", &c.PanelMenuItemPage{basePage, menuItem}})
+ return renderTemplate("panel", w, r, basePage.Header, c.Panel{basePage, "", "", "panel_themes_menus_item_edit", &c.PanelMenuItemPage{basePage, menuItem}})
}
-func themesMenuItemSetters(r *http.Request, mItem c.MenuItem) c.MenuItem {
+func themesMenuItemSetters(r *http.Request, i c.MenuItem) c.MenuItem {
getItem := func(name string) string {
return c.SanitiseSingleLine(r.PostFormValue("item-" + name))
}
- mItem.Name = getItem("name")
- mItem.HTMLID = getItem("htmlid")
- mItem.CSSClass = getItem("cssclass")
- mItem.Position = getItem("position")
- if mItem.Position != "left" && mItem.Position != "right" {
- mItem.Position = "left"
+ i.Name = getItem("name")
+ i.HTMLID = getItem("htmlid")
+ i.CSSClass = getItem("cssclass")
+ i.Position = getItem("position")
+ if i.Position != "left" && i.Position != "right" {
+ i.Position = "left"
}
- mItem.Path = getItem("path")
- mItem.Aria = getItem("aria")
- mItem.Tooltip = getItem("tooltip")
- mItem.TmplName = getItem("tmplname")
+ i.Path = getItem("path")
+ i.Aria = getItem("aria")
+ i.Tooltip = getItem("tooltip")
+ i.TmplName = getItem("tmplname")
switch getItem("permissions") {
case "everyone":
- mItem.GuestOnly = false
- mItem.MemberOnly = false
- mItem.SuperModOnly = false
- mItem.AdminOnly = false
+ i.GuestOnly = false
+ i.MemberOnly = false
+ i.SuperModOnly = false
+ i.AdminOnly = false
case "guest-only":
- mItem.GuestOnly = true
- mItem.MemberOnly = false
- mItem.SuperModOnly = false
- mItem.AdminOnly = false
+ i.GuestOnly = true
+ i.MemberOnly = false
+ i.SuperModOnly = false
+ i.AdminOnly = false
case "member-only":
- mItem.GuestOnly = false
- mItem.MemberOnly = true
- mItem.SuperModOnly = false
- mItem.AdminOnly = false
+ i.GuestOnly = false
+ i.MemberOnly = true
+ i.SuperModOnly = false
+ i.AdminOnly = false
case "supermod-only":
- mItem.GuestOnly = false
- mItem.MemberOnly = true
- mItem.SuperModOnly = true
- mItem.AdminOnly = false
+ i.GuestOnly = false
+ i.MemberOnly = true
+ i.SuperModOnly = true
+ i.AdminOnly = false
case "admin-only":
- mItem.GuestOnly = false
- mItem.MemberOnly = true
- mItem.SuperModOnly = true
- mItem.AdminOnly = true
+ i.GuestOnly = false
+ i.MemberOnly = true
+ i.SuperModOnly = true
+ i.AdminOnly = true
}
- return mItem
+ return i
}
func ThemesMenuItemEditSubmit(w http.ResponseWriter, r *http.Request, user c.User, sitemID string) c.RouteError {
@@ -211,7 +211,7 @@ func ThemesMenuItemEditSubmit(w http.ResponseWriter, r *http.Request, user c.Use
if ferr != nil {
return ferr
}
- js := (r.PostFormValue("js") == "1")
+ js := r.PostFormValue("js") == "1"
if !user.Perms.ManageThemes {
return c.NoPermissionsJSQ(w, r, user, js)
}
@@ -243,7 +243,7 @@ func ThemesMenuItemCreateSubmit(w http.ResponseWriter, r *http.Request, user c.U
return ferr
}
- js := (r.PostFormValue("js") == "1")
+ js := r.PostFormValue("js") == "1"
if !user.Perms.ManageThemes {
return c.NoPermissionsJSQ(w, r, user, js)
}
@@ -270,7 +270,7 @@ func ThemesMenuItemDeleteSubmit(w http.ResponseWriter, r *http.Request, user c.U
if ferr != nil {
return ferr
}
- js := (r.PostFormValue("js") == "1")
+ js := r.PostFormValue("js") == "1"
if !user.Perms.ManageThemes {
return c.NoPermissionsJSQ(w, r, user, js)
}
@@ -299,7 +299,7 @@ func ThemesMenuItemOrderSubmit(w http.ResponseWriter, r *http.Request, user c.Us
if ferr != nil {
return ferr
}
- js := (r.PostFormValue("js") == "1")
+ js := r.PostFormValue("js") == "1"
if !user.Perms.ManageThemes {
return c.NoPermissionsJSQ(w, r, user, js)
}
@@ -341,14 +341,14 @@ func ThemesWidgets(w http.ResponseWriter, r *http.Request, user c.User) c.RouteE
}
basePage.Header.AddScript("widgets.js")
- var docks = make(map[string][]c.WidgetEdit)
+ docks := make(map[string][]c.WidgetEdit)
for _, name := range c.GetDockList() {
if name == "leftOfNav" || name == "rightOfNav" {
continue
}
var widgets []c.WidgetEdit
for _, widget := range c.GetDock(name) {
- var data = make(map[string]string)
+ data := make(map[string]string)
err := json.Unmarshal([]byte(widget.RawBody), &data)
if err != nil {
return c.InternalError(err, w, r)
@@ -359,12 +359,12 @@ func ThemesWidgets(w http.ResponseWriter, r *http.Request, user c.User) c.RouteE
}
pi := c.PanelWidgetListPage{basePage, docks, c.WidgetEdit{&c.Widget{ID: 0, Type: "simple"}, make(map[string]string)}}
- return renderTemplate("panel", w, r, basePage.Header, c.Panel{basePage,"","","panel_themes_widgets", pi})
+ return renderTemplate("panel", w, r, basePage.Header, c.Panel{basePage, "", "", "panel_themes_widgets", pi})
}
func widgetsParseInputs(r *http.Request, widget *c.Widget) (*c.WidgetEdit, error) {
- var data = make(map[string]string)
- widget.Enabled = (r.FormValue("wenabled") == "1")
+ data := make(map[string]string)
+ widget.Enabled = r.FormValue("wenabled") == "1"
widget.Location = r.FormValue("wlocation")
if widget.Location == "" {
return nil, errors.New("You need to specify a location for this widget.")
@@ -374,7 +374,7 @@ func widgetsParseInputs(r *http.Request, widget *c.Widget) (*c.WidgetEdit, error
return nil, errors.New("The widget dock you specified doesn't exist.")
}
- var wtype = r.FormValue("wtype")
+ wtype := r.FormValue("wtype")
switch wtype {
case "simple", "about":
data["Name"] = r.FormValue("wname")
@@ -402,7 +402,7 @@ func ThemesWidgetsEditSubmit(w http.ResponseWriter, r *http.Request, user c.User
if ferr != nil {
return ferr
}
- js := (r.PostFormValue("js") == "1")
+ js := r.PostFormValue("js") == "1"
if !user.Perms.ManageThemes {
return c.NoPermissionsJSQ(w, r, user, js)
}
@@ -435,7 +435,7 @@ func ThemesWidgetsEditSubmit(w http.ResponseWriter, r *http.Request, user c.User
// ThemesWidgetsCreateSubmit is an action which is triggered when someone sends a create request for a widget
func ThemesWidgetsCreateSubmit(w http.ResponseWriter, r *http.Request, user c.User) c.RouteError {
//fmt.Println("in ThemesWidgetsCreateSubmit")
- js := (r.PostFormValue("js") == "1")
+ js := r.PostFormValue("js") == "1"
_, ferr := c.SimplePanelUserCheck(w, r, &user)
if ferr != nil {
return ferr
@@ -462,7 +462,7 @@ func ThemesWidgetsDeleteSubmit(w http.ResponseWriter, r *http.Request, user c.Us
if ferr != nil {
return ferr
}
- js := (r.PostFormValue("js") == "1")
+ js := r.PostFormValue("js") == "1"
if !user.Perms.ManageThemes {
return c.NoPermissionsJSQ(w, r, user, js)
}
diff --git a/routes/poll.go b/routes/poll.go
index ab6abcc0..60385ad3 100644
--- a/routes/poll.go
+++ b/routes/poll.go
@@ -7,7 +7,7 @@ import (
"strconv"
c "github.com/Azareal/Gosora/common"
- "github.com/Azareal/Gosora/query_gen"
+ qgen "github.com/Azareal/Gosora/query_gen"
)
func PollVote(w http.ResponseWriter, r *http.Request, user c.User, sPollID string) c.RouteError {
@@ -57,7 +57,6 @@ func PollVote(w http.ResponseWriter, r *http.Request, user c.User, sPollID strin
if err != nil {
return c.LocalError("Malformed input", w, r, user)
}
-
err = poll.CastVote(optionIndex, user.ID, user.LastIP)
if err != nil {
return c.InternalError(err, w, r)
@@ -88,7 +87,7 @@ func PollResults(w http.ResponseWriter, r *http.Request, user c.User, sPollID st
}
defer rows.Close()
- var optionList = ""
+ optionList := ""
for rows.Next() {
var votes int
err := rows.Scan(&votes)
diff --git a/routes/topic_list.go b/routes/topic_list.go
index 12e85966..3b879d2a 100644
--- a/routes/topic_list.go
+++ b/routes/topic_list.go
@@ -19,16 +19,16 @@ func wsTopicList(topicList []*c.TopicsRow, lastPage int) *c.WsTopicList {
return &c.WsTopicList{wsTopicList, lastPage, 0}
}
-func TopicList(w http.ResponseWriter, r *http.Request, user c.User, header *c.Header) c.RouteError {
- skip, rerr := header.Hooks.VhookSkippable("route_topic_list_start", w, r, &user, header)
+func TopicList(w http.ResponseWriter, r *http.Request, user c.User, h *c.Header) c.RouteError {
+ skip, rerr := h.Hooks.VhookSkippable("route_topic_list_start", w, r, &user, h)
if skip || rerr != nil {
return rerr
}
- return TopicListCommon(w, r, user, header, "lastupdated", "")
+ return TopicListCommon(w, r, user, h, "lastupdated", "")
}
-func TopicListMostViewed(w http.ResponseWriter, r *http.Request, user c.User, header *c.Header) c.RouteError {
- return TopicListCommon(w, r, user, header, "mostviewed", "most-viewed")
+func TopicListMostViewed(w http.ResponseWriter, r *http.Request, user c.User, h *c.Header) c.RouteError {
+ return TopicListCommon(w, r, user, h, "mostviewed", "most-viewed")
}
// TODO: Implement search
@@ -85,7 +85,7 @@ func TopicListCommon(w http.ResponseWriter, r *http.Request, user c.User, header
var cfids []int
if len(fids) > 0 {
- var inSlice = func(haystack []int, needle int) bool {
+ inSlice := func(haystack []int, needle int) bool {
for _, item := range haystack {
if needle == item {
return true
@@ -117,7 +117,7 @@ func TopicListCommon(w http.ResponseWriter, r *http.Request, user c.User, header
if err != nil {
return c.InternalError(err, w, r)
}
- var reqUserList = make(map[int]bool)
+ reqUserList := make(map[int]bool)
for _, topic := range tMap {
reqUserList[topic.CreatedBy] = true
reqUserList[topic.LastReplyBy] = true
@@ -126,7 +126,7 @@ func TopicListCommon(w http.ResponseWriter, r *http.Request, user c.User, header
//fmt.Printf("reqUserList %+v\n", reqUserList)
// Convert the user ID map to a slice, then bulk load the users
- var idSlice = make([]int, len(reqUserList))
+ idSlice := make([]int, len(reqUserList))
var i int
for userID := range reqUserList {
idSlice[i] = userID
diff --git a/schema/mssql/inserts.sql b/schema/mssql/inserts.sql
index b0dd2453..ef7bc8b2 100644
--- a/schema/mssql/inserts.sql
+++ b/schema/mssql/inserts.sql
@@ -7,9 +7,9 @@ INSERT INTO [settings] ([name],[content],[type]) VALUES ('rapid_loading','1','bo
INSERT INTO [settings] ([name],[content],[type]) VALUES ('google_site_verify','','html-attribute');
INSERT INTO [themes] ([uname],[default]) VALUES ('cosora',1);
INSERT INTO [emails] ([email],[uid],[validated]) VALUES ('admin@localhost',1,1);
-INSERT INTO [users_groups] ([name],[permissions],[plugin_perms],[is_mod],[is_admin],[tag]) VALUES ('Administrator','{"BanUsers":true,"ActivateUsers":true,"EditUser":true,"EditUserEmail":true,"EditUserPassword":true,"EditUserGroup":true,"EditUserGroupSuperMod":true,"EditUserGroupAdmin":false,"EditGroup":true,"EditGroupLocalPerms":true,"EditGroupGlobalPerms":true,"EditGroupSuperMod":true,"EditGroupAdmin":false,"ManageForums":true,"EditSettings":true,"ManageThemes":true,"ManagePlugins":true,"ViewAdminLogs":true,"ViewIPs":true,"UploadFiles":true,"UploadAvatars":true,"ViewTopic":true,"LikeItem":true,"CreateTopic":true,"EditTopic":true,"DeleteTopic":true,"CreateReply":true,"EditReply":true,"DeleteReply":true,"PinTopic":true,"CloseTopic":true,"MoveTopic":true}','{}',1,1,'Admin');
-INSERT INTO [users_groups] ([name],[permissions],[plugin_perms],[is_mod],[tag]) VALUES ('Moderator','{"BanUsers":true,"ActivateUsers":false,"EditUser":true,"EditUserEmail":false,"EditUserGroup":true,"ViewIPs":true,"UploadFiles":true,"UploadAvatars":true,"ViewTopic":true,"LikeItem":true,"CreateTopic":true,"EditTopic":true,"DeleteTopic":true,"CreateReply":true,"EditReply":true,"DeleteReply":true,"PinTopic":true,"CloseTopic":true,"MoveTopic":true}','{}',1,'Mod');
-INSERT INTO [users_groups] ([name],[permissions],[plugin_perms]) VALUES ('Member','{"UploadFiles":true,"UploadAvatars":true,"ViewTopic":true,"LikeItem":true,"CreateTopic":true,"CreateReply":true}','{}');
+INSERT INTO [users_groups] ([name],[permissions],[plugin_perms],[is_mod],[is_admin],[tag]) VALUES ('Administrator','{"BanUsers":true,"ActivateUsers":true,"EditUser":true,"EditUserEmail":true,"EditUserPassword":true,"EditUserGroup":true,"EditUserGroupSuperMod":true,"EditUserGroupAdmin":false,"EditGroup":true,"EditGroupLocalPerms":true,"EditGroupGlobalPerms":true,"EditGroupSuperMod":true,"EditGroupAdmin":false,"ManageForums":true,"EditSettings":true,"ManageThemes":true,"ManagePlugins":true,"ViewAdminLogs":true,"ViewIPs":true,"UploadFiles":true,"UploadAvatars":true,"UseConvos":true,"ViewTopic":true,"LikeItem":true,"CreateTopic":true,"EditTopic":true,"DeleteTopic":true,"CreateReply":true,"EditReply":true,"DeleteReply":true,"PinTopic":true,"CloseTopic":true,"MoveTopic":true}','{}',1,1,'Admin');
+INSERT INTO [users_groups] ([name],[permissions],[plugin_perms],[is_mod],[tag]) VALUES ('Moderator','{"BanUsers":true,"ActivateUsers":false,"EditUser":true,"EditUserEmail":false,"EditUserGroup":true,"ViewIPs":true,"UploadFiles":true,"UploadAvatars":true,"UseConvos":true,"ViewTopic":true,"LikeItem":true,"CreateTopic":true,"EditTopic":true,"DeleteTopic":true,"CreateReply":true,"EditReply":true,"DeleteReply":true,"PinTopic":true,"CloseTopic":true,"MoveTopic":true}','{}',1,'Mod');
+INSERT INTO [users_groups] ([name],[permissions],[plugin_perms]) VALUES ('Member','{"UploadFiles":true,"UploadAvatars":true,"UseConvos":true,"ViewTopic":true,"LikeItem":true,"CreateTopic":true,"CreateReply":true}','{}');
INSERT INTO [users_groups] ([name],[permissions],[plugin_perms],[is_banned]) VALUES ('Banned','{"ViewTopic":true}','{}',1);
INSERT INTO [users_groups] ([name],[permissions],[plugin_perms]) VALUES ('Awaiting Activation','{"ViewTopic":true}','{}');
INSERT INTO [users_groups] ([name],[permissions],[plugin_perms],[tag]) VALUES ('Not Loggedin','{"ViewTopic":true}','{}','Guest');
@@ -36,6 +36,6 @@ INSERT INTO [menu_items] ([mid],[htmlID],[cssClass],[position],[tmplName],[order
INSERT INTO [menu_items] ([mid],[name],[cssClass],[position],[path],[aria],[tooltip],[memberOnly],[order]) VALUES (1,'{lang.menu_account}','menu_account','left','/user/edit/','{lang.menu_account_aria}','{lang.menu_account_tooltip}',1,3);
INSERT INTO [menu_items] ([mid],[name],[cssClass],[position],[path],[aria],[tooltip],[memberOnly],[order]) VALUES (1,'{lang.menu_profile}','menu_profile','left','{me.Link}','{lang.menu_profile_aria}','{lang.menu_profile_tooltip}',1,4);
INSERT INTO [menu_items] ([mid],[name],[cssClass],[position],[path],[aria],[tooltip],[memberOnly],[staffOnly],[order]) VALUES (1,'{lang.menu_panel}','menu_panel menu_account','left','/panel/','{lang.menu_panel_aria}','{lang.menu_panel_tooltip}',1,1,5);
-INSERT INTO [menu_items] ([mid],[name],[cssClass],[position],[path],[aria],[tooltip],[memberOnly],[order]) VALUES (1,'{lang.menu_logout}','menu_logout','left','/accounts/logout/?session={me.Session}','{lang.menu_logout_aria}','{lang.menu_logout_tooltip}',1,6);
+INSERT INTO [menu_items] ([mid],[name],[cssClass],[position],[path],[aria],[tooltip],[memberOnly],[order]) VALUES (1,'{lang.menu_logout}','menu_logout','left','/accounts/logout/?s={me.Session}','{lang.menu_logout_aria}','{lang.menu_logout_tooltip}',1,6);
INSERT INTO [menu_items] ([mid],[name],[cssClass],[position],[path],[aria],[tooltip],[guestOnly],[order]) VALUES (1,'{lang.menu_register}','menu_register','left','/accounts/create/','{lang.menu_register_aria}','{lang.menu_register_tooltip}',1,7);
INSERT INTO [menu_items] ([mid],[name],[cssClass],[position],[path],[aria],[tooltip],[guestOnly],[order]) VALUES (1,'{lang.menu_login}','menu_login','left','/accounts/login/','{lang.menu_login_aria}','{lang.menu_login_tooltip}',1,8);
diff --git a/schema/mysql/inserts.sql b/schema/mysql/inserts.sql
index 83f07bce..913b315c 100644
--- a/schema/mysql/inserts.sql
+++ b/schema/mysql/inserts.sql
@@ -15,9 +15,9 @@ INSERT INTO `settings`(`name`,`content`,`type`) VALUES ('rapid_loading','1','boo
INSERT INTO `settings`(`name`,`content`,`type`) VALUES ('google_site_verify','','html-attribute');
INSERT INTO `themes`(`uname`,`default`) VALUES ('cosora',1);
INSERT INTO `emails`(`email`,`uid`,`validated`) VALUES ('admin@localhost',1,1);
-INSERT INTO `users_groups`(`name`,`permissions`,`plugin_perms`,`is_mod`,`is_admin`,`tag`) VALUES ('Administrator','{"BanUsers":true,"ActivateUsers":true,"EditUser":true,"EditUserEmail":true,"EditUserPassword":true,"EditUserGroup":true,"EditUserGroupSuperMod":true,"EditUserGroupAdmin":false,"EditGroup":true,"EditGroupLocalPerms":true,"EditGroupGlobalPerms":true,"EditGroupSuperMod":true,"EditGroupAdmin":false,"ManageForums":true,"EditSettings":true,"ManageThemes":true,"ManagePlugins":true,"ViewAdminLogs":true,"ViewIPs":true,"UploadFiles":true,"UploadAvatars":true,"ViewTopic":true,"LikeItem":true,"CreateTopic":true,"EditTopic":true,"DeleteTopic":true,"CreateReply":true,"EditReply":true,"DeleteReply":true,"PinTopic":true,"CloseTopic":true,"MoveTopic":true}','{}',1,1,'Admin');
-INSERT INTO `users_groups`(`name`,`permissions`,`plugin_perms`,`is_mod`,`tag`) VALUES ('Moderator','{"BanUsers":true,"ActivateUsers":false,"EditUser":true,"EditUserEmail":false,"EditUserGroup":true,"ViewIPs":true,"UploadFiles":true,"UploadAvatars":true,"ViewTopic":true,"LikeItem":true,"CreateTopic":true,"EditTopic":true,"DeleteTopic":true,"CreateReply":true,"EditReply":true,"DeleteReply":true,"PinTopic":true,"CloseTopic":true,"MoveTopic":true}','{}',1,'Mod');
-INSERT INTO `users_groups`(`name`,`permissions`,`plugin_perms`) VALUES ('Member','{"UploadFiles":true,"UploadAvatars":true,"ViewTopic":true,"LikeItem":true,"CreateTopic":true,"CreateReply":true}','{}');
+INSERT INTO `users_groups`(`name`,`permissions`,`plugin_perms`,`is_mod`,`is_admin`,`tag`) VALUES ('Administrator','{"BanUsers":true,"ActivateUsers":true,"EditUser":true,"EditUserEmail":true,"EditUserPassword":true,"EditUserGroup":true,"EditUserGroupSuperMod":true,"EditUserGroupAdmin":false,"EditGroup":true,"EditGroupLocalPerms":true,"EditGroupGlobalPerms":true,"EditGroupSuperMod":true,"EditGroupAdmin":false,"ManageForums":true,"EditSettings":true,"ManageThemes":true,"ManagePlugins":true,"ViewAdminLogs":true,"ViewIPs":true,"UploadFiles":true,"UploadAvatars":true,"UseConvos":true,"ViewTopic":true,"LikeItem":true,"CreateTopic":true,"EditTopic":true,"DeleteTopic":true,"CreateReply":true,"EditReply":true,"DeleteReply":true,"PinTopic":true,"CloseTopic":true,"MoveTopic":true}','{}',1,1,'Admin');
+INSERT INTO `users_groups`(`name`,`permissions`,`plugin_perms`,`is_mod`,`tag`) VALUES ('Moderator','{"BanUsers":true,"ActivateUsers":false,"EditUser":true,"EditUserEmail":false,"EditUserGroup":true,"ViewIPs":true,"UploadFiles":true,"UploadAvatars":true,"UseConvos":true,"ViewTopic":true,"LikeItem":true,"CreateTopic":true,"EditTopic":true,"DeleteTopic":true,"CreateReply":true,"EditReply":true,"DeleteReply":true,"PinTopic":true,"CloseTopic":true,"MoveTopic":true}','{}',1,'Mod');
+INSERT INTO `users_groups`(`name`,`permissions`,`plugin_perms`) VALUES ('Member','{"UploadFiles":true,"UploadAvatars":true,"UseConvos":true,"ViewTopic":true,"LikeItem":true,"CreateTopic":true,"CreateReply":true}','{}');
INSERT INTO `users_groups`(`name`,`permissions`,`plugin_perms`,`is_banned`) VALUES ('Banned','{"ViewTopic":true}','{}',1);
INSERT INTO `users_groups`(`name`,`permissions`,`plugin_perms`) VALUES ('Awaiting Activation','{"ViewTopic":true}','{}');
INSERT INTO `users_groups`(`name`,`permissions`,`plugin_perms`,`tag`) VALUES ('Not Loggedin','{"ViewTopic":true}','{}','Guest');
@@ -44,6 +44,6 @@ INSERT INTO `menu_items`(`mid`,`htmlID`,`cssClass`,`position`,`tmplName`,`order`
INSERT INTO `menu_items`(`mid`,`name`,`cssClass`,`position`,`path`,`aria`,`tooltip`,`memberOnly`,`order`) VALUES (1,'{lang.menu_account}','menu_account','left','/user/edit/','{lang.menu_account_aria}','{lang.menu_account_tooltip}',1,3);
INSERT INTO `menu_items`(`mid`,`name`,`cssClass`,`position`,`path`,`aria`,`tooltip`,`memberOnly`,`order`) VALUES (1,'{lang.menu_profile}','menu_profile','left','{me.Link}','{lang.menu_profile_aria}','{lang.menu_profile_tooltip}',1,4);
INSERT INTO `menu_items`(`mid`,`name`,`cssClass`,`position`,`path`,`aria`,`tooltip`,`memberOnly`,`staffOnly`,`order`) VALUES (1,'{lang.menu_panel}','menu_panel menu_account','left','/panel/','{lang.menu_panel_aria}','{lang.menu_panel_tooltip}',1,1,5);
-INSERT INTO `menu_items`(`mid`,`name`,`cssClass`,`position`,`path`,`aria`,`tooltip`,`memberOnly`,`order`) VALUES (1,'{lang.menu_logout}','menu_logout','left','/accounts/logout/?session={me.Session}','{lang.menu_logout_aria}','{lang.menu_logout_tooltip}',1,6);
+INSERT INTO `menu_items`(`mid`,`name`,`cssClass`,`position`,`path`,`aria`,`tooltip`,`memberOnly`,`order`) VALUES (1,'{lang.menu_logout}','menu_logout','left','/accounts/logout/?s={me.Session}','{lang.menu_logout_aria}','{lang.menu_logout_tooltip}',1,6);
INSERT INTO `menu_items`(`mid`,`name`,`cssClass`,`position`,`path`,`aria`,`tooltip`,`guestOnly`,`order`) VALUES (1,'{lang.menu_register}','menu_register','left','/accounts/create/','{lang.menu_register_aria}','{lang.menu_register_tooltip}',1,7);
INSERT INTO `menu_items`(`mid`,`name`,`cssClass`,`position`,`path`,`aria`,`tooltip`,`guestOnly`,`order`) VALUES (1,'{lang.menu_login}','menu_login','left','/accounts/login/','{lang.menu_login_aria}','{lang.menu_login_tooltip}',1,8);
diff --git a/schema/pgsql/inserts.sql b/schema/pgsql/inserts.sql
index c374ae08..ed218269 100644
--- a/schema/pgsql/inserts.sql
+++ b/schema/pgsql/inserts.sql
@@ -7,9 +7,9 @@ INSERT INTO "settings"("name","content","type") VALUES ('rapid_loading','1','boo
INSERT INTO "settings"("name","content","type") VALUES ('google_site_verify','','html-attribute');
INSERT INTO "themes"("uname","default") VALUES ('cosora',1);
INSERT INTO "emails"("email","uid","validated") VALUES ('admin@localhost',1,1);
-INSERT INTO "users_groups"("name","permissions","plugin_perms","is_mod","is_admin","tag") VALUES ('Administrator','{"BanUsers":true,"ActivateUsers":true,"EditUser":true,"EditUserEmail":true,"EditUserPassword":true,"EditUserGroup":true,"EditUserGroupSuperMod":true,"EditUserGroupAdmin":false,"EditGroup":true,"EditGroupLocalPerms":true,"EditGroupGlobalPerms":true,"EditGroupSuperMod":true,"EditGroupAdmin":false,"ManageForums":true,"EditSettings":true,"ManageThemes":true,"ManagePlugins":true,"ViewAdminLogs":true,"ViewIPs":true,"UploadFiles":true,"UploadAvatars":true,"ViewTopic":true,"LikeItem":true,"CreateTopic":true,"EditTopic":true,"DeleteTopic":true,"CreateReply":true,"EditReply":true,"DeleteReply":true,"PinTopic":true,"CloseTopic":true,"MoveTopic":true}','{}',1,1,'Admin');
-INSERT INTO "users_groups"("name","permissions","plugin_perms","is_mod","tag") VALUES ('Moderator','{"BanUsers":true,"ActivateUsers":false,"EditUser":true,"EditUserEmail":false,"EditUserGroup":true,"ViewIPs":true,"UploadFiles":true,"UploadAvatars":true,"ViewTopic":true,"LikeItem":true,"CreateTopic":true,"EditTopic":true,"DeleteTopic":true,"CreateReply":true,"EditReply":true,"DeleteReply":true,"PinTopic":true,"CloseTopic":true,"MoveTopic":true}','{}',1,'Mod');
-INSERT INTO "users_groups"("name","permissions","plugin_perms") VALUES ('Member','{"UploadFiles":true,"UploadAvatars":true,"ViewTopic":true,"LikeItem":true,"CreateTopic":true,"CreateReply":true}','{}');
+INSERT INTO "users_groups"("name","permissions","plugin_perms","is_mod","is_admin","tag") VALUES ('Administrator','{"BanUsers":true,"ActivateUsers":true,"EditUser":true,"EditUserEmail":true,"EditUserPassword":true,"EditUserGroup":true,"EditUserGroupSuperMod":true,"EditUserGroupAdmin":false,"EditGroup":true,"EditGroupLocalPerms":true,"EditGroupGlobalPerms":true,"EditGroupSuperMod":true,"EditGroupAdmin":false,"ManageForums":true,"EditSettings":true,"ManageThemes":true,"ManagePlugins":true,"ViewAdminLogs":true,"ViewIPs":true,"UploadFiles":true,"UploadAvatars":true,"UseConvos":true,"ViewTopic":true,"LikeItem":true,"CreateTopic":true,"EditTopic":true,"DeleteTopic":true,"CreateReply":true,"EditReply":true,"DeleteReply":true,"PinTopic":true,"CloseTopic":true,"MoveTopic":true}','{}',1,1,'Admin');
+INSERT INTO "users_groups"("name","permissions","plugin_perms","is_mod","tag") VALUES ('Moderator','{"BanUsers":true,"ActivateUsers":false,"EditUser":true,"EditUserEmail":false,"EditUserGroup":true,"ViewIPs":true,"UploadFiles":true,"UploadAvatars":true,"UseConvos":true,"ViewTopic":true,"LikeItem":true,"CreateTopic":true,"EditTopic":true,"DeleteTopic":true,"CreateReply":true,"EditReply":true,"DeleteReply":true,"PinTopic":true,"CloseTopic":true,"MoveTopic":true}','{}',1,'Mod');
+INSERT INTO "users_groups"("name","permissions","plugin_perms") VALUES ('Member','{"UploadFiles":true,"UploadAvatars":true,"UseConvos":true,"ViewTopic":true,"LikeItem":true,"CreateTopic":true,"CreateReply":true}','{}');
INSERT INTO "users_groups"("name","permissions","plugin_perms","is_banned") VALUES ('Banned','{"ViewTopic":true}','{}',1);
INSERT INTO "users_groups"("name","permissions","plugin_perms") VALUES ('Awaiting Activation','{"ViewTopic":true}','{}');
INSERT INTO "users_groups"("name","permissions","plugin_perms","tag") VALUES ('Not Loggedin','{"ViewTopic":true}','{}','Guest');
@@ -36,6 +36,6 @@ INSERT INTO "menu_items"("mid","htmlID","cssClass","position","tmplName","order"
INSERT INTO "menu_items"("mid","name","cssClass","position","path","aria","tooltip","memberOnly","order") VALUES (1,'{lang.menu_account}','menu_account','left','/user/edit/','{lang.menu_account_aria}','{lang.menu_account_tooltip}',1,3);
INSERT INTO "menu_items"("mid","name","cssClass","position","path","aria","tooltip","memberOnly","order") VALUES (1,'{lang.menu_profile}','menu_profile','left','{me.Link}','{lang.menu_profile_aria}','{lang.menu_profile_tooltip}',1,4);
INSERT INTO "menu_items"("mid","name","cssClass","position","path","aria","tooltip","memberOnly","staffOnly","order") VALUES (1,'{lang.menu_panel}','menu_panel menu_account','left','/panel/','{lang.menu_panel_aria}','{lang.menu_panel_tooltip}',1,1,5);
-INSERT INTO "menu_items"("mid","name","cssClass","position","path","aria","tooltip","memberOnly","order") VALUES (1,'{lang.menu_logout}','menu_logout','left','/accounts/logout/?session={me.Session}','{lang.menu_logout_aria}','{lang.menu_logout_tooltip}',1,6);
+INSERT INTO "menu_items"("mid","name","cssClass","position","path","aria","tooltip","memberOnly","order") VALUES (1,'{lang.menu_logout}','menu_logout','left','/accounts/logout/?s={me.Session}','{lang.menu_logout_aria}','{lang.menu_logout_tooltip}',1,6);
INSERT INTO "menu_items"("mid","name","cssClass","position","path","aria","tooltip","guestOnly","order") VALUES (1,'{lang.menu_register}','menu_register','left','/accounts/create/','{lang.menu_register_aria}','{lang.menu_register_tooltip}',1,7);
INSERT INTO "menu_items"("mid","name","cssClass","position","path","aria","tooltip","guestOnly","order") VALUES (1,'{lang.menu_login}','menu_login','left','/accounts/login/','{lang.menu_login_aria}','{lang.menu_login_tooltip}',1,8);
diff --git a/templates/footer.html b/templates/footer.html
index 6be90a71..3868a5f3 100644
--- a/templates/footer.html
+++ b/templates/footer.html
@@ -9,12 +9,12 @@
- {{/**{{if .CurrentUser.IsAdmin}}**/}}{{.Header.Elapsed1}}
{{elapsed .Header.StartedAt}}
{{/**{{end}}**/}}
+ {{if .CurrentUser.IsAdmin}}{{.Header.Elapsed1}}
{{elapsed .Header.StartedAt}}
{{end}}
diff --git a/templates/panel_menu.html b/templates/panel_menu.html
index dd39062a..16a84bee 100644
--- a/templates/panel_menu.html
+++ b/templates/panel_menu.html
@@ -1 +1 @@
-{{template "panel_inner_menu.html" . }}
+{{template "panel_inner_menu.html" . }}
\ No newline at end of file
diff --git a/tickloop.go b/tickloop.go
index 955f47f2..40e987a4 100644
--- a/tickloop.go
+++ b/tickloop.go
@@ -15,8 +15,7 @@ import (
// TODO: Name the tasks so we can figure out which one it was when something goes wrong? Or maybe toss it up WithStack down there?
func runTasks(tasks []func() error) {
for _, task := range tasks {
- err := task()
- if err != nil {
+ if err := task(); err != nil {
c.LogError(err)
}
}
@@ -24,8 +23,7 @@ func runTasks(tasks []func() error) {
func startTick() (abort bool) {
isDBDown := atomic.LoadInt32(&c.IsDBDown)
- err := db.Ping()
- if err != nil {
+ if err := db.Ping(); err != nil {
// TODO: There's a bit of a race here, but it doesn't matter if this error appears multiple times in the logs as it's capped at three times, we just want to cut it down 99% of the time
if isDBDown == 0 {
db.SetConnMaxLifetime(time.Second) // Drop all the connections and start over
@@ -45,8 +43,7 @@ func startTick() (abort bool) {
}
func runHook(name string) {
- err := c.RunTaskHook(name)
- if err != nil {
+ if err := c.RunTaskHook(name); err != nil {
c.LogError(err, "Failed at task '"+name+"'")
}
}
@@ -88,16 +85,14 @@ func tickLoop(thumbChan chan bool) {
runTasks(c.ScheduledSecondTasks)
// TODO: Stop hard-coding this
- err := c.HandleExpiredScheduledGroups()
- if err != nil {
+ if err := c.HandleExpiredScheduledGroups(); err != nil {
c.LogError(err)
}
// TODO: Handle delayed moderation tasks
// Sync with the database, if there are any changes
- err = c.HandleServerSync()
- if err != nil {
+ if err = c.HandleServerSync(); err != nil {
c.LogError(err)
}
@@ -164,35 +159,30 @@ func dailies() {
}
if c.Config.LogPruneCutoff > -1 {
- _, err := qgen.NewAcc().Delete("login_logs").DateOlderThan("doneAt",c.Config.LogPruneCutoff,"day").Run()
- if err != nil {
- c.LogError(err)
- }
- _, err = qgen.NewAcc().Delete("registration_logs").DateOlderThan("doneAt",c.Config.LogPruneCutoff,"day").Run()
- if err != nil {
- c.LogError(err)
+ f := func(tbl string) {
+ _, err := qgen.NewAcc().Delete(tbl).DateOlderThan("doneAt",c.Config.LogPruneCutoff,"day").Run()
+ if err != nil {
+ c.LogError(err)
+ }
}
+ f("login_logs")
+ f("registration_logs")
}
if c.Config.PostIPCutoff > -1 {
// TODO: Use unixtime to remove this MySQLesque logic?
- _, err := qgen.NewAcc().Update("topics").Set("ipaddress = '0'").DateOlderThan("createdAt",c.Config.PostIPCutoff,"day").Where("ipaddress != '0'").Exec()
- if err != nil {
- c.LogError(err)
+ f := func(tbl string) {
+ _, err := qgen.NewAcc().Update(tbl).Set("ipaddress = '0'").DateOlderThan("createdAt",c.Config.PostIPCutoff,"day").Where("ipaddress != '0'").Exec()
+ if err != nil {
+ c.LogError(err)
+ }
}
+ f("topics")
+ f("replies")
+ f("users_replies")
- _, err = qgen.NewAcc().Update("replies").Set("ipaddress = '0'").DateOlderThan("createdAt",c.Config.PostIPCutoff,"day").Where("ipaddress != '0'").Exec()
- if err != nil {
- c.LogError(err)
- }
-
// TODO: Find some way of purging the ip data in polls_votes without breaking any anti-cheat measures which might be running... maybe hash it instead?
- _, err = qgen.NewAcc().Update("users_replies").Set("ipaddress = '0'").DateOlderThan("createdAt",c.Config.PostIPCutoff,"day").Where("ipaddress != '0'").Exec()
- if err != nil {
- c.LogError(err)
- }
-
// TODO: lastActiveAt isn't currently set, so we can't rely on this to purge last_ips of users who haven't been on in a while
/*_, err = qgen.NewAcc().Update("users").Set("last_ip = '0'").DateOlderThan("lastActiveAt",c.Config.PostIPCutoff,"day").Where("last_ip != '0'").Exec()
if err != nil {