fe

2020-05-08 14:09:53 +01:00 · 2020-05-08 14:09:53 +01:00 · 9eede61d00
parent 233d592e0f
commit 9eede61d00
60 changed files with 23 additions and 21 deletions
--- a/lib/pleroma/pool/request.ex
+++ b/lib/pleroma/pool/request.ex
@ -24,42 +24,42 @@ def execute(pid, client, request, timeout) do
  def handle_call({:execute, client, request}, _from, state) do
    response = Pleroma.HTTP.request(client, request)

-    {:reply, response, state}
+    {:reply, response, state, :hibernate}
  end

  @impl true
  def handle_info({:gun_data, _conn, _stream, _, _}, state) do
-    {:noreply, state}
+    {:noreply, state, :hibernate}
  end

  @impl true
  def handle_info({:gun_up, _conn, _protocol}, state) do
-    {:noreply, state}
+    {:noreply, state, :hibernate}
  end

  @impl true
  def handle_info({:gun_down, _conn, _protocol, _reason, _killed}, state) do
-    {:noreply, state}
+    {:noreply, state, :hibernate}
  end

  @impl true
  def handle_info({:gun_error, _conn, _stream, _error}, state) do
-    {:noreply, state}
+    {:noreply, state, :hibernate}
  end

  @impl true
  def handle_info({:gun_push, _conn, _stream, _new_stream, _method, _uri, _headers}, state) do
-    {:noreply, state}
+    {:noreply, state, :hibernate}
  end

  @impl true
  def handle_info({:gun_response, _conn, _stream, _, _status, _headers}, state) do
-    {:noreply, state}
+    {:noreply, state, :hibernate}
  end

  @impl true
  def handle_info(msg, state) do
    Logger.warn("Received unexpected message #{inspect(__MODULE__)} #{inspect(msg)}")
-    {:noreply, state}
+    {:noreply, state, :hibernate}
  end
 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"><link rel=stylesheet href=/static/font/css/fontello.css><link rel=stylesheet href=/static/font/css/animation.css><link rel=stylesheet href=/static/font/css/lato.css><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.1055039ce3f2fe4dd110.css rel=stylesheet><link href=/static/fontello.1587222923489.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.de343579e844e698d456.js></script><script type=text/javascript src=/static/js/app.2156f8b23e368ba319e5.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"><link rel=stylesheet href=/static/font/css/fontello.css><link rel=stylesheet href=/static/font/css/animation.css><link rel=stylesheet href=/static/font/css/lato.css><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.1055039ce3f2fe4dd110.css rel=stylesheet><link href=/static/fontello.1588196596336.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.de343579e844e698d456.js></script><script type=text/javascript src=/static/js/app.e689136d879ca1c869c6.js></script></body></html>
--- a/priv/static/static/font/fontello.1587222923489.woff2
+++ b/priv/static/static/font/fontello.1587222923489.woff2
--- a/priv/static/static/font/fontello.1588196596336.eot
+++ b/priv/static/static/font/fontello.1588196596336.eot
--- a/priv/static/static/font/fontello.1588196596336.svg
+++ b/priv/static/static/font/fontello.1588196596336.svg
--- a/priv/static/static/font/fontello.1588196596336.ttf
+++ b/priv/static/static/font/fontello.1588196596336.ttf
--- a/priv/static/static/font/fontello.1588196596336.woff
+++ b/priv/static/static/font/fontello.1588196596336.woff
--- a/priv/static/static/font/fontello.1588196596336.woff2
+++ b/priv/static/static/font/fontello.1588196596336.woff2
--- a/priv/static/static/fontello.1588196596336.css
+++ b/priv/static/static/fontello.1588196596336.css
@ -1,11 +1,11 @@
@font-face {
 	font-family: "Icons";
-	src: url("./font/fontello.1587222923489.eot");
-	src: url("./font/fontello.1587222923489.eot") format("embedded-opentype"),
-		url("./font/fontello.1587222923489.woff2") format("woff2"),
-		url("./font/fontello.1587222923489.woff") format("woff"),
-		url("./font/fontello.1587222923489.ttf") format("truetype"),
-		url("./font/fontello.1587222923489.svg") format("svg");
+	src: url("./font/fontello.1588196596336.eot");
+	src: url("./font/fontello.1588196596336.eot") format("embedded-opentype"),
+		url("./font/fontello.1588196596336.woff2") format("woff2"),
+		url("./font/fontello.1588196596336.woff") format("woff"),
+		url("./font/fontello.1588196596336.ttf") format("truetype"),
+		url("./font/fontello.1588196596336.svg") format("svg");
 	font-weight: normal;
 	font-style: normal;
 }
--- a/priv/static/static/js/app.2156f8b23e368ba319e5.js
+++ b/priv/static/static/js/app.2156f8b23e368ba319e5.js
--- a/priv/static/static/js/app.2156f8b23e368ba319e5.js.map
+++ b/priv/static/static/js/app.2156f8b23e368ba319e5.js.map
--- a/priv/static/static/js/app.e689136d879ca1c869c6.js
+++ b/priv/static/static/js/app.e689136d879ca1c869c6.js
--- a/priv/static/static/js/app.e689136d879ca1c869c6.js.map
+++ b/priv/static/static/js/app.e689136d879ca1c869c6.js.map
--- a/priv/static/static/stickers/yuruyuri/304819270.png
+++ b/priv/static/static/stickers/yuruyuri/304819270.png
--- a/priv/static/static/stickers/yuruyuri/304819271.png
+++ b/priv/static/static/stickers/yuruyuri/304819271.png
--- a/priv/static/static/stickers/yuruyuri/304819272.png
+++ b/priv/static/static/stickers/yuruyuri/304819272.png
--- a/priv/static/static/stickers/yuruyuri/304819273.png
+++ b/priv/static/static/stickers/yuruyuri/304819273.png
--- a/priv/static/static/stickers/yuruyuri/304819274.png
+++ b/priv/static/static/stickers/yuruyuri/304819274.png
--- a/priv/static/static/stickers/yuruyuri/304819275.png
+++ b/priv/static/static/stickers/yuruyuri/304819275.png
--- a/priv/static/static/stickers/yuruyuri/304819276.png
+++ b/priv/static/static/stickers/yuruyuri/304819276.png
--- a/priv/static/static/stickers/yuruyuri/304819277.png
+++ b/priv/static/static/stickers/yuruyuri/304819277.png
--- a/priv/static/static/stickers/yuruyuri/304819278.png
+++ b/priv/static/static/stickers/yuruyuri/304819278.png
--- a/priv/static/static/stickers/yuruyuri/304819279.png
+++ b/priv/static/static/stickers/yuruyuri/304819279.png
--- a/priv/static/static/stickers/yuruyuri/304819280.png
+++ b/priv/static/static/stickers/yuruyuri/304819280.png
--- a/priv/static/static/stickers/yuruyuri/304819281.png
+++ b/priv/static/static/stickers/yuruyuri/304819281.png
--- a/priv/static/static/stickers/yuruyuri/304819282.png
+++ b/priv/static/static/stickers/yuruyuri/304819282.png
--- a/priv/static/static/stickers/yuruyuri/304819283.png
+++ b/priv/static/static/stickers/yuruyuri/304819283.png
--- a/priv/static/static/stickers/yuruyuri/304819284.png
+++ b/priv/static/static/stickers/yuruyuri/304819284.png
--- a/priv/static/static/stickers/yuruyuri/304819285.png
+++ b/priv/static/static/stickers/yuruyuri/304819285.png
--- a/priv/static/static/stickers/yuruyuri/304819286.png
+++ b/priv/static/static/stickers/yuruyuri/304819286.png
--- a/priv/static/static/stickers/yuruyuri/304819287.png
+++ b/priv/static/static/stickers/yuruyuri/304819287.png
--- a/priv/static/static/stickers/yuruyuri/304819288.png
+++ b/priv/static/static/stickers/yuruyuri/304819288.png
--- a/priv/static/static/stickers/yuruyuri/304819289.png
+++ b/priv/static/static/stickers/yuruyuri/304819289.png
--- a/priv/static/static/stickers/yuruyuri/304819290.png
+++ b/priv/static/static/stickers/yuruyuri/304819290.png
--- a/priv/static/static/stickers/yuruyuri/304819291.png
+++ b/priv/static/static/stickers/yuruyuri/304819291.png
--- a/priv/static/static/stickers/yuruyuri/304819292.png
+++ b/priv/static/static/stickers/yuruyuri/304819292.png
--- a/priv/static/static/stickers/yuruyuri/304819293.png
+++ b/priv/static/static/stickers/yuruyuri/304819293.png
--- a/priv/static/static/stickers/yuruyuri/304819294.png
+++ b/priv/static/static/stickers/yuruyuri/304819294.png
--- a/priv/static/static/stickers/yuruyuri/304819295.png
+++ b/priv/static/static/stickers/yuruyuri/304819295.png
--- a/priv/static/static/stickers/yuruyuri/304819296.png
+++ b/priv/static/static/stickers/yuruyuri/304819296.png
--- a/priv/static/static/stickers/yuruyuri/304819297.png
+++ b/priv/static/static/stickers/yuruyuri/304819297.png
--- a/priv/static/static/stickers/yuruyuri/304819298.png
+++ b/priv/static/static/stickers/yuruyuri/304819298.png
--- a/priv/static/static/stickers/yuruyuri/304819299.png
+++ b/priv/static/static/stickers/yuruyuri/304819299.png
--- a/priv/static/static/stickers/yuruyuri/304819300.png
+++ b/priv/static/static/stickers/yuruyuri/304819300.png
--- a/priv/static/static/stickers/yuruyuri/304819301.png
+++ b/priv/static/static/stickers/yuruyuri/304819301.png
--- a/priv/static/static/stickers/yuruyuri/304819302.png
+++ b/priv/static/static/stickers/yuruyuri/304819302.png
--- a/priv/static/static/stickers/yuruyuri/304819303.png
+++ b/priv/static/static/stickers/yuruyuri/304819303.png
--- a/priv/static/static/stickers/yuruyuri/304819304.png
+++ b/priv/static/static/stickers/yuruyuri/304819304.png
--- a/priv/static/static/stickers/yuruyuri/304819305.png
+++ b/priv/static/static/stickers/yuruyuri/304819305.png
--- a/priv/static/static/stickers/yuruyuri/304819306.png
+++ b/priv/static/static/stickers/yuruyuri/304819306.png
--- a/priv/static/static/stickers/yuruyuri/304819307.png
+++ b/priv/static/static/stickers/yuruyuri/304819307.png
--- a/priv/static/static/stickers/yuruyuri/304819308.png
+++ b/priv/static/static/stickers/yuruyuri/304819308.png
--- a/priv/static/static/stickers/yuruyuri/304819309.png
+++ b/priv/static/static/stickers/yuruyuri/304819309.png
--- a/priv/static/static/stickers/yuruyuri/pack.json
+++ b/priv/static/static/stickers/yuruyuri/pack.json
@ -2,5 +2,5 @@
        "title": "yuruyuri",
        "author": "idk",
        "tabIcon": "tab.png",
-	"stickers": ["8031419.png", "8031405.png", "8031428.png", "8031413.png", "8031403.png", "8031418.png", "8031408.png", "8031420.png", "8031397.png", "8031426.png", "8031410.png", "8031402.png", "8031416.png", "8031421.png", "8031407.png", "8031427.png", "8031429.png", "8031396.png", "8031424.png", "8031411.png", "8031399.png", "8031433.png", "8031430.png", "8031425.png", "8031400.png", "8031398.png", "8031415.png", "8031414.png", "8031409.png", "8031431.png", "8031422.png", "8031434.png", "8031435.png", "8031401.png", "8031417.png", "8031406.png", "8031412.png", "8031423.png", "8031432.png", "8031404.png"]
+	"stickers": ["8031419.png", "304819280.png", "304819283.png", "304819300.png", "304819289.png", "8031405.png", "304819290.png", "8031428.png", "8031413.png", "304819305.png", "304819297.png", "304819306.png", "8031403.png", "8031418.png", "304819274.png", "8031408.png", "8031420.png", "8031397.png", "304819301.png", "8031426.png", "304819302.png", "8031410.png", "304819276.png", "304819279.png", "304819309.png", "8031402.png", "304819275.png", "304819285.png", "8031416.png", "304819278.png", "304819294.png", "8031421.png", "8031407.png", "304819287.png", "304819277.png", "8031427.png", "8031429.png", "304819293.png", "304819308.png", "8031396.png", "8031424.png", "8031411.png", "304819272.png", "304819304.png", "304819281.png", "8031399.png", "304819282.png", "8031433.png", "8031430.png", "304819296.png", "8031425.png", "8031400.png", "304819288.png", "8031398.png", "304819295.png", "8031415.png", "8031414.png", "8031409.png", "304819271.png", "8031431.png", "304819299.png", "304819286.png", "8031422.png", "8031434.png", "8031435.png", "304819303.png", "304819292.png", "8031401.png", "8031417.png", "8031406.png", "8031412.png", "304819273.png", "8031423.png", "304819291.png", "304819307.png", "8031432.png", "304819284.png", "304819270.png", "304819298.png", "8031404.png"]
 }
--- a/priv/static/static/stickers/yuruyuri/productInfo.meta
+++ b/priv/static/static/stickers/yuruyuri/productInfo.meta
@ -1 +1 @@
-{"packageId":5271,"onSale":true,"validDays":0,"title":{"en":"YURU-YURI","es":"YURU-YURI","in":"YURU-YURI","ja":"ゆるゆり","ko":"유루유리","th":"คลับบ้าฮาต๊อง\n","zh-Hans":"摇曳百合","zh-Hant":"輕鬆百合"},"author":{"en":"Ichijinsha Inc.","es":"Ichijinsha Inc.","ja":"一迅社","ko":"Ichijinsha Inc.","zh-Hans":"Ichijinsha Inc.","zh-Hant":"Ichijinsha Inc."},"price":[{"country":"@@","symbol":"NLC","price":100.00,"currency":"NLC"},{"country":"HK","symbol":"HK$","price":15.00,"currency":"HKD"},{"country":"JP","symbol":"￥","price":200.00,"currency":"JPY"},{"country":"KR","symbol":"₩","price":2000.00,"currency":"KRW"},{"country":"SG","symbol":"S$","price":2.58,"currency":"SGD"},{"country":"TW","symbol":"NT$","price":60.00,"currency":"TWD"},{"country":"US","symbol":"＄","price":1.99,"currency":"USD"}],"stickers":[{"width":150,"id":8031396,"height":152},{"width":160,"id":8031397,"height":150},{"width":149,"id":8031398,"height":150},{"width":154,"id":8031399,"height":150},{"width":136,"id":8031400,"height":156},{"width":146,"id":8031401,"height":150},{"width":165,"id":8031402,"height":151},{"width":164,"id":8031403,"height":151},{"width":149,"id":8031404,"height":151},{"width":145,"id":8031405,"height":150},{"width":158,"id":8031406,"height":151},{"width":155,"id":8031407,"height":161},{"width":138,"id":8031408,"height":151},{"width":132,"id":8031409,"height":150},{"width":150,"id":8031410,"height":156},{"width":157,"id":8031411,"height":150},{"width":156,"id":8031412,"height":150},{"width":150,"id":8031413,"height":151},{"width":172,"id":8031414,"height":155},{"width":160,"id":8031415,"height":153},{"width":160,"id":8031416,"height":150},{"width":152,"id":8031417,"height":150},{"width":142,"id":8031418,"height":156},{"width":169,"id":8031419,"height":151},{"width":162,"id":8031420,"height":151},{"width":160,"id":8031421,"height":150},{"width":143,"id":8031422,"height":150},{"width":161,"id":8031423,"height":157},{"width":152,"id":8031424,"height":150},{"width":165,"id":8031425,"height":156},{"width":154,"id":8031426,"height":155},{"width":132,"id":8031427,"height":160},{"width":155,"id":8031428,"height":150},{"width":162,"id":8031429,"height":149},{"width":153,"id":8031430,"height":151},{"width":149,"id":8031431,"height":150},{"width":107,"id":8031432,"height":162},{"width":168,"id":8031433,"height":156},{"width":157,"id":8031434,"height":150},{"width":160,"id":8031435,"height":150}]}
+{"packageId":11440073,"onSale":true,"validDays":0,"title":{"en":"YURU-YURI Goraku Bu-chan Sticker","ja":"ゆるゆり ごらくぶーちゃんスタンプ"},"author":{"en":"Ichijinsha Inc.","ja":"一迅社"},"price":[{"country":"@@","currency":"NLC","symbol":"NLC","price":50.0},{"country":"ID","currency":"IDR","symbol":"Rp","price":12000.0},{"country":"JP","currency":"JPY","symbol":"￥","price":120.0},{"country":"TH","currency":"THB","symbol":"THB","price":30.0},{"country":"TW","currency":"TWD","symbol":"NT$","price":33.0},{"country":"US","currency":"USD","symbol":"$","price":0.99}],"stickers":[{"id":304819270,"width":185,"height":160},{"id":304819271,"width":185,"height":160},{"id":304819272,"width":185,"height":160},{"id":304819273,"width":185,"height":160},{"id":304819274,"width":185,"height":160},{"id":304819275,"width":185,"height":160},{"id":304819276,"width":185,"height":160},{"id":304819277,"width":185,"height":160},{"id":304819278,"width":185,"height":160},{"id":304819279,"width":185,"height":160},{"id":304819280,"width":185,"height":160},{"id":304819281,"width":185,"height":160},{"id":304819282,"width":185,"height":160},{"id":304819283,"width":185,"height":160},{"id":304819284,"width":185,"height":160},{"id":304819285,"width":185,"height":160},{"id":304819286,"width":185,"height":160},{"id":304819287,"width":185,"height":160},{"id":304819288,"width":185,"height":160},{"id":304819289,"width":185,"height":160},{"id":304819290,"width":185,"height":160},{"id":304819291,"width":185,"height":160},{"id":304819292,"width":185,"height":160},{"id":304819293,"width":185,"height":160},{"id":304819294,"width":185,"height":160},{"id":304819295,"width":185,"height":160},{"id":304819296,"width":185,"height":160},{"id":304819297,"width":185,"height":160},{"id":304819298,"width":185,"height":160},{"id":304819299,"width":185,"height":160},{"id":304819300,"width":185,"height":160},{"id":304819301,"width":185,"height":160},{"id":304819302,"width":185,"height":160},{"id":304819303,"width":185,"height":160},{"id":304819304,"width":185,"height":160},{"id":304819305,"width":185,"height":160},{"id":304819306,"width":185,"height":160},{"id":304819307,"width":185,"height":160},{"id":304819308,"width":185,"height":160},{"id":304819309,"width":185,"height":160}],"hasAnimation":false,"hasSound":false,"stickerResourceType":"STATIC"}
--- a/priv/static/static/stickers/yuruyuri/tab.png
+++ b/priv/static/static/stickers/yuruyuri/tab.png
--- a/priv/static/static/stickers/yuruyuri/tab_off.png
+++ b/priv/static/static/stickers/yuruyuri/tab_off.png
--- a/priv/static/static/stickers/yuruyuri/tab_on.png
+++ b/priv/static/static/stickers/yuruyuri/tab_on.png
--- a/priv/static/sw-pleroma.js
+++ b/priv/static/sw-pleroma.js
@ -1,4 +1,4 @@
-var serviceWorkerOption = {"assets":["/static/fontello.1587222923489.css","/static/font/fontello.1587222923489.eot","/static/font/fontello.1587222923489.svg","/static/font/fontello.1587222923489.ttf","/static/font/fontello.1587222923489.woff","/static/font/fontello.1587222923489.woff2","/static/img/nsfw.ca95de9.png","/static/css/app.1055039ce3f2fe4dd110.css","/static/js/app.2156f8b23e368ba319e5.js","/static/css/vendors~app.b2603a50868c68a1c192.css","/static/js/vendors~app.de343579e844e698d456.js","/static/js/2.f158cbd2b8770e467dfe.js"]};
+var serviceWorkerOption = {"assets":["/static/fontello.1588196596336.css","/static/font/fontello.1588196596336.eot","/static/font/fontello.1588196596336.svg","/static/font/fontello.1588196596336.ttf","/static/font/fontello.1588196596336.woff","/static/font/fontello.1588196596336.woff2","/static/img/nsfw.ca95de9.png","/static/css/app.1055039ce3f2fe4dd110.css","/static/js/app.e689136d879ca1c869c6.js","/static/css/vendors~app.b2603a50868c68a1c192.css","/static/js/vendors~app.de343579e844e698d456.js","/static/js/2.f158cbd2b8770e467dfe.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){
 /*!
--- a/vm.args
+++ b/vm.args
@ -0,0 +1,2 @@
+-sname pleroma
+-setcookie "ohnoendme"