From f8b083f64a3e31be1cdbe1649776fcce11495e16 Mon Sep 17 00:00:00 2001
From: Chaska <166928710+chaskayote@users.noreply.github.com>
Date: Tue, 30 Apr 2024 18:08:13 -0500
Subject: [PATCH] QoL and blacklist tags add
---
.gitignore | 1 +
config/tag.json | 31 +++++++++++++++++++
.../templates/image/new.html.slime | 5 +--
lib/philomena_web/views/image_view.ex | 24 +++++++++-----
4 files changed, 51 insertions(+), 10 deletions(-)
diff --git a/.gitignore b/.gitignore
index 354e8069..c8c4b70b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -61,3 +61,4 @@ npm-debug.log
# Jest coverage
/assets/coverage
+docker/app/Dockerfile
diff --git a/config/tag.json b/config/tag.json
index 2b34d669..2d1d8f15 100644
--- a/config/tag.json
+++ b/config/tag.json
@@ -9,6 +9,34 @@
"2 horns",
"2 penises",
"2 tails",
+ "circumcision scar",
+ "colored seam underwear",
+ "seam (sewing)",
+ "white seam underwear",
+ "blue seam underwear",
+ "red seam underwear",
+ "white seam briefs",
+ "blue seam briefs",
+ "black seam underwear",
+ "red seam briefs",
+ "green seam underwear",
+ "black seam briefs",
+ "yellow seam underwear",
+ "grey seam underwear",
+ "orange seam underwear",
+ "colored seam briefs",
+ "topwear",
+ "blushing at another",
+ "ceiling",
+ "muscular anthro",
+ "overweight anthro",
+ "topless anthro",
+ "topless female",
+ "topless male",
+ "topless humanoid",
+ "topless human",
+ "topless intersex",
+ "topless gynomorph",
"3 eyes",
"4 arms",
"4 breasts",
@@ -1749,6 +1777,9 @@
"pink clothing",
"pink collar",
"pink countershading",
+ "casual exposure",
+ "text on clothing",
+ "topwear",
"pink crop top",
"pink cum",
"pink diaper",
diff --git a/lib/philomena_web/templates/image/new.html.slime b/lib/philomena_web/templates/image/new.html.slime
index 8172f922..91584ddb 100644
--- a/lib/philomena_web/templates/image/new.html.slime
+++ b/lib/philomena_web/templates/image/new.html.slime
@@ -28,7 +28,7 @@
= url_input f, :scraper_url, class: "input input--wide js-scraper", placeholder: "External Page Link"
button.button.button--separate-left#js-scraper-preview(type="button" title="Fetch the image at the specified URL" data-disable-with="Fetch" disabled)
' Fetch
- p Supports: DeviantArt, Tumblr, X/Twitter, Furaffinity, Inkbunny, E621 or a direct image link.
+ p Supports: DeviantArt, Tumblr, X/Twitter, Furaffinity, Inkbunny, E621, Furbooru, Derpibooru, or a direct image link.
.field-error-js.hidden.js-scraper
@@ -36,7 +36,7 @@
p
'The page(s) you found this image on. Images may have a maximum of
span.js-max-source-count> 10
- ' source URLs. Leave any sources you don't want to use blank.
+ ' source URLs. Do not list source urls that just go to the artist page. Image should be present on direct source url.
= inputs_for f, :sources, fn fs ->
.field.js-image-source.field--inline.flex--no-wrap.flex--centered
@@ -61,6 +61,7 @@
p For artists: prefix with artist: If you don't know the artist, put unknown artist.
p For original characters, prefix with oc:
+ p For AI creators, prefix with director:
= render PhilomenaWeb.TagView, "_tag_editor.html", f: f, name: :tag_input, type: :upload
= error_tag f, :tag_input
diff --git a/lib/philomena_web/views/image_view.ex b/lib/philomena_web/views/image_view.ex
index 629beb1f..efd189c0 100644
--- a/lib/philomena_web/views/image_view.ex
+++ b/lib/philomena_web/views/image_view.ex
@@ -409,17 +409,25 @@ defmodule PhilomenaWeb.ImageView do
u
when u in [
- "furaffinity.net",
"furbooru.org",
- "inkbunny.net",
- "e621.net",
- "e926.net",
- "sofurry.com",
+ "sofurry.com"
+ ] ->
+ "fa fa-paw"
+
+ u
+ when u in [
"weasyl.com",
"www.weasyl.com",
"cdn.weasyl.com"
] ->
- "fa fa-paw"
+ "fa-solid fa-otter"
+
+ u
+ when u in [
+ "e621.net",
+ "e926.net"
+ ] ->
+ "fa-solid fa-gavel"
u
when u in [
@@ -467,9 +475,9 @@ defmodule PhilomenaWeb.ImageView do
String.ends_with?(link, ".deviantart.com") or String.ends_with?(link, ".deviantart.net") ->
"fab fa-deviantart"
- String.ends_with?(link, ".furaffinity.net") or String.ends_with?(link, ".sofurry.com") or
+ String.ends_with?(link, ".furaffinity.net") or
String.ends_with?(link, ".facdn.net") ->
- "fa fa-paw"
+ "fa-solid fa-dumpster-fire"
String.ends_with?(link, ".userapi.com") or String.ends_with?(link, ".vk.me") ->
"fab fa-vk"