STRLCPY/maigret

Vimeo activation, tags updates
Soxoj committed 4 years ago

b9da54f7

1 parent fd236dd1

Revision indexing in progress... (symbol navigation in revisions will be accurate after indexed)

■ ■ ■ ■ ■ ■

maigret/activation.py

		skipped 10 lines
11	11		guest_token = j[site.activation['src']]
12	12		site.headers['x-guest-token'] = guest_token
13	13
	14	+	@staticmethod
	15	+	def vimeo(site, logger):
	16	+	headers = dict(site.headers)
	17	+	if 'Authorization' in headers:
	18	+	del headers['Authorization']
	19	+	r = requests.get(site.activation['url'], headers=headers)
	20	+	jwt_token = r.json()['jwt']
	21	+	site.headers['Authorization'] = 'jwt ' + jwt_token
	22	+

■ ■ ■ ■ ■ ■

maigret/maigret.py

		skipped 181 lines
182	182		error_text, site_error_text = detect_error_page(html_text, status_code, failure_errors,
183	183		site.ignore_403)
184	184
185		-	if site.activation:
	185	+	if site.activation and html_text:
186	186		is_need_activation = any([s for s in site.activation['marks'] if s in html_text])
187	187		if is_need_activation:
188	188		method = site.activation['method']
		skipped 7 lines
196	196		# presense flags
197	197		# True by default
198	198		presense_flags = site.presense_strs
	199	+	is_presense_detected = False
199	200		if html_text:
200		-	is_presense_detected = False
201	201		if not presense_flags:
202	202		is_presense_detected = True
203	203		site.stats['presense_flag'] = None
		skipped 743 lines

■ ■ ■ ■ ■ ■

maigret/resources/data.json

		skipped 308 lines
309	309		"500px": {
310	310		"tags": [
311	311		"global",
312		-	"in",
313		-	"photos"
	312	+	"photo"
314	313		],
315	314		"errors": {
316	315		"INTERNAL_SERVER_ERROR": "Site error",
		skipped 687 lines
1004	1003		},
1005	1004		"Aptoide": {
1006	1005		"tags": [
1007		-	"in"
	1006	+	"apps"
1008	1007		],
1009	1008		"regexCheck": "^[^\\.]+$",
1010	1009		"checkType": "status_code",
	1010	+	"presenseStrs": [
	1011	+	"BreadcrumbList"
	1012	+	],
1011	1013		"alexaRank": 6653,
1012	1014		"url": "https://{username}.en.aptoide.com/",
1013	1015		"urlMain": "https://en.aptoide.com/",
1014		-	"usernameClaimed": "blue",
	1016	+	"usernameClaimed": "kodi",
1015	1017		"usernameUnclaimed": "noonewouldeverusethis7"
1016	1018		},
1017	1019		"Aqa": {
		skipped 534 lines
1552	1554		"Badoo": {
1553	1555		"disabled": true,
1554	1556		"tags": [
1555		-	"br",
1556		-	"de",
1557		-	"pl",
1558		-	"social"
	1557	+	"global",
	1558	+	"dating"
1559	1559		],
1560	1560		"checkType": "status_code",
1561	1561		"alexaRank": 2343,
		skipped 1662 lines
3224	3224		"DeviantART": {
3225	3225		"tags": [
3226	3226		"global",
3227		-	"images",
3228		-	"photos",
3229		-	"us"
	3227	+	"photo",
	3228	+	"art"
3230	3229		],
3231	3230		"regexCheck": "^[a-zA-Z][a-zA-Z0-9_-]*$",
3232	3231		"checkType": "status_code",
		skipped 751 lines
3984	3983		},
3985	3984		"EyeEm": {
3986	3985		"tags": [
3987		-	"de",
3988	3986		"global",
3989		-	"in",
3990		-	"it",
3991		-	"photos",
3992		-	"sd"
	3987	+	"photo"
3993	3988		],
3994	3989		"checkType": "message",
3995	3990		"absenceStrs": "Not Found (404) \| EyeEm",
		skipped 89 lines
4085	4080		},
4086	4081		"Facebook": {
4087	4082		"tags": [
4088		-	"global",
4089		-	"social",
4090		-	"us"
	4083	+	"global"
4091	4084		],
4092	4085		"regexCheck": "^[a-zA-Z0-9_\\.]{3,49}(?<!\\.com\|\\.org\|\\.net)$",
4093	4086		"checkType": "status_code",
		skipped 5763 lines
9857	9850		"tags": [
9858	9851		"global",
9859	9852		"instagram",
9860		-	"photos",
9861		-	"us"
	9853	+	"photo"
9862	9854		],
9863	9855		"checkType": "message",
9864	9856		"absenceStrs": [
		skipped 54 lines
9919	9911		},
9920	9912		"Pinterest": {
9921	9913		"tags": [
9922		-	"images",
9923		-	"photos",
9924		-	"us"
	9914	+	"art",
	9915	+	"photo"
9925	9916		],
9926	9917		"checkType": "status_code",
9927	9918		"alexaRank": 152,
		skipped 944 lines
10872	10863		"Reddit": {
10873	10864		"tags": [
10874	10865		"news",
10875		-	"social",
10876		-	"us"
	10866	+	"discussions"
10877	10867		],
10878	10868		"checkType": "status_code",
10879	10869		"presenseStrs": [
		skipped 2492 lines
13372	13362		},
13373	13363		"TryHackMe": {
13374	13364		"tags": [
13375		-	"be",
13376		-	"in",
13377		-	"us"
	13365	+	"hacking"
13378	13366		],
13379	13367		"checkType": "status_code",
13380	13368		"alexaRank": 35003,
		skipped 5 lines
13386	13374		"Tumblr": {
13387	13375		"tags": [
13388	13376		"blogs",
13389		-	"global",
13390		-	"us"
	13377	+	"global"
13391	13378		],
13392	13379		"regexCheck": "^[^\\.]+$",
13393	13380		"checkType": "status_code",
		skipped 16 lines
13410	13397		},
13411	13398		"Twitch": {
13412	13399		"tags": [
13413		-	"us"
	13400	+	"streaming"
13414	13401		],
13415	13402		"urlProbe": "https://m.twitch.tv/{username}",
13416	13403		"checkType": "status_code",
		skipped 5 lines
13422	13409		},
13423	13410		"Twitter": {
13424	13411		"tags": [
13425		-	"global",
13426		-	"social",
13427		-	"us"
	13412	+	"global"
13428	13413		],
13429	13414		"headers": {
13430	13415		"sec-ch-ua": "Google Chrome\";v=\"87\", \" Not;A Brand\";v=\"99\", \"Chromium\";v=\"87\"",
		skipped 183 lines
13614	13599		"VK": {
13615	13600		"tags": [
13616	13601		"global",
13617		-	"ru",
13618		-	"social"
	13602	+	"ru"
13619	13603		],
13620	13604		"checkType": "response_url",
13621	13605		"alexaRank": 23,
		skipped 166 lines
13788	13772		},
13789	13773		"Vimeo": {
13790	13774		"tags": [
13791		-	"us",
	13775	+	"global",
13792	13776		"video"
13793	13777		],
	13778	+	"headers": {
	13779	+	"Authorization": "jwt eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJleHAiOjE2MTA4MDIxODAsInVzZXJfaWQiOm51bGwsImFwcF9pZCI6NTg0NzksInNjb3BlcyI6InB1YmxpYyIsInRlYW1fdXNlcl9pZCI6bnVsbH0.x1M4yvCF7fqekRpFfgxjtevGuEZkTP6HK8FXAxlAAQk"
	13780	+	},
	13781	+	"activation": {
	13782	+	"url": "https://vimeo.com/_rv/viewer",
	13783	+	"marks": [
	13784	+	"Something strange occurred. Please contact the app owners."
	13785	+	],
	13786	+	"method": "vimeo"
	13787	+	},
	13788	+	"urlProbe": "https://api.vimeo.com/users/{username}?fields=name%2Cgender%2Cbio%2Curi%2Clink%2Cbackground_video%2Clocation_details%2Cpictures%2Cverified%2Cmetadata.public_videos.total%2Cavailable_for_hire%2Ccan_work_remotely%2Cmetadata.connections.videos.total%2Cmetadata.connections.albums.total%2Cmetadata.connections.followers.total%2Cmetadata.connections.following.total%2Cmetadata.public_videos.total%2Ctotal_collection_count%2Ccreated_time%2Cprofile_preferences%2Cmembership%2Cclients%2Cskills%2Cproject_types%2Crates%2Ccategories&fetch_user_profile=1",
13794	13789		"checkType": "status_code",
13795	13790		"alexaRank": 158,
13796	13791		"url": "https://vimeo.com/{username}",
		skipped 266 lines
14063	14058		"Wattpad": {
14064	14059		"tags": [
14065	14060		"in",
14066		-	"social"
	14061	+	"reading"
14067	14062		],
14068	14063		"checkType": "message",
14069	14064		"absenceStrs": "userError-404",
		skipped 39 lines
14109	14104		},
14110	14105		"We Heart It": {
14111	14106		"tags": [
14112		-	"in",
14113		-	"photos",
14114		-	"us"
	14107	+	"photo",
	14108	+	"global",
	14109	+	"blogs"
14115	14110		],
14116	14111		"checkType": "message",
14117	14112		"absenceStrs": "Oops! You've landed on a moving target!",
		skipped 1353 lines
15471	15466		},
15472	15467		"devRant": {
15473	15468		"tags": [
15474		-	"in",
15475		-	"social"
	15469	+	"global",
	15470	+	"coding"
15476	15471		],
15477	15472		"checkType": "response_url",
15478	15473		"alexaRank": 133141,
		skipped 686 lines
16165	16160		},
16166	16161		"geocaching": {
16167	16162		"tags": [
16168		-	"de",
16169		-	"social"
	16163	+	"hobby"
16170	16164		],
16171	16165		"checkType": "status_code",
16172	16166		"alexaRank": 17327,
		skipped 1545 lines
17718	17712		},
17719	17713		"social.tchncs.de": {
17720	17714		"tags": [
17721		-	"in",
17722		-	"vn"
	17715	+	"de"
17723	17716		],
17724	17717		"checkType": "status_code",
17725	17718		"alexaRank": 441382,
		skipped 4721 lines

Vimeo activation, tags updates