diff --git a/config/config.exs b/config/config.exs index fa616bcce..5c3c1b0c6 100644 --- a/config/config.exs +++ b/config/config.exs @@ -47,16 +47,16 @@ version = config :pleroma, :http, proxy_url: nil config :pleroma, :instance, - version: "2.1", + version: version, name: "Shigusegubu", email: "pleroma@hjkos.com", limit: 5000, - upload_limit: 16_000_000, + upload_limit: 20_000_000, registrations_open: true, federating: true, rewrite_policy: Pleroma.Web.ActivityPub.MRF.NoOpPolicy, public: true, - quarantined_instances: [] + quarantined_instances: ["pleroma.rareome.ga"] config :pleroma, :activitypub, accept_blocks: true, diff --git a/config/custom_emoji.txt b/config/custom_emoji.txt index 49369749d..ed9e6b467 100644 --- a/config/custom_emoji.txt +++ b/config/custom_emoji.txt @@ -82,3 +82,6 @@ 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 +energy_star, /emoji/sgsgb/energy_star.png +loss, /emoji/sgsgb/loss.png diff --git a/config/emoji.txt b/config/emoji.txt index 3ea245a5b..7e43eed9b 100644 --- a/config/emoji.txt +++ b/config/emoji.txt @@ -28,11 +28,3 @@ f_33b00b, /emoji/f_33b00b.png f_33b22b, /emoji/f_33b22b.png f_33h, /emoji/f_33h.png f_33t, /emoji/f_33t.png -shinitai-shi, /emoji/shinitai-shi.png -shinitai-ni, /emoji/shinitai-ni.png -shinitai-ta, /emoji/shinitai-ta.png -shinitai-i, /emoji/shinitai-i.png -shinitai_shi, /emoji/shinitai_shi.png -shinitai_ni, /emoji/shinitai_ni.png -shinitai_ta, /emoji/shinitai_ta.png -shinitai_i, /emoji/shinitai_i.png