From 232dd793419e16ab27b1d314909bbfed240d387f Mon Sep 17 00:00:00 2001 From: Henry Jameson Date: Sun, 28 Apr 2019 18:31:37 +0300 Subject: [PATCH] updates --- config/config.exs | 4 +- config/custom_emoji.txt | 192 +++++++++++++++++++++++----------------- 2 files changed, 112 insertions(+), 84 deletions(-) diff --git a/config/config.exs b/config/config.exs index 450db428a..de642a748 100644 --- a/config/config.exs +++ b/config/config.exs @@ -205,7 +205,7 @@ config :pleroma, :instance, description: "SigSegV, a pleroma instance", limit: 5_000, remote_limit: 100_000, - upload_limit: 50_000_000, + upload_limit: 200_000_000, avatar_upload_limit: 2_000_000, background_upload_limit: 4_000_000, banner_upload_limit: 4_000_000, @@ -223,7 +223,7 @@ config :pleroma, :instance, managed_config: true, static_dir: "instance/static/", allowed_post_formats: [ - "text/plain" + "text/plain", "text/bbcode" ], mrf_transparency: true, diff --git a/config/custom_emoji.txt b/config/custom_emoji.txt index ed9e6b467..c7a706630 100644 --- a/config/custom_emoji.txt +++ b/config/custom_emoji.txt @@ -1,87 +1,115 @@ -shinitai-shi, /emoji/sgsgb/shinitai-shi.png -shinitai-ni, /emoji/sgsgb/shinitai-ni.png -shinitai-ta, /emoji/sgsgb/shinitai-ta.png -shinitai-i, /emoji/sgsgb/shinitai-i.png -shinitai_shi, /emoji/sgsgb/shinitai_shi.png -shinitai_ni, /emoji/sgsgb/shinitai_ni.png -shinitai_ta, /emoji/sgsgb/shinitai_ta.png -shinitai_i, /emoji/sgsgb/shinitai_i.png -poptepipic23, /emoji/sgsgb/poptepipic23.png -poptepipic22, /emoji/sgsgb/poptepipic22.png -poptepipic21, /emoji/sgsgb/poptepipic21.png -poptepipic20, /emoji/sgsgb/poptepipic20.png -poptepipic19, /emoji/sgsgb/poptepipic19.png -poptepipic18, /emoji/sgsgb/poptepipic18.png -poptepipic17, /emoji/sgsgb/poptepipic17.png -poptepipic16, /emoji/sgsgb/poptepipic16.png -poptepipic15, /emoji/sgsgb/poptepipic15.png -poptepipic14, /emoji/sgsgb/poptepipic14.png -poptepipic13, /emoji/sgsgb/poptepipic13.png -poptepipic12, /emoji/sgsgb/poptepipic12.png -poptepipic11, /emoji/sgsgb/poptepipic11.png -poptepipic10, /emoji/sgsgb/poptepipic10.png -poptepipic9, /emoji/sgsgb/poptepipic9.png -poptepipic8, /emoji/sgsgb/poptepipic8.png -poptepipic7, /emoji/sgsgb/poptepipic7.png -poptepipic6, /emoji/sgsgb/poptepipic6.png -poptepipic5, /emoji/sgsgb/poptepipic5.png -poptepipic4, /emoji/sgsgb/poptepipic4.png -poptepipic3, /emoji/sgsgb/poptepipic3.png -poptepipic2, /emoji/sgsgb/poptepipic2.png -poptepipic1, /emoji/sgsgb/poptepipic1.png -payyap, /emoji/sgsgb/payyap.png -orangeman, /emoji/sgsgb/orangeman.png -ohyes, /emoji/sgsgb/ohyes.png -ohgno, /emoji/sgsgb/ohgno.png -nyoron, /emoji/sgsgb/nyoron.png -nice, /emoji/sgsgb/nice.png -necromancy3, /emoji/sgsgb/necromancy3.png -necromancy2, /emoji/sgsgb/necromancy2.png -necromancy1, /emoji/sgsgb/necromancy1.png -moraleup, /emoji/sgsgb/moraleup.png -moraledn, /emoji/sgsgb/moraledn.png -megaman, /emoji/sgsgb/megaman.png -luck, /emoji/sgsgb/luck.png -lucknorm, /emoji/sgsgb/lucknorm.png -jyushimatsu_think, /emoji/sgsgb/jyushimatsu_think.png -jake, /emoji/sgsgb/jake.png -itisamystery, /emoji/sgsgb/itisamystery.png -italian2, /emoji/sgsgb/italian2.png -italian1, /emoji/sgsgb/italian1.png -herrington, /emoji/sgsgb/herrington.png -heavy_winninggreat, /emoji/sgsgb/heavy_winninggreat.png -heavy_losingeh, /emoji/sgsgb/heavy_losingeh.png -granddad, /emoji/sgsgb/granddad.png -furrythink, /emoji/sgsgb/furrythink.png +Advanced_Sorcery, /emoji/sgsgb/Advanced_Sorcery.png FACE_QUAD, /emoji/sgsgb/FACE_QUAD.png -dogcited, /emoji/sgsgb/dogcited.png -denton, /emoji/sgsgb/denton.png -denton_laugh, /emoji/sgsgb/denton_laugh.png -debian, /emoji/sgsgb/debian.png -catboythink, /emoji/sgsgb/catboythink.png -cacolaugh, /emoji/sgsgb/cacolaugh.png -bandits, /emoji/sgsgb/bandits.png -bananya, /emoji/sgsgb/bananya.png +Yukkuri_Reimu, /emoji/sgsgb/Yukkuri_Reimu.png a_to, /emoji/sgsgb/a_to.png angrypirds, /emoji/sgsgb/angrypirds.png -Advanced_Sorcery, /emoji/sgsgb/Advanced_Sorcery.png -Yukkuri_Reimu, /emoji/sgsgb/Yukkuri_Reimu.png -vanpeek, /emoji/sgsgb/vanpeek.png -tux, /emoji/sgsgb/tux.png -tuturu, /emoji/sgsgb/tuturu.png -tobdog, /emoji/sgsgb/tobdog.png -thnk, /emoji/sgsgb/thnk.png -stalkers, /emoji/sgsgb/stalkers.png -spurdo, /emoji/sgsgb/spurdo.png -smug_marisa, /emoji/sgsgb/smug_marisa.png -shotging, /emoji/sgsgb/shotging.png -shag, /emoji/sgsgb/shag.png -serious, /emoji/sgsgb/serious.png -scut, /emoji/sgsgb/scut.png -sandro, /emoji/sgsgb/sandro.png -puke, /emoji/sgsgb/puke.png -kokoko, /emoji/sgsgb/kokoko.png -the_e, /emoji/sgsgb/e.png -avard_bios, /emoji/sgsgb/avard_bios.png +annoying_dog_hole, /emoji/sgsgb/annoying_dog_hole.png +award_bios, /emoji/sgsgb/award_bios.png +bananya, /emoji/sgsgb/bananya.png +bandits, /emoji/sgsgb/bandits.png +blobcatknife, /emoji/sgsgb/blobcatknife.png +cacolaugh, /emoji/sgsgb/cacolaugh.png +catboythink, /emoji/sgsgb/catboythink.png +cirno_run, /emoji/sgsgb/cirno_run.png +debian, /emoji/sgsgb/debian.png +denton, /emoji/sgsgb/denton.png +denton_laugh, /emoji/sgsgb/denton_laugh.png +dio, /emoji/sgsgb/dio.png +dogcited, /emoji/sgsgb/dogcited.png +dong, /emoji/sgsgb/dong.png +duane, /emoji/sgsgb/duane.png +e, /emoji/sgsgb/e.png energy_star, /emoji/sgsgb/energy_star.png +flynn_smirk, /emoji/sgsgb/flynn_smirk.png +furrythink, /emoji/sgsgb/furrythink.png +granddad, /emoji/sgsgb/granddad.png +heavy_losingeh, /emoji/sgsgb/heavy_losingeh.png +heavy_winninggreat, /emoji/sgsgb/heavy_winninggreat.png +herrington, /emoji/sgsgb/herrington.png +hogan, /emoji/sgsgb/hogan.png +hyperjoy, /emoji/sgsgb/hyperjoy.png +itisamystery, /emoji/sgsgb/itisamystery.png +jacobson, /emoji/sgsgb/jacobson.png +jake, /emoji/sgsgb/jake.png +jyushimatsu_think, /emoji/sgsgb/jyushimatsu_think.png +kinzo, /emoji/sgsgb/kinzo.png +kms, /emoji/sgsgb/kms.png +kokoko, /emoji/sgsgb/kokoko.png loss, /emoji/sgsgb/loss.png +luck, /emoji/sgsgb/luck.png +lucknorm, /emoji/sgsgb/lucknorm.png +marko, /emoji/sgsgb/marko.png +megaman, /emoji/sgsgb/megaman.png +miyanozoom, /emoji/sgsgb/miyanozoom.png +monster_energy_ultra, /emoji/sgsgb/monster_energy_ultra.png +moraledn, /emoji/sgsgb/moraledn.png +moraleup, /emoji/sgsgb/moraleup.png +multiply, /emoji/sgsgb/multiply.png +mycomputer, /emoji/sgsgb/mycomputer.png +necromancy1, /emoji/sgsgb/necromancy1.png +necromancy2, /emoji/sgsgb/necromancy2.png +necromancy3, /emoji/sgsgb/necromancy3.png +nice, /emoji/sgsgb/nice.png +nyoron, /emoji/sgsgb/nyoron.png +ohgno, /emoji/sgsgb/ohgno.png +ohyes, /emoji/sgsgb/ohyes.png +orangeman, /emoji/sgsgb/orangeman.png +payyap, /emoji/sgsgb/payyap.png +pooh, /emoji/sgsgb/pooh.png +poohington, /emoji/sgsgb/poohington.png +poptepipic1, /emoji/sgsgb/poptepipic1.png +poptepipic10, /emoji/sgsgb/poptepipic10.png +poptepipic11, /emoji/sgsgb/poptepipic11.png +poptepipic12, /emoji/sgsgb/poptepipic12.png +poptepipic13, /emoji/sgsgb/poptepipic13.png +poptepipic14, /emoji/sgsgb/poptepipic14.png +poptepipic15, /emoji/sgsgb/poptepipic15.png +poptepipic16, /emoji/sgsgb/poptepipic16.png +poptepipic17, /emoji/sgsgb/poptepipic17.png +poptepipic18, /emoji/sgsgb/poptepipic18.png +poptepipic19, /emoji/sgsgb/poptepipic19.png +poptepipic2, /emoji/sgsgb/poptepipic2.png +poptepipic20, /emoji/sgsgb/poptepipic20.png +poptepipic21, /emoji/sgsgb/poptepipic21.png +poptepipic22, /emoji/sgsgb/poptepipic22.png +poptepipic23, /emoji/sgsgb/poptepipic23.png +poptepipic3, /emoji/sgsgb/poptepipic3.png +poptepipic4, /emoji/sgsgb/poptepipic4.png +poptepipic5, /emoji/sgsgb/poptepipic5.png +poptepipic6, /emoji/sgsgb/poptepipic6.png +poptepipic7, /emoji/sgsgb/poptepipic7.png +poptepipic8, /emoji/sgsgb/poptepipic8.png +poptepipic9, /emoji/sgsgb/poptepipic9.png +puke, /emoji/sgsgb/puke.png +quake_net, /emoji/sgsgb/quake_net.png +quake_ram, /emoji/sgsgb/quake_ram.png +ranger, /emoji/sgsgb/ranger.png +ranger_none, /emoji/sgsgb/ranger_none.png +risitas1, /emoji/sgsgb/risitas1.png +risitas2, /emoji/sgsgb/risitas2.png +rokalife, /emoji/sgsgb/rokalife.png +sandro, /emoji/sgsgb/sandro.png +scut, /emoji/sgsgb/scut.png +serious, /emoji/sgsgb/serious.png +shag, /emoji/sgsgb/shag.png +shinitai_i, /emoji/sgsgb/shinitai_i.png +shinitai_ni, /emoji/sgsgb/shinitai_ni.png +shinitai_shi, /emoji/sgsgb/shinitai_shi.png +shinitai_ta, /emoji/sgsgb/shinitai_ta.png +shotging, /emoji/sgsgb/shotging.png +skelethor, /emoji/sgsgb/skelethor.png +smug_marisa, /emoji/sgsgb/smug_marisa.png +spurdo, /emoji/sgsgb/spurdo.png +stalkers, /emoji/sgsgb/stalkers.png +tenshi_eating_corndog, /emoji/sgsgb/tenshi_eating_corndog.png +thinkingwat, /emoji/sgsgb/thinkingwat.png +thnk, /emoji/sgsgb/thnk.png +tobdog, /emoji/sgsgb/tobdog.png +todd, /emoji/sgsgb/todd.png +trash, /emoji/sgsgb/trash.png +tuturu, /emoji/sgsgb/tuturu.png +tux, /emoji/sgsgb/tux.png +uwot, /emoji/sgsgb/uwot.png +uwot2, /emoji/sgsgb/uwot2.png +uwot3, /emoji/sgsgb/uwot3.png +vanpeek, /emoji/sgsgb/vanpeek.png