Merge branch 'reduce-fixmystreet-app'

1 files changed, 7 insertions, 10 deletions

diff --git a/bin/send-comments b/bin/send-comments
index fbbd57891..bf5f27ce0 100755
--- a/bin/send-comments
+++ b/bin/send-comments
@@ -20,15 +20,12 @@ BEGIN {
     require "$d/../setenv.pl";
 }
 
-use Digest::MD5;
-use Encode;
 use CronFns;
 
-use FixMyStreet::App;
-
-use Utils;
-use mySociety::Config;
-
+use DateTime;
+use FixMyStreet;
+use FixMyStreet::Cobrand;
+use FixMyStreet::DB;
 use Open311;
 
 # send_method config values found in by-area config data, for selecting to appropriate method
@@ -39,10 +36,10 @@ use constant COUNCIL_ID_OXFORDSHIRE => 2237;
 
 # Set up site, language etc.
 my ($verbose, $nomail) = CronFns::options();
-my $base_url = mySociety::Config::get('BASE_URL');
+my $base_url = FixMyStreet->config('BASE_URL');
 my $site = CronFns::site($base_url);
 
-my $bodies = FixMyStreet::App->model('DB::Body')->search( {
+my $bodies = FixMyStreet::DB->resultset('Body')->search( {
     send_method => SEND_METHOD_OPEN311,
     send_comments => 1,
 } );
@@ -54,7 +51,7 @@ while ( my $body = $bodies->next ) {
     next if $body->areas->{+COUNCIL_ID_OXFORDSHIRE};
 
     my $use_extended = 0;
-    my $comments = FixMyStreet::App->model('DB::Comment')->search( {
+    my $comments = FixMyStreet::DB->resultset('Comment')->search( {
             'me.whensent'    => undef,
             'me.external_id' => undef,
             'me.state'          => 'confirmed',