Add baraag.net support

app/logical/mastodon_api_client.rb

@@ -66,9 +66,13 @@ class MastodonApiClient
   end
 
   def client
-    if @site_name == "pawoo.net"
+    case @site_name
+    when "pawoo.net"
       client_id = Danbooru.config.pawoo_client_id
       client_secret = Danbooru.config.pawoo_client_secret
+    when "baraag.net"
+      client_id = Danbooru.config.baraag_client_id
+      client_secret = Danbooru.config.baraag_client_secret
     end
 
     return unless client_id && client_secret

app/logical/sources/strategies/mastodon.rb

@@ -16,8 +16,8 @@
 
 module Sources::Strategies
   class Mastodon < Base
-    HOST = %r{\Ahttps?://(?:www\.)?(?<domain>pawoo\.net)}i
-    IMAGE = %r{\Ahttps?://img\.pawoo\.net/media_attachments/files/(\d+/\d+/\d+)}
+    HOST = %r{\Ahttps?://(?:www\.)?(?<domain>pawoo\.net|baraag\.net)}i
+    IMAGE = %r{\Ahttps?://(?:img\.pawoo\.net|baraag\.net)/media_attachments/files/(\d+/\d+/\d+)}
     NAMED_PROFILE = %r{#{HOST}/@(?<artist_name>\w+)}i
     ID_PROFILE = %r{#{HOST}/web/accounts/(?<account_id>\d+)}
 
@@ -25,7 +25,7 @@ module Sources::Strategies
     STATUS2 = %r{\A#{NAMED_PROFILE}/(?<status_id>\d+)}
 
     def domains
-      ["pawoo.net"]
+      ["pawoo.net", "baraag.net"]
     end
 
     def site_name

config/danbooru_default_config.rb

@@ -330,6 +330,14 @@ module Danbooru
       nil
     end
 
+    def baraag_client_id
+      nil
+    end
+
+    def baraag_client_secret
+      nil
+    end
+
     # 1. Register app at https://www.tumblr.com/oauth/register.
     # 2. Copy "OAuth Consumer Key" from https://www.tumblr.com/oauth/apps.
     def tumblr_consumer_key

test/unit/sources/mastodon_test.rb

@@ -97,21 +97,40 @@ module Sources
       end
     end
 
+    context "A baraag url" do
+      setup do
+        skip "Baraag keys not set" unless Danbooru.config.baraag_client_id
+        @url = "https://baraag.net/@bardbot/105732813175612920"
+        @site = Sources::Strategies.find(@url)
+      end
+
+      should "work" do
+        assert_equal("https://baraag.net/@bardbot", @site.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("bardbot", @site.artist_name)
+        assert_equal("🍌", @site.dtext_artist_commentary_desc)
+      end
+    end
+
     context "normalizing for source" do
       should "normalize correctly" do
         source1 = "https://pawoo.net/@evazion/19451018/"
         source2 = "https://pawoo.net/web/statuses/19451018/favorites"
+        source3 = "https://baraag.net/@bardbot/105732813175612920/"
 
         assert_equal("https://pawoo.net/@evazion/19451018", Sources::Strategies.normalize_source(source1))
         assert_equal("https://pawoo.net/web/statuses/19451018", Sources::Strategies.normalize_source(source2))
+        assert_equal("https://baraag.net/@bardbot/105732813175612920", Sources::Strategies.normalize_source(source3))
       end
 
       should "avoid normalizing unnormalizable urls" do
         bad_source1 = "https://img.pawoo.net/media_attachments/files/001/297/997/original/c4272a09570757c2.png"
         bad_source2 = "https://pawoo.net/@evazion/media"
+        bad_source3 = "https://baraag.net/system/media_attachments/files/105/732/803/241/495/700/original/556e1eb7f5ca610f.png"
 
         assert_equal(bad_source1, Sources::Strategies.normalize_source(bad_source1))
         assert_equal(bad_source2, Sources::Strategies.normalize_source(bad_source2))
+        assert_equal(bad_source3, Sources::Strategies.normalize_source(bad_source3))
       end
     end
   end