if we already have it, don't get it

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

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) {
u := login.GetUserInfo(r)
xid := r.FormValue("xid")
xonk := getxonk(u.UserID, xid)
if xonk == nil {
p, _ := investigate(xid)
if p != nil {
xid = p.XID
@ -386,7 +389,6 @@ func ximport(w http.ResponseWriter, r *http.Request) {
return
}
log.Printf("importing %s", xid)
u := login.GetUserInfo(r)
user, _ := butwhatabout(u.Username)
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)
return
}
xonk := xonksaver(user, j, originate(xid))
xonk = xonksaver(user, j, originate(xid))
}
convoy := ""
if xonk != nil {
convoy = xonk.Convoy