1
0
Fork 0
mirror of https://github.com/benbusby/farside.git synced 2025-04-19 18:38:42 +00:00

Replace bibliogram w/ proxigram

Closes #149
This commit is contained in:
Ben Busby 2024-01-08 12:07:38 -07:00
parent 7f26ab3bbf
commit 99b13b3aa6
No known key found for this signature in database
GPG key ID: B9B7231E01D924A1
4 changed files with 20 additions and 35 deletions

View file

@ -8,7 +8,7 @@ defmodule Farside do
# farside.link/https://www.youtube.com/watch?v=dQw4w9WgXcQ # farside.link/https://www.youtube.com/watch?v=dQw4w9WgXcQ
@youtube_regex ~r/youtu(.be|be.com)|invidious|piped/ @youtube_regex ~r/youtu(.be|be.com)|invidious|piped/
@reddit_regex ~r/reddit.com|libreddit|redlib/ @reddit_regex ~r/reddit.com|libreddit|redlib/
@instagram_regex ~r/instagram.com|bibliogram/ @instagram_regex ~r/instagram.com|proxigram/
@twitter_regex ~r/twitter.com|nitter/ @twitter_regex ~r/twitter.com|nitter/
@wikipedia_regex ~r/wikipedia.org|wikiless/ @wikipedia_regex ~r/wikipedia.org|wikiless/
@medium_regex ~r/medium.com|scribe/ @medium_regex ~r/medium.com|scribe/
@ -23,7 +23,7 @@ defmodule Farside do
@parent_services %{ @parent_services %{
@youtube_regex => ["invidious", "piped"], @youtube_regex => ["invidious", "piped"],
@reddit_regex => ["libreddit", "redlib"], @reddit_regex => ["libreddit", "redlib"],
@instagram_regex => ["bibliogram"], @instagram_regex => ["proxigram"],
@twitter_regex => ["nitter"], @twitter_regex => ["nitter"],
@wikipedia_regex => ["wikiless"], @wikipedia_regex => ["wikiless"],
@medium_regex => ["scribe"], @medium_regex => ["scribe"],
@ -114,24 +114,6 @@ defmodule Farside do
instance instance
end end
def amend_instance(instance, service, path) do
cond do
String.match?(service, @instagram_regex) ->
# Bibliogram doesn't have a 1:1 matching to Instagram URLs for users,
# so a "/u" is appended if the requested path doesn't explicitly include
# "/p" for a post or an empty path for the home page.
if String.length(path) > 0 and
!String.starts_with?(path, "p/") and
!String.starts_with?(path, "u/") do
"#{instance}/u"
else
instance
end
true ->
instance
end
end
def get_last_updated do def get_last_updated do
CubDB.get(CubDB, "last_updated") CubDB.get(CubDB, "last_updated")
end end

View file

@ -62,7 +62,6 @@ defmodule Farside.Router do
true -> true ->
instance = Farside.get_service(service_name) instance = Farside.get_service(service_name)
|> Farside.pick_instance |> Farside.pick_instance
|> Farside.amend_instance(service_name, path)
# Redirect to the available instance # Redirect to the available instance
conn conn

View file

@ -65,15 +65,17 @@
] ]
}, },
{ {
"type": "bibliogram", "type": "proxigram",
"test_url": "/p/Ch2WRmiLMjj", "test_url": "/p/Ch2WRmiLMjj",
"fallback": "https://bibliogram.1d4.us", "fallback": "https://ig.opnxng.com",
"instances": [ "instances": [
"https://bibliogram.1d4.us", "https://ig.opnxng.com",
"https://bibliogram.froth.zone", "https://proxigram.lunar.icu",
"https://bibliogram.priv.pw", "https://gram.whatever.social",
"https://ig.femboy.hu", "https://ig.snine.nl",
"https://ig.tokhmi.xyz" "https://ig.floppa.one",
"https://proxigram.kyun.li",
"https://proxigram.ducks.party"
] ]
}, },
{ {

View file

@ -58,15 +58,17 @@
] ]
}, },
{ {
"type": "bibliogram", "type": "proxigram",
"test_url": "/p/Ch2WRmiLMjj", "test_url": "/p/Ch2WRmiLMjj",
"fallback": "https://bibliogram.1d4.us", "fallback": "https://ig.opnxng.com",
"instances": [ "instances": [
"https://bibliogram.1d4.us", "https://ig.opnxng.com",
"https://bibliogram.froth.zone", "https://proxigram.lunar.icu",
"https://bibliogram.priv.pw", "https://gram.whatever.social",
"https://ig.femboy.hu", "https://ig.snine.nl",
"https://ig.tokhmi.xyz" "https://ig.floppa.one",
"https://proxigram.kyun.li",
"https://proxigram.ducks.party"
] ]
}, },
{ {