jaculabilis/danbooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Baraag: fix image regex

Browse Source 
Fixes a bug for Baraag.net that caused the batch bookmarklet to always pick the first picture in multi-image posts.
This commit is contained in:
nonamethanks
2021-03-06 08:44:24 +01:00
parent 52adf87489
commit 4118a3f3c9
2 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/logical/sources/strategies/mastodon.rb
View File

@@ -17,7 +17,7 @@
module Sources::Strategies module Sources::Strategies
class Mastodon < Base class Mastodon < Base
HOST = %r{\Ahttps?://(?:www\.)?(?<domain>pawoo\.net|baraag\.net)}i HOST = %r{\Ahttps?://(?:www\.)?(?<domain>pawoo\.net|baraag\.net)}i
IMAGE = %r{\Ahttps?://(?:img\.pawoo\.net|baraag\.net)/media_attachments/files/(\d+/\d+/\d+)} IMAGE = %r{\Ahttps?://(?:img\.pawoo\.net|baraag\.net(?:/system(?:/cache)?)?)/media_attachments/files/((?:\d+/)+\d+)}
NAMED_PROFILE = %r{#{HOST}/@(?<artist_name>\w+)}i NAMED_PROFILE = %r{#{HOST}/@(?<artist_name>\w+)}i
ID_PROFILE = %r{#{HOST}/web/accounts/(?<account_id>\d+)} ID_PROFILE = %r{#{HOST}/web/accounts/(?<account_id>\d+)}
@@ -35,6 +35,7 @@ module Sources::Strategies
def file_host def file_host
case site_name case site_name
when "pawoo.net" then "img.pawoo.net" when "pawoo.net" then "img.pawoo.net"
when "baraag.net" then "baraag.net/system"
else site_name else site_name
end end
end end

16
test/unit/sources/mastodon_test.rb
View File

@@ -101,14 +101,20 @@ module Sources
setup do setup do
skip "Baraag keys not set" unless Danbooru.config.baraag_client_id skip "Baraag keys not set" unless Danbooru.config.baraag_client_id
@url = "https://baraag.net/@bardbot/105732813175612920" @url = "https://baraag.net/@bardbot/105732813175612920"
@site = Sources::Strategies.find(@url) @site1 = Sources::Strategies.find(@url)
@img = "https://baraag.net/system/media_attachments/files/105/803/948/862/719/091/original/54e1cb7ca33ec449.png"
@ref = "https://baraag.net/@Nakamura/105803949565505009"
@site2 = Sources::Strategies.find(@img, @ref)
end end
should "work" do should "work" do
assert_equal("https://baraag.net/@bardbot", @site.profile_url) assert_equal("https://baraag.net/@bardbot", @site1.profile_url)
assert_equal(["https://baraag.net/system/media_attachments/files/105/732/803/241/495/700/original/556e1eb7f5ca610f.png"], @site.image_urls) assert_equal(["https://baraag.net/system/media_attachments/files/105/732/803/241/495/700/original/556e1eb7f5ca610f.png"], @site1.image_urls)
assert_equal("bardbot", @site.artist_name) assert_equal("bardbot", @site1.artist_name)
assert_equal("🍌", @site.dtext_artist_commentary_desc) assert_equal("🍌", @site1.dtext_artist_commentary_desc)
assert_equal([@img], @site2.image_urls)
end end
end end