M cache.go → cache.go

@@ -28,10 +28,22 @@ filler cacheFiller
 	lock   sync.Mutex
 }
 
-func cacheNew(filler cacheFiller) *Cache {
+func cacheNew(fillfn interface{}) *Cache {
 	c := new(Cache)
 	c.cache = make(map[interface{}]interface{})
-	c.filler = filler
+	ftype := reflect.TypeOf(fillfn)
+	if ftype.Kind() != reflect.Func {
+		panic("cache filler is not function")
+	}
+	if ftype.NumIn() != 1 || ftype.NumOut() != 2 {
+		panic("cache filler has wrong argument count")
+	}
+	c.filler = func(key interface{}) (interface{}, bool) {
+		vfn := reflect.ValueOf(fillfn)
+		args := []reflect.Value{reflect.ValueOf(key)}
+		rv := vfn.Call(args)
+		return rv[0].Interface(), rv[1].Bool()
+	}
 	return c
 }
 

M web.go → web.go

@@ -1141,8 +1141,7 @@ log.Print(err)
 	}
 }
 
-var combocache = cacheNew(func(key interface{}) (interface{}, bool) {
-	userid := key.(int64)
+var combocache = cacheNew(func(userid int64) ([]string, bool) {
 	honkers := gethonkers(userid)
 	var combos []string
 	for _, h := range honkers {