lou_de_sel/akkoma
1
0
Fork 0
forked from AkkomaGang/akkoma
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
lain 2018-04-02 13:15:38 +02:00
commit cd543d58a1
297 changed files with 271 additions and 138925 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
config/config.exs
View file

@ -50,6 +50,7 @@
name: "Pleroma", name: "Pleroma",
email: "example@example.com", email: "example@example.com",
limit: 5000, limit: 5000,
upload_limit: 16_000_000,
registrations_open: true, registrations_open: true,
federating: true federating: true

11
installation/pleroma.nginx
View file

@ -28,7 +28,16 @@ server {
gzip_http_version 1.1; gzip_http_version 1.1;
gzip_types text/plain text/css application/json application/javascript text/xml application/xml application/xml+rss text/javascript application/activity+json application/atom+xml; gzip_types text/plain text/css application/json application/javascript text/xml application/xml application/xml+rss text/javascript application/activity+json application/atom+xml;
location / { location / {
add_header 'Access-Control-Allow-Origin' '*'; # if you do not want remote frontends to be able to access your Pleroma backend
# server, remove these lines.
add_header 'Access-Control-Allow-Origin' '*' always;
add_header 'Access-Control-Allow-Methods' 'POST, GET, OPTIONS' always;
add_header 'Access-Control-Allow-Headers' 'Authorization, Content-Type' always;
if ($request_method = OPTIONS) {
return 204;
}
# stop removing lines here.
proxy_http_version 1.1; proxy_http_version 1.1;
proxy_set_header Upgrade $http_upgrade; proxy_set_header Upgrade $http_upgrade;
proxy_set_header Connection "upgrade"; proxy_set_header Connection "upgrade";

3
lib/pleroma/web/endpoint.ex
View file

@ -34,7 +34,8 @@ defmodule Pleroma.Web.Endpoint do
Plug.Parsers, Plug.Parsers,
parsers: [:urlencoded, :multipart, :json], parsers: [:urlencoded, :multipart, :json],
pass: ["*/*"], pass: ["*/*"],
json_decoder: Jason json_decoder: Jason,
length: Application.get_env(:pleroma, :instance) |> Keyword.get(:upload_limit)
) )
plug(Plug.MethodOverride) plug(Plug.MethodOverride)

6
lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
View file

@ -513,12 +513,16 @@ def search(%{assigns: %{user: user}} = conn, %{"q" => query} = params) do
) )
statuses = Repo.all(q) ++ fetched statuses = Repo.all(q) ++ fetched
tags = String.split(query)
|> Enum.uniq()
|> Enum.filter(fn tag -> String.starts_with?(tag, "#") end)
|> Enum.map(fn tag -> String.slice(tag, 1..-1) end)
res = %{ res = %{
"accounts" => AccountView.render("accounts.json", users: accounts, for: user, as: :user), "accounts" => AccountView.render("accounts.json", users: accounts, for: user, as: :user),
"statuses" => "statuses" =>
StatusView.render("index.json", activities: statuses, for: user, as: :activity), StatusView.render("index.json", activities: statuses, for: user, as: :activity),
"hashtags" => [] "hashtags" => tags
} }
json(conn, res) json(conn, res)

7
lib/pleroma/web/templates/mastodon_api/mastodon/index.html.eex
View file

@ -9,14 +9,17 @@
<link rel="icon" type="image/png" href="/favicon.png"/> <link rel="icon" type="image/png" href="/favicon.png"/>
<link rel="stylesheet" media="all" href="/packs/common.css" /> <link rel="stylesheet" media="all" href="/packs/common.css" />
<link rel="stylesheet" media="all" href="/packs/default.css" /> <link rel="stylesheet" media="all" href="/packs/default.css" />
<link rel="stylesheet" media="all" href="/packs/pl-dark-masto-fe.css" />
<script src="/packs/common.js"></script> <script src="/packs/common.js"></script>
<script src="/packs/locale_en.js"></script> <script src="/packs/locale_en.js"></script>
<link as='script' crossorigin='anonymous' href='/packs/features/getting_started.js' rel='preload'>
<link as='script' crossorigin='anonymous' href='/packs/features/compose.js' rel='preload'>
<link as='script' crossorigin='anonymous' href='/packs/features/home_timeline.js' rel='preload'>
<link as='script' crossorigin='anonymous' href='/packs/features/notifications.js' rel='preload'>
<script id='initial-state' type='application/json'><%= raw @initial_state %></script> <script id='initial-state' type='application/json'><%= raw @initial_state %></script>
<script src="/packs/application.js"></script> <script src="/packs/application.js"></script>
</head> </head>
<body class='app-body'> <body class='app-body no-reduce-motion'>
<div class='app-holder' data-props='{&quot;locale&quot;:&quot;en&quot;}' id='mastodon'> <div class='app-holder' data-props='{&quot;locale&quot;:&quot;en&quot;}' id='mastodon'>
</div> </div>
</body> </body>

BIN
priv/static/packs/about-d6275c885cd0e28a1186.js
View file

Binary file not shown.

BIN
priv/static/packs/about.js Normal file
View file

Binary file not shown.

BIN
priv/static/packs/about.js.map Normal file
View file

Binary file not shown.

BIN
priv/static/packs/admin-1bab981afc4fd0d71402.js
View file

Binary file not shown.

BIN
priv/static/packs/admin.js Normal file
View file

Binary file not shown.

BIN
priv/static/packs/admin.js.map Normal file
View file

Binary file not shown.

73
priv/static/packs/appcache/manifest.appcache
View file

@ -1,42 +1,45 @@
CACHE MANIFEST CACHE MANIFEST
#ver:11/12/2017, 12:40:57 PM #ver:2018-4-1 11:28:19
#plugin:4.8.4 #plugin:4.8.4
CACHE: CACHE:
/packs/features/compose-4617f6e912b5bfa71c43.js /packs/base_polyfills.js
/packs/modals/onboarding_modal-399f44a19ddd0ddc4e9c.js /packs/extra_polyfills.js
/packs/features/public_timeline-d6e6bc704f49ebf922be.js /packs/features/compose.js
/packs/features/community_timeline-20bc8a94c08809c127d0.js /packs/modals/onboarding_modal.js
/packs/features/hashtag_timeline-3ed7e7bf18fd2fc04c9e.js /packs/emoji_picker.js
/packs/emoji_picker-9cf581d158c1cefc73c9.js /packs/features/notifications.js
/packs/features/notifications-99d27ff7a90c7f701400.js /packs/features/account_timeline.js
/packs/features/home_timeline-c146f32b0118845677ee.js /packs/features/home_timeline.js
/packs/features/account_timeline-cad2550e777d3958eca4.js /packs/features/public_timeline.js
/packs/features/pinned_statuses-fc56dd5916a37286e823.js /packs/features/community_timeline.js
/packs/features/favourited_statuses-b15a9a6cc711cca1eb76.js /packs/features/favourited_statuses.js
/packs/features/status-1f1807fdb4d1fd6daf40.js /packs/features/list_timeline.js
/packs/features/following-9060b3726e6ad25f3621.js /packs/features/following.js
/packs/features/followers-6716b8606f70dfa12ed7.js /packs/features/followers.js
/packs/features/account_gallery-b13924812f8dd47200c2.js /packs/features/hashtag_timeline.js
/packs/modals/report_modal-7a2950f40d4867b9cbb0.js /packs/features/status.js
/packs/features/follow_requests-281e5b40331385149920.js /packs/features/account_gallery.js
/packs/features/mutes-60c139f123f8d11ed903.js /packs/features/blocks.js
/packs/features/blocks-e9605338ea941de78465.js /packs/features/follow_requests.js
/packs/features/reblogs-e284a8647e830c151a40.js /packs/features/reblogs.js
/packs/features/favourites-083fedd11007764f7fad.js /packs/features/favourites.js
/packs/features/getting_started-b65f1e917d66a972f2bf.js /packs/features/getting_started.js
/packs/features/generic_not_found-dc757b4cfe00489a06fb.js /packs/features/keyboard_shortcuts.js
/packs/modals/embed_modal-c776fd6a0ea581675783.js /packs/features/generic_not_found.js
/packs/status/media_gallery-7642f779bf4243e58b78.js /packs/features/list_editor.js
/packs/application-1b1f37dff2aac402336b.js /packs/status/media_gallery.js
/packs/share-914b479bea45d0f6d4aa.js /packs/share.js
/packs/about-d6275c885cd0e28a1186.js /packs/application.js
/packs/public-88b87539fc95f07f2721.js /packs/about.js
/packs/default-99ffdcf166b2dedef105.js /packs/public.js
/packs/admin-1bab981afc4fd0d71402.js /packs/mailer.js
/packs/common-1789b98651001ef10c0b.js /packs/default.js
/packs/common-daadaac9454e7d14470e7954e3143dca.css /packs/admin.js
/packs/default-818c1287ac3c764905d81e549d5e0160.css /packs/common.js
/packs/common.css
/packs/mailer.css
/packs/default.css
/packs/manifest.json /packs/manifest.json
NETWORK: NETWORK:

BIN
priv/static/packs/application.js
View file

Binary file not shown.

BIN
priv/static/packs/application.js.map Normal file
View file

Binary file not shown.

BIN
priv/static/packs/base_polyfills-0e7cb02d7748745874eb.js
View file

Binary file not shown.

BIN
priv/static/packs/base_polyfills.js Normal file
View file

Binary file not shown.

BIN
priv/static/packs/base_polyfills.js.map Normal file
View file

Binary file not shown.

BIN
priv/static/packs/common.css
View file

Binary file not shown.

1
priv/static/packs/common.css.map Normal file
View file

@ -0,0 +1 @@
{"version":3,"sources":[],"names":[],"mappings":"","file":"common.css","sourceRoot":""}

BIN
priv/static/packs/common.js
View file

Binary file not shown.

BIN
priv/static/packs/common.js.map Normal file
View file

Binary file not shown.

BIN
priv/static/packs/default-99ffdcf166b2dedef105.js
View file

Binary file not shown.

BIN
priv/static/packs/default.css
View file

Binary file not shown.

1
priv/static/packs/default.css.map Normal file
View file

@ -0,0 +1 @@
{"version":3,"sources":[],"names":[],"mappings":"","file":"default.css","sourceRoot":""}

BIN
priv/static/packs/default.js Normal file
View file

Binary file not shown.

BIN
priv/static/packs/default.js.map Normal file
View file

Binary file not shown.

BIN
priv/static/packs/elephant-friend-1-18bbe5bf56bcd2f550f26ae91be00dfb.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 142 KiB

BIN
priv/static/packs/elephant-friend-df0b9c6af525e0dea9f1f9c044d9a903.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 24 KiB

1
priv/static/packs/elephant_ui_disappointed-8864342480c3612e3061702851d3a798.svg Normal file
View file

File diff suppressed because one or more lines are too long
Side by side

After

Width:  |  Height:  |  Size: 11 KiB

1
priv/static/packs/elephant_ui_greeting-475430963d0b00fe82b07b17857ebf6c.svg Normal file
View file

File diff suppressed because one or more lines are too long
Side by side

After

Width:  |  Height:  |  Size: 17 KiB

1
priv/static/packs/elephant_ui_plane-e3f2d57c12c376e189c274cbe81af8dd.svg Normal file
View file

File diff suppressed because one or more lines are too long
Side by side

After

Width:  |  Height:  |  Size: 11 KiB

1
priv/static/packs/elephant_ui_working-2e653cc278c2ac871c23aeb10de1c0e2.svg Normal file
View file

File diff suppressed because one or more lines are too long
Side by side

After

Width:  |  Height:  |  Size: 8.3 KiB

BIN
priv/static/packs/emoji_picker-9cf581d158c1cefc73c9.js → priv/static/packs/emoji_picker.js
View file

Binary file not shown.

BIN
priv/static/packs/emoji_picker.js.map Normal file
View file

Binary file not shown.

BIN
priv/static/packs/extra_polyfills-1caed55b56bce0471b41.js
View file

Binary file not shown.

BIN
priv/static/packs/extra_polyfills.js Normal file
View file

Binary file not shown.

BIN
priv/static/packs/extra_polyfills.js.map Normal file
View file

Binary file not shown.

BIN
priv/static/packs/features/account_gallery-b13924812f8dd47200c2.js
View file

Binary file not shown.

BIN
priv/static/packs/features/account_gallery-b13924812f8dd47200c2.js.gz
View file

Binary file not shown.

BIN
priv/static/packs/features/account_gallery-b13924812f8dd47200c2.js.map
View file

Binary file not shown.

BIN
priv/static/packs/features/account_gallery.js Normal file
View file

Binary file not shown.

BIN
priv/static/packs/features/account_gallery.js.map Normal file
View file

Binary file not shown.

BIN
priv/static/packs/features/account_timeline-cad2550e777d3958eca4.js
View file

Binary file not shown.

BIN
priv/static/packs/features/account_timeline-cad2550e777d3958eca4.js.gz
View file

Binary file not shown.

BIN
priv/static/packs/features/account_timeline-cad2550e777d3958eca4.js.map
View file

Binary file not shown.

BIN
priv/static/packs/features/account_timeline.js Normal file
View file

Binary file not shown.

BIN
priv/static/packs/features/account_timeline.js.map Normal file
View file

Binary file not shown.

BIN
priv/static/packs/features/blocks-e9605338ea941de78465.js
View file

Binary file not shown.

BIN
priv/static/packs/features/blocks-e9605338ea941de78465.js.gz
View file

Binary file not shown.

BIN
priv/static/packs/features/blocks-e9605338ea941de78465.js.map
View file

Binary file not shown.

BIN
priv/static/packs/features/blocks.js Normal file
View file

Binary file not shown.

BIN
priv/static/packs/features/blocks.js.map Normal file
View file

Binary file not shown.

BIN
priv/static/packs/features/community_timeline-20bc8a94c08809c127d0.js
View file

Binary file not shown.

BIN
priv/static/packs/features/community_timeline-20bc8a94c08809c127d0.js.gz
View file

Binary file not shown.

BIN
priv/static/packs/features/community_timeline-20bc8a94c08809c127d0.js.map
View file

Binary file not shown.

BIN
priv/static/packs/features/community_timeline.js Normal file
View file

Binary file not shown.

BIN
priv/static/packs/features/community_timeline.js.map Normal file
View file

Binary file not shown.

BIN
priv/static/packs/features/compose-4617f6e912b5bfa71c43.js
View file

Binary file not shown.

BIN
priv/static/packs/features/compose-4617f6e912b5bfa71c43.js.gz
View file

Binary file not shown.

BIN
priv/static/packs/features/compose-4617f6e912b5bfa71c43.js.map
View file

Binary file not shown.

BIN
priv/static/packs/features/compose.js Normal file
View file

Binary file not shown.

BIN
priv/static/packs/features/compose.js.map Normal file
View file

Binary file not shown.

BIN
priv/static/packs/features/favourited_statuses-b15a9a6cc711cca1eb76.js
View file

Binary file not shown.

BIN
priv/static/packs/features/favourited_statuses-b15a9a6cc711cca1eb76.js.gz
View file

Binary file not shown.

BIN
priv/static/packs/features/favourited_statuses-b15a9a6cc711cca1eb76.js.map
View file

Binary file not shown.

BIN
priv/static/packs/features/favourited_statuses.js Normal file
View file

Binary file not shown.

BIN
priv/static/packs/features/favourited_statuses.js.map Normal file
View file

Binary file not shown.

BIN
priv/static/packs/features/favourites-083fedd11007764f7fad.js
View file

Binary file not shown.

BIN
priv/static/packs/features/favourites-083fedd11007764f7fad.js.gz
View file

Binary file not shown.

BIN
priv/static/packs/features/favourites-083fedd11007764f7fad.js.map
View file

Binary file not shown.

BIN
priv/static/packs/features/favourites.js Normal file
View file

Binary file not shown.

BIN
priv/static/packs/features/favourites.js.map Normal file
View file

Binary file not shown.

BIN
priv/static/packs/features/follow_requests-281e5b40331385149920.js
View file

Binary file not shown.

BIN
priv/static/packs/features/follow_requests-281e5b40331385149920.js.gz
View file

Binary file not shown.

BIN
priv/static/packs/features/follow_requests-281e5b40331385149920.js.map
View file

Binary file not shown.

BIN
priv/static/packs/features/follow_requests.js Normal file
View file

Binary file not shown.

BIN
priv/static/packs/features/follow_requests.js.map Normal file
View file

Binary file not shown.

BIN
priv/static/packs/features/followers-6716b8606f70dfa12ed7.js
View file

Binary file not shown.

BIN
priv/static/packs/features/followers-6716b8606f70dfa12ed7.js.gz
View file

Binary file not shown.

BIN
priv/static/packs/features/followers-6716b8606f70dfa12ed7.js.map
View file

Binary file not shown.

BIN
priv/static/packs/features/followers.js Normal file
View file

Binary file not shown.

BIN
priv/static/packs/features/followers.js.map Normal file
View file

Binary file not shown.

BIN
priv/static/packs/features/following-9060b3726e6ad25f3621.js
View file

Binary file not shown.

BIN
priv/static/packs/features/following-9060b3726e6ad25f3621.js.gz
View file

Binary file not shown.

BIN
priv/static/packs/features/following-9060b3726e6ad25f3621.js.map
View file

Binary file not shown.

BIN
priv/static/packs/features/following.js Normal file
View file

Binary file not shown.

BIN
priv/static/packs/features/following.js.map Normal file
View file

Binary file not shown.

BIN
priv/static/packs/features/generic_not_found-dc757b4cfe00489a06fb.js
View file

Binary file not shown.

BIN
priv/static/packs/features/generic_not_found-dc757b4cfe00489a06fb.js.gz
View file

Binary file not shown.

BIN
priv/static/packs/features/generic_not_found-dc757b4cfe00489a06fb.js.map
View file

Binary file not shown.

BIN
priv/static/packs/features/generic_not_found.js Normal file
View file

Binary file not shown.

BIN
priv/static/packs/features/generic_not_found.js.map Normal file
View file

Binary file not shown.

BIN
priv/static/packs/features/getting_started-b65f1e917d66a972f2bf.js
View file

Binary file not shown.

BIN
priv/static/packs/features/getting_started-b65f1e917d66a972f2bf.js.gz
View file

Binary file not shown.

BIN
priv/static/packs/features/getting_started-b65f1e917d66a972f2bf.js.map
View file

Binary file not shown.

BIN
priv/static/packs/features/getting_started.js Normal file
View file

Binary file not shown.

BIN
priv/static/packs/features/getting_started.js.map Normal file
View file

Binary file not shown.

BIN
priv/static/packs/features/hashtag_timeline-3ed7e7bf18fd2fc04c9e.js
View file

Binary file not shown.

BIN
priv/static/packs/features/hashtag_timeline-3ed7e7bf18fd2fc04c9e.js.gz
View file

Binary file not shown.

BIN
priv/static/packs/features/hashtag_timeline-3ed7e7bf18fd2fc04c9e.js.map
View file

Binary file not shown.

Some files were not shown because too many files have changed in this diff Show more