From ae09c0d92a44f7319fc4dae9c66b7fcd696a8920 Mon Sep 17 00:00:00 2001
From: Gabriel Simmer <gabriel@gitgalaxy.com>
Date: Wed, 6 Jul 2022 17:55:18 +0100
Subject: [PATCH] Switch to using user ID for invite log

---
 store/database.go | 16 ++++++++--------
 transport/http.go |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/store/database.go b/store/database.go
index a507d12..7f06461 100644
--- a/store/database.go
+++ b/store/database.go
@@ -27,7 +27,7 @@ type Storer interface {
 	SaveServer(server Server) error
 	GetUserServers(user User) ([]Server, error)
 	DeleteServer(server Server, user User) error
-	LogInviteUse(user string, invite Invite) error
+	LogInviteUse(user User, invite Invite) error
 	InviteLog(invite Invite) ([]InviteLog, error)
 	DeleteInvite(invite Invite) error
 	GetUser(uid string) (User, error)
@@ -163,14 +163,14 @@ func (s *Store) GetInvite(token string) (Invite, error) {
 	return in, nil
 }
 
-func (s *Store) LogInviteUse(user string, invite Invite) error {
+func (s *Store) LogInviteUse(user User, invite Invite) error {
 	q, err := s.database.Prepare("INSERT INTO invite_log (entry_id, invite, user) VALUES ($1, $2, $3)")
 	if err != nil {
 		return err
 	}
 	entryId := uuid.New().String()
 
-	_, err = q.Exec(entryId, invite.Token, user)
+	_, err = q.Exec(entryId, invite.Token, user.Id)
 	return err
 }
 
@@ -180,22 +180,22 @@ func (s *Store) InviteLog(invite Invite) ([]InviteLog, error) {
 		return []InviteLog{}, nil
 	}
 
-	var log []InviteLog
+	var logs []InviteLog
 	for q.Next() {
 		var logEntry InviteLog
 		err := q.Scan(&logEntry.EntryID, &logEntry.Invite.Token, &logEntry.User.Id)
 		if err != nil {
-			continue
+			log.Println(err.Error())
 		}
 		user, err := s.GetUser(logEntry.User.Id)
 		if err != nil {
-			continue
+			log.Println(err.Error())
 		}
 		logEntry.User = user
-		log = append(log, logEntry)
+		logs = append(logs, logEntry)
 	}
 
-	return log, nil
+	return logs, nil
 }
 
 func (s *Store) GetServer(id string) (Server, error) {
diff --git a/transport/http.go b/transport/http.go
index 5028590..628668c 100644
--- a/transport/http.go
+++ b/transport/http.go
@@ -165,7 +165,7 @@ func (h *Handler) AcceptInvite(w http.ResponseWriter, r *http.Request) {
 	}
 
 	if resp == fmt.Sprintf("Added %s to the whitelist", user.DisplayName) {
-		err = h.store.LogInviteUse(user.DisplayName, in)
+		err = h.store.LogInviteUse(user, in)
 		if err != nil {
 			http.Error(w, err.Error(), http.StatusInternalServerError)
 			return