From: sadposter Date: Tue, 29 Dec 2020 13:16:14 +0000 (+0000) Subject: Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=6cd0586ef9f1991655c7736479a9a1fb39f4098c;p=akkoma Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop --- 6cd0586ef9f1991655c7736479a9a1fb39f4098c diff --cc lib/mix/tasks/pleroma/user.ex index 391f7c5b4,20fe6c6e4..09f9356d3 --- a/lib/mix/tasks/pleroma/user.ex +++ b/lib/mix/tasks/pleroma/user.ex @@@ -345,40 -345,7 +345,40 @@@ defmodule Mix.Tasks.Pleroma.User d end end + def run(["change_email", nickname, email]) do + start_pleroma() + + with %User{} = user <- User.get_cached_by_nickname(nickname) do + user + |> User.update_changeset(%{"email" => email}) + |> User.update_and_set_cache() + + shell_info("#{nickname}'s email updated") + end + end + + def run(["show", nickname]) do + start_pleroma() + + nickname + |> User.get_cached_by_nickname() + |> IO.inspect() + end + + def run(["send_confirmation", nickname]) do + start_pleroma() + + with %User{} = user <- User.get_cached_by_nickname(nickname) do + user + |> Pleroma.Emails.UserEmail.account_confirmation_email() + |> IO.inspect() + |> Pleroma.Emails.Mailer.deliver!() + + shell_info("#{nickname}'s email sent") + end + end + - def run(["toggle_confirmed", nickname]) do + def run(["confirm", nickname]) do start_pleroma() with %User{} = user <- User.get_cached_by_nickname(nickname) do diff --cc lib/pleroma/web/endpoint.ex index f26542e88,f26542e88..f2c377c56 --- a/lib/pleroma/web/endpoint.ex +++ b/lib/pleroma/web/endpoint.ex @@@ -55,6 -55,6 +55,19 @@@ defmodule Pleroma.Web.Endpoint d } ) ++ plug(Plug.Static.IndexHtml, at: "/pleroma/fedife/") ++ ++ plug(Pleroma.Web.Plugs.FrontendStatic, ++ at: "/pleroma/fedife", ++ frontend_type: :fedife, ++ gzip: true, ++ cache_control_for_etags: @static_cache_control, ++ headers: %{ ++ "cache-control" => @static_cache_control ++ } ++ ) ++ ++ # Serve at "/" the static files from "priv/static" directory. # # You should set gzip to true if you are running phoenix.digest diff --cc priv/static/static/stickers.json index 679860175,000000000..978d7b0b5 mode 100644,000000..100644 --- a/priv/static/static/stickers.json +++ b/priv/static/static/stickers.json @@@ -1,1 -1,0 +1,1 @@@ - {"menhera": "/static/stickers/menhera/", "yotsuba": "/static/stickers/yotsuba/", "yuruyuri": "/static/stickers/yuruyuri/", "bocchi": "/static/stickers/bocchi/", "yurukawa": "/static/stickers/yurukawa/", "gabdrop": "/static/stickers/gabdrop/", "evangelion": "/static/stickers/evangelion/", "shakaijin_kanojo": "/static/stickers/shakaijin_kanojo/", "pko": "/static/stickers/pko/", "ihba": "/static/stickers/ihba/", "azurlane": "/static/stickers/azurlane/"} ++{"menhera": "/static/stickers/menhera/", "yotsuba": "/static/stickers/yotsuba/", "yuruyuri": "/static/stickers/yuruyuri/", "bocchi": "/static/stickers/bocchi/", "yurukawa": "/static/stickers/yurukawa/", "gabdrop": "/static/stickers/gabdrop/", "evangelion": "/static/stickers/evangelion/", "shakaijin_kanojo": "/static/stickers/shakaijin_kanojo/", "pko": "/static/stickers/pko/", "ihba": "/static/stickers/ihba/", "azurlane": "/static/stickers/azurlane/", "omesis": "/static/stickers/omesis/"} diff --cc priv/static/static/stickers/omesis/354832542.png index 000000000,000000000..c342e3075 new file mode 100644 Binary files differ diff --cc priv/static/static/stickers/omesis/354832543.png index 000000000,000000000..3c8d107a1 new file mode 100644 Binary files differ diff --cc priv/static/static/stickers/omesis/354832544.png index 000000000,000000000..9e1796277 new file mode 100644 Binary files differ diff --cc priv/static/static/stickers/omesis/354832545.png index 000000000,000000000..18ffeed79 new file mode 100644 Binary files differ diff --cc priv/static/static/stickers/omesis/354832546.png index 000000000,000000000..d88aeb4d2 new file mode 100644 Binary files differ diff --cc priv/static/static/stickers/omesis/354832547.png index 000000000,000000000..7c65731d5 new file mode 100644 Binary files differ diff --cc priv/static/static/stickers/omesis/354832548.png index 000000000,000000000..5e056cf0f new file mode 100644 Binary files differ diff --cc priv/static/static/stickers/omesis/354832549.png index 000000000,000000000..e129134d0 new file mode 100644 Binary files differ diff --cc priv/static/static/stickers/omesis/354832550.png index 000000000,000000000..ea6700305 new file mode 100644 Binary files differ diff --cc priv/static/static/stickers/omesis/354832551.png index 000000000,000000000..0ab686b29 new file mode 100644 Binary files differ diff --cc priv/static/static/stickers/omesis/354832552.png index 000000000,000000000..f011b598a new file mode 100644 Binary files differ diff --cc priv/static/static/stickers/omesis/354832553.png index 000000000,000000000..79c6eba4c new file mode 100644 Binary files differ diff --cc priv/static/static/stickers/omesis/354832554.png index 000000000,000000000..17e7a84ea new file mode 100644 Binary files differ diff --cc priv/static/static/stickers/omesis/354832555.png index 000000000,000000000..a87b74d1f new file mode 100644 Binary files differ diff --cc priv/static/static/stickers/omesis/354832556.png index 000000000,000000000..4e93dee61 new file mode 100644 Binary files differ diff --cc priv/static/static/stickers/omesis/354832557.png index 000000000,000000000..4d24025fc new file mode 100644 Binary files differ diff --cc priv/static/static/stickers/omesis/354832558.png index 000000000,000000000..5214e0555 new file mode 100644 Binary files differ diff --cc priv/static/static/stickers/omesis/354832559.png index 000000000,000000000..4ecc14c0b new file mode 100644 Binary files differ diff --cc priv/static/static/stickers/omesis/354832560.png index 000000000,000000000..9029d9b2b new file mode 100644 Binary files differ diff --cc priv/static/static/stickers/omesis/354832561.png index 000000000,000000000..95c8798b1 new file mode 100644 Binary files differ diff --cc priv/static/static/stickers/omesis/354832562.png index 000000000,000000000..19337e4d7 new file mode 100644 Binary files differ diff --cc priv/static/static/stickers/omesis/354832563.png index 000000000,000000000..e63b9b7e9 new file mode 100644 Binary files differ diff --cc priv/static/static/stickers/omesis/354832564.png index 000000000,000000000..987eb2c4f new file mode 100644 Binary files differ diff --cc priv/static/static/stickers/omesis/354832565.png index 000000000,000000000..c806333ce new file mode 100644 Binary files differ diff --cc priv/static/static/stickers/omesis/pack.json index 000000000,000000000..a2d265fb7 new file mode 100644 --- /dev/null +++ b/priv/static/static/stickers/omesis/pack.json @@@ -1,0 -1,0 +1,6 @@@ ++{ ++ "title": "omesis", ++ "author": "idk", ++ "tabIcon": "tab.png", ++ "stickers": ["354832559.png", "354832551.png", "354832549.png", "354832542.png", "354832548.png", "354832555.png", "354832544.png", "354832546.png", "354832560.png", "354832552.png", "354832558.png", "354832557.png", "354832553.png", "354832550.png", "354832565.png", "354832545.png", "354832561.png", "354832554.png", "354832556.png", "354832563.png", "354832543.png", "354832564.png", "354832547.png", "354832562.png"] ++} diff --cc priv/static/static/stickers/omesis/productInfo.meta index 000000000,000000000..0c8a015a5 new file mode 100644 --- /dev/null +++ b/priv/static/static/stickers/omesis/productInfo.meta @@@ -1,0 -1,0 +1,1 @@@ ++{"packageId":13451465,"onSale":true,"validDays":0,"title":{"en":"Omesis BIG sticker","ja":"おめシス スタンプ【BIG】"},"author":{"en":"OMEGA-SISTERS"},"price":[{"country":"@@","currency":"NLC","symbol":"NLC","price":100.0},{"country":"ID","currency":"IDR","symbol":"Rp","price":18700.0},{"country":"JP","currency":"JPY","symbol":"￥","price":240.0},{"country":"TH","currency":"THB","symbol":"THB","price":60.0},{"country":"TW","currency":"TWD","symbol":"NT$","price":70.0},{"country":"US","currency":"USD","symbol":"$","price":1.99}],"stickers":[{"id":354832542,"width":210,"height":340},{"id":354832543,"width":210,"height":340},{"id":354832544,"width":210,"height":340},{"id":354832545,"width":210,"height":340},{"id":354832546,"width":210,"height":340},{"id":354832547,"width":210,"height":340},{"id":354832548,"width":210,"height":340},{"id":354832549,"width":210,"height":340},{"id":354832550,"width":210,"height":340},{"id":354832551,"width":210,"height":340},{"id":354832552,"width":210,"height":340},{"id":354832553,"width":210,"height":340},{"id":354832554,"width":210,"height":340},{"id":354832555,"width":210,"height":340},{"id":354832556,"width":210,"height":340},{"id":354832557,"width":210,"height":340},{"id":354832558,"width":210,"height":340},{"id":354832559,"width":210,"height":340},{"id":354832560,"width":210,"height":340},{"id":354832561,"width":210,"height":340},{"id":354832562,"width":210,"height":340},{"id":354832563,"width":210,"height":340},{"id":354832564,"width":210,"height":340},{"id":354832565,"width":210,"height":340}],"hasAnimation":false,"hasSound":false,"stickerResourceType":"STATIC"} diff --cc priv/static/static/stickers/omesis/tab.png index 000000000,000000000..33cf71949 new file mode 100644 Binary files differ diff --cc priv/static/static/stickers/omesis/tab_off.png index 000000000,000000000..4394ea727 new file mode 100644 Binary files differ diff --cc priv/static/static/stickers/omesis/tab_on.png index 000000000,000000000..33cf71949 new file mode 100644 Binary files differ