diff --git a/lib/pleroma/web/activity_pub/mrf/gab_rewrite_policy.ex b/lib/pleroma/web/activity_pub/mrf/gab_rewrite_policy.ex deleted file mode 100644 index fe48b848e..000000000 --- a/lib/pleroma/web/activity_pub/mrf/gab_rewrite_policy.ex +++ /dev/null @@ -1,53 +0,0 @@ -defmodule Pleroma.Web.ActivityPub.MRF.GABRewritePolicy do - @moduledoc "Adds stupid quotes to gab users" - @behaviour Pleroma.Web.ActivityPub.MRF - @domain "gab.com" - @appends [ - "Sent from AOL Mobile Mail", - "John had surgery Friday and he's with the lord now.", - "Lovely pics as alway, Janice. I have terminal brain cancer.", - "DISCUSTING", - "I DID NOT POST THAT! SOMEONE HAS HACKED MY ACCOUNT", - "LOVE ETHYL", - "Just got back from the doctor. I have Ebola. See you at church on Sunday!", - "ADULT ONLY", - "Are you my grandson?", - "http://m.facebook.com", - "WISH GOD WOULD TAKE ME.", - "YOU SURE ARE A LONG BABY", - "REFURBISHD +OK?", - "THIS EMAIL IS INTENDED FOR THE RECIPIENT ONLY. PLEASE THINK ABOUT THE ENVIRONMENT BEFORE YOU PRINT THIS MESSAGE", - "AC/DC is my favourite band", - "BRAD'S WIFE!", - "Order corn!", - "Yim yum", - "My 49 year old son, Shane, died this morning.", - "I called Mr uber", - "Coconut oil.", - "price for apple sauce at walmart", - "no SWEARING on my timeline!", - "MILK TRUK JUST ARRIVE", - "Also my catheter bag is full.", - "Go finish your yoghurt", - "I am going to slap your mouth grandson." - ] - - def add(%{"object" => %{"content" => content}} = object) do - put_in(object, ["object", "content"], content <> " " <> Enum.random(@appends)) - end - - @impl true - def describe, do: {:ok, %{}} - - @impl true - def filter(%{"type" => "Create", "actor" => actor} = object) do - actor_info = URI.parse(actor) - if String.contains?(actor_info.host, @domain) do - {:ok, add(object)} - else - {:ok, object} - end - end - - def filter(object), do: {:ok, object} -end diff --git a/priv/static/index.html b/priv/static/index.html index a4c1578db..539ff68a0 100644 --- a/priv/static/index.html +++ b/priv/static/index.html @@ -1 +1 @@ -Pleroma
\ No newline at end of file +Pleroma
\ No newline at end of file diff --git a/priv/static/static/font/fontello.1579191413379.woff b/priv/static/static/font/fontello.1579191413379.woff deleted file mode 100644 index 32c2f86ba..000000000 Binary files a/priv/static/static/font/fontello.1579191413379.woff and /dev/null differ diff --git a/priv/static/static/font/fontello.1579191413379.woff2 b/priv/static/static/font/fontello.1579191413379.woff2 deleted file mode 100644 index 75ef8cdfe..000000000 Binary files a/priv/static/static/font/fontello.1579191413379.woff2 and /dev/null differ diff --git a/priv/static/static/font/fontello.1579191413379.eot b/priv/static/static/font/fontello.1579191725174.eot similarity index 88% rename from priv/static/static/font/fontello.1579191413379.eot rename to priv/static/static/font/fontello.1579191725174.eot index aeb870f7c..90f9bdb79 100644 Binary files a/priv/static/static/font/fontello.1579191413379.eot and b/priv/static/static/font/fontello.1579191725174.eot differ diff --git a/priv/static/static/font/fontello.1579191413379.svg b/priv/static/static/font/fontello.1579191725174.svg similarity index 99% rename from priv/static/static/font/fontello.1579191413379.svg rename to priv/static/static/font/fontello.1579191725174.svg index 44beba9a2..98111ac20 100644 --- a/priv/static/static/font/fontello.1579191413379.svg +++ b/priv/static/static/font/fontello.1579191725174.svg @@ -74,8 +74,6 @@ - - diff --git a/priv/static/static/font/fontello.1579191413379.ttf b/priv/static/static/font/fontello.1579191725174.ttf similarity index 88% rename from priv/static/static/font/fontello.1579191413379.ttf rename to priv/static/static/font/fontello.1579191725174.ttf index 6a81cee8d..5cd2c1417 100644 Binary files a/priv/static/static/font/fontello.1579191413379.ttf and b/priv/static/static/font/fontello.1579191725174.ttf differ diff --git a/priv/static/static/font/fontello.1579191725174.woff b/priv/static/static/font/fontello.1579191725174.woff new file mode 100644 index 000000000..dec0aca59 Binary files /dev/null and b/priv/static/static/font/fontello.1579191725174.woff differ diff --git a/priv/static/static/font/fontello.1579191725174.woff2 b/priv/static/static/font/fontello.1579191725174.woff2 new file mode 100644 index 000000000..75dd7d17a Binary files /dev/null and b/priv/static/static/font/fontello.1579191725174.woff2 differ diff --git a/priv/static/static/fontello.1579191413379.css b/priv/static/static/fontello.1579191725174.css similarity index 87% rename from priv/static/static/fontello.1579191413379.css rename to priv/static/static/fontello.1579191725174.css index 9ee16f20d..4d993747a 100644 Binary files a/priv/static/static/fontello.1579191413379.css and b/priv/static/static/fontello.1579191725174.css differ diff --git a/priv/static/static/fontello.json b/priv/static/static/fontello.json index 829241b55..c1ed33938 100755 --- a/priv/static/static/fontello.json +++ b/priv/static/static/fontello.json @@ -333,12 +333,6 @@ "css": "login", "code": 59424, "src": "fontawesome" - }, - { - "uid": "f3ebd6751c15a280af5cc5f4a764187d", - "css": "arrow-curved", - "code": 59426, - "src": "iconic" } ] } \ No newline at end of file diff --git a/priv/static/static/js/2.8896ea39a0ea8016391a.js b/priv/static/static/js/2.7eaed4ad0d253fad6f55.js similarity index 91% rename from priv/static/static/js/2.8896ea39a0ea8016391a.js rename to priv/static/static/js/2.7eaed4ad0d253fad6f55.js index ece883546..5c8446f1a 100644 Binary files a/priv/static/static/js/2.8896ea39a0ea8016391a.js and b/priv/static/static/js/2.7eaed4ad0d253fad6f55.js differ diff --git a/priv/static/static/js/2.8896ea39a0ea8016391a.js.map b/priv/static/static/js/2.7eaed4ad0d253fad6f55.js.map similarity index 98% rename from priv/static/static/js/2.8896ea39a0ea8016391a.js.map rename to priv/static/static/js/2.7eaed4ad0d253fad6f55.js.map index 4a5dc5be7..c92dcc8fc 100644 Binary files a/priv/static/static/js/2.8896ea39a0ea8016391a.js.map and b/priv/static/static/js/2.7eaed4ad0d253fad6f55.js.map differ diff --git a/priv/static/static/js/app.6fc3537f2985f0a2e06a.js b/priv/static/static/js/app.6fc3537f2985f0a2e06a.js new file mode 100644 index 000000000..8a9a3a142 Binary files /dev/null and b/priv/static/static/js/app.6fc3537f2985f0a2e06a.js differ diff --git a/priv/static/static/js/app.6fc3537f2985f0a2e06a.js.map b/priv/static/static/js/app.6fc3537f2985f0a2e06a.js.map new file mode 100644 index 000000000..9c1bfca59 Binary files /dev/null and b/priv/static/static/js/app.6fc3537f2985f0a2e06a.js.map differ diff --git a/priv/static/static/js/app.eb7444df7c8e44e553de.js b/priv/static/static/js/app.eb7444df7c8e44e553de.js deleted file mode 100644 index 0cd93f32a..000000000 Binary files a/priv/static/static/js/app.eb7444df7c8e44e553de.js and /dev/null differ diff --git a/priv/static/static/js/app.eb7444df7c8e44e553de.js.map b/priv/static/static/js/app.eb7444df7c8e44e553de.js.map deleted file mode 100644 index 9c960be91..000000000 Binary files a/priv/static/static/js/app.eb7444df7c8e44e553de.js.map and /dev/null differ diff --git a/priv/static/static/js/vendors~app.86bc6d5e06d2e17976c5.js.map b/priv/static/static/js/vendors~app.86bc6d5e06d2e17976c5.js.map deleted file mode 100644 index 98d62c3b1..000000000 Binary files a/priv/static/static/js/vendors~app.86bc6d5e06d2e17976c5.js.map and /dev/null differ diff --git a/priv/static/static/js/vendors~app.86bc6d5e06d2e17976c5.js b/priv/static/static/js/vendors~app.ef669266eac4d086d74e.js similarity index 92% rename from priv/static/static/js/vendors~app.86bc6d5e06d2e17976c5.js rename to priv/static/static/js/vendors~app.ef669266eac4d086d74e.js index 0b8705ae8..18bac2d14 100644 Binary files a/priv/static/static/js/vendors~app.86bc6d5e06d2e17976c5.js and b/priv/static/static/js/vendors~app.ef669266eac4d086d74e.js differ diff --git a/priv/static/static/js/vendors~app.ef669266eac4d086d74e.js.map b/priv/static/static/js/vendors~app.ef669266eac4d086d74e.js.map new file mode 100644 index 000000000..539456264 Binary files /dev/null and b/priv/static/static/js/vendors~app.ef669266eac4d086d74e.js.map differ diff --git a/priv/static/static/styles.json b/priv/static/static/styles.json index f85c72f9d..4c564d125 100644 --- a/priv/static/static/styles.json +++ b/priv/static/static/styles.json @@ -1,7 +1,6 @@ { "pleroma-dark": [ "Pleroma Dark", "#121a24", "#182230", "#b9b9ba", "#d8a070", "#d31014", "#0fa00f", "#0095ff", "#ffa500" ], "pleroma-light": [ "Pleroma Light", "#f2f4f6", "#dbe0e8", "#304055", "#f86f0f", "#d31014", "#0fa00f", "#0095ff", "#ffa500" ], - "pleroma-amoled": [ "Pleroma Dark AMOLED", "#000000", "#111111", "#b0b0b1", "#d8a070", "#aa0000", "#0fa00f", "#0095ff", "#d59500"], "classic-dark": [ "Classic Dark", "#161c20", "#282e32", "#b9b9b9", "#baaa9c", "#d31014", "#0fa00f", "#0095ff", "#ffa500" ], "bird": [ "Bird", "#f8fafd", "#e6ecf0", "#14171a", "#0084b8", "#e0245e", "#17bf63", "#1b95e0", "#fab81e"], "ir-black": [ "Ir Black", "#000000", "#242422", "#b5b3aa", "#ff6c60", "#FF6C60", "#A8FF60", "#96CBFE", "#FFFFB6" ], diff --git a/priv/static/static/terms-of-service.html b/priv/static/static/terms-of-service.html index c02cb7198..16ce636b6 100644 --- a/priv/static/static/terms-of-service.html +++ b/priv/static/static/terms-of-service.html @@ -1,7 +1,45 @@

Terms of Service

-

This is a placeholder ToS.

+

It's mainly "be nice".

+ +
    +
  1. +

    Don't be a big meanie

    +

    Arguments are cool and all but don't make them into flamewars. Try to act in good faith - we want to be at least on good terms with people. Please act with understanding towards others on this instance. Most people here are probably struggling with a lot, be mindful of that.

    +
    2. +
  2. +

    Mark your lewds!

    +

    Reminder that lewd is bad and nobody wants to be forced to see that. Just mark it sensitive, and post unlisted. That is to say, anything suggestive/ecchi upwards should be marked. If you wouldn't look at it with your parents/boss in the room, mark it. It goes without saying that if you're going to post lewd stuff, keep it sensible. Obviously nothing underaged or otherwise questionable. Or you could just not post lewd stuff. Either/or.

    +
    3. +
  3. +

    This is a Kink Shame Zone

    +

    Being a lewdie will be met with many anime girl reaction images shaming you for your lewdness. Go think about icky things on someone else's webzone™

    +
    4. +
  4. +

    Keep it legal!

    +

    Server is hosted in france, keep content legal for there (+ wherever you're browsing from)

    +
    5. +
  5. +

    No ads/spambots

    +

    I didn't think I'd have to specify this, but please do not set up bots solely for trying to advertise. +

    6. +
  6. +

    Non-TOS recommendations

    +

    This is stuff that'd I'd like you to do, but I won't outright ban you if you don't follow them

    +
      +
    • If someone is sadposting, don't antagonise them - they probably just want to vent
      • +
    • Put walls of text behind a subject (CW) - helps the timeline not get flooded with text
      • +
    +
    7. + +
  7. +

    Other

    +

    If you're here and you happen to play minecraft, feel free to message me with your username and come play with us sometime!

    +
    8. + +
+ +

So I guess yeah, that's about it. Try to be nice, eh? We're probably all sad here.

-

Edit "/static/terms-of-service.html" to make it fit the needs of your instance.


diff --git a/priv/static/sw-pleroma.js b/priv/static/sw-pleroma.js index 9407c1f82..5d299d592 100644 Binary files a/priv/static/sw-pleroma.js and b/priv/static/sw-pleroma.js differ