fix text format-related functions

diff --git a/src/newslash_web/lib/Newslash/Plugin/NewslashHelpers.pm b/src/newslash_web/lib/Newslash/Plugin/NewslashHelpers.pm
index 9baa0a9..c0bb405 100644 (file)
--- a/src/newslash_web/lib/Newslash/Plugin/NewslashHelpers.pm
+++ b/src/newslash_web/lib/Newslash/Plugin/NewslashHelpers.pm
@@ -42,7 +42,7 @@ sub register {
 
     for my $k (qw[boxes format_timestamp page_type content_type site_config
                   declare insert_code
-                  tidy_html clean_html escape_html escape_title escape_plaintext strip_by_mode
+                  tidy_html clean_html escape_html format_htmltext escape_plaintext strip_by_mode
                 ]) {
         $app->helper($k => $self->can("_$k"))
     }
@@ -82,7 +82,7 @@ sub _escape_html {
 =cut
 
 sub _clean_html {
-    my ($c, $html, $type) = @_;
+    my ($c, $html) = @_;
     my $allowed = $c->app->config->{Editor}->{allowed_tags};
     return Newslash::Util::TextFormatter::clean_html($allowed, $html);
 }
@@ -98,15 +98,35 @@ sub _escape_plaintext {
     return Newslash::Util::TextFormatter::escape_plaintext($text);
 }
 
-=head2 escape_title($text)
+=head2 format_htmltext($text)
 
-  escape title, then returns result.
+  format html/text, then returns result.
 
 =cut
 
-sub _escape_title {
-    my ($c, $text) = @_;
-    return Newslash::Util::TextFormatter::escape_plaintext($text);
+sub _format_htmltext {
+    my ($c, $text, $type) = @_;
+    my $allowed;
+
+    if ($type eq "title") {
+        return Newslash::Util::TextFormatter::escape_plaintext($text);
+    }
+    elsif ($type eq "story") {
+        return Newslash::Util::TextFormatter::tidy_html($text);
+    }
+    elsif ($type eq "comment") {
+        $allowed = $c->app->config->{Editor}->{allowed_tags};
+    }
+    elsif ($type eq "journal") {
+        $allowed = $c->app->config->{Editor}->{allowed_tags};
+    }
+    elsif ($type eq "submission") {
+        $allowed = $c->app->config->{Editor}->{allowed_tags};
+    }
+    else {
+        $allowed = $c->app->config->{Editor}->{allowed_tags};
+    }
+    return Newslash::Util::TextFormatter::escape_html($allowed, $text);
 }
 
 =head2 strip_by_mode($html, $post_type)

diff --git a/src/newslash_web/lib/Newslash/Util/TextFormatter.pm b/src/newslash_web/lib/Newslash/Util/TextFormatter.pm
index 3565d55..3961672 100644 (file)
--- a/src/newslash_web/lib/Newslash/Util/TextFormatter.pm
+++ b/src/newslash_web/lib/Newslash/Util/TextFormatter.pm
@@ -15,6 +15,7 @@ our @EXPORT_OK = qw(strip_by_mode);
 use EscapeHTML qw();
 use HTML::Tidy;
 use Data::Dumper;
+use Encode;
 
 use constant ANCHOR    => -4;
 use constant NOTAGS    => -3;
@@ -555,6 +556,7 @@ sub tidy_html {
                                  'show-body-only' => 1,
                      } );
     my $tidyed = $tidy->clean($html);
+    chomp($tidyed);
     return $tidyed;
 }
 
@@ -586,7 +588,6 @@ sub clean_html {
                                  'show-body-only' => 1,
                      } );
     my $tidyed = $tidy->clean($escaped);
-    chomp($tidyed);
     return $tidyed;
 }
 

diff --git a/src/newslash_web/lib/Newslash/Web/Controller/API/Comment.pm b/src/newslash_web/lib/Newslash/Web/Controller/API/Comment.pm
index 340407f..9e89528 100644 (file)
--- a/src/newslash_web/lib/Newslash/Web/Controller/API/Comment.pm
+++ b/src/newslash_web/lib/Newslash/Web/Controller/API/Comment.pm
@@ -28,7 +28,7 @@ sub post {
     my $message = "";
 
     $params->{title} = $c->escape_title($data->{title});
-    $params->{comment} = $c->clean_html($data->{comment}, "comment");
+    $params->{comment} = $c->format_htmltext($data->{comment}, "comment");
     $params->{discussion_id} = $data->{discussion_id};
     $params->{stoid} = $data->{stoid};
     $params->{pid} = $data->{pid};

diff --git a/src/newslash_web/lib/Newslash/Web/Controller/API/Journal.pm b/src/newslash_web/lib/Newslash/Web/Controller/API/Journal.pm
index f47a4cb..ed9ed8e 100644 (file)
--- a/src/newslash_web/lib/Newslash/Web/Controller/API/Journal.pm
+++ b/src/newslash_web/lib/Newslash/Web/Controller/API/Journal.pm
@@ -120,7 +120,7 @@ sub post {
             $item->{introtext} = $c->strip_by_mode($params->{article}, $params->{posttype});
         }
         else {
-            $item->{introtext} = $c->clean_html($params->{article}, "journal");
+            $item->{introtext} = $c->format_htmltext($params->{article}, "journal");
         }
         $item->{intro_text} = $item->{intro_text};
         $item->{title} = $params->{description};

diff --git a/src/newslash_web/lib/Newslash/Web/Controller/API/Story.pm b/src/newslash_web/lib/Newslash/Web/Controller/API/Story.pm
index 775dee8..b26277e 100644 (file)
--- a/src/newslash_web/lib/Newslash/Web/Controller/API/Story.pm
+++ b/src/newslash_web/lib/Newslash/Web/Controller/API/Story.pm
@@ -37,7 +37,7 @@ sub get {
         $c->rendered(404);
         return;
     }
-    my $related = $stories->get_related_items($story->{stoid});
+    my $related = $stories->get_related_items(stoid => $story->{stoid});
     $story->{related} = $related;
     $c->render(json => { item => $story });
 }
@@ -65,7 +65,7 @@ sub post {
     # client send data like this:
     # {"item":{"title":"ほげ","introtext":"ほんぶん","bodytext":"","createtime":"2017-06-30T21:50:04","author":"hylom","dept":"テスト","commentstatus":"enabled","submissioncopy":0,"url":"","email":"","tags_string":"news","related_urls":"http://sdtest.osdn.co.jp:3000/story/16/01/28/0610215/"},"action":"preview"}
 
-    $params->{title} = $c->escape_plaintext($item->{title});
+    $params->{title} = $c->format_htmltext($item->{title}, "title");
     $message = "no_title" if !$params->{title};
 
     # convert time
@@ -92,21 +92,31 @@ sub post {
 
     # check: introtext exists ?
     my $intro_text = $item->{intro_text} || $item->{introtext} || "";
-    $params->{introtext} = $c->clean_html($intro_text, "story");
+    $params->{introtext} = $c->format_htmltext($intro_text, "story");
     if (!$params->{introtext}) {
         $message = "introtext_not_given";
     }
 
     # bodytext (omittable)
     my $body_text = $item->{body_text} || $item->{bodytext} || "";
-    $params->{bodytext} = $c->clean_html($body_text, "story");
-
-    # TODO: related urls
-    #$params->{add_related} = $item->{add_related} || $item->{related_urls} || "";
+    $params->{bodytext} = $c->format_htmltext($body_text, "story");
+
+    # related urls
+    my $related_string = $item->{add_related} || $item->{related_urls} || "";
+    my @relateds = split(/\s+/, $related_string);
+    my $related_sids = [];
+    for my $related (@relateds) {
+        if ($related =~ m|^.*(\d\d/\d\d/\d\d/\d+)/|) {
+            push @$related_sids, $1;
+        }
+    }
+    $params->{add_related} = $related_sids;
 
     # tags
     # tags_strings is like: "mainpage japan business transport"
     my @tags = split(/\s+/, $item->{tags_string} || "");
+    $params->{add_tags} = \@tags;
+
     # add topics
     my $primary_topic = $topics->get_primary_topic_from_tags(\@tags);
     if ($primary_topic) {
@@ -116,7 +126,6 @@ sub post {
         $params->{topics_chosen} = { 49 => 10, }; # tid => weight
     }
 
-
     # TODO: media related
     #$item->{mediaurl};
     #$item->{mediatype};
@@ -161,7 +170,6 @@ sub post {
         #                           params => $params);
     }
 
-    # TODO: add tags
     # error check
     if (!$stoid) {
         if ($stories->last_errorno && $stories->last_errorno == 1062) { #ER_DUP_ENTRY

diff --git a/src/newslash_web/lib/Newslash/Web/Controller/API/Submission.pm b/src/newslash_web/lib/Newslash/Web/Controller/API/Submission.pm
index c524711..480badd 100644 (file)
--- a/src/newslash_web/lib/Newslash/Web/Controller/API/Submission.pm
+++ b/src/newslash_web/lib/Newslash/Web/Controller/API/Submission.pm
@@ -91,7 +91,7 @@ sub post {
     if ($item->{introtext} || $item->{intro_text}) {
         my $text = $item->{introtext} || $item->{intro_text};
         $text =~ s/\s+\z//m;
-        $params->{introtext} = $c->clean_html($text, "submission");
+        $params->{introtext} = $c->format_htmltext($text, "submission");
         $params->{introtext} =~ s/\s+\z//m;
     }
     else {