Merge branch 'main' of gitlab.com:bashrc2/epicyon

merge-requests/30/head
Bob Mottram 2022-03-08 19:59:20 +00:00
commit 130e4ef5e5
2 changed files with 9 additions and 3 deletions

View File

@ -122,7 +122,13 @@ def blocked_user_agent(calling_domain: str, agent_str: str,
if agent_str:
# is this a web crawler? If so then block it by default
# unless this is a news instance or if it is in the allowed list
if 'bot/' in agent_str_lower or 'bot-' in agent_str_lower:
bot_strings = ('bot/', 'bot-', '/bot', '/robot')
contains_bot_string = False
for bot_str in bot_strings:
if bot_str in agent_str_lower:
contains_bot_string = True
break
if contains_bot_string:
if agent_str_lower not in known_bots:
known_bots.append(agent_str_lower)
known_bots.sort()

View File

@ -55,7 +55,7 @@ def _add_embedded_video_from_sites(translate: {}, content: str,
url = content.split('"' + video_site)[1]
if '"' in url:
url = url.split('"')[0]
if '/channel/' not in url:
if '/channel/' not in url and '/playlist' not in url:
url = url.replace('/watch?v=', '/embed/')
if '&' in url:
url = url.split('&')[0]
@ -74,7 +74,7 @@ def _add_embedded_video_from_sites(translate: {}, content: str,
url = content.split('"' + video_site)[1]
if '"' in url:
url = url.split('"')[0]
if '/channel/' not in url:
if '/channel/' not in url and '/playlist' not in url:
url = 'embed/' + url
if '&' in url:
url = url.split('&')[0]