- Fix UTF-8 comments from the CLI version. (closes #442)

trizen · Jan 21, 2025 · 2cb70fc · 2cb70fc
1 parent baf7c8e
commit 2cb70fc
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/bin/youtube-viewer b/bin/youtube-viewer
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-# Copyright (C) 2010-2024 Trizen <echo dHJpemVuQHByb3Rvbm1haWwuY29tCg== | base64 -d>.
+# Copyright (C) 2010-2025 Trizen <echo dHJpemVuQHByb3Rvbm1haWwuY29tCg== | base64 -d>.
 #
 # This program is free software; you can redistribute it and/or modify it
 # under the terms of either: the GNU General Public License as published
@@ -15,7 +15,7 @@
 #-------------------------------------------------------
 #  youtube-viewer
 #  Created on: 02 June 2010
-#  Latest edit on: 25 August 2024
+#  Latest edit on: 21 January 2025
 #  https://github.com/trizen/youtube-viewer
 #-------------------------------------------------------
 
@@ -3177,7 +3177,13 @@ sub print_comments {
                         warn colored("\n[!] Editor exited with a non-zero code. Unable to continue!", 'bold red') . "\n";
                     }
                     else {
-                        my $comment = do { local (@ARGV, $/) = $filename; <> };
+                        my $comment = do {
+                            open(my $fh, '<:utf8', $filename)
+                              or warn colored("\n[!] Your comment has NOT been posted!", 'bold red') . "\n";
+                            local $/;
+                            <$fh>;
+                        };
+
                         $comment =~ s/[^\s[:^cntrl:]]+//g;    # remove control characters
 
                         if (length($comment) and $yv_obj->comment_to_video_id($comment, $videoID)) {

diff --git a/lib/WWW/YoutubeViewer.pm b/lib/WWW/YoutubeViewer.pm
@@ -540,8 +540,7 @@ sub _send_request {
             if (defined($content)) {
                 $req->content_type('application/json; charset=UTF-8');
                 $req->header('Content-Length' => length($content));
-                use Encode;
-                $req->content(Encode::encode 'UTF-8', $content);
+                $req->content($content);
             }
 
             $self->{lwp}->request($req);