openidec

commit b0dbf47aa523b4853e305228c35b3e7b385a74fc
parent b81c5af848e10be98dc101243072f5e3a4194e24
Author: Peter Kosyh <p.kosyh@gmail.com>
Date:   Thu,  3 Sep 2020 22:35:38 +0300

reply and fix in topic

Diffstat:
A
ii-node/tpl/reply.tpl
 | 
11
+++++++++++
M
ii-node/tpl/topic.tpl
 | 
1
+
M
ii-node/web.go
 | 
59
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
M
ii/msg.go
 | 
1
-

4 files changed, 69 insertions(+), 3 deletions(-)
diff --git a/ii-node/tpl/reply.tpl b/ii-node/tpl/reply.tpl
@@ -0,0 +1,11 @@
+{{template "header.tpl" $}}
+{{range .Msg}}
+<form method="post" enctype="application/x-www-form-urlencoded" action="/{{.MsgId}}/reply">
+<input type="text" name="subj" class="subj" placeholder="subject" value="{{.Subj}}"><br>
+<input type="text" name="to" class="to" placeholder="To" value="{{.From}}"><br>
+<textarea type="text" name="msg" class="message" cols=60 row=10 placeholder="Text here.">{{.Text}}</textarea><br>
+<br>
+<button class="form-button">Submit</button>
+</form>
+{{end}}
+{{template "footer.tpl"}}
diff --git a/ii-node/tpl/topic.tpl b/ii-node/tpl/topic.tpl
@@ -4,6 +4,7 @@
 <div class="topic">
 {{ range .Msg }}
 <div class="msg">
+<span class="msgid"><a href="/{{$.BasePath}}/reply">{{.MsgId}}</a></span><br>
 <span class="msgsubj">{{.Subj}}</span>
 <br/>
 <span class="msginfo">{{.From}}({{.Addr}}) -> {{.To}}</span>
diff --git a/ii-node/web.go b/ii-node/web.go
@@ -117,7 +117,9 @@ func getTopics(db *ii.DB, mi []*ii.MsgInfo) map[string][]string {
 			continue
 		}
 		t := l[len(l) - 1]
-		topics[t] = append(topics[t], t)
+		if len(topics[t]) == 0 {
+			topics[t] = append(topics[t], t)
+		}
 		for _, id := range l {
 			if id == t {
 				continue
@@ -264,7 +266,6 @@ func www_new(user *ii.User, www WWW, w http.ResponseWriter, r *http.Request, ech
 		to := r.FormValue("to")
 		msg := r.FormValue("msg")
 		text := fmt.Sprintf("%s\n%s\n%s\n\n%s", echo, to, subj, msg)
-		fmt.Printf("%s\n", text)
 		m, err := ii.DecodeMsgline(text, false)
 		if err != nil {
 			ii.Error.Printf("Error while posting new topic: %s", err)
@@ -282,6 +283,57 @@ func www_new(user *ii.User, www WWW, w http.ResponseWriter, r *http.Request, ech
 	return nil
 }
 
+func www_reply(user *ii.User, www WWW, w http.ResponseWriter, r *http.Request, id string) error {
+	ctx := WebContext{ User: user }
+	ctx.BasePath = id
+
+	switch r.Method {
+	case "GET":
+		m := www.db.Get(id)
+		if m == nil {
+			ii.Error.Printf("No such msg: %s", id)
+			return  errors.New("No such msg")
+		}
+		ctx.Msg = append(ctx.Msg, m)
+		err := www.tpl.ExecuteTemplate(w, "reply.tpl", ctx)
+		return err
+	case "POST":
+		ii.Trace.Printf("www reply on %s", id)
+		if err := r.ParseForm(); err != nil {
+			ii.Error.Printf("Error in POST request: %s", err)
+			return  err
+		}
+		if user.Name == "" {
+			ii.Error.Printf("Access denied")
+			return  errors.New("Access denied")
+		}
+		m := www.db.Get(id)
+		if m == nil {
+			ii.Error.Printf("No such msg: %s", id)
+			return  errors.New("No such msg")
+		}
+		subj := r.FormValue("subj")
+		to := r.FormValue("to")
+		msg := r.FormValue("msg")
+		text := fmt.Sprintf("%s\n%s\n%s\n\n@repto:%s\n%s", m.Echo, to, subj, m.MsgId,  msg)
+		ii.Trace.Printf("Reply msg: %s\n", text)
+		m, err := ii.DecodeMsgline(text, false)
+		if err != nil {
+			ii.Error.Printf("Error while reply to %s: %s", id, err)
+			return err
+		}
+		m.From = user.Name
+		m.Addr = fmt.Sprintf("%s,%d", www.db.Name, user.Id)
+		if err = www.db.Store(m); err != nil {
+			ii.Error.Printf("Error while store reply msg %s: %s", m.MsgId, err)
+			return err
+		}
+		http.Redirect(w, r, "/" + m.Echo + "/1", http.StatusSeeOther)
+		return nil
+	}
+	return nil
+}
+
 func msg_format(txt string) template.HTML {
 	txt = strings.Replace(txt, "&", "&amp;", -1)
 	txt = strings.Replace(txt, "<", "&lt;", -1)
@@ -325,6 +377,9 @@ func handleWWW(www WWW, w http.ResponseWriter, r *http.Request) error {
 	} else if ii.IsMsgId(args[0]) {
 		page := 1
 		if len(args) > 1 {
+			if args[1] == "reply" {
+				return www_reply(user, www, w, r, args[0])
+			}
 			fmt.Sscanf(args[1], "%d", &page)
 		}
 		return www_topic(user, www, w, r, args[0], page)
diff --git a/ii/msg.go b/ii/msg.go
@@ -73,7 +73,6 @@ func DecodeMsgline(msg string, enc bool) (*Msg, error) {
 	start := 4
 	repto := text[4]
 	m.Tags, _ = MakeTags("ii/ok")
-
 	if strings.HasPrefix(repto, "@repto:") {
 		start += 1
 		m.Tags.Add("repto/" + strings.Trim(strings.Split(repto, ":")[1], " "))