Skip to content

Commit 657f165

Browse files
AudricVAudricV
committed
Update client version and mocks
1 parent 8c1c728 commit 657f165

186 files changed

Lines changed: 9009 additions & 7274 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeParsingHelper.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ private YoutubeParsingHelper() {
6666

6767
public static final String YOUTUBEI_V1_URL = "https://www.youtube.com/youtubei/v1/";
6868

69-
private static final String HARDCODED_CLIENT_VERSION = "2.20210601.07.00";
69+
private static final String HARDCODED_CLIENT_VERSION = "2.20210603.07.00";
7070
private static final String HARDCODED_KEY = "AIzaSyAO_FJ2SlqU8Q4STEHLGCilw_Y9_11qcW8";
7171
private static final String MOBILE_YOUTUBE_KEY = "AIzaSyA8eiZmM1FaDVjRy-df2KTyQ_vz_yYM39w";
7272
private static final String MOBILE_YOUTUBE_CLIENT_VERSION = "16.20.36";

‎extractor/src/test/java/org/schabi/newpipe/extractor/services/youtube/YoutubeChannelExtractorTest.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ public void accountTerminatedTOSFetch() throws Exception {
5959
YouTube.getChannelExtractor("https://www.youtube.com/channel/UCTGjY2I-ZUGnwVoWAGRd7XQ");
6060
try {
6161
extractor.fetchPage();
62-
} catch (AccountTerminatedException e) {
62+
} catch (final AccountTerminatedException e) {
6363
assertEquals(e.getReason(), AccountTerminatedException.Reason.VIOLATION);
6464
throw e;
6565
}
@@ -72,7 +72,7 @@ public void accountTerminatedCommunityFetch() throws Exception {
7272
YouTube.getChannelExtractor("https://www.youtube.com/channel/UC0AuOxCr9TZ0TtEgL1zpIgA");
7373
try {
7474
extractor.fetchPage();
75-
} catch (AccountTerminatedException e) {
75+
} catch (final AccountTerminatedException e) {
7676
assertEquals(e.getReason(), AccountTerminatedException.Reason.VIOLATION);
7777
throw e;
7878
}
@@ -86,7 +86,7 @@ public void accountTerminatedHateFetch() throws Exception {
8686
YouTube.getChannelExtractor("https://www.youtube.com/channel/UCPWXIOPK-9myzek6jHR5yrg");
8787
try {
8888
extractor.fetchPage();
89-
} catch (AccountTerminatedException e) {
89+
} catch (final AccountTerminatedException e) {
9090
assertEquals(e.getReason(), AccountTerminatedException.Reason.VIOLATION);
9191
throw e;
9292
}
@@ -100,7 +100,7 @@ public void accountTerminatedBullyFetch() throws Exception {
100100
YouTube.getChannelExtractor("https://youtube.com/channel/UCB1o7_gbFp2PLsamWxFenBg");
101101
try {
102102
extractor.fetchPage();
103-
} catch (AccountTerminatedException e) {
103+
} catch (final AccountTerminatedException e) {
104104
assertEquals(e.getReason(), AccountTerminatedException.Reason.VIOLATION);
105105
throw e;
106106
}
@@ -115,7 +115,7 @@ public void accountTerminatedSpamFetch() throws Exception {
115115
YouTube.getChannelExtractor("https://www.youtube.com/channel/UCoaO4U_p7G7AwalqSbGCZOA");
116116
try {
117117
extractor.fetchPage();
118-
} catch (AccountTerminatedException e) {
118+
} catch (final AccountTerminatedException e) {
119119
assertEquals(e.getReason(), AccountTerminatedException.Reason.VIOLATION);
120120
throw e;
121121
}
@@ -129,7 +129,7 @@ public void accountTerminatedCopyrightFetch() throws Exception {
129129
YouTube.getChannelExtractor("https://www.youtube.com/channel/UCpExuV8qJMfCaSQNL1YG6bQ");
130130
try {
131131
extractor.fetchPage();
132-
} catch (AccountTerminatedException e) {
132+
} catch (final AccountTerminatedException e) {
133133
assertEquals(e.getReason(), AccountTerminatedException.Reason.VIOLATION);
134134
throw e;
135135
}

‎extractor/src/test/resources/org/schabi/newpipe/extractor/kiosk/generated_mock_0.json‎

Lines changed: 6 additions & 6 deletions
Large diffs are not rendered by default.

‎extractor/src/test/resources/org/schabi/newpipe/extractor/kiosk/generated_mock_1.json‎

Lines changed: 6 additions & 6 deletions
Large diffs are not rendered by default.

‎extractor/src/test/resources/org/schabi/newpipe/extractor/services/youtube/extractor/channel/VSauce/generated_mock_0.json‎

Lines changed: 6 additions & 6 deletions
Large diffs are not rendered by default.

‎extractor/src/test/resources/org/schabi/newpipe/extractor/services/youtube/extractor/channel/VSauce/generated_mock_1.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
"https://www.youtube.com"
1717
],
1818
"X-YouTube-Client-Version": [
19-
"2.20210601.07.00"
19+
"2.20210603.07.00"
2020
]
2121
},
2222
"dataToSend": [
@@ -110,7 +110,7 @@
110110
48,
111111
54,
112112
48,
113-
49,
113+
51,
114114
46,
115115
48,
116116
55,
@@ -185,10 +185,10 @@
185185
"application/json; charset\u003dUTF-8"
186186
],
187187
"date": [
188-
"Wed, 02 Jun 2021 17:36:32 GMT"
188+
"Sat, 05 Jun 2021 16:54:19 GMT"
189189
],
190190
"expires": [
191-
"Wed, 02 Jun 2021 17:36:32 GMT"
191+
"Sat, 05 Jun 2021 16:54:19 GMT"
192192
],
193193
"p3p": [
194194
"CP\u003d\"This is not a P3P policy! See g.co/p3phelp for more info.\""
@@ -197,7 +197,7 @@
197197
"ESF"
198198
],
199199
"set-cookie": [
200-
"CONSENT\u003dPENDING+162; expires\u003dFri, 01-Jan-2038 00:00:00 GMT; path\u003d/; domain\u003d.youtube.com; Secure"
200+
"CONSENT\u003dPENDING+116; expires\u003dFri, 01-Jan-2038 00:00:00 GMT; path\u003d/; domain\u003d.youtube.com; Secure"
201201
],
202202
"vary": [
203203
"Origin",
@@ -214,7 +214,7 @@
214214
"0"
215215
]
216216
},
217-
"responseBody": "{\n \"responseContext\": {\n \"visitorData\": \"Cgt4aXZuM2dQcWxzayigg9-FBg%3D%3D\",\n \"serviceTrackingParams\": [\n {\n \"service\": \"CSI\",\n \"params\": [\n {\n \"key\": \"c\",\n \"value\": \"WEB\"\n },\n {\n \"key\": \"cver\",\n \"value\": \"2.20210601.07.00\"\n },\n {\n \"key\": \"yt_li\",\n \"value\": \"0\"\n },\n {\n \"key\": \"ResolveUrl_rid\",\n \"value\": \"0x8aa2cf4dff7833b0\"\n }\n ]\n },\n {\n \"service\": \"GFEEDBACK\",\n \"params\": [\n {\n \"key\": \"logged_in\",\n \"value\": \"0\"\n },\n {\n \"key\": \"e\",\n \"value\": \"24007246,23946420,24004644,24001373,24038976,23968386,24049915,24027133,24043529,23857949,24044666,24010465,24037794,24027649,24042870,24044575,23882502,24039455,23983296,1714245,24043806,23944779,24040786,23884386,24049788,23891346,24037806,23986021,24030040,23804281,24005802,23891344,24036085,24043558,24030993,23970529,23966208,23735348,23968099,24042868,24005646,24026152,23918597,23934970,23744176,9466593,23974595,23890959,23996830,24035275\"\n }\n ]\n },\n {\n \"service\": \"GUIDED_HELP\",\n \"params\": [\n {\n \"key\": \"logged_in\",\n \"value\": \"0\"\n }\n ]\n },\n {\n \"service\": \"ECATCHER\",\n \"params\": [\n {\n \"key\": \"client.version\",\n \"value\": \"2.20210601\"\n },\n {\n \"key\": \"client.name\",\n \"value\": \"WEB\"\n }\n ]\n }\n ],\n \"mainAppWebResponseContext\": {\n \"loggedOut\": true\n },\n \"webResponseContextExtensionData\": {\n \"hasDecorated\": true\n }\n },\n \"endpoint\": {\n \"clickTrackingParams\": \"IhMIpe3zsb758AIVMzzxBR0FxAtNMghleHRlcm5hbA\u003d\u003d\",\n \"commandMetadata\": {\n \"webCommandMetadata\": {\n \"url\": \"/youtubei/v1/navigation/resolve_url\",\n \"webPageType\": \"WEB_PAGE_TYPE_CHANNEL\",\n \"rootVe\": 3611,\n \"apiUrl\": \"/youtubei/v1/browse\"\n },\n \"resolveUrlCommandMetadata\": {\n \"isVanityUrl\": true\n }\n },\n \"browseEndpoint\": {\n \"browseId\": \"UC6nSFpj9HTCZ5t-N3Rm3-HA\",\n \"params\": \"EgC4AQA%3D\"\n }\n }\n}\n",
217+
"responseBody": "{\n \"responseContext\": {\n \"visitorData\": \"CgtGU0R3TWhqclN0MCi72O6FBg%3D%3D\",\n \"serviceTrackingParams\": [\n {\n \"service\": \"CSI\",\n \"params\": [\n {\n \"key\": \"c\",\n \"value\": \"WEB\"\n },\n {\n \"key\": \"cver\",\n \"value\": \"2.20210603.07.00\"\n },\n {\n \"key\": \"yt_li\",\n \"value\": \"0\"\n },\n {\n \"key\": \"ResolveUrl_rid\",\n \"value\": \"0x9b43c28b33d3aab5\"\n }\n ]\n },\n {\n \"service\": \"GFEEDBACK\",\n \"params\": [\n {\n \"key\": \"logged_in\",\n \"value\": \"0\"\n },\n {\n \"key\": \"e\",\n \"value\": \"24010465,23944779,23890959,24048890,23744176,24051457,24027133,23974595,23998056,23940237,24050517,23918597,24005802,23968386,23882503,1714246,24005207,24048461,23996830,23891346,24030040,24005646,23983296,23804281,23934970,24042870,23857950,24023961,24053133,24003541,24044575,24036085,24037794,23880830,24049126,23880836,24036947,24011648,24007246,24027649,24004644,23891344,23885487,24001373,23946420,23986031,24042868,23968099,24037806,23966208,23884386,23970529\"\n }\n ]\n },\n {\n \"service\": \"GUIDED_HELP\",\n \"params\": [\n {\n \"key\": \"logged_in\",\n \"value\": \"0\"\n }\n ]\n },\n {\n \"service\": \"ECATCHER\",\n \"params\": [\n {\n \"key\": \"client.version\",\n \"value\": \"2.20210603\"\n },\n {\n \"key\": \"client.name\",\n \"value\": \"WEB\"\n }\n ]\n }\n ],\n \"mainAppWebResponseContext\": {\n \"loggedOut\": true\n },\n \"webResponseContextExtensionData\": {\n \"hasDecorated\": true\n }\n },\n \"endpoint\": {\n \"clickTrackingParams\": \"IhMI24fFxvqA8QIV9yzxBR3C6QWIMghleHRlcm5hbA\u003d\u003d\",\n \"commandMetadata\": {\n \"webCommandMetadata\": {\n \"url\": \"/youtubei/v1/navigation/resolve_url\",\n \"webPageType\": \"WEB_PAGE_TYPE_CHANNEL\",\n \"rootVe\": 3611,\n \"apiUrl\": \"/youtubei/v1/browse\"\n },\n \"resolveUrlCommandMetadata\": {\n \"isVanityUrl\": true\n }\n },\n \"browseEndpoint\": {\n \"browseId\": \"UC6nSFpj9HTCZ5t-N3Rm3-HA\",\n \"params\": \"EgC4AQA%3D\"\n }\n }\n}\n",
218218
"latestUrl": "https://www.youtube.com/youtubei/v1/navigation/resolve_url?key\u003dAIzaSyAO_FJ2SlqU8Q4STEHLGCilw_Y9_11qcW8"
219219
}
220220
}

‎extractor/src/test/resources/org/schabi/newpipe/extractor/services/youtube/extractor/channel/VSauce/generated_mock_2.json‎

Lines changed: 6 additions & 6 deletions
Large diffs are not rendered by default.

‎extractor/src/test/resources/org/schabi/newpipe/extractor/services/youtube/extractor/channel/VSauce/generated_mock_3.json‎

Lines changed: 5 additions & 5 deletions
Large diffs are not rendered by default.

‎extractor/src/test/resources/org/schabi/newpipe/extractor/services/youtube/extractor/channel/captainDisillusion/generated_mock_0.json‎

Lines changed: 6 additions & 6 deletions
Large diffs are not rendered by default.

‎extractor/src/test/resources/org/schabi/newpipe/extractor/services/youtube/extractor/channel/captainDisillusion/generated_mock_1.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
"https://www.youtube.com"
1717
],
1818
"X-YouTube-Client-Version": [
19-
"2.20210601.07.00"
19+
"2.20210603.07.00"
2020
]
2121
},
2222
"dataToSend": [
@@ -110,7 +110,7 @@
110110
48,
111111
54,
112112
48,
113-
49,
113+
51,
114114
46,
115115
48,
116116
55,
@@ -197,10 +197,10 @@
197197
"application/json; charset\u003dUTF-8"
198198
],
199199
"date": [
200-
"Wed, 02 Jun 2021 17:37:31 GMT"
200+
"Sat, 05 Jun 2021 16:55:30 GMT"
201201
],
202202
"expires": [
203-
"Wed, 02 Jun 2021 17:37:31 GMT"
203+
"Sat, 05 Jun 2021 16:55:30 GMT"
204204
],
205205
"p3p": [
206206
"CP\u003d\"This is not a P3P policy! See g.co/p3phelp for more info.\""
@@ -209,7 +209,7 @@
209209
"ESF"
210210
],
211211
"set-cookie": [
212-
"CONSENT\u003dPENDING+135; expires\u003dFri, 01-Jan-2038 00:00:00 GMT; path\u003d/; domain\u003d.youtube.com; Secure"
212+
"CONSENT\u003dPENDING+456; expires\u003dFri, 01-Jan-2038 00:00:00 GMT; path\u003d/; domain\u003d.youtube.com; Secure"
213213
],
214214
"vary": [
215215
"Origin",
@@ -226,7 +226,7 @@
226226
"0"
227227
]
228228
},
229-
"responseBody": "{\n \"responseContext\": {\n \"visitorData\": \"CgtTUU1CZkNEQ3g1WSjbg9-FBg%3D%3D\",\n \"serviceTrackingParams\": [\n {\n \"service\": \"CSI\",\n \"params\": [\n {\n \"key\": \"c\",\n \"value\": \"WEB\"\n },\n {\n \"key\": \"cver\",\n \"value\": \"2.20210601.07.00\"\n },\n {\n \"key\": \"yt_li\",\n \"value\": \"0\"\n },\n {\n \"key\": \"ResolveUrl_rid\",\n \"value\": \"0x7ab52fa69212c1f1\"\n }\n ]\n },\n {\n \"service\": \"GFEEDBACK\",\n \"params\": [\n {\n \"key\": \"logged_in\",\n \"value\": \"0\"\n },\n {\n \"key\": \"e\",\n \"value\": \"24022465,24023960,24051638,24037794,23999406,24030993,24040786,24044575,24013932,24010466,23891346,24005646,23934970,23804281,24038008,24042870,23996830,23983296,24030040,24012513,24044134,24043530,23827039,23968386,24048461,23990876,24045692,24047353,24050517,23918597,24003105,24005802,23744176,24047689,24027133,23882685,23975652,23974595,23857949,23944779,24044365,24035275,24003540,1714243,23890959,23970530,24042868,24001373,23946420,24037806,24002841,23966208,23884386,23968099,24027649,24022729,24036085,23986033,23891344,24007246,24004644\"\n }\n ]\n },\n {\n \"service\": \"GUIDED_HELP\",\n \"params\": [\n {\n \"key\": \"logged_in\",\n \"value\": \"0\"\n }\n ]\n },\n {\n \"service\": \"ECATCHER\",\n \"params\": [\n {\n \"key\": \"client.version\",\n \"value\": \"2.20210601\"\n },\n {\n \"key\": \"client.name\",\n \"value\": \"WEB\"\n }\n ]\n }\n ],\n \"mainAppWebResponseContext\": {\n \"loggedOut\": true\n },\n \"webResponseContextExtensionData\": {\n \"hasDecorated\": true\n }\n },\n \"endpoint\": {\n \"clickTrackingParams\": \"IhMIto6Gzr758AIVdCvxBR1K-AhMMghleHRlcm5hbA\u003d\u003d\",\n \"commandMetadata\": {\n \"webCommandMetadata\": {\n \"url\": \"/youtubei/v1/navigation/resolve_url\",\n \"webPageType\": \"WEB_PAGE_TYPE_CHANNEL\",\n \"rootVe\": 3611,\n \"apiUrl\": \"/youtubei/v1/browse\"\n },\n \"resolveUrlCommandMetadata\": {\n \"isVanityUrl\": true\n }\n },\n \"browseEndpoint\": {\n \"browseId\": \"UCEOXxzW2vU0P-0THehuIIeg\",\n \"params\": \"EgC4AQA%3D\"\n }\n }\n}\n",
229+
"responseBody": "{\n \"responseContext\": {\n \"visitorData\": \"CgtUS1F0TlBKZ0tSYyiC2e6FBg%3D%3D\",\n \"serviceTrackingParams\": [\n {\n \"service\": \"CSI\",\n \"params\": [\n {\n \"key\": \"c\",\n \"value\": \"WEB\"\n },\n {\n \"key\": \"cver\",\n \"value\": \"2.20210603.07.00\"\n },\n {\n \"key\": \"yt_li\",\n \"value\": \"0\"\n },\n {\n \"key\": \"ResolveUrl_rid\",\n \"value\": \"0xfe309bc2ceefe8ed\"\n }\n ]\n },\n {\n \"service\": \"GFEEDBACK\",\n \"params\": [\n {\n \"key\": \"logged_in\",\n \"value\": \"0\"\n },\n {\n \"key\": \"e\",\n \"value\": \"23918597,24007246,24048891,24037794,24027649,24050517,23946420,24050503,24022464,24046103,23884386,24030293,23891346,24043961,24005646,24044723,23996830,23990875,24037806,23968099,23966208,24590263,23804281,24001373,23934970,24030040,24010466,23891344,24004644,24036085,23974595,24051457,1714257,24036947,23748146,23744176,23940237,23890959,23857949,24042868,23981192,23970529,24042870,23968386,24044575,23882685,23998057,24005802,24027133,23944779,23986021,24053491,23983296\"\n }\n ]\n },\n {\n \"service\": \"GUIDED_HELP\",\n \"params\": [\n {\n \"key\": \"logged_in\",\n \"value\": \"0\"\n }\n ]\n },\n {\n \"service\": \"ECATCHER\",\n \"params\": [\n {\n \"key\": \"client.version\",\n \"value\": \"2.20210603\"\n },\n {\n \"key\": \"client.name\",\n \"value\": \"WEB\"\n }\n ]\n }\n ],\n \"mainAppWebResponseContext\": {\n \"loggedOut\": true\n },\n \"webResponseContextExtensionData\": {\n \"hasDecorated\": true\n }\n },\n \"endpoint\": {\n \"clickTrackingParams\": \"IhMImpzC6PqA8QIV4ynxBR1KpAb9MghleHRlcm5hbA\u003d\u003d\",\n \"commandMetadata\": {\n \"webCommandMetadata\": {\n \"url\": \"/youtubei/v1/navigation/resolve_url\",\n \"webPageType\": \"WEB_PAGE_TYPE_CHANNEL\",\n \"rootVe\": 3611,\n \"apiUrl\": \"/youtubei/v1/browse\"\n },\n \"resolveUrlCommandMetadata\": {\n \"isVanityUrl\": true\n }\n },\n \"browseEndpoint\": {\n \"browseId\": \"UCEOXxzW2vU0P-0THehuIIeg\",\n \"params\": \"EgC4AQA%3D\"\n }\n }\n}\n",
230230
"latestUrl": "https://www.youtube.com/youtubei/v1/navigation/resolve_url?key\u003dAIzaSyAO_FJ2SlqU8Q4STEHLGCilw_Y9_11qcW8"
231231
}
232232
}

0 commit comments

Comments
 (0)