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

quick fix before tags can go live

This commit is contained in:
Ted Unangst 2019-08-24 23:11:53 -04:00
parent f74b91e15b
commit 368b4d067e
2 changed files with 28 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
activity.go
View File

@ -255,7 +255,7 @@ func savexonk(user *WhatAbout, x *Honk) {
go prehandle(x.Honker) go prehandle(x.Honker)
go prehandle(x.Oonker) go prehandle(x.Oonker)
res, err := stmtSaveHonk.Exec(x.UserID, x.What, x.Honker, x.XID, x.RID, dt, x.URL, aud, res, err := stmtSaveHonk.Exec(x.UserID, x.What, x.Honker, x.XID, x.RID, dt, x.URL, aud,
x.Noise, x.Convoy, whofore, "html", x.Precis, x.Oonker, 0) x.Noise, x.Convoy, whofore, "html", x.Precis, x.Oonker, 0, strings.Join(x.Onts, " "))
if err != nil { if err != nil {
log.Printf("err saving xonk: %s", err) log.Printf("err saving xonk: %s", err)
return return
@ -268,6 +268,13 @@ func savexonk(user *WhatAbout, x *Honk) {
return return
} }
} }
for _, o := range x.Onts {
_, err = stmtSaveOnts.Exec(strings.ToLower(o), x.ID)
if err != nil {
log.Printf("error saving ont: %s", err)
}
}
} }
type Box struct { type Box struct {

24
honk.go
View File

@ -77,6 +77,7 @@ type Honk struct {
Style string Style string
Open string Open string
Donks []*Donk Donks []*Donk
Onts []string
} }
const ( const (
@ -952,9 +953,10 @@ func savebonk(w http.ResponseWriter, r *http.Request) {
aud := strings.Join(bonk.Audience, " ") aud := strings.Join(bonk.Audience, " ")
whofore := 2 whofore := 2
onts := ontologies(xonk.Noise)
res, err := stmtSaveHonk.Exec(userinfo.UserID, "bonk", bonk.Honker, xid, "", res, err := stmtSaveHonk.Exec(userinfo.UserID, "bonk", bonk.Honker, xid, "",
dt.Format(dbtimeformat), "", aud, xonk.Noise, xonk.Convoy, whofore, "html", dt.Format(dbtimeformat), "", aud, xonk.Noise, xonk.Convoy, whofore, "html",
xonk.Precis, oonker, 0) xonk.Precis, oonker, 0, strings.Join(onts, " "))
if err != nil { if err != nil {
log.Printf("error saving bonk: %s", err) log.Printf("error saving bonk: %s", err)
return return
@ -967,6 +969,12 @@ func savebonk(w http.ResponseWriter, r *http.Request) {
return return
} }
} }
for _, o := range onts {
_, err = stmtSaveOnts.Exec(strings.ToLower(o), bonk.ID)
if err != nil {
log.Printf("error saving ont: %s", err)
}
}
go honkworldwide(user, &bonk) go honkworldwide(user, &bonk)
} }
@ -1224,9 +1232,10 @@ func savehonk(w http.ResponseWriter, r *http.Request) {
} }
return return
} }
onts := ontologies(honk.Noise)
res, err := stmtSaveHonk.Exec(userinfo.UserID, what, honk.Honker, xid, rid, res, err := stmtSaveHonk.Exec(userinfo.UserID, what, honk.Honker, xid, rid,
dt.Format(dbtimeformat), "", aud, honk.Noise, convoy, whofore, "html", dt.Format(dbtimeformat), "", aud, honk.Noise, convoy, whofore, "html",
honk.Precis, honk.Oonker, 0) honk.Precis, honk.Oonker, 0, strings.Join(onts, " "))
if err != nil { if err != nil {
log.Printf("error saving honk: %s", err) log.Printf("error saving honk: %s", err)
http.Error(w, "something bad happened while saving", http.StatusInternalServerError) http.Error(w, "something bad happened while saving", http.StatusInternalServerError)
@ -1241,6 +1250,12 @@ func savehonk(w http.ResponseWriter, r *http.Request) {
return return
} }
} }
for _, o := range onts {
_, err = stmtSaveOnts.Exec(strings.ToLower(o), honk.ID)
if err != nil {
log.Printf("error saving ont: %s", err)
}
}
go honkworldwide(user, &honk) go honkworldwide(user, &honk)
@ -1679,7 +1694,7 @@ var stmtFindZonk, stmtFindXonk, stmtSaveDonk, stmtFindFile, stmtSaveFile *sql.St
var stmtAddDoover, stmtGetDoovers, stmtLoadDoover, stmtZapDoover *sql.Stmt var stmtAddDoover, stmtGetDoovers, stmtLoadDoover, stmtZapDoover *sql.Stmt
var stmtHasHonker, stmtThumbBiters, stmtZonkIt, stmtZonkDonks, stmtSaveZonker *sql.Stmt var stmtHasHonker, stmtThumbBiters, stmtZonkIt, stmtZonkDonks, stmtSaveZonker *sql.Stmt
var stmtGetZonkers, stmtRecentHonkers, stmtGetXonker, stmtSaveXonker, stmtDeleteXonker *sql.Stmt var stmtGetZonkers, stmtRecentHonkers, stmtGetXonker, stmtSaveXonker, stmtDeleteXonker *sql.Stmt
var stmtUpdateFlags, stmtClearFlags *sql.Stmt var stmtSaveOnts, stmtUpdateFlags, stmtClearFlags *sql.Stmt
func preparetodie(db *sql.DB, s string) *sql.Stmt { func preparetodie(db *sql.DB, s string) *sql.Stmt {
stmt, err := db.Prepare(s) stmt, err := db.Prepare(s)
@ -1711,7 +1726,8 @@ func prepareStatements(db *sql.DB) {
stmtHonksByConvoy = preparetodie(db, selecthonks+"where (honks.userid = ? or (? = -1 and whofore = 2)) and convoy = ?"+limit) stmtHonksByConvoy = preparetodie(db, selecthonks+"where (honks.userid = ? or (? = -1 and whofore = 2)) and convoy = ?"+limit)
stmtHonksByOntology = preparetodie(db, selecthonks+"join onts on honks.honkid = onts.honkid where onts.ontology = ? and honks.whofore = 2"+limit) stmtHonksByOntology = preparetodie(db, selecthonks+"join onts on honks.honkid = onts.honkid where onts.ontology = ? and honks.whofore = 2"+limit)
stmtSaveHonk = preparetodie(db, "insert into honks (userid, what, honker, xid, rid, dt, url, audience, noise, convoy, whofore, format, precis, oonker, flags) values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)") stmtSaveHonk = preparetodie(db, "insert into honks (userid, what, honker, xid, rid, dt, url, audience, noise, convoy, whofore, format, precis, oonker, flags, onts) values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)")
stmtSaveOnts = preparetodie(db, "insert into onts (ontology, honkid), values (?, ?)")
stmtFileData = preparetodie(db, "select media, content from files where xid = ?") stmtFileData = preparetodie(db, "select media, content from files where xid = ?")
stmtFindXonk = preparetodie(db, "select honkid from honks where userid = ? and xid = ?") stmtFindXonk = preparetodie(db, "select honkid from honks where userid = ? and xid = ?")
stmtSaveDonk = preparetodie(db, "insert into donks (honkid, fileid) values (?, ?)") stmtSaveDonk = preparetodie(db, "insert into donks (honkid, fileid) values (?, ?)")