From 815bfa664dcf6aeaa32bec210515a679bea1a7cf Mon Sep 17 00:00:00 2001 From: Natalie Rose Date: Thu, 10 Sep 2026 08:42:42 +1000 Subject: [PATCH] Investigating captcha issue --- lib/Lacuna/RPC/Building/Embassy.pm | 2 +- lib/Lacuna/RPC/Building/Entertainment.pm | 2 +- lib/Lacuna/RPC/Building/Intelligence.pm | 2 +- lib/Lacuna/RPC/Building/MercenariesGuild.pm | 2 +- lib/Lacuna/RPC/Building/Parliament.pm | 2 +- lib/Lacuna/RPC/Building/SpacePort.pm | 10 +++++----- lib/Lacuna/RPC/Building/Trade.pm | 2 +- lib/Lacuna/RPC/Building/Transporter.pm | 2 +- 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/lib/Lacuna/RPC/Building/Embassy.pm b/lib/Lacuna/RPC/Building/Embassy.pm index e8db3673..f3651b7b 100644 --- a/lib/Lacuna/RPC/Building/Embassy.pm +++ b/lib/Lacuna/RPC/Building/Embassy.pm @@ -111,7 +111,7 @@ sub accept_invite { if ($empire->current_session->is_sitter) { confess [1015, 'Sitters cannot join alliances.']; } - $empire->current_session->check_captcha; + $session->check_captcha; unless ($invite_id) { confess [1002, 'You must specify an invite id.']; } diff --git a/lib/Lacuna/RPC/Building/Entertainment.pm b/lib/Lacuna/RPC/Building/Entertainment.pm index 59891c7a..b60be93f 100644 --- a/lib/Lacuna/RPC/Building/Entertainment.pm +++ b/lib/Lacuna/RPC/Building/Entertainment.pm @@ -34,7 +34,7 @@ sub get_lottery_voting_options { if ($session->is_sitter) { confess [1015, 'Sitters cannot enter the lottery.']; } - $empire->current_session->check_captcha; + $session->check_captcha; my $cache = Lacuna->cache; my @list; my $config = Lacuna->config; diff --git a/lib/Lacuna/RPC/Building/Intelligence.pm b/lib/Lacuna/RPC/Building/Intelligence.pm index fb354ae1..b8c2ffeb 100644 --- a/lib/Lacuna/RPC/Building/Intelligence.pm +++ b/lib/Lacuna/RPC/Building/Intelligence.pm @@ -158,7 +158,7 @@ sub assign_spy { unless ($building->efficiency == 100) { confess [1010, "You can not communicate with your spy when the Intelligence Ministry is in need of repair."]; } - $empire->current_session->check_captcha; + $session->check_captcha; my $spy = $building->get_spy($spy_id); unless (defined $spy) { confess [1002, "Spy not found."]; diff --git a/lib/Lacuna/RPC/Building/MercenariesGuild.pm b/lib/Lacuna/RPC/Building/MercenariesGuild.pm index 14f4b8c8..ef1ef129 100644 --- a/lib/Lacuna/RPC/Building/MercenariesGuild.pm +++ b/lib/Lacuna/RPC/Building/MercenariesGuild.pm @@ -79,7 +79,7 @@ sub accept_from_market { confess [1009, 'You are already at the maximum number of spies for the Intelligence Ministry.']; } - $empire->current_session->check_captcha; + $session->check_captcha; my $trade = $building->market->find($trade_id); unless (defined $trade) { diff --git a/lib/Lacuna/RPC/Building/Parliament.pm b/lib/Lacuna/RPC/Building/Parliament.pm index e8d3e56c..8d1144e8 100644 --- a/lib/Lacuna/RPC/Building/Parliament.pm +++ b/lib/Lacuna/RPC/Building/Parliament.pm @@ -145,7 +145,7 @@ sub propose_fire_bfg { if ($empire->current_session->is_sitter) { confess [1015, 'Sitters cannot create propositions.']; } - $empire->current_session->check_captcha; + $session->check_captcha; unless ($building->effective_level >= 25) { confess [1013, 'Parliament must be level 25 to propose using the BFG.',25]; } diff --git a/lib/Lacuna/RPC/Building/SpacePort.pm b/lib/Lacuna/RPC/Building/SpacePort.pm index 9c8af981..a48a9fb1 100644 --- a/lib/Lacuna/RPC/Building/SpacePort.pm +++ b/lib/Lacuna/RPC/Building/SpacePort.pm @@ -231,7 +231,7 @@ sub send_ship { $body->empire($empire); $ship->can_send_to_target($target); if ($ship->hostile_action) { - $empire->current_session->check_captcha; + $session->check_captcha; } confess [1009, "Sitters cannot send this type of ship."] if $empire->current_session->is_sitter and not $ship->sitter_can_send; $ship->send(target => $target); @@ -381,7 +381,7 @@ sub send_ship_types { } } if ($do_captcha_check) { - $empire->current_session->check_captcha; + $session->check_captcha; } # If we get here without exceptions, then all ships can be sent @@ -536,7 +536,7 @@ sub send_fleet { $body->empire($empire); $ship->can_send_to_target($target); if ($captcha_check && $ship->hostile_action ) { - $empire->current_session->check_captcha; + $session->check_captcha; $captcha_check = 0; } confess [1009, "Sitters cannot send this type of ship."] if $empire->current_session->is_sitter and not $ship->sitter_can_send; @@ -636,7 +636,7 @@ sub prepare_send_spies { } unless ($on_body->empire_id == $to_body->empire_id) { - $empire->current_session->check_captcha; + $session->check_captcha; } my $max_berth = $on_body->max_berth; @@ -713,7 +713,7 @@ sub send_spies { } unless ($on_body->empire_id == $to_body->empire_id) { - $empire->current_session->check_captcha; + $session->check_captcha; } # get the ship diff --git a/lib/Lacuna/RPC/Building/Trade.pm b/lib/Lacuna/RPC/Building/Trade.pm index f97cf85b..42cd2eba 100644 --- a/lib/Lacuna/RPC/Building/Trade.pm +++ b/lib/Lacuna/RPC/Building/Trade.pm @@ -516,7 +516,7 @@ sub accept_from_market { my $building = $session->current_building; confess [1013, 'You cannot use a trade ministry that has not yet been built.'] unless $building->effective_level > 0; - $empire->current_session->check_captcha; + $session->check_captcha; my $trade = $building->market->find($trade_id); unless (defined $trade) { diff --git a/lib/Lacuna/RPC/Building/Transporter.pm b/lib/Lacuna/RPC/Building/Transporter.pm index f3c43df4..ebd0c50e 100644 --- a/lib/Lacuna/RPC/Building/Transporter.pm +++ b/lib/Lacuna/RPC/Building/Transporter.pm @@ -182,7 +182,7 @@ sub accept_from_market { my $building = $session->current_building; confess [1013, 'You cannot use a transporter that has not yet been built.'] unless $building->effective_level > 0; - $empire->current_session->check_captcha; + $session->check_captcha; my $trade = $building->market->find($trade_id); unless (defined $trade) { -- 2.51.2