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

combine common code

This commit is contained in:
Ted Unangst 2019-09-16 16:46:14 -04:00
parent a73d042205
commit 6a68d43997
1 changed files with 8 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
database.go
View File

@ -90,10 +90,10 @@ func allusers() []login.UserInfo {
return users return users
} }
func getxonk(userid int64, xid string) *Honk { func scanxonk(row *sql.Row) *Honk {
h := new(Honk) h := new(Honk)
var dt, aud, onts string var dt, aud, onts string
row := stmtOneXonk.QueryRow(userid, xid)
err := row.Scan(&h.ID, &h.UserID, &h.Username, &h.What, &h.Honker, &h.Oonker, &h.XID, &h.RID, err := row.Scan(&h.ID, &h.UserID, &h.Username, &h.What, &h.Honker, &h.Oonker, &h.XID, &h.RID,
&dt, &h.URL, &aud, &h.Noise, &h.Precis, &h.Convoy, &h.Whofore, &h.Flags, &onts) &dt, &h.URL, &aud, &h.Noise, &h.Precis, &h.Convoy, &h.Whofore, &h.Flags, &onts)
if err != nil { if err != nil {
@ -111,25 +111,14 @@ func getxonk(userid int64, xid string) *Honk {
return h return h
} }
func getxonk(userid int64, xid string) *Honk {
row := stmtOneXonk.QueryRow(userid, xid)
return scanxonk(row)
}
func getbonk(userid int64, xid string) *Honk { func getbonk(userid int64, xid string) *Honk {
h := new(Honk)
var dt, aud, onts string
row := stmtOneBonk.QueryRow(userid, xid) row := stmtOneBonk.QueryRow(userid, xid)
err := row.Scan(&h.ID, &h.UserID, &h.Username, &h.What, &h.Honker, &h.Oonker, &h.XID, &h.RID, return scanxonk(row)
&dt, &h.URL, &aud, &h.Noise, &h.Precis, &h.Convoy, &h.Whofore, &h.Flags, &onts)
if err != nil {
if err != sql.ErrNoRows {
log.Printf("error scanning xonk: %s", err)
}
return nil
}
h.Date, _ = time.Parse(dbtimeformat, dt)
h.Audience = strings.Split(aud, " ")
h.Public = !keepitquiet(h.Audience)
if len(onts) > 0 {
h.Onts = strings.Split(onts, " ")
}
return h
} }
func getpublichonks() []*Honk { func getpublichonks() []*Honk {