open.source/whoogle-search
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main' into feature/anonymous-view

Browse Source
This commit is contained in:
Ben Busby 2022-03-30 10:51:08 -06:00
commit 2abfbc310f
No known key found for this signature in database
GPG Key ID: B9B7231E01D924A1
13 changed files with 75 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Dockerfile
View File

@ -37,12 +37,12 @@ ARG use_https=''
ARG whoogle_port=5000
ARG twitter_alt='farside.link/nitter'
ARG youtube_alt='farside.link/invidious'
ARG instagram_alt='farside.link/bibliogram'
ARG instagram_alt='farside.link/bibliogram/u'
ARG reddit_alt='farside.link/libreddit'
ARG medium_alt='farside.link/scribe'
ARG translate_alt='lingva.ml'
ARG imgur_alt='imgin.voidnet.tech'
ARG wikipedia_alt='wikiless.org'
ARG translate_alt='farside.link/lingva'
ARG imgur_alt='farside.link/rimgo'
ARG wikipedia_alt='farside.link/wikiless'
ENV CONFIG_VOLUME=$config_dir \
WHOOGLE_USER=$username \

9
README.md
View File

@ -202,9 +202,9 @@ Description=Whoogle
#Environment=WHOOGLE_ALT_IG=farside.link/bibliogram/u
#Environment=WHOOGLE_ALT_RD=farside.link/libreddit
#Environment=WHOOGLE_ALT_MD=farside.link/scribe
#Environment=WHOOGLE_ALT_TL=lingva.ml
#Environment=WHOOGLE_ALT_IMG=imgin.voidnet.tech
#Environment=WHOOGLE_ALT_WIKI=wikiless.org
#Environment=WHOOGLE_ALT_TL=farside.link/lingva
#Environment=WHOOGLE_ALT_IMG=farside.link/rimgo
#Environment=WHOOGLE_ALT_WIKI=farside.link/wikiless
# Load values from dotenv only
#Environment=WHOOGLE_DOTENV=1
Type=simple
@ -518,9 +518,10 @@ A lot of the app currently piggybacks on Google's existing support for fetching
| [https://s.alefvanoon.xyz](https://s.alefvanoon.xyz) | 🇺🇸 US | Multi-choice | ✅ |
| [https://www.whooglesearch.ml](https://www.whooglesearch.ml) | 🇺🇸 US | English | |
| [https://search.sethforprivacy.com](https://search.sethforprivacy.com) | 🇩🇪 DE | English | |
| [https://whoogle.dcs0.hu](https://whoogle.dcs0.hu) | 🇭🇺 HU | Multi-choice | ✅ |
| [https://whoogle.dcs0.hu](https://whoogle.dcs0.hu) | 🇭🇺 HU | Multi-choice | |
| [https://whoogle.esmailelbob.xyz](https://whoogle.esmailelbob.xyz) | 🇨🇦 CA | Multi-choice | |
| [https://gowogle.voring.me](https://gowogle.voring.me) | 🇺🇸 US | Multi-choice | |
| [https://whoogle.lunar.icu](https://whoogle.lunar.icu) | 🇩🇪 DE | Multi-choice | ✅ |

6
app.json
View File

@ -72,17 +72,17 @@
},
"WHOOGLE_ALT_TL": {
"description": "The Google Translate alternative to use for all searches following the 'translate ___' structure.",
"value": "lingva.ml",
"value": "farside.link/lingva",
"required": false
},
"WHOOGLE_ALT_IMG": {
"description": "The site to use as a replacement for imgur.com when site alternatives are enabled in the config.",
"value": "imgin.voidnet.tech",
"value": "farside.link/rimgo",
"required": false
},
"WHOOGLE_ALT_WIKI": {
"description": "The site to use as a replacement for wikipedia.com when site alternatives are enabled in the config.",
"value": "wikiless.org",
"value": "farside.link/wikiless",
"required": false
},
"WHOOGLE_MINIMAL": {

2
app/__init__.py
View File

@ -82,7 +82,7 @@ app.config['HAS_UPDATE'] = ''
# The alternative to Google Translate is treated a bit differently than other
# social media site alternatives, in that it is used for any translation
# related searches.
translate_url = os.getenv('WHOOGLE_ALT_TL', 'https://lingva.ml')
translate_url = os.getenv('WHOOGLE_ALT_TL', 'https://farside.link/lingva')
if not translate_url.startswith('http'):
translate_url = 'https://' + translate_url
app.config['TRANSLATE_URL'] = translate_url

2
app/static/css/dark-theme.css
View File

@ -98,7 +98,7 @@ select {
}
.sa1toc {
background: var(--whoogle-dark-element-bg) !important;
background: var(--whoogle-dark-page-bg) !important;
}
#search-bar {

52
app/static/settings/translations.json
View File

@ -347,8 +347,8 @@
"continue-search": "继续搜索 Farside",
"all": "全部",
"images": "圖片",
"maps": "影片",
"videos": "地圖",
"maps": "地圖",
"videos": "影片",
"news": "新聞",
"books": "書籍"
},
@ -567,8 +567,8 @@
"continue-search": "繼續搜索 Farside",
"all": "全部",
"images": "圖片",
"maps": "影片",
"videos": "地圖",
"maps": "地圖",
"videos": "影片",
"news": "新聞",
"books": "書籍"
},
@ -703,5 +703,49 @@
"videos": "動画",
"news": "ニュース",
"books": "書籍"
},
"lang_ko": {
"search": "검색",
"config": "구성",
"config-country": "국가 설정",
"config-lang": "인터페이스 언어",
"config-lang-search": "검색 언어",
"config-near": "주변",
"config-near-help": "도시 이름",
"config-block": "차단",
"config-block-help": "쉼표로 구분된 사이트 목록",
"config-block-title": "제목으로 차단",
"config-block-title-help": "정규 표현식 사용",
"config-block-url": "URL로 차단",
"config-block-url-help": "정규 표현식 사용",
"config-theme": "테마",
"config-nojs": "Show NoJS Links",
"config-dark": "다크 모드",
"config-safe": "세이프서치",
"config-alts": "소설 미디어 주소 수정",
"config-alts-help": "Twitter/YouTube/Instagram 등의 링크를 프라이버시를 존중하는 링크로 대체합니다",
"config-new-tab": "새 탭에서 열기",
"config-images": "최대 크기 이미지 검색",
"config-images-help": "(실험적) 데스크톱 이미지 검색에 '이미지 보기' 옵션을 추가합니다. 이미지 결과 미리보기 썸네일이 낮은 해상도로 표시됩니다.",
"config-tor": "Tor 사용",
"config-get-only": "GET 요청만",
"config-url": "루트 URL",
"config-css": "커스텀 CSS",
"load": "불러오기",
"apply": "적용",
"save-as": "다른 이름으로 저장...",
"github-link": "깃허브에서 보기",
"translate": "번역",
"light": "라이트",
"dark": "다크",
"system": "시스템",
"ratelimit": "인스턴스가 속도 제한되었습니다.",
"continue-search": "Farside로 검색 계속하기",
"all": "전체",
"images": "이미지",
"maps": "지도",
"videos": "동영상",
"news": "뉴스",
"books": "도서"
}
}

4
app/utils/results.py
View File

@ -34,8 +34,8 @@ SITE_ALTS = {
'medium.com',
'levelup.gitconnected.com'
], os.getenv('WHOOGLE_ALT_MD', 'farside.link/scribe')),
'imgur.com': os.getenv('WHOOGLE_ALT_IMG', 'imgin.voidnet.tech'),
'wikipedia.com': os.getenv('WHOOGLE_ALT_WIKI', 'wikiless.org')
'imgur.com': os.getenv('WHOOGLE_ALT_IMG', 'farside.link/rimgo'),
'wikipedia.org': os.getenv('WHOOGLE_ALT_WIKI', 'farside.link/wikiless')
}

1
app/utils/search.py
View File

@ -153,6 +153,7 @@ class Search:
self.request_params.to_dict(flat=True).items()
if self.config.is_safe_key(k))
for link in formatted_results.find_all('a', href=True):
link['rel'] = "nofollow noopener noreferrer"
if 'search?' not in link['href'] or link['href'].index(
'search?') > 1:
continue

8
docker-compose.yml
View File

@ -18,7 +18,7 @@ services:
- ALL
tmpfs:
- /config/:size=10M,uid=927,gid=927,mode=1700
- /var/lib/tor/:size=10M,uid=927,gid=927,mode=1700
- /var/lib/tor/:size=15M,uid=927,gid=927,mode=1700
- /run/tor/:size=1M,uid=927,gid=927,mode=1700
#environment: # Uncomment to configure environment variables
# Basic auth configuration, uncomment to enable
@ -37,9 +37,9 @@ services:
#- WHOOGLE_ALT_IG=farside.link/bibliogram/u
#- WHOOGLE_ALT_RD=farside.link/libreddit
#- WHOOGLE_ALT_MD=farside.link/scribe
#- WHOOGLE_ALT_TL=lingva.ml
#- WHOOGLE_ALT_IMG=imgin.voidnet.tech
#- WHOOGLE_ALT_WIKI=wikiless.org
#- WHOOGLE_ALT_TL=farside.link/lingva
#- WHOOGLE_ALT_IMG=farside.link/rimgo
#- WHOOGLE_ALT_WIKI=farside.link/wikiless
#env_file: # Alternatively, load variables from whoogle.env
#- whoogle.env
ports:

1
misc/instances.txt
View File

@ -8,3 +8,4 @@ https://whooglesearch.net
https://www.whooglesearch.ml
https://whoogle.dcs0.hu
https://whoogle.esmailelbob.xyz
https://whoogle.lunar.icu

2
requirements.txt
View File

@ -28,7 +28,7 @@ requests==2.25.1
soupsieve==1.9.5
stem==1.8.0
urllib3==1.26.5
waitress==1.4.3
waitress==2.1.1
wcwidth==0.1.9
Werkzeug==0.16.0
python-dotenv==0.16.0

2
test/test_results.py
View File

@ -60,7 +60,7 @@ def test_translate_search(client):
# Pretty weak test, but better than nothing
str_data = str(rv.data)
assert 'iframe' in str_data
assert 'lingva.ml/auto/en/ hola' in str_data
assert '/auto/en/ hola' in str_data
def test_block_results(client):

6
whoogle.template.env
View File

@ -12,9 +12,9 @@
#WHOOGLE_ALT_IG=farside.link/bibliogram/u
#WHOOGLE_ALT_RD=farside.link/libreddit
#WHOOGLE_ALT_MD=farside.link/scribe
#WHOOGLE_ALT_TL=lingva.ml
#WHOOGLE_ALT_IMG=imgin.voidnet.tech
#WHOOGLE_ALT_WIKI=wikiless.org
#WHOOGLE_ALT_TL=farside.link/lingva
#WHOOGLE_ALT_IMG=farside.link/rimgo
#WHOOGLE_ALT_WIKI=farside.link/wikiless
#WHOOGLE_USER=""
#WHOOGLE_PASS=""
#WHOOGLE_PROXY_USER=""