Update emojo

diff --git a/config/custom_emoji.txt b/config/custom_emoji.txt
new file mode 100644 (file)
index 0000000..4c4d72e
--- /dev/null
+++ b/config/custom_emoji.txt
@@ -0,0 +1,82 @@
+killme, /emoji/custom/guninmouth.png
+blobhang, /emoji/custom/blobhang.png
+thunking, /emoji/custom/thunking.png
+akasmug, /emoji/custom/akasmug.png
+luluconcern, /emoji/custom/lulucoconcern.png
+lulucosmug, /emoji/custom/lulucosmug.png
+akaheh, /emoji/custom/akaheh.png
+kirbeats, /emoji/custom/kirbeats.png
+226, /emoji/custom/226.png
+abca, /emoji/custom/abca.png
+akk, /emoji/custom/akk.png
+aks-(2), /emoji/custom/aks-(2).png
+aks3, /emoji/custom/aks3.png
+aks, /emoji/custom/aks.png
+amz, /emoji/custom/amz.png
+aynm2, /emoji/custom/aynm2.png
+aynm, /emoji/custom/aynm.png
+bil, /emoji/custom/bil.png
+bj, /emoji/custom/bj.png
+br2, /emoji/custom/br2.png
+br, /emoji/custom/br.png
+brcr2, /emoji/custom/brcr2.png
+brcr, /emoji/custom/brcr.png
+bs, /emoji/custom/bs.png
+bst, /emoji/custom/bst.png
+crba, /emoji/custom/crba.png
+crb, /emoji/custom/crb.png
+crbrd, /emoji/custom/crbrd.png
+crlp, /emoji/custom/crlp.png
+dc, /emoji/custom/dc.png
+edrj, /emoji/custom/edrj.png
+fshud, /emoji/custom/fshud.png
+ft, /emoji/custom/ft.png
+hbk, /emoji/custom/hbk.png
+hd, /emoji/custom/hd.png
+hm, /emoji/custom/hm.png
+hn, /emoji/custom/hn.png
+hp, /emoji/custom/hp.png
+hr, /emoji/custom/hr.png
+hu, /emoji/custom/hu.png
+i19, /emoji/custom/i19.png
+irstrea, /emoji/custom/irstrea.png
+jbr, /emoji/custom/jbr.png
+jc, /emoji/custom/jc.png
+jo2, /emoji/custom/jo2.png
+jo, /emoji/custom/jo.png
+kg, /emoji/custom/kg.png
+ksrg, /emoji/custom/ksrg.png
+laird, /emoji/custom/laird.png
+lp, /emoji/custom/lp.png
+mc, /emoji/custom/mc.png
+mck2, /emoji/custom/mck2.png
+mck, /emoji/custom/mck.png
+mj, /emoji/custom/mj.png
+mks, /emoji/custom/mks.png
+mnc, /emoji/custom/mnc.png
+my, /emoji/custom/my.png
+ncrs, /emoji/custom/ncrs.png
+nhi, /emoji/custom/nhi.png
+nn, /emoji/custom/nn.png
+ns, /emoji/custom/ns.png
+oig, /emoji/custom/oig.png
+pnx, /emoji/custom/pnx.png
+ptld, /emoji/custom/ptld.png
+rgr, /emoji/custom/rgr.png
+rp, /emoji/custom/rp.png
+sdeig, /emoji/custom/sdeig.png
+sfk, /emoji/custom/sfk.png
+sgr, /emoji/custom/sgr.png
+sr, /emoji/custom/sr.png
+srcy, /emoji/custom/srcy.png
+tko2, /emoji/custom/tko2.png
+tko, /emoji/custom/tko.png
+udc, /emoji/custom/udc.png
+unc, /emoji/custom/unc.png
+wsfit2, /emoji/custom/wsfit2.png
+wsfit, /emoji/custom/wsfit.png
+ykkj, /emoji/custom/ykkj.png
+ysr, /emoji/custom/ysr.png
+z23, /emoji/custom/z23.png
+z35, /emoji/custom/z35.png
+z46, /emoji/custom/z46.png

diff --git a/priv/static/instance/panel.html b/priv/static/instance/panel.html
index 4b56f2ef3b0ef45627335a7127eed314f92ccee6..d448a2fc8ae99dfcee53612005b829fbc95e8f15 100644 (file)
--- a/priv/static/instance/panel.html
+++ b/priv/static/instance/panel.html
@@ -2,6 +2,15 @@
 <p>Welcome to <a href="https://pleroma.social" target="_blank">Pleroma!</a></p>
 <p>Sadposting admin is <a href="/FloatingGhost">@FloatingGhost@ihatebeinga.live</a></p>
 
+<hr />
+
+<p>Self-signup is disabled right now because a meanie took advantage of it to flood acccounts.</p>
+<p>If you want an account, feel free to fling an <a href="mailto:hannah@coffee-and-dreams.uk">email</a>  (<a href="https://coffee-and-dreams.uk/pubkey.asc">PGP Key</a>) or XMPP
+message to the admin.</p>
+
+<hr />
+
+Frontends: 
 <p><a href="https://sad.ihatebeinga.live">Sad FE</a> | <a href="/main/all">Pleroma FE</a> | <a href="/web">Mastodon FE</a></p>
 </div>
 

diff --git a/priv/static/static/img/nsfw.74818f9.png b/priv/static/static/img/nsfw.74818f9.png
index e32525aa53bc1e8314a7d2f90e97c9c35f6addf3..e0d1fc2a93ca669e9b7549c58d4dba8f31836287 100644 (file)
Binary files a/priv/static/static/img/nsfw.74818f9.png and b/priv/static/static/img/nsfw.74818f9.png differ