FE

2020-01-29 10:56:34 +00:00 · 2020-01-29 10:56:34 +00:00 · ff552c5151
commit ff552c5151
parent 4646d3c9d6
23 changed files with 62 additions and 88 deletions
--- a/lib/pleroma/web/activity_pub/mrf/gab_rewrite_policy.ex
+++ b/lib/pleroma/web/activity_pub/mrf/gab_rewrite_policy.ex
@ -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
--- a/priv/static/index.html
+++ b/priv/static/index.html
@ -1 +1 @@
-<!DOCTYPE html><html lang=en><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1,user-scalable=no"><title>Pleroma</title><!--server-generated-meta--><link rel=icon type=image/png href=/favicon.png><link rel=stylesheet href=/static/font/css/lato.css><link href=/static/css/vendors~app.b2603a50868c68a1c192.css rel=stylesheet><link href=/static/css/app.ae04505b31bb0ee2765e.css rel=stylesheet><link href=/static/fontello.1579191413379.css rel=stylesheet></head><body class=hidden><noscript>To use Pleroma, please enable JavaScript.</noscript><div id=app></div><script type=text/javascript src=/static/js/vendors~app.86bc6d5e06d2e17976c5.js></script><script type=text/javascript src=/static/js/app.eb7444df7c8e44e553de.js></script></body></html>
+<!DOCTYPE html><html lang=en><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1,user-scalable=no"><title>Pleroma</title><!--server-generated-meta--><link rel=icon type=image/png href=/favicon.png><link rel=stylesheet href=/static/font/css/lato.css><link href=/static/css/vendors~app.b2603a50868c68a1c192.css rel=stylesheet><link href=/static/css/app.ae04505b31bb0ee2765e.css rel=stylesheet><link href=/static/fontello.1579191725174.css rel=stylesheet></head><body class=hidden><noscript>To use Pleroma, please enable JavaScript.</noscript><div id=app></div><script type=text/javascript src=/static/js/vendors~app.ef669266eac4d086d74e.js></script><script type=text/javascript src=/static/js/app.6fc3537f2985f0a2e06a.js></script></body></html>
--- a/priv/static/static/font/fontello.1579191413379.woff
+++ b/priv/static/static/font/fontello.1579191413379.woff
--- a/priv/static/static/font/fontello.1579191413379.woff2
+++ b/priv/static/static/font/fontello.1579191413379.woff2
--- a/priv/static/static/font/fontello.1579191725174.eot
+++ b/priv/static/static/font/fontello.1579191725174.eot
--- a/priv/static/static/font/fontello.1579191725174.svg
+++ b/priv/static/static/font/fontello.1579191725174.svg
@ -74,8 +74,6 @@

 <glyph glyph-name="home-2" unicode="&#xe821;" d="M521 826q322-279 500-429 20-16 20-40 0-21-15-37t-36-15l-105 0 0-364q0-21-15-37t-36-16l-156 0q-22 0-37 16t-16 37l0 208-209 0 0-208q0-21-15-37t-36-16l-156 0q-21 0-37 16t-16 37l0 364-103 0q-22 0-37 15t-16 37 19 40z" horiz-adv-x="1041" />

-<glyph glyph-name="arrow-curved" unicode="&#xe822;" d="M799 302l0-56 112 0-223-223-224 223 112 0 0 56q0 116-81 197t-197 82-198-82-82-197q0 162 115 276t276 114 276-114 114-276z" horiz-adv-x="928" />
-
 <glyph glyph-name="spin3" unicode="&#xe832;" d="M494 857c-266 0-483-210-494-472-1-19 13-20 13-20l84 0c16 0 19 10 19 18 10 199 176 358 378 358 107 0 205-45 273-118l-58-57c-11-12-11-27 5-31l247-50c21-5 46 11 37 44l-58 227c-2 9-16 22-29 13l-65-60c-89 91-214 148-352 148z m409-508c-16 0-19-10-19-18-10-199-176-358-377-358-108 0-205 45-274 118l59 57c10 12 10 27-5 31l-248 50c-21 5-46-11-37-44l58-227c2-9 16-22 30-13l64 60c89-91 214-148 353-148 265 0 482 210 493 473 1 18-13 19-13 19l-84 0z" horiz-adv-x="1000" />

 <glyph glyph-name="spin4" unicode="&#xe834;" d="M498 857c-114 0-228-39-320-116l0 0c173 140 428 130 588-31 134-134 164-332 89-495-10-29-5-50 12-68 21-20 61-23 84 0 3 3 12 15 15 24 71 180 33 393-112 539-99 98-228 147-356 147z m-409-274c-14 0-29-5-39-16-3-3-13-15-15-24-71-180-34-393 112-539 185-185 479-195 676-31l0 0c-173-140-428-130-589 31-134 134-163 333-89 495 11 29 6 50-12 68-11 11-27 17-44 16z" horiz-adv-x="1001" />
--- a/priv/static/static/font/fontello.1579191725174.ttf
+++ b/priv/static/static/font/fontello.1579191725174.ttf
--- a/priv/static/static/font/fontello.1579191725174.woff
+++ b/priv/static/static/font/fontello.1579191725174.woff
--- a/priv/static/static/font/fontello.1579191725174.woff2
+++ b/priv/static/static/font/fontello.1579191725174.woff2
--- a/priv/static/static/fontello.1579191725174.css
+++ b/priv/static/static/fontello.1579191725174.css
@ -1,11 +1,11 @@
@font-face {
 	font-family: "Icons";
-	src: url("./font/fontello.1579191413379.eot");
-	src: url("./font/fontello.1579191413379.eot") format("embedded-opentype"),
-		url("./font/fontello.1579191413379.woff2") format("woff2"),
-		url("./font/fontello.1579191413379.woff") format("woff"),
-		url("./font/fontello.1579191413379.ttf") format("truetype"),
-		url("./font/fontello.1579191413379.svg") format("svg");
+	src: url("./font/fontello.1579191725174.eot");
+	src: url("./font/fontello.1579191725174.eot") format("embedded-opentype"),
+		url("./font/fontello.1579191725174.woff2") format("woff2"),
+		url("./font/fontello.1579191725174.woff") format("woff"),
+		url("./font/fontello.1579191725174.ttf") format("truetype"),
+		url("./font/fontello.1579191725174.svg") format("svg");
 	font-weight: normal;
 	font-style: normal;
 }
@ -132,5 +132,3 @@
 .icon-chat::before { content: "\e81e"; }

 .icon-login::before { content: "\e820"; }
-
-.icon-arrow-curved::before { content: "\e822"; }
--- 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"
    }
  ]
 }
--- a/priv/static/static/js/2.7eaed4ad0d253fad6f55.js
+++ b/priv/static/static/js/2.7eaed4ad0d253fad6f55.js
@ -1,2 +1,2 @@
-(window.webpackJsonp=window.webpackJsonp||[]).push([[2],{567:function(t,e,i){var c=i(568);"string"==typeof c&&(c=[[t.i,c,""]]),c.locals&&(t.exports=c.locals);(0,i(3).default)("cc6cdea4",c,!0,{})},568:function(t,e,i){(t.exports=i(2)(!1)).push([t.i,".sticker-picker{width:100%}.sticker-picker .contents{min-height:250px}.sticker-picker .contents .sticker-picker-content{display:-ms-flexbox;display:flex;-ms-flex-wrap:wrap;flex-wrap:wrap;padding:0 4px}.sticker-picker .contents .sticker-picker-content .sticker{display:-ms-flexbox;display:flex;-ms-flex:1 1 auto;flex:1 1 auto;margin:4px;width:56px;height:56px}.sticker-picker .contents .sticker-picker-content .sticker img{height:100%}.sticker-picker .contents .sticker-picker-content .sticker img:hover{filter:drop-shadow(0 0 5px var(--link,#d8a070))}",""])},569:function(t,e,i){"use strict";i.r(e);var c=i(88),n={components:{TabSwitcher:i(49).a},data:function(){return{meta:{stickers:[]},path:""}},computed:{pack:function(){return this.$store.state.instance.stickers||[]}},methods:{clear:function(){this.meta={stickers:[]}},pick:function(t,e){var i=this,n=this.$store;fetch(t).then(function(t){t.blob().then(function(t){var a=new File([t],e,{mimetype:"image/png"}),s=new FormData;s.append("file",a),c.a.uploadMedia({store:n,formData:s}).then(function(t){i.$emit("uploaded",t),i.clear()},function(t){console.warn("Can't attach sticker"),console.warn(t),i.$emit("upload-failed","default")})})})}}},a=i(0);var s=function(t){i(567)},r=Object(a.a)(n,function(){var t=this,e=t.$createElement,i=t._self._c||e;return i("div",{staticClass:"sticker-picker"},[i("tab-switcher",{staticClass:"tab-switcher",attrs:{"render-only-focused":!0,"scrollable-tabs":""}},t._l(t.pack,function(e){return i("div",{key:e.path,staticClass:"sticker-picker-content",attrs:{"image-tooltip":e.meta.title,image:e.path+e.meta.tabIcon}},t._l(e.meta.stickers,function(c){return i("div",{key:c,staticClass:"sticker",on:{click:function(i){i.stopPropagation(),i.preventDefault(),t.pick(e.path+c,e.meta.title)}}},[i("img",{attrs:{src:e.path+c}})])}),0)}),0)],1)},[],!1,s,null,null);e.default=r.exports}}]);
-//# sourceMappingURL=2.8896ea39a0ea8016391a.js.map
+(window.webpackJsonp=window.webpackJsonp||[]).push([[2],{567:function(t,e,i){var c=i(568);"string"==typeof c&&(c=[[t.i,c,""]]),c.locals&&(t.exports=c.locals);(0,i(4).default)("cc6cdea4",c,!0,{})},568:function(t,e,i){(t.exports=i(3)(!1)).push([t.i,".sticker-picker{width:100%}.sticker-picker .contents{min-height:250px}.sticker-picker .contents .sticker-picker-content{display:-ms-flexbox;display:flex;-ms-flex-wrap:wrap;flex-wrap:wrap;padding:0 4px}.sticker-picker .contents .sticker-picker-content .sticker{display:-ms-flexbox;display:flex;-ms-flex:1 1 auto;flex:1 1 auto;margin:4px;width:56px;height:56px}.sticker-picker .contents .sticker-picker-content .sticker img{height:100%}.sticker-picker .contents .sticker-picker-content .sticker img:hover{filter:drop-shadow(0 0 5px var(--link,#d8a070))}",""])},569:function(t,e,i){"use strict";i.r(e);var c=i(88),n={components:{TabSwitcher:i(49).a},data:function(){return{meta:{stickers:[]},path:""}},computed:{pack:function(){return this.$store.state.instance.stickers||[]}},methods:{clear:function(){this.meta={stickers:[]}},pick:function(t,e){var i=this,n=this.$store;fetch(t).then(function(t){t.blob().then(function(t){var a=new File([t],e,{mimetype:"image/png"}),s=new FormData;s.append("file",a),c.a.uploadMedia({store:n,formData:s}).then(function(t){i.$emit("uploaded",t),i.clear()},function(t){console.warn("Can't attach sticker"),console.warn(t),i.$emit("upload-failed","default")})})})}}},a=i(0);var s=function(t){i(567)},r=Object(a.a)(n,function(){var t=this,e=t.$createElement,i=t._self._c||e;return i("div",{staticClass:"sticker-picker"},[i("tab-switcher",{staticClass:"tab-switcher",attrs:{"render-only-focused":!0,"scrollable-tabs":""}},t._l(t.pack,function(e){return i("div",{key:e.path,staticClass:"sticker-picker-content",attrs:{"image-tooltip":e.meta.title,image:e.path+e.meta.tabIcon}},t._l(e.meta.stickers,function(c){return i("div",{key:c,staticClass:"sticker",on:{click:function(i){i.stopPropagation(),i.preventDefault(),t.pick(e.path+c,e.meta.title)}}},[i("img",{attrs:{src:e.path+c}})])}),0)}),0)],1)},[],!1,s,null,null);e.default=r.exports}}]);
+//# sourceMappingURL=2.7eaed4ad0d253fad6f55.js.map
--- a/priv/static/static/js/2.7eaed4ad0d253fad6f55.js.map
+++ b/priv/static/static/js/2.7eaed4ad0d253fad6f55.js.map
--- a/priv/static/static/js/app.6fc3537f2985f0a2e06a.js
+++ b/priv/static/static/js/app.6fc3537f2985f0a2e06a.js
--- a/priv/static/static/js/app.6fc3537f2985f0a2e06a.js.map
+++ b/priv/static/static/js/app.6fc3537f2985f0a2e06a.js.map
--- a/priv/static/static/js/app.eb7444df7c8e44e553de.js
+++ b/priv/static/static/js/app.eb7444df7c8e44e553de.js
--- a/priv/static/static/js/app.eb7444df7c8e44e553de.js.map
+++ b/priv/static/static/js/app.eb7444df7c8e44e553de.js.map
--- a/priv/static/static/js/vendors~app.86bc6d5e06d2e17976c5.js.map
+++ b/priv/static/static/js/vendors~app.86bc6d5e06d2e17976c5.js.map
--- a/priv/static/static/js/vendors~app.ef669266eac4d086d74e.js
+++ b/priv/static/static/js/vendors~app.ef669266eac4d086d74e.js
--- a/priv/static/static/js/vendors~app.ef669266eac4d086d74e.js.map
+++ b/priv/static/static/js/vendors~app.ef669266eac4d086d74e.js.map
--- 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" ],
--- a/priv/static/static/terms-of-service.html
+++ b/priv/static/static/terms-of-service.html
@ -1,7 +1,45 @@
 <h4>Terms of Service</h4>

-<p>This is a placeholder ToS.</p>
+<p>It's mainly "be nice".</p>
+
+<ol>
+    <li>
+        <h3>Don't be a big meanie</h4>
+        <p>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.</p>
+    </li>
+    <li>
+        <h3>Mark your lewds!</h3>
+	<p>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 <em>going</em> to post lewd stuff, keep it sensible. Obviously nothing underaged or otherwise questionable. Or you could just not post lewd stuff. Either/or.</p>
+    </li>
+    <li>
+	    <h3>This is a <b>Kink Shame Zone</b></h3>
+	    <p>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™</p>
+    </li>
+    <li>
+	   <h3>Keep it legal!</h3>
+	   <p>Server is hosted in france, keep content legal for there (+ wherever you're browsing from)</p>
+    </li>
+    <li>
+	    <h3>No ads/spambots</h3>
+	    <p>I didn't think I'd have to specify this, but please do not set up bots solely for trying to advertise.</h3>
+    </li>
+    <li>
+	    <h3>Non-TOS recommendations</h3>
+	    <p>This is stuff that'd I'd <em>like</em> you to do, but I won't outright ban you if you don't follow them</p>
+	    <ul>
+		    <li>If someone is sadposting, don't antagonise them - they probably just want to vent</li>
+		    <li>Put walls of text behind a subject (CW) - helps the timeline not get flooded with text</li>
+	    </ul>
+    </li>
+
+    <li>
+	    <h3>Other</h3>
+	    <p>If you're here and you happen to play minecraft, feel free to message me with your username and come play with us sometime!</p>
+   </li>
+
+</ol>
+
+<p>So I guess yeah, that's about it. Try to be nice, eh? We're probably all sad here.</p>

-<p>Edit <code>"/static/terms-of-service.html"</code> to make it fit the needs of your instance.</p>
 <br>
 <img src="/static/logo.png"/ style="display: block; margin: auto;">
--- a/priv/static/sw-pleroma.js
+++ b/priv/static/sw-pleroma.js
@ -1,4 +1,4 @@
-var serviceWorkerOption = {"assets":["/static/fontello.1579191413379.css","/static/font/fontello.1579191413379.eot","/static/font/fontello.1579191413379.svg","/static/font/fontello.1579191413379.ttf","/static/font/fontello.1579191413379.woff","/static/font/fontello.1579191413379.woff2","/static/img/nsfw.ca95de9.png","/static/css/app.ae04505b31bb0ee2765e.css","/static/js/app.eb7444df7c8e44e553de.js","/static/css/vendors~app.b2603a50868c68a1c192.css","/static/js/vendors~app.86bc6d5e06d2e17976c5.js","/static/js/2.8896ea39a0ea8016391a.js"]};
+var serviceWorkerOption = {"assets":["/static/fontello.1579191725174.css","/static/font/fontello.1579191725174.eot","/static/font/fontello.1579191725174.svg","/static/font/fontello.1579191725174.ttf","/static/font/fontello.1579191725174.woff","/static/font/fontello.1579191725174.woff2","/static/img/nsfw.ca95de9.png","/static/css/app.ae04505b31bb0ee2765e.css","/static/js/app.6fc3537f2985f0a2e06a.js","/static/css/vendors~app.b2603a50868c68a1c192.css","/static/js/vendors~app.ef669266eac4d086d74e.js","/static/js/2.7eaed4ad0d253fad6f55.js"]};
        
        !function(e){var n={};function t(r){if(n[r])return n[r].exports;var o=n[r]={i:r,l:!1,exports:{}};return e[r].call(o.exports,o,o.exports,t),o.l=!0,o.exports}t.m=e,t.c=n,t.d=function(e,n,r){t.o(e,n)||Object.defineProperty(e,n,{enumerable:!0,get:r})},t.r=function(e){"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},t.t=function(e,n){if(1&n&&(e=t(e)),8&n)return e;if(4&n&&"object"==typeof e&&e&&e.__esModule)return e;var r=Object.create(null);if(t.r(r),Object.defineProperty(r,"default",{enumerable:!0,value:e}),2&n&&"string"!=typeof e)for(var o in e)t.d(r,o,function(n){return e[n]}.bind(null,o));return r},t.n=function(e){var n=e&&e.__esModule?function(){return e.default}:function(){return e};return t.d(n,"a",n),n},t.o=function(e,n){return Object.prototype.hasOwnProperty.call(e,n)},t.p="/",t(t.s=1)}([function(e,n){
 /*!