a
/
gosora
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

use hookgen for topic_create_frow_assign 

rename header to h in CreateTopic
avoid double indirect for h for topic_create_pre_loop
This commit is contained in:
Azareal 2020-05-27 10:10:49 +10:00
parent 4683e33664
commit d83969edce
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
routes/topic.go
View File

@ -288,7 +288,7 @@ func RemoveAttachFromTopicSubmit(w http.ResponseWriter, r *http.Request, user *c
// ? - Log username changes and put restrictions on this? // ? - Log username changes and put restrictions on this?
// TODO: Test this // TODO: Test this
// TODO: Revamp this route // TODO: Revamp this route
func CreateTopic(w http.ResponseWriter, r *http.Request, user *c.User, header *c.Header, sfid string) c.RouteError { func CreateTopic(w http.ResponseWriter, r *http.Request, user *c.User, h *c.Header, sfid string) c.RouteError {
var fid int var fid int
var err error var err error
if sfid != "" { if sfid != "" {
@ -301,7 +301,7 @@ func CreateTopic(w http.ResponseWriter, r *http.Request, user *c.User, header *c
fid = c.Config.DefaultForum fid = c.Config.DefaultForum
} }
ferr := c.ForumUserCheck(header, w, r, user, fid) ferr := c.ForumUserCheck(h, w, r, user, fid)
if ferr != nil { if ferr != nil {
return ferr return ferr
} }
@ -309,13 +309,13 @@ func CreateTopic(w http.ResponseWriter, r *http.Request, user *c.User, header *c
return c.NoPermissions(w, r, user) return c.NoPermissions(w, r, user)
} }
// TODO: Add a phrase for this // TODO: Add a phrase for this
header.Title = phrases.GetTitlePhrase("create_topic") h.Title = phrases.GetTitlePhrase("create_topic")
header.Zone = "create_topic" h.Zone = "create_topic"
// Lock this to the forum being linked? // Lock this to the forum being linked?
// Should we always put it in strictmode when it's linked from another forum? Well, the user might end up changing their mind on what forum they want to post in and it would be a hassle, if they had to switch pages, even if it is a single click for many (exc. mobile) // Should we always put it in strictmode when it's linked from another forum? Well, the user might end up changing their mind on what forum they want to post in and it would be a hassle, if they had to switch pages, even if it is a single click for many (exc. mobile)
var strict bool var strict bool
header.Hooks.VhookNoRet("topic_create_pre_loop", w, r, fid, &header, user, &strict) h.Hooks.VhookNoRet("topic_create_pre_loop", w, r, fid, h, user, &strict)
// TODO: Re-add support for plugin_guilds // TODO: Re-add support for plugin_guilds
var forumList []c.Forum var forumList []c.Forum
@ -348,14 +348,15 @@ func CreateTopic(w http.ResponseWriter, r *http.Request, user *c.User, header *c
if f.Name != "" && f.Active { if f.Name != "" && f.Active {
fcopy := f.Copy() fcopy := f.Copy()
// TODO: Abstract this // TODO: Abstract this
if header.Hooks.HookSkippable("topic_create_frow_assign", &fcopy) { //if h.Hooks.HookSkip("topic_create_frow_assign", &fcopy) {
if c.H_topic_create_frow_assign_hook(h.Hooks, &fcopy) {
continue continue
} }
forumList = append(forumList, fcopy) forumList = append(forumList, fcopy)
} }
} }
return renderTemplate("create_topic", w, r, header, c.CreateTopicPage{header, forumList, fid}) return renderTemplate("create_topic", w, r, h, c.CreateTopicPage{h, forumList, fid})
} }
func CreateTopicSubmit(w http.ResponseWriter, r *http.Request, user *c.User) c.RouteError { func CreateTopicSubmit(w http.ResponseWriter, r *http.Request, user *c.User) c.RouteError {