From ccb4e90463e0c3e201bae8124af9e3a708cf44ad Mon Sep 17 00:00:00 2001
From: Ryan Voots <ryan@voots.org>
Date: Mon, 24 Apr 2017 20:52:23 -0400
Subject: [PATCH] Should be working now, except announcement

---
 lib/App/Controller/Apiv1.pm | 4 ++--
 lib/App/Controller/Paste.pm | 5 +++--
 lib/App/Model/Eval.pm       | 2 +-
 lib/App/Model/Paste.pm      | 4 +++-
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/lib/App/Controller/Apiv1.pm b/lib/App/Controller/Apiv1.pm
index 9a7ead0..80c3c38 100644
--- a/lib/App/Controller/Apiv1.pm
+++ b/lib/App/Controller/Apiv1.pm
@@ -25,7 +25,7 @@ sub api_get_paste {
     my $c = shift;
     my $pasteid = $c->param('pasteid');
     
-    my $row = get_paste($pasteid); 
+    my $row = $c->paste->get_paste($pasteid); 
 
     if ($row) {
         my $data = {
@@ -51,7 +51,7 @@ sub api_post_paste {
 
     my @args = map {($c->param($_))} qw/paste username description channel expire language/;
 
-    my $id = insert_pastebin(@args);
+    my $id = $c->paste->insert_pastebin(@args);
     my ($code, $who, $desc, $channel) = @args;
 
     # TODO select which one based on config
diff --git a/lib/App/Controller/Paste.pm b/lib/App/Controller/Paste.pm
index 8991e5e..3e52518 100644
--- a/lib/App/Controller/Paste.pm
+++ b/lib/App/Controller/Paste.pm
@@ -63,6 +63,7 @@ sub post_paste {
 
 sub edit_paste {
     my $c = shift;
+
     my $pasteid = $c->param('pasteid');
     
     my $row = $c->paste->get_paste($pasteid);
@@ -71,7 +72,7 @@ sub edit_paste {
         $c->stash({pastedata => $row->{paste}, channels =>$cfg->{announce}{channels}});
         $c->stash({page_tmpl => 'editor.html'});
 
-        $c->render('page');
+        $c->render(template => 'page');
     } else {
         return $c->reply->not_found;
     }
@@ -100,7 +101,7 @@ sub get_paste {
     if ($row) {
         $c->stash($row);
         $c->stash({page_tmpl => 'viewer.html'});
-        $c->stash({eval => get_eval($pasteid, $row->{paste}, $row->{lang})});
+        $c->stash({eval => $c->eval->get_eval($pasteid, $row->{paste}, $row->{lang})});
         $c->stash({paste_id => $pasteid});
 
         $c->render('page');
diff --git a/lib/App/Model/Eval.pm b/lib/App/Model/Eval.pm
index c28984b..4f18b6a 100644
--- a/lib/App/Model/Eval.pm
+++ b/lib/App/Model/Eval.pm
@@ -1,4 +1,4 @@
-package Eval::Perlbot;
+package App::Model::Eval;
 
 use strict;
 use warnings;
diff --git a/lib/App/Model/Paste.pm b/lib/App/Model/Paste.pm
index fcc0da3..3e3f1b0 100644
--- a/lib/App/Model/Paste.pm
+++ b/lib/App/Model/Paste.pm
@@ -5,6 +5,7 @@ use warnings;
 
 use DBI;
 use Mojo::Base '-base';
+use DateTime;
 
 # TODO config for dbname
 has 'dbh' => sub {DBI->connect("dbi:SQLite:dbname=pastes.db", "", "", {RaiseError => 1, sqlite_unicode => 1})};
@@ -28,7 +29,8 @@ sub insert_pastebin {
 }
 
 sub get_paste {
-  my ($self, $pasteid) = shift;
+  my ($self, $pasteid) = @_;
+
   my $dbh = $self->dbh;
   my $row = $dbh->selectrow_hashref(q{
     SELECT p.*