Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop

diff --cc .gitignore
Simple merge

diff --cc config/config.exs
Simple merge

diff --cc lib/mix/tasks/pleroma/user.ex
index 391f7c5b489fffb18e7a4de34412a56fbb677ddd,20fe6c6e408bc85275a5cb88a73774a13b937554..09f9356d34998078a251870ca8e7b6630eb62ccd
--- 1/lib/mix/tasks/pleroma/user.ex
--- 2/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(["toggle_confirmed", nickname]) do
 +  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(["confirm", nickname]) do
      start_pleroma()
  
      with %User{} = user <- User.get_cached_by_nickname(nickname) do

diff --cc lib/pleroma/web/endpoint.ex
index f26542e888c435917c48b08d62664fc569d4aa5d,f26542e888c435917c48b08d62664fc569d4aa5d..f2c377c5631c19a2962a706d2196eaff86ac9b2a
--- 1/lib/pleroma/web/endpoint.ex
--- 2/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 67986017507bd7520a64a6dc9ebf638ced7457da,0000000000000000000000000000000000000000..978d7b0b57f73e15b9c6e6fbfd2e9ecce49ec84a
mode 100644,000000..100644
--- 1/priv/static/static/stickers.json
--- /dev/null
+++ 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 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..c342e3075014c6f0372303e3a8a4a620163853f7
new file mode 100644 (file)
Binary files differ

diff --cc priv/static/static/stickers/omesis/354832543.png
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..3c8d107a1463f71a044595f857fce7251f23c936
new file mode 100644 (file)
Binary files differ

diff --cc priv/static/static/stickers/omesis/354832544.png
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..9e179627773716a03b979a5f22927031923ae7ae
new file mode 100644 (file)
Binary files differ

diff --cc priv/static/static/stickers/omesis/354832545.png
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..18ffeed792fc97d05ddd4a85c636b946d03d521b
new file mode 100644 (file)
Binary files differ

diff --cc priv/static/static/stickers/omesis/354832546.png
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..d88aeb4d231e5e0831ee195c1ec892f2d4ec8788
new file mode 100644 (file)
Binary files differ

diff --cc priv/static/static/stickers/omesis/354832547.png
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..7c65731d54a93a4d46afb53ced2a2e4d276994bb
new file mode 100644 (file)
Binary files differ

diff --cc priv/static/static/stickers/omesis/354832548.png
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..5e056cf0f4a131764091f1e6df8bcfcb522307ce
new file mode 100644 (file)
Binary files differ

diff --cc priv/static/static/stickers/omesis/354832549.png
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..e129134d07fd03262b15e45bfde9a7d370cab061
new file mode 100644 (file)
Binary files differ

diff --cc priv/static/static/stickers/omesis/354832550.png
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..ea6700305a8053e012d824d556164383129a2040
new file mode 100644 (file)
Binary files differ

diff --cc priv/static/static/stickers/omesis/354832551.png
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..0ab686b29733fdd05a7be64c0584443940272aad
new file mode 100644 (file)
Binary files differ

diff --cc priv/static/static/stickers/omesis/354832552.png
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..f011b598a4743ee264d729f40a11824cb3ce7421
new file mode 100644 (file)
Binary files differ

diff --cc priv/static/static/stickers/omesis/354832553.png
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..79c6eba4c5a99d6ed6210039a1a4cf8001653b5d
new file mode 100644 (file)
Binary files differ

diff --cc priv/static/static/stickers/omesis/354832554.png
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..17e7a84ea13e145440153cbc03e8ec073724dc55
new file mode 100644 (file)
Binary files differ

diff --cc priv/static/static/stickers/omesis/354832555.png
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..a87b74d1f8384ef972599e6b893ac2dc2ebf47f9
new file mode 100644 (file)
Binary files differ

diff --cc priv/static/static/stickers/omesis/354832556.png
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..4e93dee6124eba6ed5fd493f88c6e3fd3d2b3e07
new file mode 100644 (file)
Binary files differ

diff --cc priv/static/static/stickers/omesis/354832557.png
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..4d24025fce3fafbe34fccf618f16237017312949
new file mode 100644 (file)
Binary files differ

diff --cc priv/static/static/stickers/omesis/354832558.png
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..5214e05551de7c6cb55399126e4384c3ef3523f4
new file mode 100644 (file)
Binary files differ

diff --cc priv/static/static/stickers/omesis/354832559.png
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..4ecc14c0b8054d35200e9e1945f1c9c4b6a81b93
new file mode 100644 (file)
Binary files differ

diff --cc priv/static/static/stickers/omesis/354832560.png
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..9029d9b2b33cd16bfb7260ffa5b944ae4512d42b
new file mode 100644 (file)
Binary files differ

diff --cc priv/static/static/stickers/omesis/354832561.png
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..95c8798b1ca09fa0750d09a9e508149e406d36a6
new file mode 100644 (file)
Binary files differ

diff --cc priv/static/static/stickers/omesis/354832562.png
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..19337e4d7a2fd0d47094c42530087e0b63c502a1
new file mode 100644 (file)
Binary files differ

diff --cc priv/static/static/stickers/omesis/354832563.png
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..e63b9b7e9d4338c12c1ea7e53e8da53cd5aea916
new file mode 100644 (file)
Binary files differ

diff --cc priv/static/static/stickers/omesis/354832564.png
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..987eb2c4f404ceeaf54226bad27162110d59bab6
new file mode 100644 (file)
Binary files differ

diff --cc priv/static/static/stickers/omesis/354832565.png
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..c806333ce789060d92b5ce677480bd8814eef35d
new file mode 100644 (file)
Binary files differ

diff --cc priv/static/static/stickers/omesis/pack.json
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..a2d265fb754d6b07ea151ebfe718429a7ea7209e
new file mode 100644 (file)
--- /dev/null
--- /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 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..0c8a015a528e9bd2eb11686cb3fbc3473e7a0988
new file mode 100644 (file)
--- /dev/null
--- /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 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..33cf71949f28148c3eeb06a59938af15a89b42de
new file mode 100644 (file)
Binary files differ

diff --cc priv/static/static/stickers/omesis/tab_off.png
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..4394ea727345e7faa7ce5f625e98adbc0318d448
new file mode 100644 (file)
Binary files differ

diff --cc priv/static/static/stickers/omesis/tab_on.png
index 0000000000000000000000000000000000000000,0000000000000000000000000000000000000000..33cf71949f28148c3eeb06a59938af15a89b42de
new file mode 100644 (file)
Binary files differ