From d0b14644bb9937d73137a4b8c0121a13defe9b56 Mon Sep 17 00:00:00 2001
From: Stypox <stypox@pm.me>
Date: Sat, 16 May 2020 21:14:10 +0200
Subject: [PATCH] [YouTube/MediaCCC] Consider dates as GMT and not as local

---
 .../services/media_ccc/extractors/MediaCCCParsingHelper.java | 5 ++++-
 .../extractor/services/youtube/YoutubeParsingHelper.java     | 4 +++-
 .../extractor/services/DefaultStreamExtractorTest.java       | 3 +--
 .../services/peertube/PeertubeStreamExtractorTest.java       | 4 ++--
 4 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/services/media_ccc/extractors/MediaCCCParsingHelper.java b/extractor/src/main/java/org/schabi/newpipe/extractor/services/media_ccc/extractors/MediaCCCParsingHelper.java
index 9e5baaf9c..dfdceeadc 100644
--- a/extractor/src/main/java/org/schabi/newpipe/extractor/services/media_ccc/extractors/MediaCCCParsingHelper.java
+++ b/extractor/src/main/java/org/schabi/newpipe/extractor/services/media_ccc/extractors/MediaCCCParsingHelper.java
@@ -6,6 +6,7 @@ import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.Calendar;
 import java.util.Date;
+import java.util.TimeZone;
 
 public final class MediaCCCParsingHelper {
     private MediaCCCParsingHelper() { }
@@ -13,7 +14,9 @@ public final class MediaCCCParsingHelper {
     public static Calendar parseDateFrom(final String textualUploadDate) throws ParsingException {
         Date date;
         try {
-            date = new SimpleDateFormat("yyyy-MM-dd").parse(textualUploadDate);
+            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+            sdf.setTimeZone(TimeZone.getTimeZone("GMT"));
+            date = sdf.parse(textualUploadDate);
         } catch (ParseException e) {
             throw new ParsingException("Could not parse date: \"" + textualUploadDate + "\"", e);
         }
diff --git a/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeParsingHelper.java b/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeParsingHelper.java
index af10efa22..cefab49d5 100644
--- a/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeParsingHelper.java
+++ b/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeParsingHelper.java
@@ -185,7 +185,9 @@ public class YoutubeParsingHelper {
     public static Calendar parseDateFrom(String textualUploadDate) throws ParsingException {
         Date date;
         try {
-            date = new SimpleDateFormat("yyyy-MM-dd").parse(textualUploadDate);
+            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+            sdf.setTimeZone(TimeZone.getTimeZone("GMT"));
+            date = sdf.parse(textualUploadDate);
         } catch (ParseException e) {
             throw new ParsingException("Could not parse date: \"" + textualUploadDate + "\"", e);
         }
diff --git a/extractor/src/test/java/org/schabi/newpipe/extractor/services/DefaultStreamExtractorTest.java b/extractor/src/test/java/org/schabi/newpipe/extractor/services/DefaultStreamExtractorTest.java
index 860dfd48d..81d9dced3 100644
--- a/extractor/src/test/java/org/schabi/newpipe/extractor/services/DefaultStreamExtractorTest.java
+++ b/extractor/src/test/java/org/schabi/newpipe/extractor/services/DefaultStreamExtractorTest.java
@@ -172,10 +172,9 @@ public abstract class DefaultStreamExtractorTest extends DefaultExtractorTest<St
 
             final Calendar expectedDate = Calendar.getInstance();
             final Calendar actualDate = dateWrapper.date();
-            expectedDate.setTimeZone(TimeZone.getTimeZone("GMT"));
-            actualDate.setTimeZone(TimeZone.getTimeZone("GMT"));
 
             final SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.S");
+            sdf.setTimeZone(TimeZone.getTimeZone("GMT"));
             expectedDate.setTime(sdf.parse(expectedUploadDate()));
             assertEquals(expectedDate, actualDate);
         }
diff --git a/extractor/src/test/java/org/schabi/newpipe/extractor/services/peertube/PeertubeStreamExtractorTest.java b/extractor/src/test/java/org/schabi/newpipe/extractor/services/peertube/PeertubeStreamExtractorTest.java
index 0b5f13050..8b9550b81 100644
--- a/extractor/src/test/java/org/schabi/newpipe/extractor/services/peertube/PeertubeStreamExtractorTest.java
+++ b/extractor/src/test/java/org/schabi/newpipe/extractor/services/peertube/PeertubeStreamExtractorTest.java
@@ -80,7 +80,7 @@ public class PeertubeStreamExtractorTest {
         @Override public long expectedLength() { return 113; }
         @Override public long expectedTimestamp() { return TIMESTAMP_MINUTE*60 + TIMESTAMP_SECOND; }
         @Override public long expectedViewCountAtLeast() { return 38600; }
-        @Nullable @Override public String expectedUploadDate() { return "2018-10-01 12:52:46.396"; } // GMT (!)
+        @Nullable @Override public String expectedUploadDate() { return "2018-10-01 10:52:46.396"; }
         @Nullable @Override public String expectedTextualUploadDate() { return "2018-10-01T10:52:46.396Z"; }
         @Override public long expectedLikeCountAtLeast() { return 120; }
         @Override public long expectedDislikeCountAtLeast() { return 0; }
@@ -137,7 +137,7 @@ public class PeertubeStreamExtractorTest {
         }
         @Override public long expectedLength() { return 512; }
         @Override public long expectedViewCountAtLeast() { return 7; }
-        @Nullable @Override public String expectedUploadDate() { return "2019-10-22 08:16:48.982"; } // GMT (!)
+        @Nullable @Override public String expectedUploadDate() { return "2019-10-22 06:16:48.982"; }
         @Nullable @Override public String expectedTextualUploadDate() { return "2019-10-22T06:16:48.982Z"; }
         @Override public long expectedLikeCountAtLeast() { return 3; }
         @Override public long expectedDislikeCountAtLeast() { return 0; }