diff --git a/files/assets/images/Drama/sidebar/151.webp b/files/assets/images/Drama/sidebar/151.webp index 8fd805cd1..25962c3f2 100644 Binary files a/files/assets/images/Drama/sidebar/151.webp and b/files/assets/images/Drama/sidebar/151.webp differ diff --git a/files/assets/images/emojis/wolfromulusremus.webp b/files/assets/images/emojis/wolfromulusremus.webp new file mode 100644 index 000000000..c61e194fe Binary files /dev/null and b/files/assets/images/emojis/wolfromulusremus.webp differ diff --git a/files/assets/images/emojis/wolfrope.webp b/files/assets/images/emojis/wolfrope.webp new file mode 100644 index 000000000..22af5af97 Binary files /dev/null and b/files/assets/images/emojis/wolfrope.webp differ diff --git a/files/assets/images/emojis/wolftinfoil.webp b/files/assets/images/emojis/wolftinfoil.webp new file mode 100644 index 000000000..af430f56b Binary files /dev/null and b/files/assets/images/emojis/wolftinfoil.webp differ diff --git a/files/assets/js/emoji_modal.js b/files/assets/js/emoji_modal.js index a506b37d9..841a0ae93 100644 --- a/files/assets/js/emoji_modal.js +++ b/files/assets/js/emoji_modal.js @@ -29,7 +29,7 @@ function loadEmojis(form) { 'flags': ['russia','niger','lgbt','saudi','animesexual','blacknation','blm','blueline','dreamgender','fatpride','incelpride','israel','kazakhstan','landlordlove','scalperpride','superstraight','trans','translord','transracial','usa'], - 'wolf': ['wolfmarseymask','wolfputin','wolfpat','wolfpat2','wolfdrama','wolfcumjar','wolflgbt','wolfmarseyhead','wolfnoir','wolfsherifssmoking','wolftrans','wolfvaporwave','wolfangry','wolfbrains','wolfcry','wolfdead','wolfdevilish','wolffacepalm','wolfhappy','wolfidea','wolfkoala','wolflaugh','wolflove','wolfmeditate','wolfphone','wolfrainbow','wolfroses','wolfsad','wolfsfear','wolfsleep','wolftear','wolfthink','wolfthumbsup','wolfupsidedown','wolfvictory','wolfwave','wolfwink'], + 'wolf': ['wolfromulusremus','wolfrope','wolftinfoil','wolfmarseymask','wolfputin','wolfpat','wolfpat2','wolfdrama','wolfcumjar','wolflgbt','wolfmarseyhead','wolfnoir','wolfsherifssmoking','wolftrans','wolfvaporwave','wolfangry','wolfbrains','wolfcry','wolfdead','wolfdevilish','wolffacepalm','wolfhappy','wolfidea','wolfkoala','wolflaugh','wolflove','wolfmeditate','wolfphone','wolfrainbow','wolfroses','wolfsad','wolfsfear','wolfsleep','wolftear','wolfthink','wolfthumbsup','wolfupsidedown','wolfvictory','wolfwave','wolfwink'], 'misc': ['kippypat','yotsubafish','yotsubalol','sigmatalking','zoroarkconfused','zoroarkhappy','zoroarkpout','zoroarksleepy','casanovanova','deuxwaifu','flairlessmong','hardislife','redditgigachad','rfybear','etika','sneed','retardedchildren','bruh','autism','doot','kylieface','queenyes','wholesomeseal','chadyescapy','gigachadglow','gigachadorthodox','gigachad','gigachad2','gigachad3'] } diff --git a/files/routes/admin.py b/files/routes/admin.py index 3fc251692..7231524cf 100644 --- a/files/routes/admin.py +++ b/files/routes/admin.py @@ -32,7 +32,7 @@ def fix(v): if num: li = li[:int(num)] for post in li: print(post.id, flush=True) - try: req = requests.get(f"https://web.archive.org/{post.url}", timeout=5) + try: req = requests.get(f"https://web.archive.org/{post.url}", timeout=1) except: continue if str(req) == '': print(post.url, flush=True) @@ -40,7 +40,8 @@ def fix(v): post.thumburl = post.url print(post.permalink, flush=True) g.db.add(post) - g.db.commit() + try: g.db.commit() + except: continue return 'sex' @app.post('/admin/merge//') diff --git a/files/templates/emoji_modal.html b/files/templates/emoji_modal.html index bd0fe6d6b..67112a5ad 100644 --- a/files/templates/emoji_modal.html +++ b/files/templates/emoji_modal.html @@ -94,4 +94,4 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/files/templates/sidebar_Drama.html b/files/templates/sidebar_Drama.html index 88ef67ae8..900869e13 100644 --- a/files/templates/sidebar_Drama.html +++ b/files/templates/sidebar_Drama.html @@ -4,7 +4,7 @@ {% set image=sub.sidebar_url %} {% else %} {% set path = "assets/images/" + SITE_NAME + "/sidebar" %} - {% set image = "/static/" + path + "/" + listdir('files/' + path)|random() + '?v=34' %} + {% set image = "/static/" + path + "/" + listdir('files/' + path)|random() + '?v=35' %} {% endif %} sidebar image