From 3327b6a1eee64f544a3fbb3facaff7676cadc512 Mon Sep 17 00:00:00 2001
From: counterweight <counterweightoperator@protonmail.com>
Date: Thu, 13 Feb 2025 00:13:56 +0100
Subject: [PATCH] small naming improvments

---
 scripts/create_invite.sh       | 6 +++---
 src/models/AppInviteCreated.js | 2 +-
 src/services/invitesService.js | 7 ++-----
 3 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/scripts/create_invite.sh b/scripts/create_invite.sh
index 838480a..e33489e 100644
--- a/scripts/create_invite.sh
+++ b/scripts/create_invite.sh
@@ -7,7 +7,7 @@ source "$(dirname "$0")/../.env"
 UUID=$(uuidgen)
 
 # Create a fake inviter_npub (using a random string here)
-INVITER_NPUB="fake_inviter_${RANDOM}"
+INVITER_PUB_KEY="fake_inviter_${RANDOM}"
 
 # Get the current timestamp for created_at
 CREATED_AT=$(date +"%Y-%m-%d %H:%M:%S")
@@ -18,13 +18,13 @@ POSTGRES_CONTAINER_NAME=$(docker compose ps -q postgres | xargs docker inspect -
 # Connect to the Postgres container and insert the fake record into the app_invite table
 docker exec -i "$POSTGRES_CONTAINER_NAME" psql -v -U "$POSTGRES_USER" -d "$POSTGRES_DB" -h localhost -p 5432 -c "
     INSERT INTO app_invite_created (uuid, inviter_npub, created_at)
-    VALUES ('$UUID', '$INVITER_NPUB', '$CREATED_AT')
+    VALUES ('$UUID', '$INVITER_PUB_KEY', '$CREATED_AT')
     RETURNING *;
 "
 
 # Print the generated values
 echo "Inserted app_invite_created Record:"
 echo "UUID: $UUID"
-echo "Inviter Npub: $INVITER_NPUB"
+echo "Inviter Npub: $INVITER_PUB_KEY"
 echo "Created At: $CREATED_AT"
 echo "Try it at http://localhost/invite/$UUID"
diff --git a/src/models/AppInviteCreated.js b/src/models/AppInviteCreated.js
index 83da417..776d239 100644
--- a/src/models/AppInviteCreated.js
+++ b/src/models/AppInviteCreated.js
@@ -8,7 +8,7 @@ const AppInviteCreated = sequelize.define('AppInviteCreated', {
         unique: true,
         primaryKey: true
     },
-    inviter_npub: {
+    inviter_pub_key: {
         type: DataTypes.STRING,
         allowNull: false,
     },
diff --git a/src/services/invitesService.js b/src/services/invitesService.js
index f8abc7c..28258f2 100644
--- a/src/services/invitesService.js
+++ b/src/services/invitesService.js
@@ -5,10 +5,7 @@ const AppInviteCreated = require('../models/AppInviteCreated');
 const SignUpChallengeCreated = require('../models/SignUpChallengeCreated');
 const SignUpChallengeCompleted = require('../models/SignUpChallengeCompleted');
 
-
 const errors = require('../errors');
-const NostrChallengeCompleted = require('../models/NostrChallengeCompleted');
-const { sortEvents } = require('nostr-tools');
 
 async function appInviteExists(inviteUuid) {
     const invite = await AppInviteCreated.findOne({ where: { uuid: inviteUuid } });
@@ -36,10 +33,10 @@ async function isAppInviteSpent(appInviteUuid) {
     return false;
 }
 
-async function createAppInvite(inviterNpub) {
+async function createAppInvite(inviterPubKey) {
     return await AppInviteCreated.create({
         uuid: uuid.v7(),
-        inviter_npub: inviterNpub,
+        inviter_pub_key: inviterPubKey,
         created_at: new Date().toISOString()
     }
     );