LibreY

- privacy respecting meta search engine
git clone git://git.acid.vegas/LibreY.git
Log | Files | Refs | Archive | README | LICENSE

commit eaa76b3cfa79eddbf662255f7da0c8350d9da320
parent 227ff16e674ee493fde88f4dfecd369f3941a072
Author: hnhx <49120638+hnhx@users.noreply.github.com>
Date: Mon, 17 Apr 2023 10:25:12 +0200

Merge pull request #199 from codedipper/main Remove bibliogram, add suds

Diffstat:
Mconfig.php.example | 12++++++------
Mdocker/README.md | 2+-
Mdocker/attributes.sh | 2+-
Mdocker/php/config.php | 13+++++++------
Mdocker/php/php.dockerfile | 2+-
Mmisc/tools.php | 6------

6 files changed, 16 insertions(+), 21 deletions(-)

diff --git a/config.php.example b/config.php.example
@@ -32,12 +32,6 @@
                 "original_name" => "YouTube",
                 "original_url" => "youtube.com"
             ),
-            "bibliogram" => array(
-                "instance_url" => "",
-                "project_url" => "https://git.sr.ht/~cadence/bibliogram-docs/tree/master/docs/Instances.md", 
-                "original_name" => "Instagram",
-                "original_url" => "instagram.com"
-            ),
             "rimgo" => array(
                 "instance_url" => "",
                 "project_url" => "https://codeberg.org/video-prize-ranch/rimgo#instances", 
@@ -111,6 +105,12 @@
                 "project_url" => "https://github.com/httpjamesm/AnonymousOverflow#clearnet-instances", 
                 "original_name" => "StackOverflow",
                 "original_url" => "stackoverflow.com"
+            ),
+            "suds" => array(
+                "instance_url" => "",
+                "project_url" => "https://git.vern.cc/cobra/Suds/src/branch/main/instances.json",
+                "original_name" => "Snopes",
+                "original_url" => "snopes.com"
             )
         ),
 
diff --git a/docker/README.md b/docker/README.md
@@ -107,7 +107,6 @@ This docker image was developed with high configurability in mind, so here is th
 | Variables | Default | Examples | Description |
 |:----------|:-------------|:---------|:------|
 | APP_INVIDIOUS | "" | string | Integration with external self-hosted apps, configure the desired host. |
-| APP_BIBLIOGRAM | "" | string | Integration with external self-hosted apps, configure the desired host. |
 | APP_RIMGO | "" | string | Integration with external self-hosted apps, configure the desired host. |
 | APP_SCRIBE | "" | string | Integration with external self-hosted apps, configure the desired host. |
 | APP_LIBRARIAN | "" | string | Integration with external self-hosted apps, configure the desired host. |
@@ -120,6 +119,7 @@ This docker image was developed with high configurability in mind, so here is th
 | APP_LIBREMDB | "" | string | Integration with external self-hosted apps, configure the desired host. |
 | APP_BREEZEWIKI | "" | string | Integration with external self-hosted apps, configure the desired host. |
 | APP_ANONYMOUS_OVERFLOW | "" | string | Integration with external self-hosted apps, configure the desired host. |
+| APP_SUDS | "" | string | Integration with external self-hosted apps, configure the desired host. |
 
 <br>
 
diff --git a/docker/attributes.sh b/docker/attributes.sh
@@ -34,7 +34,6 @@ export CONFIG_WIKIPEDIA_LANGUAGE=${CONFIG_WIKIPEDIA_LANGUAGE:-${CONFIG_GOOGLE_LA
 # Supported apps integration configuration. These empty spaces can be set up using free hosts as pointers
 # A particular example is using the "https://yewtu.be" or a self-hosted host to integrate the invidious app to librex
 export APP_INVIDIOUS=${APP_INVIDIOUS:-""}
-export APP_BIBLIOGRAM=${APP_BIBLIOGRAM:-""}
 export APP_RIMGO=${APP_RIMGO:-""}
 export APP_SCRIBE=${APP_SCRIBE:-""}
 export APP_LIBRARIAN=${APP_LIBRARIAN:-""}
@@ -47,6 +46,7 @@ export APP_QUETRE=${APP_QUETRE:-""}
 export APP_LIBREMDB=${APP_LIBREMDB:-""}
 export APP_BREEZEWIKI=${APP_BREEZEWIKI:-""}
 export APP_ANONYMOUS_OVERFLOW=${APP_ANONYMOUS_OVERFLOW:-""}
+export APP_SUDS=${APP_SUDS:-""}
 
 # GNU/Curl configurations. Leave 'CURLOPT_PROXY' blank whether you don't need to use a proxy for requests
 # Generally, a proxy is needed when your IP address is blocked by search engines in response to multiple requests within a short time frame. In these cases, it is recommended to use rotating proxies
diff --git a/docker/php/config.php b/docker/php/config.php
@@ -18,12 +18,6 @@
                 "original_name" => "YouTube",
                 "original_url" => "youtube.com"
             ),
-            "bibliogram" => array(
-                "instance_url" => "${APP_BIBLIOGRAM}",
-                "project_url" => "https://git.sr.ht/~cadence/bibliogram-docs/tree/master/docs/Instances.md",
-                "original_name" => "Instagram",
-                "original_url" => "instagram.com"
-            ),
             "rimgo" => array(
                 "instance_url" => "${APP_RIMGO}",
                 "project_url" => "https://codeberg.org/video-prize-ranch/rimgo#instances",
@@ -97,7 +91,14 @@
                 "project_url" => "https://github.com/httpjamesm/AnonymousOverflow#clearnet-instances",
                 "original_name" => "StackOverflow",
                 "original_url" => "stackoverflow.com"
+            ),
+            "suds" => array(
+                "instance_url" => "${APP_SUDS}",
+                "project_url" => "https://git.vern.cc/cobra/Suds/src/branch/main/instances.json",
+                "original_name" => "Snopes",
+                "original_url" => "snopes.com"
             )
+
         ),
 
         "curl_settings" => array(
diff --git a/docker/php/php.dockerfile b/docker/php/php.dockerfile
@@ -22,7 +22,6 @@ ENV CONFIG_BITTORRENT_TRACKERS="&tr=http://nyaa.tracker.wf:7777/announce&tr=udp:
 # Supported apps integration configuration. These empty spaces can be set up using free hosts as pointers
 # A particular example is using the "https://yewtu.be" or a self-hosted host to integrate the invidious app to librex
 ENV APP_INVIDIOUS=""
-ENV APP_BIBLIOGRAM=""
 ENV APP_RIMGO=""
 ENV APP_SCRIBE=""
 ENV APP_LIBRARIAN=""
@@ -35,6 +34,7 @@ ENV APP_QUETRE=""
 ENV APP_LIBREMDB=""
 ENV APP_BREEZEWIKI=""
 ENV APP_ANONYMOUS_OVERFLOW=""
+ENV APP_SUDS=""
 
 # GNU/Curl configurations. Leave 'CURLOPT_PROXY' blank whether you don't need to use a proxy for requests
 # Generally, a proxy is needed when your IP address is blocked by search engines in response to multiple requests within a short time frame. In these cases, it is recommended to use rotating proxies
diff --git a/misc/tools.php b/misc/tools.php
@@ -30,12 +30,6 @@
             else if (!empty($frontends[$frontend]["instance_url"]))
                 $frontend = $frontends[$frontend]["instance_url"];
 
-           if ($original == "instagram.com")
-            {
-                if (!strpos($url, "/p/"))
-                    $frontend .= "/u";
-            }
-
             if (empty(trim($frontend)))
                 return $url;