changed the getting sauces system

19 files changed, 20 insertions, 4 deletions

diff --git a/.gitignore b/.gitignore
index 460b6bd..460b6bd 100644..100755
--- a/.gitignore
+++ b/.gitignore
diff --git a/.gitmodules b/.gitmodules
index 8941b52..8941b52 100644..100755
--- a/.gitmodules
+++ b/.gitmodules
diff --git a/LICENSE b/LICENSE
index f288702..f288702 100644..100755
--- a/LICENSE
+++ b/LICENSE
diff --git a/bot.py b/bot.py
index 3c8f6e0..7161ce5 100644..100755
--- a/bot.py
+++ b/bot.py
@@ -1,5 +1,5 @@
 import os

-os.chdir("/root/yaoi-communism")

+os.chdir("/home/eden/yaoi-communism")

 

 from twython import Twython

 import get_images

diff --git a/exampleconfig.json b/exampleconfig.json
index 31418ce..31418ce 100644..100755
--- a/exampleconfig.json
+++ b/exampleconfig.json
diff --git a/fonts/BadScript-Regular.ttf b/fonts/BadScript-Regular.ttf
index 7dc02d4..7dc02d4 100644..100755
--- a/fonts/BadScript-Regular.ttf
+++ b/fonts/BadScript-Regular.ttf
diff --git a/fonts/Caveat-Bold.ttf b/fonts/Caveat-Bold.ttf
index e7e6a83..e7e6a83 100644..100755
--- a/fonts/Caveat-Bold.ttf
+++ b/fonts/Caveat-Bold.ttf
diff --git a/fonts/Caveat-Regular.ttf b/fonts/Caveat-Regular.ttf
index 278a61c..278a61c 100644..100755
--- a/fonts/Caveat-Regular.ttf
+++ b/fonts/Caveat-Regular.ttf
diff --git a/fonts/DancingScript-VariableFont_wght.ttf b/fonts/DancingScript-VariableFont_wght.ttf
index 6f55454..6f55454 100644..100755
--- a/fonts/DancingScript-VariableFont_wght.ttf
+++ b/fonts/DancingScript-VariableFont_wght.ttf
diff --git a/fonts/Kalam-Regular.ttf b/fonts/Kalam-Regular.ttf
index 16f1586..16f1586 100644..100755
--- a/fonts/Kalam-Regular.ttf
+++ b/fonts/Kalam-Regular.ttf
diff --git a/fonts/Roboto-Bold.ttf b/fonts/Roboto-Bold.ttf
index d998cf5..d998cf5 100644..100755
--- a/fonts/Roboto-Bold.ttf
+++ b/fonts/Roboto-Bold.ttf
diff --git a/fonts/Satisfy-Regular.ttf b/fonts/Satisfy-Regular.ttf
index d428788..d428788 100644..100755
--- a/fonts/Satisfy-Regular.ttf
+++ b/fonts/Satisfy-Regular.ttf
diff --git a/fonts/Yellowtail-Regular.ttf b/fonts/Yellowtail-Regular.ttf
index 6dc4f90..6dc4f90 100644..100755
--- a/fonts/Yellowtail-Regular.ttf
+++ b/fonts/Yellowtail-Regular.ttf
diff --git a/get_images.py b/get_images.py
index 817b9c1..9d25599 100644..100755
--- a/get_images.py
+++ b/get_images.py
@@ -1,5 +1,6 @@
 from dataclasses import dataclass
 from PIL import Image, ImageDraw
+from lxml.html import parse
 from io import StringIO
 from lxml import etree
 import requests
@@ -85,10 +86,21 @@ def get_num_pages(tags):
     else:
         return int(int(urllib.parse.parse_qs(page_element.get("href"))["pid"][0]) / (5*8))
 
+def check_pixiv_404(url):
+    text = requests.get(url).text
+    return text[text.find("<title>") + 7 : text.find("</title>")] == "イラストコミュニケーションサービス[pixiv]"
+
 def fix_source_url(url):
-    if "pixiv.net" in url or "pximg.net" in url: 
-        return "https://www.pixiv.net/en/artworks/%s" % url.split("/")[-1][:8]                
-    return url 
+    parsed = urllib.parse.urlparse(url)
+    if parsed.netloc == "www.pixiv.net":
+        return "https://www.pixiv.net/en/artworks/" + urllib.parse.parse_qs(parsed.query)["illust_id"][0]
+    elif parsed.netloc in ["bishie.booru.org", "www.secchan.net"]:
+        return ConnectionError("Couldn't get source")
+    elif "pximg.net" in parsed.netloc or "pixiv.net" in parsed.netloc:
+        return "https://www.pixiv.net/en/artworks/" + parsed.path.split("/")[-1][:8]
+    elif parsed.netloc == "twitter.com":
+        return url.replace("twitter.com", "nitter.eda.gay")
+    return url
 
 def append_blacklisted(id_):
     with open(CONFIG["blacklist"], "a") as f:
@@ -127,6 +139,10 @@ def main(draw_faces = False):
         logging.info("Retried, already posted image...")
         return main()
 
+    if check_pixiv_404(fix_source_url(simg.source)):
+        logging.warning("Skipping since pixiv linked 404'd")
+        return main()
+
     append_blacklisted(simg.id)
 
     with DownloadedImage(simg.imurl) as impath:
diff --git a/readme.md b/readme.md
index 2eff7ae..2eff7ae 100644..100755
--- a/readme.md
+++ b/readme.md
diff --git a/requirements.txt b/requirements.txt
index cc0f624..cc0f624 100644..100755
--- a/requirements.txt
+++ b/requirements.txt
diff --git a/texts/quotes.txt b/texts/quotes.txt
index 0791014..0791014 100644..100755
--- a/texts/quotes.txt
+++ b/texts/quotes.txt
diff --git a/texts/short.txt b/texts/short.txt
index 5764f71..5764f71 100644..100755
--- a/texts/short.txt
+++ b/texts/short.txt
diff --git a/utils.py b/utils.py
index ce3f3b9..ce3f3b9 100644..100755
--- a/utils.py
+++ b/utils.py