diff --git a/Dockerfile b/Dockerfile index 63a8215..09618ef 100644 --- a/Dockerfile +++ b/Dockerfile @@ -38,7 +38,6 @@ 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/u' ARG reddit_alt='farside.link/libreddit' ARG medium_alt='farside.link/scribe' ARG translate_alt='farside.link/lingva' @@ -60,7 +59,6 @@ ENV CONFIG_VOLUME=$config_dir \ EXPOSE_PORT=$whoogle_port \ WHOOGLE_ALT_TW=$twitter_alt \ WHOOGLE_ALT_YT=$youtube_alt \ - WHOOGLE_ALT_IG=$instagram_alt \ WHOOGLE_ALT_RD=$reddit_alt \ WHOOGLE_ALT_MD=$medium_alt \ WHOOGLE_ALT_TL=$translate_alt \ diff --git a/README.md b/README.md index f7bb14e..610b6e3 100644 --- a/README.md +++ b/README.md @@ -214,7 +214,6 @@ Description=Whoogle # with default values. #Environment=WHOOGLE_ALT_TW=farside.link/nitter #Environment=WHOOGLE_ALT_YT=farside.link/invidious -#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=farside.link/lingva @@ -403,7 +402,6 @@ There are a few optional environment variables available for customizing a Whoog | HTTPS_ONLY | Enforce HTTPS. (See [here](https://github.com/benbusby/whoogle-search#https-enforcement)) | | WHOOGLE_ALT_TW | The twitter.com alternative to use when site alternatives are enabled in the config. Set to "" to disable. | | WHOOGLE_ALT_YT | The youtube.com alternative to use when site alternatives are enabled in the config. Set to "" to disable. | -| WHOOGLE_ALT_IG | The instagram.com alternative to use when site alternatives are enabled in the config. Set to "" to disable. | | WHOOGLE_ALT_RD | The reddit.com alternative to use when site alternatives are enabled in the config. Set to "" to disable. | | WHOOGLE_ALT_TL | The Google Translate alternative to use. This is used for all "translate ____" searches. Set to "" to disable. | | WHOOGLE_ALT_MD | The medium.com alternative to use when site alternatives are enabled in the config. Set to "" to disable. | diff --git a/app.json b/app.json index add80e0..87be096 100644 --- a/app.json +++ b/app.json @@ -60,11 +60,6 @@ "value": "farside.link/invidious", "required": false }, - "WHOOGLE_ALT_IG": { - "description": "The site to use as a replacement for instagram.com when site alternatives are enabled in the config.", - "value": "farside.link/bibliogram/u", - "required": false - }, "WHOOGLE_ALT_RD": { "description": "The site to use as a replacement for reddit.com when site alternatives are enabled in the config.", "value": "farside.link/libreddit", diff --git a/app/static/settings/translations.json b/app/static/settings/translations.json index 993f322..8fee1cb 100644 --- a/app/static/settings/translations.json +++ b/app/static/settings/translations.json @@ -20,7 +20,7 @@ "config-dark": "Dark Mode", "config-safe": "Safe Search", "config-alts": "Replace Social Media Links", - "config-alts-help": "Replaces Twitter/YouTube/Instagram/etc links with privacy respecting alternatives.", + "config-alts-help": "Replaces Twitter/YouTube/etc links with privacy respecting alternatives.", "config-new-tab": "Open Links in New Tab", "config-images": "Full Size Image Search", "config-images-help": "(Experimental) Adds the 'View Image' option to desktop image searches. This will cause image result thumbnails to be lower resolution.", @@ -75,7 +75,7 @@ "config-dark": "Donkere Modus", "config-safe": "Veilig zoeken", "config-alts": "Social Media Links Vervangen", - "config-alts-help": "Vervang Twitter/YouTube/Instagram/etc links met privacy gerespecteerde alternatieve.", + "config-alts-help": "Vervang Twitter/YouTube/etc links met privacy gerespecteerde alternatieve.", "config-new-tab": "Open Links in New Tab", "config-images": "Volledige Grote Afbeelding Zoeken", "config-images-help": "(Expirimenteel) Voegt de optie 'View Image' toe aan desktop afbeeldingen zoeken. Dit zorgt ervoor dat de voorbeeld foto's kleiner zijn.", @@ -131,7 +131,7 @@ "config-dark": "Dark Mode", "config-safe": "Sicheres Suchen", "config-alts": "Social-Media-Links ersetzen", - "config-alts-help": "Ersetzt Twitter/YouTube/Instagram/etc Links mit Alternativen, welche die Privatsphäre respektieren.", + "config-alts-help": "Ersetzt Twitter/YouTube/etc Links mit Alternativen, welche die Privatsphäre respektieren.", "config-new-tab": "Links in neuen Tabs öffnen", "config-images": "Bilder-Suche in Vollbild", "config-images-help": "(Experimentell) Fügt 'View Image'-Einstellung zu Dekstop Bilder-Suchen hinzu. Dadurch werden Thumbnails in niedrigerer Auflösung angezeigt.", @@ -187,7 +187,7 @@ "config-dark": "Modo Oscuro", "config-safe": "Búsqueda Segura", "config-alts": "Reemplazar Enlaces de Redes Sociales", - "config-alts-help": "Reemplaza los enlaces de Twitter/YouTube/Instagram/etc con alternativas que respetan la privacidad.", + "config-alts-help": "Reemplaza los enlaces de Twitter/YouTube/etc con alternativas que respetan la privacidad.", "config-new-tab": "Abrir enlaces en una pestaña nueva", "config-images": "Búsqueda de imágenes a tamaño completo", "config-images-help": "(Experimental) Agrega la opción 'Ver imagen' a las búsquedas de imágenes de escritorio. Esto hará que las miniaturas de los resultados de la imagen aparezcan con una resolución más baja.", @@ -244,7 +244,7 @@ "config-dark": "Mode Gelap", "config-safe": "Pencarian Aman", "config-alts": "Ganti Tautan Media Sosial", - "config-alts-help": "Mengganti tautan Twitter/YouTube/Instagram/dll dengan alternatif yang lebih menjaga privasi.", + "config-alts-help": "Mengganti tautan Twitter/YouTube/dll dengan alternatif yang lebih menjaga privasi.", "config-new-tab": "Buka Tautan dalam Tab Baru", "config-images": "Pencarian Gambar Ukuran Penuh", "config-images-help": "(Eksperimental) Menambahkan opsi 'Lihat Gambar' ke pencarian gambar desktop. Ini akan menyebabkan resolusi thumbnail hasil gambar menjadi lebih rendah.", @@ -299,7 +299,7 @@ "config-dark": "Modalità Notte", "config-safe": "Ricerca Sicura", "config-alts": "Sostituisci link dei social", - "config-alts-help": "Sostituisci link di Twitter/YouTube/Instagram/etc con alternative che rispettano la privacy.", + "config-alts-help": "Sostituisci link di Twitter/YouTube/etc con alternative che rispettano la privacy.", "config-new-tab": "Apri i link in una nuova scheda", "config-images": "Ricerca Immagini", "config-images-help": "(Sperimentale) Aggiunge la modalità 'Ricerca Immagini'. Questo ridurrà drasticamente la qualità delle miniature durante la ricerca.", @@ -355,7 +355,7 @@ "config-dark": "Modo Escuro", "config-safe": "Pesquisa Segura", "config-alts": "Substituir Links de Redes Sociais", - "config-alts-help": "Substitui os links do Twitter/YouTube/Instagram/etc. por alternativas que respeitam sua privacidade.", + "config-alts-help": "Substitui os links do Twitter/YouTube/etc. por alternativas que respeitam sua privacidade.", "config-new-tab": "Abrir Links em Nova Aba", "config-images": "Pesquisa de Imagem em Tamanho Real", "config-images-help": "(Experimental) Adiciona a opção 'Mostrar Imagem' às pesquisas de imagens no modo 'para computador'. Isso fará com que as miniaturas do resultado da imagem sejam de menor resolução.", @@ -411,7 +411,7 @@ "config-dark": "Тёмный режим", "config-safe": "Безопасный поиск", "config-alts": "Заменить ссылки на социальные сети", - "config-alts-help": "Замена ссылкок Twitter, YouTube, Instagram и т.д. на альтернативы, уважающие конфиденциальность.", + "config-alts-help": "Замена ссылкок Twitter, YouTube, и т.д. на альтернативы, уважающие конфиденциальность.", "config-new-tab": "Открывать ссылки в новой вкладке", "config-images": "Поиск полноразмерных изображений", "config-images-help": "(Эксперимент) Добавляет опцию 'Просмотр изображения' к поиску изображений в ПК-режиме. Это приведет к тому, что миниатюры изображений будут иметь более низкое разрешение.", @@ -467,7 +467,7 @@ "config-dark": "深色模式", "config-safe": "安全搜索", "config-alts": "替换社交媒体链接", - "config-alts-help": "使用尊重隐私的第三方网站替换 Twitter/YouTube/Instagram 等链接。", + "config-alts-help": "使用尊重隐私的第三方网站替换 Twitter/YouTube 等链接。", "config-new-tab": "在新标签页打开链接", "config-images": "完整尺寸图片搜索", "config-images-help": "(实验性)为桌面版图片搜索添加“查看图片”选项。这会降低图片结果缩略图的分辨率。", @@ -579,7 +579,7 @@ "config-dark": "Mode Sombre", "config-safe": "Recherche sécurisée", "config-alts": "Remplacer les liens des réseaux sociaux", - "config-alts-help": "Remplacer les liens Twitter/YouTube/Instagram/etc avec leurs alternatives respectueuses de la vie privée.", + "config-alts-help": "Remplacer les liens Twitter/YouTube/etc avec leurs alternatives respectueuses de la vie privée.", "config-new-tab": "Ouvrir les Liens dans un Nouveau Onglet", "config-images": "Recherche d'image en plein écran", "config-images-help": "(Expérimental) Ajouter l'option 'Voir Image' aux recherches d'images sur ordinateur. Les vignettes des résultats d'image seront de plus faible résolution.", @@ -691,7 +691,7 @@ "config-dark": "Tmavý motiv", "config-safe": "Bezpečné vyhledávání", "config-alts": "Nahradit odkazy na sociální média", - "config-alts-help": "Nahradí odkazy na Twitter, YouTube, Instagram atd. alternativami respektujícími soukromí.", + "config-alts-help": "Nahradí odkazy na Twitter, YouTube, atd. alternativami respektujícími soukromí.", "config-new-tab": "Otevírat odkazy na novém listu", "config-images": "Vyhledávání obrázků v plné velikosti", "config-images-help": "(Experimentální) Přidá volbu ‚Zobrazit obrázek‘ do vyhledávání obrázků na ploše. Způsobí to, že náhledy výsledků vyhledávání obrázků budou mít nižší rozlišení.", @@ -747,7 +747,7 @@ "config-dark": "深色模式", "config-safe": "安全搜尋", "config-alts": "將社群網站連結替換", - "config-alts-help": "將 Twitter/YouTube/Instagram 等網站之連結替換為尊重隱私的第三方網站。", + "config-alts-help": "將 Twitter/YouTube 等網站之連結替換為尊重隱私的第三方網站。", "config-new-tab": "以新分頁開啟連結", "config-images": "完整尺寸圖片搜尋", "config-images-help": "(實驗性)在桌面版圖片搜尋中增加「檢視圖片」選項。這會使搜尋結果圖片解析度降低", @@ -803,7 +803,7 @@ "config-dark": "Тъмен режим", "config-safe": "Безопасно търсене", "config-alts": "Заменете връзките към социалните медии", - "config-alts-help": "Заменя връзките на Twitter/YouTube/Instagram и т.н. с защитени алтернативни поверителни връзки.", + "config-alts-help": "Заменя връзките на Twitter/YouTube и т.н. с защитени алтернативни поверителни връзки.", "config-new-tab": "Отваряне на връзките в нов раздел", "config-images": "Търсене на изображения в пълен размер", "config-images-help": "(Експериментално) Добавя опцията „Преглед на изображение“ към резултатите от търсене на изображения през работния плот на компютъра. Това ще доведе до по-ниска разделителна способност на миниатюрите, в резултатите от търсене на изображения.", @@ -915,7 +915,7 @@ "config-dark": "ダークモード", "config-safe": "セーフサーチ", "config-alts": "ソーシャルメディアのリンクを置き換え", - "config-alts-help": "Twitter/YouTube/Instagramなどのリンクを、プライバシーを尊重した代替サイトに置き換えます。", + "config-alts-help": "Twitter/YouTubeなどのリンクを、プライバシーを尊重した代替サイトに置き換えます。", "config-new-tab": "新しいタブでリンクを開く", "config-images": "フルサイズの画像を検索", "config-images-help": "(実験的) デスクトップの画像検索に「画像を表示」オプションを追加します。これにより、画像検索結果のサムネイルの解像度が低くなります。", @@ -971,7 +971,7 @@ "config-dark": "다크 모드", "config-safe": "세이프서치", "config-alts": "소설 미디어 주소 수정", - "config-alts-help": "Twitter/YouTube/Instagram 등의 링크를 프라이버시를 존중하는 링크로 대체합니다", + "config-alts-help": "Twitter/YouTube 등의 링크를 프라이버시를 존중하는 링크로 대체합니다", "config-new-tab": "새 탭에서 열기", "config-images": "최대 크기 이미지 검색", "config-images-help": "(실험적) 데스크톱 이미지 검색에 '이미지 보기' 옵션을 추가합니다. 이미지 결과 미리보기 썸네일이 낮은 해상도로 표시됩니다.", @@ -1027,7 +1027,7 @@ "config-dark": "Awaya Tarî", "config-safe": "Lêgerîna Parastî", "config-alts": "Girêdanên Tora Civakî Biguherîne", - "config-alts-help": "Girêdanên Twitter/YouTube/Instagram/hwd biguherîne bi alternatîvên ku ji taybetiyê re rêzê digrin.", + "config-alts-help": "Girêdanên Twitter/YouTube/hwd biguherîne bi alternatîvên ku ji taybetiyê re rêzê digrin.", "config-new-tab": "Girêdanan di Rûgereke Nû de Veke", "config-images": "Lêgerîna Wêne bi Mezinahiya Tevahî", "config-images-help": "(Ezmûnî) Vebijêrka 'Wêneyê Nîşan bide' tevlî lêgerînên wêneyê yê sermaseyê bike. Ev ê bibe sedem ku çareseriya encamê wêneyên nîşanê kêmtir bibe.", @@ -1083,7 +1083,7 @@ "config-dark": "โหมดมืด", "config-safe": "ค้นหาแบบปลอดภัย", "config-alts": "แทนที่ลิงก์โซเชียลมีเดีย", - "config-alts-help": "แทนที่ลิงก์ Twitter/YouTube/Instagram/อื่นๆ ตามความเป็นส่วนตัวด้วยทางเลือกอื่น", + "config-alts-help": "แทนที่ลิงก์ Twitter/YouTube/อื่นๆ ตามความเป็นส่วนตัวด้วยทางเลือกอื่น", "config-new-tab": "เปิดลิงก์ในแท็บใหม่", "config-images": "ค้นหารูปภาพขนาดเต็ม", "config-images-help": "(ตัวอย่าง) เพิ่มตัวเลือก 'ดูภาพ' ในการค้นหารูปภาพบนเดสก์ท็อป ซึ่งจะทำให้ภาพขนาดย่อมีความละเอียดต่ำ", @@ -1139,7 +1139,7 @@ "config-dark": "Modd Tywyll", "config-safe": "Chwilio'n Ddiogel", "config-alts": "Disodli Cysylltau Cyfryngau Cymdeithasol", - "config-alts-help": "Yn Amnewid Cysylltau Twitter/YouTube/Instagram/etc gyda Gwefanau Preifatrwydd.", + "config-alts-help": "Yn Amnewid Cysylltau Twitter/YouTube/etc gyda Gwefanau Preifatrwydd.", "config-new-tab": "Agor Cysylltau mewn Tab Newydd", "config-images": "Chwiliad Delwedd Maint Llawn", "config-images-help": "(Arbrofol) Yn dangos y 'Gweld Delwedd' opsiwn i chwiliadau delweddau bwrdd gwaith. Mae hyn yn achosi delwedd o ansawdd is.", @@ -1196,7 +1196,7 @@ "config-dark": "Qaranlıq rejim", "config-safe": "Təhlükəsiz axtarış", "config-alts": "Sosial Media Linklərini dəyişdirin", - "config-alts-help": "Twitter/YouTube/Instagram/s. linkləri alternativlərə uyğun məxfiliklə əvəz edir.", + "config-alts-help": "Twitter/YouTube/s. linkləri alternativlərə uyğun məxfiliklə əvəz edir.", "config-new-tab": "Linkləri Yeni Tabda açın", "config-images": "Tam ölçülü Şəkil Axtarışı", "config-images-help": "(Eksperimental) Masaüstü şəkil axtarışlarına 'Şəkilə Bax' seçimini əlavə edir. Bu, şəkil nəticəsi miniatürlərinin daha aşağı ayırdetmə keyfiyyətinə səbəb olacaq.", @@ -1252,7 +1252,7 @@ "config-dark": "Dark Mode", "config-safe": "Ασφαλής Αναζήτηση", "config-alts": "Replace Social Media Links", - "config-alts-help": "Replaces Twitter/YouTube/Instagram/etc links with privacy respecting alternatives.", + "config-alts-help": "Replaces Twitter/YouTube/etc links with privacy respecting alternatives.", "config-new-tab": "Άνοιγμα συνδέσμου σε νέα καρτέλα", "config-images": "Full Size Image Search", "config-images-help": "(Experimental) Adds the 'View Image' option to desktop image searches. This will cause image result thumbnails to be lower resolution.", diff --git a/app/utils/results.py b/app/utils/results.py index 1453859..5a76dc8 100644 --- a/app/utils/results.py +++ b/app/utils/results.py @@ -31,7 +31,6 @@ BLACKLIST = [ SITE_ALTS = { 'twitter.com': os.getenv('WHOOGLE_ALT_TW', 'farside.link/nitter'), 'youtube.com': os.getenv('WHOOGLE_ALT_YT', 'farside.link/invidious'), - 'instagram.com': os.getenv('WHOOGLE_ALT_IG', 'farside.link/bibliogram/u'), 'reddit.com': os.getenv('WHOOGLE_ALT_RD', 'farside.link/libreddit'), **dict.fromkeys([ 'medium.com', diff --git a/charts/whoogle/values.yaml b/charts/whoogle/values.yaml index 5b0f0da..ab01a6d 100644 --- a/charts/whoogle/values.yaml +++ b/charts/whoogle/values.yaml @@ -36,7 +36,6 @@ conf: {} # HTTPS_ONLY: "" # Enforce HTTPS. (See https://github.com/benbusby/whoogle-search#https-enforcement) # WHOOGLE_ALT_TW: "" # The twitter.com alternative to use when site alternatives are enabled in the config. # WHOOGLE_ALT_YT: "" # The youtube.com alternative to use when site alternatives are enabled in the config. - # WHOOGLE_ALT_IG: "" # The instagram.com alternative to use when site alternatives are enabled in the config. # WHOOGLE_ALT_RD: "" # The reddit.com alternative to use when site alternatives are enabled in the config. # WHOOGLE_ALT_TL: "" # The Google Translate alternative to use. This is used for all "translate ____" searches. # WHOOGLE_ALT_MD: "" # The medium.com alternative to use when site alternatives are enabled in the config. @@ -63,7 +62,7 @@ conf: {} # WHOOGLE_CONFIG_URL: "" # The root url of the instance (https:///) # WHOOGLE_CONFIG_STYLE: "" # The custom CSS to use for styling (should be single line) # WHOOGLE_CONFIG_PREFERENCES_ENCRYPTED: "" # Encrypt preferences token, requires key - # WHOOGLE_CONFIG_PREFERENCES_KEY: "" # Key to encrypt preferences in URL (REQUIRED to show url) + # WHOOGLE_CONFIG_PREFERENCES_KEY: "" # Key to encrypt preferences in URL (REQUIRED to show url) podAnnotations: {} podSecurityContext: {}