dirk/honk
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

if we already have it, don't get it

Browse source
This commit is contained in:
Ted Unangst 2019-10-01 23:30:10 -04:00
parent 9c0204572e
commit 2b9797e277
1 changed files with 23 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
web.go
View file

@ -374,7 +374,10 @@ func inbox(w http.ResponseWriter, r *http.Request) {
} }
func ximport(w http.ResponseWriter, r *http.Request) { func ximport(w http.ResponseWriter, r *http.Request) {
u := login.GetUserInfo(r)
xid := r.FormValue("xid") xid := r.FormValue("xid")
xonk := getxonk(u.UserID, xid)
if xonk == nil {
p, _ := investigate(xid) p, _ := investigate(xid)
if p != nil { if p != nil {
xid = p.XID xid = p.XID
@ -386,7 +389,6 @@ func ximport(w http.ResponseWriter, r *http.Request) {
return return
} }
log.Printf("importing %s", xid) log.Printf("importing %s", xid)
u := login.GetUserInfo(r)
user, _ := butwhatabout(u.Username) user, _ := butwhatabout(u.Username)
what, _ := j.GetString("type") what, _ := j.GetString("type")
@ -396,7 +398,8 @@ func ximport(w http.ResponseWriter, r *http.Request) {
http.Redirect(w, r, "/h?xid="+url.QueryEscape(xid), http.StatusSeeOther) http.Redirect(w, r, "/h?xid="+url.QueryEscape(xid), http.StatusSeeOther)
return return
} }
xonk := xonksaver(user, j, originate(xid)) xonk = xonksaver(user, j, originate(xid))
}
convoy := "" convoy := ""
if xonk != nil { if xonk != nil {
convoy = xonk.Convoy convoy = xonk.Convoy