diff --git a/app/helpers/icon_helper.rb b/app/helpers/icon_helper.rb index 13df7ede5..4b13dea8c 100644 --- a/app/helpers/icon_helper.rb +++ b/app/helpers/icon_helper.rb @@ -176,18 +176,26 @@ module IconHelper def external_site_icon(site_name, **options) case site_name + when "Amazon" + image_icon_tag("amazon-logo.png", **options) when "ArtStation" image_icon_tag("artstation-logo.png", **options) + when "Ask.fm" + image_icon_tag("ask-fm-logo.png", **options) when "BCY" image_icon_tag("bcy-logo.png", **options) when "Booth.pm" image_icon_tag("booth-pm-logo.png", **options) when "Circle.ms" image_icon_tag("circle-ms-logo.png", **options) - when "DLSite" - image_icon_tag("dlsite-logo.png", **options) when "Deviant Art" image_icon_tag("deviantart-logo.png", **options) + when "DLSite" + image_icon_tag("dlsite-logo.png", **options) + when "Doujinshi.org" + image_icon_tag("doujinshi-org-logo.png", **options) + when "Erogamescape" + image_icon_tag("erogamescape-logo.png", **options) when "Facebook" image_icon_tag("facebook-logo.png", **options) when "Fantia" @@ -196,12 +204,24 @@ module IconHelper image_icon_tag("fc2-logo.png", **options) when "Gumroad" image_icon_tag("gumroad-logo.png", **options) + when "Hentai Foundry" + image_icon_tag("hentai-foundry-logo.png", **options) when "Instagram" image_icon_tag("instagram-logo.png", **options) + when "Ko-fi" + image_icon_tag("ko-fi-logo.png", **options) + when "Livedoor" + image_icon_tag("livedoor-logo.png", **options) when "Lofter" image_icon_tag("lofter-logo.png", **options) + when "Mangaupdates" + image_icon_tag("mangaupdates-logo.png", **options) when "Melonbooks" image_icon_tag("melonbooks-logo.png", **options) + when "Mihuashi" + image_icon_tag("mihuashi-logo.png", **options) + when "Mixi.jp" + image_icon_tag("mixi-jp-logo.png", **options) when "Nico Seiga" image_icon_tag("nicoseiga-logo.png", **options) when "Nijie" @@ -210,6 +230,10 @@ module IconHelper image_icon_tag("patreon-logo.png", **options) when "pawoo.net" image_icon_tag("pawoo-logo.png", **options) + when "Piapro.jp" + image_icon_tag("piapro-jp-logo.png", **options) + when "Picarto" + image_icon_tag("picarto-logo.png", **options) when "Pixiv" image_icon_tag("pixiv-logo.png", **options) when "Pixiv Fanbox" @@ -218,6 +242,10 @@ module IconHelper image_icon_tag("pixiv-sketch-logo.png", **options) when "Privatter" image_icon_tag("privatter-logo.png", **options) + when "Sakura.ne.jp" + image_icon_tag("sakura-ne-jp-logo.png", **options) + when "Stickam" + image_icon_tag("stickam-logo.png", **options) when "Skeb" image_icon_tag("skeb-logo.png", **options) when "Tinami" @@ -228,8 +256,12 @@ module IconHelper image_icon_tag("twitter-logo.png", **options) when "Toranoana" image_icon_tag("toranoana-logo.png", **options) + when "Twitch" + image_icon_tag("twitch-logo.png", **options) when "Weibo" image_icon_tag("weibo-logo.png", **options) + when "Wikipedia" + image_icon_tag("wikipedia-logo.png", **options) when "Youtube" image_icon_tag("youtube-logo.png", **options) else diff --git a/app/logical/sources/strategies/base.rb b/app/logical/sources/strategies/base.rb index 52a190bd5..a9cca0b32 100644 --- a/app/logical/sources/strategies/base.rb +++ b/app/logical/sources/strategies/base.rb @@ -64,6 +64,10 @@ module Sources # XXX should go in dedicated strategies. case host + when /amazon\.(com|jp|co\.jp)\z/i + "Amazon" + when /ask\.fm\z/i + "Ask.fm" when /bcy\.net\z/i "BCY" when /booth\.pm\z/i @@ -72,6 +76,10 @@ module Sources "Circle.ms" when /dlsite\.(com|net)\z/i "DLSite" + when /doujinshi\.mugimugi\.org\z/i, /doujinshi\.org\z/i + "Doujinshi.org" + when /erogamescape\.dyndns\.org\z/i + "Erogamescape" when /facebook\.com\z/i "Facebook" when /fantia\.jp\z/i @@ -82,20 +90,42 @@ module Sources "Gumroad" when /instagram\.com\z/i "Instagram" + when /ko-fi\.com\z/i + "Ko-fi" + when /livedoor\.(jp|com)\z/i + "Livedoor" when /lofter\.com\z/i "Lofter" + when /mangaupdates\.com\z/i + "Mangaupdates" when /melonbooks\.co\.jp\z/i "Melonbooks" + when /mihuashi\.com\z/i + "Mihuashi" + when /mixi\.jp\z/i + "Mixi.jp" when /patreon\.com\z/i "Patreon" + when /piapro\.jp\z/i + "Piapro.jp" + when /picarto\.tv\z/i + "Picarto" when /privatter\.net\z/i "Privatter" + when /sakura\.ne\.jp\z/i + "Sakura.ne.jp" + when /stickam\.jp\z/i + "Stickam" when /skeb\.jp\z/i "Skeb" when /tinami\.com\z/i "Tinami" when /toranoana\.(jp|shop)\z/i "Toranoana" + when /twitch\.tv\z/i + "Twitch" + when /wikipedia\.org\z/i + "Wikipedia" when /youtube\.com\z/i "Youtube" else diff --git a/app/models/artist_url.rb b/app/models/artist_url.rb index 3eda90b18..bc6d04d3e 100644 --- a/app/models/artist_url.rb +++ b/app/models/artist_url.rb @@ -97,6 +97,8 @@ class ArtistUrl < ApplicationRecord true when %r!www\.artstation\.com!i true + when %r!blogimg\.jp!i, %r!image\.blog\.livedoor\.jp!i + true else false end @@ -106,9 +108,9 @@ class ArtistUrl < ApplicationRecord def priority sites = %w[ Pixiv Twitter - ArtStation Deviant\ Art Nico\ Seiga Nijie pawoo.net Pixiv\ Fanbox Pixiv\ Sketch Tinami Tumblr - Booth.pm Facebook Fantia FC2 Gumroad Instagram Lofter Patreon Privatter Skeb Weibo Youtube - Circle.ms DLSite Melonbooks Toranoana + ArtStation BCY Deviant\ Art Hentai\ Foundry Nico\ Seiga Nijie pawoo.net Pixiv\ Fanbox Pixiv\ Sketch Tinami Tumblr + Ask.fm Booth.pm Facebook Fantia FC2 Gumroad Instagram Ko-fi Livedoor Lofter Mihuashi Mixi.jp Patreon Piapro.jp Picarto Privatter Sakura.ne.jp Stickam Skeb Twitch Weibo Youtube + Amazon Circle.ms DLSite Doujinshi.org Erogamescape Mangaupdates Melonbooks Toranoana Wikipedia ] sites.index(site_name) || 1000 diff --git a/public/images/amazon-logo.png b/public/images/amazon-logo.png new file mode 100644 index 000000000..3ec9a9b32 Binary files /dev/null and b/public/images/amazon-logo.png differ diff --git a/public/images/ask-fm-logo.png b/public/images/ask-fm-logo.png new file mode 100644 index 000000000..aba849eb3 Binary files /dev/null and b/public/images/ask-fm-logo.png differ diff --git a/public/images/doujinshi-org-logo.png b/public/images/doujinshi-org-logo.png new file mode 100644 index 000000000..fa02930ea Binary files /dev/null and b/public/images/doujinshi-org-logo.png differ diff --git a/public/images/erogamescape-logo.png b/public/images/erogamescape-logo.png new file mode 100644 index 000000000..899c27a42 Binary files /dev/null and b/public/images/erogamescape-logo.png differ diff --git a/public/images/hentai-foundry-logo.png b/public/images/hentai-foundry-logo.png new file mode 100644 index 000000000..416e4017e Binary files /dev/null and b/public/images/hentai-foundry-logo.png differ diff --git a/public/images/ko-fi-logo.png b/public/images/ko-fi-logo.png new file mode 100644 index 000000000..53f8b6d83 Binary files /dev/null and b/public/images/ko-fi-logo.png differ diff --git a/public/images/livedoor-logo.png b/public/images/livedoor-logo.png new file mode 100644 index 000000000..387b050a9 Binary files /dev/null and b/public/images/livedoor-logo.png differ diff --git a/public/images/mangaupdates-logo.png b/public/images/mangaupdates-logo.png new file mode 100644 index 000000000..909203043 Binary files /dev/null and b/public/images/mangaupdates-logo.png differ diff --git a/public/images/mihuashi-logo.png b/public/images/mihuashi-logo.png new file mode 100644 index 000000000..e79939fdc Binary files /dev/null and b/public/images/mihuashi-logo.png differ diff --git a/public/images/mixi-jp-logo.png b/public/images/mixi-jp-logo.png new file mode 100644 index 000000000..2c0ef8c63 Binary files /dev/null and b/public/images/mixi-jp-logo.png differ diff --git a/public/images/piapro-jp-logo.png b/public/images/piapro-jp-logo.png new file mode 100644 index 000000000..a68069b8f Binary files /dev/null and b/public/images/piapro-jp-logo.png differ diff --git a/public/images/picarto-logo.png b/public/images/picarto-logo.png new file mode 100644 index 000000000..faa5ac18e Binary files /dev/null and b/public/images/picarto-logo.png differ diff --git a/public/images/sakura-ne-jp-logo.png b/public/images/sakura-ne-jp-logo.png new file mode 100644 index 000000000..579c3b8cb Binary files /dev/null and b/public/images/sakura-ne-jp-logo.png differ diff --git a/public/images/stickam-logo.png b/public/images/stickam-logo.png new file mode 100644 index 000000000..22393e890 Binary files /dev/null and b/public/images/stickam-logo.png differ diff --git a/public/images/twitch-logo.png b/public/images/twitch-logo.png new file mode 100644 index 000000000..7bb99fa75 Binary files /dev/null and b/public/images/twitch-logo.png differ diff --git a/public/images/wikipedia-logo.png b/public/images/wikipedia-logo.png new file mode 100644 index 000000000..b7ded5f62 Binary files /dev/null and b/public/images/wikipedia-logo.png differ