From 246001b24278c8fd4b513e27fd20715f34f232df Mon Sep 17 00:00:00 2001
From: swag <swaggboi@slackware.uk>
Date: Fri, 22 Jul 2022 11:06:29 -0400
Subject: [PATCH] Clean up some stuff

---
 guestbook-ng.pl                  | 7 ++++---
 lib/GuestbookNg/Model/Message.pm | 4 ----
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/guestbook-ng.pl b/guestbook-ng.pl
index aae1e18..e861be0 100755
--- a/guestbook-ng.pl
+++ b/guestbook-ng.pl
@@ -85,15 +85,16 @@ any [qw{GET POST}], '/sign' => sub ($c) {
             $c->stash(status => 400)
         }
         else {
-            my $new_message_id =
-                $c->message->create_post($name, $message, $url, $spam);
+            $c->message->create_post($name, $message, $url, $spam);
 
             if ($spam) {
                 $c->flash(error => 'This message was flagged as spam')
             }
             # Send this notification if there's a Webhook URL
             elsif (app->mode() eq 'production' && -s '.tom.url') {
-                my ($url_file, $url, $webhook);
+                my ($new_message_id, $url_file, $url, $webhook);
+
+                $new_message_id = $c->message->get_last_message_id();
 
                 open($url_file, '.tom.url') || die "$@";
                 chomp($url = <$url_file>);
diff --git a/lib/GuestbookNg/Model/Message.pm b/lib/GuestbookNg/Model/Message.pm
index 082329f..a320070 100644
--- a/lib/GuestbookNg/Model/Message.pm
+++ b/lib/GuestbookNg/Model/Message.pm
@@ -76,8 +76,6 @@ sub get_spam($self, $this_page = undef) {
 }
 
 sub create_post($self, $name, $message, $url = undef, $spam = 1) {
-    my $message_id = $self->get_last_message_id();
-
     if ($url) {
         $self->pg->db->query(<<~'END_SQL', $name, $message, $url, $spam)
             INSERT INTO messages (visitor_name, message, homepage_url, is_spam)
@@ -90,8 +88,6 @@ sub create_post($self, $name, $message, $url = undef, $spam = 1) {
             VALUES (?, ?, ?);
            END_SQL
     }
-
-    ++$message_id;
 }
 
 sub max_posts($self, $value = undef) {