More tests

server/server.go

@@ -36,13 +36,15 @@ import (
 
 /*
 	TODO
+		limits:
+			message cache duration
+			Keep 10000 messages or keep X days?
+			Attachment expiration based on plan
 		database migration
 		reserve topics
 		purge accounts that were not logged into in X
 		reset daily limits for users
 		Account usage not updated "in real time"
-		Attachment expiration based on plan
-		Plan: Keep 10000 messages or keep X days?
 		Sync:
 			- "mute" setting
 			- figure out what settings are "web" or "phone"

server/server_account.go

@@ -159,7 +159,7 @@ func (s *Server) handleAccountTokenIssue(w http.ResponseWriter, r *http.Request,
 	w.Header().Set("Access-Control-Allow-Origin", "*") // FIXME remove this
 	response := &apiAccountTokenResponse{
 		Token:   token.Value,
-		Expires: token.Expires,
+		Expires: token.Expires.Unix(),
 	}
 	if err := json.NewEncoder(w).Encode(response); err != nil {
 		return err
@@ -182,7 +182,7 @@ func (s *Server) handleAccountTokenExtend(w http.ResponseWriter, r *http.Request
 	w.Header().Set("Access-Control-Allow-Origin", "*") // FIXME remove this
 	response := &apiAccountTokenResponse{
 		Token:   token.Value,
-		Expires: token.Expires,
+		Expires: token.Expires.Unix(),
 	}
 	if err := json.NewEncoder(w).Encode(response); err != nil {
 		return err