Merge remote-tracking branch 'upstream/develop' into neckbeard
This commit is contained in:
commit
d6e8906aa7
|
@ -17,6 +17,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
|
||||||
- Search: When using Postgres 11+, Pleroma will use the `websearch_to_tsvector` function to parse search queries.
|
- Search: When using Postgres 11+, Pleroma will use the `websearch_to_tsvector` function to parse search queries.
|
||||||
- Emoji: Support the full Unicode 13.1 set of Emoji for reactions, plus regional indicators.
|
- Emoji: Support the full Unicode 13.1 set of Emoji for reactions, plus regional indicators.
|
||||||
- Admin API: Reports now ordered by newest
|
- Admin API: Reports now ordered by newest
|
||||||
|
- Deprecated `Pleroma.Uploaders.S3, :public_endpoint`. Now `Pleroma.Upload, :base_url` is the standard configuration key for all uploaders.
|
||||||
|
|
||||||
### Added
|
### Added
|
||||||
|
|
||||||
|
@ -33,6 +34,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
|
||||||
- OAuth form improvements: users are remembered by their cookie, the CSS is overridable by the admin, and the style has been improved.
|
- OAuth form improvements: users are remembered by their cookie, the CSS is overridable by the admin, and the style has been improved.
|
||||||
- OAuth improvements and fixes: more secure session-based authentication (by token that could be revoked anytime), ability to revoke belonging OAuth token from any client etc.
|
- OAuth improvements and fixes: more secure session-based authentication (by token that could be revoked anytime), ability to revoke belonging OAuth token from any client etc.
|
||||||
- Ability to set ActivityPub aliases for follower migration.
|
- Ability to set ActivityPub aliases for follower migration.
|
||||||
|
- Configurable background job limits for RichMedia (link previews) and MediaProxyWarmingPolicy
|
||||||
|
|
||||||
|
|
||||||
<details>
|
<details>
|
||||||
<summary>API Changes</summary>
|
<summary>API Changes</summary>
|
||||||
|
@ -51,6 +54,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
|
||||||
- Streaming API: Posts and notifications are not dropped, when CLI task is executing.
|
- Streaming API: Posts and notifications are not dropped, when CLI task is executing.
|
||||||
- Creating incorrect IPv4 address-style HTTP links when encountering certain numbers.
|
- Creating incorrect IPv4 address-style HTTP links when encountering certain numbers.
|
||||||
- Reblog API Endpoint: Do not set visibility parameter to public by default and let CommonAPI to infer it from status, so a user can reblog their private status without explicitly setting reblog visibility to private.
|
- Reblog API Endpoint: Do not set visibility parameter to public by default and let CommonAPI to infer it from status, so a user can reblog their private status without explicitly setting reblog visibility to private.
|
||||||
|
- Tag URLs in statuses are now absolute
|
||||||
|
|
||||||
<details>
|
<details>
|
||||||
<summary>API Changes</summary>
|
<summary>API Changes</summary>
|
||||||
|
|
|
@ -64,14 +64,23 @@ config :pleroma, Pleroma.Upload,
|
||||||
link_name: false,
|
link_name: false,
|
||||||
proxy_remote: false,
|
proxy_remote: false,
|
||||||
filename_display_max_length: 30,
|
filename_display_max_length: 30,
|
||||||
default_description: nil
|
default_description: nil,
|
||||||
|
base_url: nil
|
||||||
|
|
||||||
config :pleroma, Pleroma.Uploaders.Local, uploads: "uploads"
|
config :pleroma, Pleroma.Uploaders.Local, uploads: "uploads"
|
||||||
|
|
||||||
config :pleroma, Pleroma.Uploaders.S3,
|
config :pleroma, Pleroma.Uploaders.S3,
|
||||||
bucket: nil,
|
bucket: nil,
|
||||||
streaming_enabled: true,
|
bucket_namespace: nil,
|
||||||
public_endpoint: "https://s3.amazonaws.com"
|
truncated_namespace: nil,
|
||||||
|
streaming_enabled: true
|
||||||
|
|
||||||
|
config :ex_aws, :s3,
|
||||||
|
# host: "s3.wasabisys.com", # required if not Amazon AWS
|
||||||
|
access_key_id: nil,
|
||||||
|
secret_access_key: nil,
|
||||||
|
# region: "us-east-1", # may be required for Amazon AWS
|
||||||
|
scheme: "https://"
|
||||||
|
|
||||||
config :pleroma, :emoji,
|
config :pleroma, :emoji,
|
||||||
shortcode_globs: ["/emoji/custom/**/*.png"],
|
shortcode_globs: ["/emoji/custom/**/*.png"],
|
||||||
|
@ -823,6 +832,11 @@ config :pleroma, Pleroma.User.Backup,
|
||||||
limit_days: 7,
|
limit_days: 7,
|
||||||
dir: nil
|
dir: nil
|
||||||
|
|
||||||
|
config :pleroma, ConcurrentLimiter, [
|
||||||
|
{Pleroma.Web.RichMedia.Helpers, [max_running: 5, max_waiting: 5]},
|
||||||
|
{Pleroma.Web.ActivityPub.MRF.MediaProxyWarmingPolicy, [max_running: 5, max_waiting: 5]}
|
||||||
|
]
|
||||||
|
|
||||||
# Import environment specific config. This must remain at the bottom
|
# Import environment specific config. This must remain at the bottom
|
||||||
# of this file so it overrides the configuration defined above.
|
# of this file so it overrides the configuration defined above.
|
||||||
import_config "#{Mix.env()}.exs"
|
import_config "#{Mix.env()}.exs"
|
||||||
|
|
|
@ -149,18 +149,12 @@ config :pleroma, :config_description, [
|
||||||
description: "S3 bucket namespace",
|
description: "S3 bucket namespace",
|
||||||
suggestions: ["pleroma"]
|
suggestions: ["pleroma"]
|
||||||
},
|
},
|
||||||
%{
|
|
||||||
key: :public_endpoint,
|
|
||||||
type: :string,
|
|
||||||
description: "S3 endpoint",
|
|
||||||
suggestions: ["https://s3.amazonaws.com"]
|
|
||||||
},
|
|
||||||
%{
|
%{
|
||||||
key: :truncated_namespace,
|
key: :truncated_namespace,
|
||||||
type: :string,
|
type: :string,
|
||||||
description:
|
description:
|
||||||
"If you use S3 compatible service such as Digital Ocean Spaces or CDN, set folder name or \"\" etc." <>
|
"If you use S3 compatible service such as Digital Ocean Spaces or CDN, set folder name or \"\" etc." <>
|
||||||
" For example, when using CDN to S3 virtual host format, set \"\". At this time, write CNAME to CDN in public_endpoint."
|
" For example, when using CDN to S3 virtual host format, set \"\". At this time, write CNAME to CDN in Upload base_url."
|
||||||
},
|
},
|
||||||
%{
|
%{
|
||||||
key: :streaming_enabled,
|
key: :streaming_enabled,
|
||||||
|
@ -3336,5 +3330,53 @@ config :pleroma, :config_description, [
|
||||||
suggestions: [:text, :protobuf]
|
suggestions: [:text, :protobuf]
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
|
},
|
||||||
|
%{
|
||||||
|
group: :pleroma,
|
||||||
|
key: ConcurrentLimiter,
|
||||||
|
type: :group,
|
||||||
|
description: "Limits configuration for background tasks.",
|
||||||
|
children: [
|
||||||
|
%{
|
||||||
|
key: Pleroma.Web.RichMedia.Helpers,
|
||||||
|
type: :keyword,
|
||||||
|
description: "Concurrent limits configuration for getting RichMedia for activities.",
|
||||||
|
suggestions: [max_running: 5, max_waiting: 5],
|
||||||
|
children: [
|
||||||
|
%{
|
||||||
|
key: :max_running,
|
||||||
|
type: :integer,
|
||||||
|
description: "Max running concurrently jobs.",
|
||||||
|
suggestion: [5]
|
||||||
|
},
|
||||||
|
%{
|
||||||
|
key: :max_waiting,
|
||||||
|
type: :integer,
|
||||||
|
description: "Max waiting jobs.",
|
||||||
|
suggestion: [5]
|
||||||
|
}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
%{
|
||||||
|
key: Pleroma.Web.ActivityPub.MRF.MediaProxyWarmingPolicy,
|
||||||
|
type: :keyword,
|
||||||
|
description: "Concurrent limits configuration for MediaProxyWarmingPolicy.",
|
||||||
|
suggestions: [max_running: 5, max_waiting: 5],
|
||||||
|
children: [
|
||||||
|
%{
|
||||||
|
key: :max_running,
|
||||||
|
type: :integer,
|
||||||
|
description: "Max running concurrently jobs.",
|
||||||
|
suggestion: [5]
|
||||||
|
},
|
||||||
|
%{
|
||||||
|
key: :max_waiting,
|
||||||
|
type: :integer,
|
||||||
|
description: "Max waiting jobs.",
|
||||||
|
suggestion: [5]
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
]
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
|
|
|
@ -115,11 +115,6 @@ config :pleroma, Pleroma.Web.Plugs.RemoteIp, enabled: false
|
||||||
|
|
||||||
config :pleroma, Pleroma.Web.ApiSpec.CastAndValidate, strict: true
|
config :pleroma, Pleroma.Web.ApiSpec.CastAndValidate, strict: true
|
||||||
|
|
||||||
config :pleroma, Pleroma.Uploaders.S3,
|
|
||||||
bucket: nil,
|
|
||||||
streaming_enabled: true,
|
|
||||||
public_endpoint: nil
|
|
||||||
|
|
||||||
config :tzdata, :autoupdate, :disabled
|
config :tzdata, :autoupdate, :disabled
|
||||||
|
|
||||||
config :pleroma, :mrf, policies: []
|
config :pleroma, :mrf, policies: []
|
||||||
|
|
|
@ -549,7 +549,7 @@ the source code is here: [kocaptcha](https://github.com/koto-bank/kocaptcha). Th
|
||||||
* `uploader`: Which one of the [uploaders](#uploaders) to use.
|
* `uploader`: Which one of the [uploaders](#uploaders) to use.
|
||||||
* `filters`: List of [upload filters](#upload-filters) to use.
|
* `filters`: List of [upload filters](#upload-filters) to use.
|
||||||
* `link_name`: When enabled Pleroma will add a `name` parameter to the url of the upload, for example `https://instance.tld/media/corndog.png?name=corndog.png`. This is needed to provide the correct filename in Content-Disposition headers when using filters like `Pleroma.Upload.Filter.Dedupe`
|
* `link_name`: When enabled Pleroma will add a `name` parameter to the url of the upload, for example `https://instance.tld/media/corndog.png?name=corndog.png`. This is needed to provide the correct filename in Content-Disposition headers when using filters like `Pleroma.Upload.Filter.Dedupe`
|
||||||
* `base_url`: The base URL to access a user-uploaded file. Useful when you want to proxy the media files via another host.
|
* `base_url`: The base URL to access a user-uploaded file. Useful when you want to host the media files via another domain or are using a 3rd party S3 provider.
|
||||||
* `proxy_remote`: If you're using a remote uploader, Pleroma will proxy media requests instead of redirecting to it.
|
* `proxy_remote`: If you're using a remote uploader, Pleroma will proxy media requests instead of redirecting to it.
|
||||||
* `proxy_opts`: Proxy options, see `Pleroma.ReverseProxy` documentation.
|
* `proxy_opts`: Proxy options, see `Pleroma.ReverseProxy` documentation.
|
||||||
* `filename_display_max_length`: Set max length of a filename to display. 0 = no limit. Default: 30.
|
* `filename_display_max_length`: Set max length of a filename to display. 0 = no limit. Default: 30.
|
||||||
|
@ -570,10 +570,7 @@ Don't forget to configure [Ex AWS S3](#ex-aws-s3-settings)
|
||||||
|
|
||||||
* `bucket`: S3 bucket name.
|
* `bucket`: S3 bucket name.
|
||||||
* `bucket_namespace`: S3 bucket namespace.
|
* `bucket_namespace`: S3 bucket namespace.
|
||||||
* `public_endpoint`: S3 endpoint that the user finally accesses(ex. "https://s3.dualstack.ap-northeast-1.amazonaws.com")
|
|
||||||
* `truncated_namespace`: If you use S3 compatible service such as Digital Ocean Spaces or CDN, set folder name or "" etc.
|
* `truncated_namespace`: If you use S3 compatible service such as Digital Ocean Spaces or CDN, set folder name or "" etc.
|
||||||
For example, when using CDN to S3 virtual host format, set "".
|
|
||||||
At this time, write CNAME to CDN in public_endpoint.
|
|
||||||
* `streaming_enabled`: Enable streaming uploads, when enabled the file will be sent to the server in chunks as it's being read. This may be unsupported by some providers, try disabling this if you have upload problems.
|
* `streaming_enabled`: Enable streaming uploads, when enabled the file will be sent to the server in chunks as it's being read. This may be unsupported by some providers, try disabling this if you have upload problems.
|
||||||
|
|
||||||
#### Ex AWS S3 settings
|
#### Ex AWS S3 settings
|
||||||
|
@ -1113,3 +1110,15 @@ Settings to enable and configure expiration for ephemeral activities
|
||||||
|
|
||||||
* `:enabled` - enables ephemeral activities creation
|
* `:enabled` - enables ephemeral activities creation
|
||||||
* `:min_lifetime` - minimum lifetime for ephemeral activities (in seconds). Default: 10 minutes.
|
* `:min_lifetime` - minimum lifetime for ephemeral activities (in seconds). Default: 10 minutes.
|
||||||
|
|
||||||
|
## ConcurrentLimiter
|
||||||
|
|
||||||
|
Settings to restrict concurrently running jobs. Jobs which can be configured:
|
||||||
|
|
||||||
|
* `Pleroma.Web.RichMedia.Helpers` - generating link previews of URLs in activities
|
||||||
|
* `Pleroma.Web.ActivityPub.MRF.MediaProxyWarmingPolicy` - warming remote media cache via MediaProxyWarmingPolicy
|
||||||
|
|
||||||
|
Each job has these settings:
|
||||||
|
|
||||||
|
* `:max_running` - max concurrently runnings jobs
|
||||||
|
* `:max_waiting` - max waiting jobs
|
||||||
|
|
|
@ -13,7 +13,8 @@ defmodule Mix.Pleroma do
|
||||||
:flake_id,
|
:flake_id,
|
||||||
:swoosh,
|
:swoosh,
|
||||||
:timex,
|
:timex,
|
||||||
:fast_html
|
:fast_html,
|
||||||
|
:oban
|
||||||
]
|
]
|
||||||
@cachex_children ["object", "user", "scrubber", "web_resp"]
|
@cachex_children ["object", "user", "scrubber", "web_resp"]
|
||||||
@doc "Common functions to be reused in mix tasks"
|
@doc "Common functions to be reused in mix tasks"
|
||||||
|
|
|
@ -297,7 +297,16 @@ defmodule Pleroma.Application do
|
||||||
|
|
||||||
@spec limiters_setup() :: :ok
|
@spec limiters_setup() :: :ok
|
||||||
def limiters_setup do
|
def limiters_setup do
|
||||||
[Pleroma.Web.RichMedia.Helpers, Pleroma.Web.MediaProxy]
|
config = Config.get(ConcurrentLimiter, [])
|
||||||
|> Enum.each(&ConcurrentLimiter.new(&1, 1, 0))
|
|
||||||
|
[Pleroma.Web.RichMedia.Helpers, Pleroma.Web.ActivityPub.MRF.MediaProxyWarmingPolicy]
|
||||||
|
|> Enum.each(fn module ->
|
||||||
|
mod_config = Keyword.get(config, module, [])
|
||||||
|
|
||||||
|
max_running = Keyword.get(mod_config, :max_running, 5)
|
||||||
|
max_waiting = Keyword.get(mod_config, :max_waiting, 5)
|
||||||
|
|
||||||
|
ConcurrentLimiter.new(module, max_running, max_waiting)
|
||||||
|
end)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -40,7 +40,8 @@ defmodule Pleroma.Config.DeprecationWarnings do
|
||||||
:ok <- check_welcome_message_config(),
|
:ok <- check_welcome_message_config(),
|
||||||
:ok <- check_gun_pool_options(),
|
:ok <- check_gun_pool_options(),
|
||||||
:ok <- check_activity_expiration_config(),
|
:ok <- check_activity_expiration_config(),
|
||||||
:ok <- check_remote_ip_plug_name() do
|
:ok <- check_remote_ip_plug_name(),
|
||||||
|
:ok <- check_uploders_s3_public_endpoint() do
|
||||||
:ok
|
:ok
|
||||||
else
|
else
|
||||||
_ ->
|
_ ->
|
||||||
|
@ -193,4 +194,25 @@ defmodule Pleroma.Config.DeprecationWarnings do
|
||||||
warning_preface
|
warning_preface
|
||||||
)
|
)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@spec check_uploders_s3_public_endpoint() :: :ok | nil
|
||||||
|
def check_uploders_s3_public_endpoint do
|
||||||
|
s3_config = Pleroma.Config.get([Pleroma.Uploaders.S3])
|
||||||
|
|
||||||
|
use_old_config = Keyword.has_key?(s3_config, :public_endpoint)
|
||||||
|
|
||||||
|
if use_old_config do
|
||||||
|
Logger.error("""
|
||||||
|
!!!DEPRECATION WARNING!!!
|
||||||
|
Your config is using the old setting for controlling the URL of media uploaded to your S3 bucket.\n
|
||||||
|
Please make the following change at your earliest convenience.\n
|
||||||
|
\n* `config :pleroma, Pleroma.Uploaders.S3, public_endpoint` is now equal to:
|
||||||
|
\n* `config :pleroma, Pleroma.Upload, base_url`
|
||||||
|
""")
|
||||||
|
|
||||||
|
:error
|
||||||
|
else
|
||||||
|
:ok
|
||||||
|
end
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -131,12 +131,7 @@ defmodule Pleroma.Upload do
|
||||||
uploader: Keyword.get(opts, :uploader, Pleroma.Config.get([__MODULE__, :uploader])),
|
uploader: Keyword.get(opts, :uploader, Pleroma.Config.get([__MODULE__, :uploader])),
|
||||||
filters: Keyword.get(opts, :filters, Pleroma.Config.get([__MODULE__, :filters])),
|
filters: Keyword.get(opts, :filters, Pleroma.Config.get([__MODULE__, :filters])),
|
||||||
description: Keyword.get(opts, :description),
|
description: Keyword.get(opts, :description),
|
||||||
base_url:
|
base_url: base_url()
|
||||||
Keyword.get(
|
|
||||||
opts,
|
|
||||||
:base_url,
|
|
||||||
Pleroma.Config.get([__MODULE__, :base_url], Pleroma.Web.base_url())
|
|
||||||
)
|
|
||||||
}
|
}
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -217,14 +212,7 @@ defmodule Pleroma.Upload do
|
||||||
""
|
""
|
||||||
end
|
end
|
||||||
|
|
||||||
prefix =
|
[base_url, path]
|
||||||
if is_nil(Pleroma.Config.get([__MODULE__, :base_url])) do
|
|
||||||
"media"
|
|
||||||
else
|
|
||||||
""
|
|
||||||
end
|
|
||||||
|
|
||||||
[base_url, prefix, path]
|
|
||||||
|> Path.join()
|
|> Path.join()
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -241,13 +229,15 @@ defmodule Pleroma.Upload do
|
||||||
|
|
||||||
Pleroma.Uploaders.S3 ->
|
Pleroma.Uploaders.S3 ->
|
||||||
bucket = Config.get([Pleroma.Uploaders.S3, :bucket])
|
bucket = Config.get([Pleroma.Uploaders.S3, :bucket])
|
||||||
|
truncated_namespace = Config.get([Pleroma.Uploaders.S3, :truncated_namespace])
|
||||||
|
namespace = Config.get([Pleroma.Uploaders.S3, :bucket_namespace])
|
||||||
|
|
||||||
bucket_with_namespace =
|
bucket_with_namespace =
|
||||||
cond do
|
cond do
|
||||||
truncated_namespace = Config.get([Pleroma.Uploaders.S3, :truncated_namespace]) ->
|
!is_nil(truncated_namespace) ->
|
||||||
truncated_namespace
|
truncated_namespace
|
||||||
|
|
||||||
namespace = Config.get([Pleroma.Uploaders.S3, :bucket_namespace]) ->
|
!is_nil(namespace) ->
|
||||||
namespace <> ":" <> bucket
|
namespace <> ":" <> bucket
|
||||||
|
|
||||||
true ->
|
true ->
|
||||||
|
@ -261,7 +251,7 @@ defmodule Pleroma.Upload do
|
||||||
end
|
end
|
||||||
|
|
||||||
_ ->
|
_ ->
|
||||||
public_endpoint || upload_base_url
|
public_endpoint || upload_base_url || Pleroma.Web.base_url() <> "/media/"
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -289,15 +289,7 @@ defmodule Pleroma.User do
|
||||||
def account_status(%User{deactivated: true}), do: :deactivated
|
def account_status(%User{deactivated: true}), do: :deactivated
|
||||||
def account_status(%User{password_reset_pending: true}), do: :password_reset_pending
|
def account_status(%User{password_reset_pending: true}), do: :password_reset_pending
|
||||||
def account_status(%User{local: true, is_approved: false}), do: :approval_pending
|
def account_status(%User{local: true, is_approved: false}), do: :approval_pending
|
||||||
|
def account_status(%User{local: true, is_confirmed: false}), do: :confirmation_pending
|
||||||
def account_status(%User{local: true, is_confirmed: false}) do
|
|
||||||
if Config.get([:instance, :account_activation_required]) do
|
|
||||||
:confirmation_pending
|
|
||||||
else
|
|
||||||
:active
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
def account_status(%User{}), do: :active
|
def account_status(%User{}), do: :active
|
||||||
|
|
||||||
@spec visible_for(User.t(), User.t() | nil) ::
|
@spec visible_for(User.t(), User.t() | nil) ::
|
||||||
|
|
|
@ -139,6 +139,7 @@ defmodule Pleroma.User.Query do
|
||||||
defp compose_query({:active, _}, query) do
|
defp compose_query({:active, _}, query) do
|
||||||
User.restrict_deactivated(query)
|
User.restrict_deactivated(query)
|
||||||
|> where([u], u.is_approved == true)
|
|> where([u], u.is_approved == true)
|
||||||
|
|> where([u], u.is_confirmed == true)
|
||||||
end
|
end
|
||||||
|
|
||||||
defp compose_query({:legacy_active, _}, query) do
|
defp compose_query({:legacy_active, _}, query) do
|
||||||
|
|
|
@ -27,7 +27,7 @@ defmodule Pleroma.Web.ActivityPub.MRF.MediaProxyWarmingPolicy do
|
||||||
if Pleroma.Config.get(:env) == :test do
|
if Pleroma.Config.get(:env) == :test do
|
||||||
fetch(prefetch_url)
|
fetch(prefetch_url)
|
||||||
else
|
else
|
||||||
ConcurrentLimiter.limit(MediaProxy, fn ->
|
ConcurrentLimiter.limit(__MODULE__, fn ->
|
||||||
Task.start(fn -> fetch(prefetch_url) end)
|
Task.start(fn -> fetch(prefetch_url) end)
|
||||||
end)
|
end)
|
||||||
end
|
end
|
||||||
|
|
|
@ -491,7 +491,7 @@ defmodule Pleroma.Web.MastodonAPI.StatusView do
|
||||||
def build_tags(object_tags) when is_list(object_tags) do
|
def build_tags(object_tags) when is_list(object_tags) do
|
||||||
object_tags
|
object_tags
|
||||||
|> Enum.filter(&is_binary/1)
|
|> Enum.filter(&is_binary/1)
|
||||||
|> Enum.map(&%{name: &1, url: "/tag/#{URI.encode(&1)}"})
|
|> Enum.map(&%{name: &1, url: "#{Pleroma.Web.base_url()}/tag/#{URI.encode(&1)}"})
|
||||||
end
|
end
|
||||||
|
|
||||||
def build_tags(_), do: []
|
def build_tags(_), do: []
|
||||||
|
|
32
mix.exs
32
mix.exs
|
@ -123,7 +123,7 @@ defmodule Pleroma.Mixfile do
|
||||||
{:ecto_enum, "~> 1.4"},
|
{:ecto_enum, "~> 1.4"},
|
||||||
{:ecto_sql, "~> 3.4.4"},
|
{:ecto_sql, "~> 3.4.4"},
|
||||||
{:postgrex, ">= 0.15.5"},
|
{:postgrex, ">= 0.15.5"},
|
||||||
{:oban, "~> 2.1.0"},
|
{:oban, "~> 2.3.4"},
|
||||||
{:gettext, "~> 0.18"},
|
{:gettext, "~> 0.18"},
|
||||||
{:bcrypt_elixir, "~> 2.2"},
|
{:bcrypt_elixir, "~> 2.2"},
|
||||||
{:trailing_format_plug, "~> 0.0.7"},
|
{:trailing_format_plug, "~> 0.0.7"},
|
||||||
|
@ -229,7 +229,9 @@ defmodule Pleroma.Mixfile do
|
||||||
"ecto.reset": ["ecto.drop", "ecto.setup"],
|
"ecto.reset": ["ecto.drop", "ecto.setup"],
|
||||||
test: ["ecto.create --quiet", "ecto.migrate", "test"],
|
test: ["ecto.create --quiet", "ecto.migrate", "test"],
|
||||||
docs: ["pleroma.docs", "docs"],
|
docs: ["pleroma.docs", "docs"],
|
||||||
analyze: ["credo --strict --only=warnings,todo,fixme,consistency,readability"]
|
analyze: ["credo --strict --only=warnings,todo,fixme,consistency,readability"],
|
||||||
|
copyright: &add_copyright/1,
|
||||||
|
"copyright.bump": &bump_copyright/1
|
||||||
]
|
]
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@ -332,4 +334,30 @@ defmodule Pleroma.Mixfile do
|
||||||
|> Enum.filter(fn string -> string && string != "" end)
|
|> Enum.filter(fn string -> string && string != "" end)
|
||||||
|> Enum.join()
|
|> Enum.join()
|
||||||
end
|
end
|
||||||
|
|
||||||
|
defp add_copyright(_) do
|
||||||
|
year = NaiveDateTime.utc_now().year
|
||||||
|
template = ~s[\
|
||||||
|
# Pleroma: A lightweight social networking server
|
||||||
|
# Copyright © 2017-#{year} Pleroma Authors <https://pleroma.social/>
|
||||||
|
# SPDX-License-Identifier: AGPL-3.0-only
|
||||||
|
|
||||||
|
] |> String.replace("\n", "\\n")
|
||||||
|
|
||||||
|
find = "find lib test priv -type f \\( -name '*.ex' -or -name '*.exs' \\) -exec "
|
||||||
|
grep = "grep -L '# Copyright © [0-9\-]* Pleroma' {} \\;"
|
||||||
|
xargs = "xargs -n1 sed -i'' '1s;^;#{template};'"
|
||||||
|
|
||||||
|
:os.cmd(String.to_charlist("#{find}#{grep} | #{xargs}"))
|
||||||
|
end
|
||||||
|
|
||||||
|
defp bump_copyright(_) do
|
||||||
|
year = NaiveDateTime.utc_now().year
|
||||||
|
find = "find lib test priv -type f \\( -name '*.ex' -or -name '*.exs' \\)"
|
||||||
|
|
||||||
|
xargs =
|
||||||
|
"xargs sed -i'' 's;# Copyright © [0-9\-]* Pleroma.*$;# Copyright © 2017-#{year} Pleroma Authors <https://pleroma.social/>;'"
|
||||||
|
|
||||||
|
:os.cmd(String.to_charlist("#{find} | #{xargs}"))
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
8
mix.lock
8
mix.lock
|
@ -15,7 +15,7 @@
|
||||||
"combine": {:hex, :combine, "0.10.0", "eff8224eeb56498a2af13011d142c5e7997a80c8f5b97c499f84c841032e429f", [:mix], [], "hexpm", "1b1dbc1790073076580d0d1d64e42eae2366583e7aecd455d1215b0d16f2451b"},
|
"combine": {:hex, :combine, "0.10.0", "eff8224eeb56498a2af13011d142c5e7997a80c8f5b97c499f84c841032e429f", [:mix], [], "hexpm", "1b1dbc1790073076580d0d1d64e42eae2366583e7aecd455d1215b0d16f2451b"},
|
||||||
"comeonin": {:hex, :comeonin, "5.3.1", "7fe612b739c78c9c1a75186ef2d322ce4d25032d119823269d0aa1e2f1e20025", [:mix], [], "hexpm", "d6222483060c17f0977fad1b7401ef0c5863c985a64352755f366aee3799c245"},
|
"comeonin": {:hex, :comeonin, "5.3.1", "7fe612b739c78c9c1a75186ef2d322ce4d25032d119823269d0aa1e2f1e20025", [:mix], [], "hexpm", "d6222483060c17f0977fad1b7401ef0c5863c985a64352755f366aee3799c245"},
|
||||||
"concurrent_limiter": {:git, "https://git.pleroma.social/pleroma/elixir-libraries/concurrent_limiter.git", "d81be41024569330f296fc472e24198d7499ba78", [ref: "d81be41024569330f296fc472e24198d7499ba78"]},
|
"concurrent_limiter": {:git, "https://git.pleroma.social/pleroma/elixir-libraries/concurrent_limiter.git", "d81be41024569330f296fc472e24198d7499ba78", [ref: "d81be41024569330f296fc472e24198d7499ba78"]},
|
||||||
"connection": {:hex, :connection, "1.0.4", "a1cae72211f0eef17705aaededacac3eb30e6625b04a6117c1b2db6ace7d5976", [:mix], [], "hexpm", "4a0850c9be22a43af9920a71ab17c051f5f7d45c209e40269a1938832510e4d9"},
|
"connection": {:hex, :connection, "1.1.0", "ff2a49c4b75b6fb3e674bfc5536451607270aac754ffd1bdfe175abe4a6d7a68", [:mix], [], "hexpm", "722c1eb0a418fbe91ba7bd59a47e28008a189d47e37e0e7bb85585a016b2869c"},
|
||||||
"cors_plug": {:hex, :cors_plug, "2.0.2", "2b46083af45e4bc79632bd951550509395935d3e7973275b2b743bd63cc942ce", [:mix], [{:plug, "~> 1.8", [hex: :plug, repo: "hexpm", optional: false]}], "hexpm", "f0d0e13f71c51fd4ef8b2c7e051388e4dfb267522a83a22392c856de7e46465f"},
|
"cors_plug": {:hex, :cors_plug, "2.0.2", "2b46083af45e4bc79632bd951550509395935d3e7973275b2b743bd63cc942ce", [:mix], [{:plug, "~> 1.8", [hex: :plug, repo: "hexpm", optional: false]}], "hexpm", "f0d0e13f71c51fd4ef8b2c7e051388e4dfb267522a83a22392c856de7e46465f"},
|
||||||
"cowboy": {:hex, :cowboy, "2.8.0", "f3dc62e35797ecd9ac1b50db74611193c29815401e53bac9a5c0577bd7bc667d", [:rebar3], [{:cowlib, "~> 2.9.1", [hex: :cowlib, repo: "hexpm", optional: false]}, {:ranch, "~> 1.7.1", [hex: :ranch, repo: "hexpm", optional: false]}], "hexpm", "4643e4fba74ac96d4d152c75803de6fad0b3fa5df354c71afdd6cbeeb15fac8a"},
|
"cowboy": {:hex, :cowboy, "2.8.0", "f3dc62e35797ecd9ac1b50db74611193c29815401e53bac9a5c0577bd7bc667d", [:rebar3], [{:cowlib, "~> 2.9.1", [hex: :cowlib, repo: "hexpm", optional: false]}, {:ranch, "~> 1.7.1", [hex: :ranch, repo: "hexpm", optional: false]}], "hexpm", "4643e4fba74ac96d4d152c75803de6fad0b3fa5df354c71afdd6cbeeb15fac8a"},
|
||||||
"cowboy_telemetry": {:hex, :cowboy_telemetry, "0.3.0", "69fdb5cf92df6373e15675eb4018cf629f5d8e35e74841bb637d6596cb797bbc", [:rebar3], [{:cowboy, "~> 2.7", [hex: :cowboy, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "42868c229d9a2900a1501c5d0355bfd46e24c862c322b0b4f5a6f14fe0216753"},
|
"cowboy_telemetry": {:hex, :cowboy_telemetry, "0.3.0", "69fdb5cf92df6373e15675eb4018cf629f5d8e35e74841bb637d6596cb797bbc", [:rebar3], [{:cowboy, "~> 2.7", [hex: :cowboy, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "42868c229d9a2900a1501c5d0355bfd46e24c862c322b0b4f5a6f14fe0216753"},
|
||||||
|
@ -24,7 +24,7 @@
|
||||||
"crontab": {:hex, :crontab, "1.1.8", "2ce0e74777dfcadb28a1debbea707e58b879e6aa0ffbf9c9bb540887bce43617", [:mix], [{:ecto, "~> 1.0 or ~> 2.0 or ~> 3.0", [hex: :ecto, repo: "hexpm", optional: true]}], "hexpm"},
|
"crontab": {:hex, :crontab, "1.1.8", "2ce0e74777dfcadb28a1debbea707e58b879e6aa0ffbf9c9bb540887bce43617", [:mix], [{:ecto, "~> 1.0 or ~> 2.0 or ~> 3.0", [hex: :ecto, repo: "hexpm", optional: true]}], "hexpm"},
|
||||||
"crypt": {:git, "https://git.pleroma.social/pleroma/elixir-libraries/crypt.git", "cf2aa3f11632e8b0634810a15b3e612c7526f6a3", [ref: "cf2aa3f11632e8b0634810a15b3e612c7526f6a3"]},
|
"crypt": {:git, "https://git.pleroma.social/pleroma/elixir-libraries/crypt.git", "cf2aa3f11632e8b0634810a15b3e612c7526f6a3", [ref: "cf2aa3f11632e8b0634810a15b3e612c7526f6a3"]},
|
||||||
"custom_base": {:hex, :custom_base, "0.2.1", "4a832a42ea0552299d81652aa0b1f775d462175293e99dfbe4d7dbaab785a706", [:mix], [], "hexpm", "8df019facc5ec9603e94f7270f1ac73ddf339f56ade76a721eaa57c1493ba463"},
|
"custom_base": {:hex, :custom_base, "0.2.1", "4a832a42ea0552299d81652aa0b1f775d462175293e99dfbe4d7dbaab785a706", [:mix], [], "hexpm", "8df019facc5ec9603e94f7270f1ac73ddf339f56ade76a721eaa57c1493ba463"},
|
||||||
"db_connection": {:hex, :db_connection, "2.2.2", "3bbca41b199e1598245b716248964926303b5d4609ff065125ce98bcd368939e", [:mix], [{:connection, "~> 1.0.2", [hex: :connection, repo: "hexpm", optional: false]}], "hexpm", "642af240d8a8affb93b4ba5a6fcd2bbcbdc327e1a524b825d383711536f8070c"},
|
"db_connection": {:hex, :db_connection, "2.3.1", "4c9f3ed1ef37471cbdd2762d6655be11e38193904d9c5c1c9389f1b891a3088e", [:mix], [{:connection, "~> 1.0", [hex: :connection, repo: "hexpm", optional: false]}], "hexpm", "abaab61780dde30301d840417890bd9f74131041afd02174cf4e10635b3a63f5"},
|
||||||
"decimal": {:hex, :decimal, "2.0.0", "a78296e617b0f5dd4c6caf57c714431347912ffb1d0842e998e9792b5642d697", [:mix], [], "hexpm", "34666e9c55dea81013e77d9d87370fe6cb6291d1ef32f46a1600230b1d44f577"},
|
"decimal": {:hex, :decimal, "2.0.0", "a78296e617b0f5dd4c6caf57c714431347912ffb1d0842e998e9792b5642d697", [:mix], [], "hexpm", "34666e9c55dea81013e77d9d87370fe6cb6291d1ef32f46a1600230b1d44f577"},
|
||||||
"deep_merge": {:hex, :deep_merge, "1.0.0", "b4aa1a0d1acac393bdf38b2291af38cb1d4a52806cf7a4906f718e1feb5ee961", [:mix], [], "hexpm", "ce708e5f094b9cd4e8f2be4f00d2f4250c4095be93f8cd6d018c753894885430"},
|
"deep_merge": {:hex, :deep_merge, "1.0.0", "b4aa1a0d1acac393bdf38b2291af38cb1d4a52806cf7a4906f718e1feb5ee961", [:mix], [], "hexpm", "ce708e5f094b9cd4e8f2be4f00d2f4250c4095be93f8cd6d018c753894885430"},
|
||||||
"earmark": {:hex, :earmark, "1.4.3", "364ca2e9710f6bff494117dbbd53880d84bebb692dafc3a78eb50aa3183f2bfd", [:mix], [], "hexpm", "8cf8a291ebf1c7b9539e3cddb19e9cef066c2441b1640f13c34c1d3cfc825fec"},
|
"earmark": {:hex, :earmark, "1.4.3", "364ca2e9710f6bff494117dbbd53880d84bebb692dafc3a78eb50aa3183f2bfd", [:mix], [], "hexpm", "8cf8a291ebf1c7b9539e3cddb19e9cef066c2441b1640f13c34c1d3cfc825fec"},
|
||||||
|
@ -81,7 +81,7 @@
|
||||||
"nimble_parsec": {:hex, :nimble_parsec, "0.6.0", "32111b3bf39137144abd7ba1cce0914533b2d16ef35e8abc5ec8be6122944263", [:mix], [], "hexpm", "27eac315a94909d4dc68bc07a4a83e06c8379237c5ea528a9acff4ca1c873c52"},
|
"nimble_parsec": {:hex, :nimble_parsec, "0.6.0", "32111b3bf39137144abd7ba1cce0914533b2d16ef35e8abc5ec8be6122944263", [:mix], [], "hexpm", "27eac315a94909d4dc68bc07a4a83e06c8379237c5ea528a9acff4ca1c873c52"},
|
||||||
"nimble_pool": {:hex, :nimble_pool, "0.1.0", "ffa9d5be27eee2b00b0c634eb649aa27f97b39186fec3c493716c2a33e784ec6", [:mix], [], "hexpm", "343a1eaa620ddcf3430a83f39f2af499fe2370390d4f785cd475b4df5acaf3f9"},
|
"nimble_pool": {:hex, :nimble_pool, "0.1.0", "ffa9d5be27eee2b00b0c634eb649aa27f97b39186fec3c493716c2a33e784ec6", [:mix], [], "hexpm", "343a1eaa620ddcf3430a83f39f2af499fe2370390d4f785cd475b4df5acaf3f9"},
|
||||||
"nodex": {:git, "https://git.pleroma.social/pleroma/nodex", "cb6730f943cfc6aad674c92161be23a8411f15d1", [ref: "cb6730f943cfc6aad674c92161be23a8411f15d1"]},
|
"nodex": {:git, "https://git.pleroma.social/pleroma/nodex", "cb6730f943cfc6aad674c92161be23a8411f15d1", [ref: "cb6730f943cfc6aad674c92161be23a8411f15d1"]},
|
||||||
"oban": {:hex, :oban, "2.1.0", "034144686f7e76a102b5d67731f098d98a9e4a52b07c25ad580a01f83a7f1cf5", [:mix], [{:ecto_sql, ">= 3.4.3", [hex: :ecto_sql, repo: "hexpm", optional: false]}, {:jason, "~> 1.1", [hex: :jason, repo: "hexpm", optional: false]}, {:postgrex, "~> 0.14", [hex: :postgrex, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "c6f067fa3b308ed9e0e6beb2b34277c9c4e48bf95338edabd8f4a757a26e04c2"},
|
"oban": {:hex, :oban, "2.3.4", "ec7509b9af2524d55f529cb7aee93d36131ae0bf0f37706f65d2fe707f4d9fd8", [:mix], [{:ecto_sql, ">= 3.4.3", [hex: :ecto_sql, repo: "hexpm", optional: false]}, {:jason, "~> 1.1", [hex: :jason, repo: "hexpm", optional: false]}, {:postgrex, "~> 0.14", [hex: :postgrex, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "c70ca0434758fd1805422ea4446af5e910ddc697c0c861549c8f0eb0cfbd2fdf"},
|
||||||
"open_api_spex": {:git, "https://git.pleroma.social/pleroma/elixir-libraries/open_api_spex.git", "f296ac0924ba3cf79c7a588c4c252889df4c2edd", [ref: "f296ac0924ba3cf79c7a588c4c252889df4c2edd"]},
|
"open_api_spex": {:git, "https://git.pleroma.social/pleroma/elixir-libraries/open_api_spex.git", "f296ac0924ba3cf79c7a588c4c252889df4c2edd", [ref: "f296ac0924ba3cf79c7a588c4c252889df4c2edd"]},
|
||||||
"p1_utils": {:hex, :p1_utils, "1.0.18", "3fe224de5b2e190d730a3c5da9d6e8540c96484cf4b4692921d1e28f0c32b01c", [:rebar3], [], "hexpm", "1fc8773a71a15553b179c986b22fbeead19b28fe486c332d4929700ffeb71f88"},
|
"p1_utils": {:hex, :p1_utils, "1.0.18", "3fe224de5b2e190d730a3c5da9d6e8540c96484cf4b4692921d1e28f0c32b01c", [:rebar3], [], "hexpm", "1fc8773a71a15553b179c986b22fbeead19b28fe486c332d4929700ffeb71f88"},
|
||||||
"parse_trans": {:git, "https://github.com/uwiger/parse_trans.git", "76abb347c3c1d00fb0ccf9e4b43e22b3d2288484", [tag: "3.3.0"]},
|
"parse_trans": {:git, "https://github.com/uwiger/parse_trans.git", "76abb347c3c1d00fb0ccf9e4b43e22b3d2288484", [tag: "3.3.0"]},
|
||||||
|
@ -97,7 +97,7 @@
|
||||||
"plug_static_index_html": {:hex, :plug_static_index_html, "1.0.0", "840123d4d3975585133485ea86af73cb2600afd7f2a976f9f5fd8b3808e636a0", [:mix], [{:plug, "~> 1.0", [hex: :plug, repo: "hexpm", optional: false]}], "hexpm", "79fd4fcf34d110605c26560cbae8f23c603ec4158c08298bd4360fdea90bb5cf"},
|
"plug_static_index_html": {:hex, :plug_static_index_html, "1.0.0", "840123d4d3975585133485ea86af73cb2600afd7f2a976f9f5fd8b3808e636a0", [:mix], [{:plug, "~> 1.0", [hex: :plug, repo: "hexpm", optional: false]}], "hexpm", "79fd4fcf34d110605c26560cbae8f23c603ec4158c08298bd4360fdea90bb5cf"},
|
||||||
"poison": {:hex, :poison, "3.1.0", "d9eb636610e096f86f25d9a46f35a9facac35609a7591b3be3326e99a0484665", [:mix], [], "hexpm", "fec8660eb7733ee4117b85f55799fd3833eb769a6df71ccf8903e8dc5447cfce"},
|
"poison": {:hex, :poison, "3.1.0", "d9eb636610e096f86f25d9a46f35a9facac35609a7591b3be3326e99a0484665", [:mix], [], "hexpm", "fec8660eb7733ee4117b85f55799fd3833eb769a6df71ccf8903e8dc5447cfce"},
|
||||||
"poolboy": {:hex, :poolboy, "1.5.2", "392b007a1693a64540cead79830443abf5762f5d30cf50bc95cb2c1aaafa006b", [:rebar3], [], "hexpm", "dad79704ce5440f3d5a3681c8590b9dc25d1a561e8f5a9c995281012860901e3"},
|
"poolboy": {:hex, :poolboy, "1.5.2", "392b007a1693a64540cead79830443abf5762f5d30cf50bc95cb2c1aaafa006b", [:rebar3], [], "hexpm", "dad79704ce5440f3d5a3681c8590b9dc25d1a561e8f5a9c995281012860901e3"},
|
||||||
"postgrex": {:hex, :postgrex, "0.15.6", "a464c72010a56e3214fe2b99c1a76faab4c2bb0255cabdef30dea763a3569aa2", [:mix], [{:connection, "~> 1.0", [hex: :connection, repo: "hexpm", optional: false]}, {:db_connection, "~> 2.1", [hex: :db_connection, repo: "hexpm", optional: false]}, {:decimal, "~> 1.5 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "f99268325ac8f66ffd6c4964faab9e70fbf721234ab2ad238c00f9530b8cdd55"},
|
"postgrex": {:hex, :postgrex, "0.15.7", "724410acd48abac529d0faa6c2a379fb8ae2088e31247687b16cacc0e0883372", [:mix], [{:connection, "~> 1.0", [hex: :connection, repo: "hexpm", optional: false]}, {:db_connection, "~> 2.1", [hex: :db_connection, repo: "hexpm", optional: false]}, {:decimal, "~> 1.5 or ~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "88310c010ff047cecd73d5ceca1d99205e4b1ab1b9abfdab7e00f5c9d20ef8f9"},
|
||||||
"pot": {:hex, :pot, "0.11.0", "61bad869a94534739dd4614a25a619bc5c47b9970e9a0ea5bef4628036fc7a16", [:rebar3], [], "hexpm", "57ee6ee6bdeb639661ffafb9acefe3c8f966e45394de6a766813bb9e1be4e54b"},
|
"pot": {:hex, :pot, "0.11.0", "61bad869a94534739dd4614a25a619bc5c47b9970e9a0ea5bef4628036fc7a16", [:rebar3], [], "hexpm", "57ee6ee6bdeb639661ffafb9acefe3c8f966e45394de6a766813bb9e1be4e54b"},
|
||||||
"prometheus": {:hex, :prometheus, "4.6.0", "20510f381db1ccab818b4cf2fac5fa6ab5cc91bc364a154399901c001465f46f", [:mix, :rebar3], [], "hexpm", "4905fd2992f8038eccd7aa0cd22f40637ed618c0bed1f75c05aacec15b7545de"},
|
"prometheus": {:hex, :prometheus, "4.6.0", "20510f381db1ccab818b4cf2fac5fa6ab5cc91bc364a154399901c001465f46f", [:mix, :rebar3], [], "hexpm", "4905fd2992f8038eccd7aa0cd22f40637ed618c0bed1f75c05aacec15b7545de"},
|
||||||
"prometheus_ecto": {:hex, :prometheus_ecto, "1.4.3", "3dd4da1812b8e0dbee81ea58bb3b62ed7588f2eae0c9e97e434c46807ff82311", [:mix], [{:ecto, "~> 2.0 or ~> 3.0", [hex: :ecto, repo: "hexpm", optional: false]}, {:prometheus_ex, "~> 1.1 or ~> 2.0 or ~> 3.0", [hex: :prometheus_ex, repo: "hexpm", optional: false]}], "hexpm", "8d66289f77f913b37eda81fd287340c17e61a447549deb28efc254532b2bed82"},
|
"prometheus_ecto": {:hex, :prometheus_ecto, "1.4.3", "3dd4da1812b8e0dbee81ea58bb3b62ed7588f2eae0c9e97e434c46807ff82311", [:mix], [{:ecto, "~> 2.0 or ~> 3.0", [hex: :ecto, repo: "hexpm", optional: false]}, {:prometheus_ex, "~> 1.1 or ~> 2.0 or ~> 3.0", [hex: :prometheus_ex, repo: "hexpm", optional: false]}], "hexpm", "8d66289f77f913b37eda81fd287340c17e61a447549deb28efc254532b2bed82"},
|
||||||
|
|
|
@ -1,6 +1,9 @@
|
||||||
defmodule Pleroma.Repo.Migrations.AddObanJobsTable do
|
defmodule Pleroma.Repo.Migrations.AddObanJobsTable do
|
||||||
use Ecto.Migration
|
use Ecto.Migration
|
||||||
|
|
||||||
defdelegate up, to: Oban.Migrations
|
def up do
|
||||||
|
Oban.Migrations.up(version: 2)
|
||||||
|
end
|
||||||
|
|
||||||
defdelegate down, to: Oban.Migrations
|
defdelegate down, to: Oban.Migrations
|
||||||
end
|
end
|
||||||
|
|
|
@ -6,6 +6,6 @@ defmodule Pleroma.Repo.Migrations.UpdateOban do
|
||||||
end
|
end
|
||||||
|
|
||||||
def down do
|
def down do
|
||||||
Oban.Migrations.down(version: 2)
|
Oban.Migrations.down(version: 3)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -6,6 +6,6 @@ defmodule Pleroma.Repo.Migrations.UpdateObanJobsTable do
|
||||||
end
|
end
|
||||||
|
|
||||||
def down do
|
def down do
|
||||||
Oban.Migrations.down(version: 7)
|
Oban.Migrations.down(version: 8)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -6,6 +6,8 @@ defmodule Pleroma.Repo.Migrations.MoveActivityExpirationsToOban do
|
||||||
def change do
|
def change do
|
||||||
Pleroma.Config.Oban.warn()
|
Pleroma.Config.Oban.warn()
|
||||||
|
|
||||||
|
Application.ensure_all_started(:oban)
|
||||||
|
|
||||||
Supervisor.start_link([{Oban, Pleroma.Config.get(Oban)}],
|
Supervisor.start_link([{Oban, Pleroma.Config.get(Oban)}],
|
||||||
strategy: :one_for_one,
|
strategy: :one_for_one,
|
||||||
name: Pleroma.Supervisor
|
name: Pleroma.Supervisor
|
||||||
|
|
|
@ -6,6 +6,8 @@ defmodule Pleroma.Repo.Migrations.MoveTokensExpirationIntoOban do
|
||||||
def change do
|
def change do
|
||||||
Pleroma.Config.Oban.warn()
|
Pleroma.Config.Oban.warn()
|
||||||
|
|
||||||
|
Application.ensure_all_started(:oban)
|
||||||
|
|
||||||
Supervisor.start_link([{Oban, Pleroma.Config.get(Oban)}],
|
Supervisor.start_link([{Oban, Pleroma.Config.get(Oban)}],
|
||||||
strategy: :one_for_one,
|
strategy: :one_for_one,
|
||||||
name: Pleroma.Supervisor
|
name: Pleroma.Supervisor
|
||||||
|
|
|
@ -0,0 +1,57 @@
|
||||||
|
# Pleroma: A lightweight social networking server
|
||||||
|
# Copyright © 2017-2021 Pleroma Authors <https://pleroma.social/>
|
||||||
|
# SPDX-License-Identifier: AGPL-3.0-only
|
||||||
|
|
||||||
|
defmodule Pleroma.Repo.Migrations.DeprecatePublicEndpoint do
|
||||||
|
use Ecto.Migration
|
||||||
|
|
||||||
|
def up do
|
||||||
|
with %Pleroma.ConfigDB{} = s3_config <-
|
||||||
|
Pleroma.ConfigDB.get_by_params(%{group: :pleroma, key: Pleroma.Uploaders.S3}),
|
||||||
|
%Pleroma.ConfigDB{} = upload_config <-
|
||||||
|
Pleroma.ConfigDB.get_by_params(%{group: :pleroma, key: Pleroma.Upload}) do
|
||||||
|
public_endpoint = s3_config.value[:public_endpoint]
|
||||||
|
|
||||||
|
if !is_nil(public_endpoint) do
|
||||||
|
upload_value = upload_config.value |> Keyword.merge(base_url: public_endpoint)
|
||||||
|
|
||||||
|
upload_config
|
||||||
|
|> Ecto.Changeset.change(value: upload_value)
|
||||||
|
|> Pleroma.Repo.update()
|
||||||
|
|
||||||
|
s3_value = s3_config.value |> Keyword.delete(:public_endpoint)
|
||||||
|
|
||||||
|
s3_config
|
||||||
|
|> Ecto.Changeset.change(value: s3_value)
|
||||||
|
|> Pleroma.Repo.update()
|
||||||
|
end
|
||||||
|
else
|
||||||
|
_ -> :ok
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
def down do
|
||||||
|
with %Pleroma.ConfigDB{} = upload_config <-
|
||||||
|
Pleroma.ConfigDB.get_by_params(%{group: :pleroma, key: Pleroma.Upload}),
|
||||||
|
%Pleroma.ConfigDB{} = s3_config <-
|
||||||
|
Pleroma.ConfigDB.get_by_params(%{group: :pleroma, key: Pleroma.Uploaders.S3}) do
|
||||||
|
base_url = upload_config.value[:base_url]
|
||||||
|
|
||||||
|
if !is_nil(base_url) do
|
||||||
|
s3_value = s3_config.value |> Keyword.merge(public_endpoint: base_url)
|
||||||
|
|
||||||
|
s3_config
|
||||||
|
|> Ecto.Changeset.change(value: s3_value)
|
||||||
|
|> Pleroma.Repo.update()
|
||||||
|
|
||||||
|
upload_value = upload_config.value |> Keyword.delete(:base_url)
|
||||||
|
|
||||||
|
upload_config
|
||||||
|
|> Ecto.Changeset.change(value: upload_value)
|
||||||
|
|> Pleroma.Repo.update()
|
||||||
|
end
|
||||||
|
else
|
||||||
|
_ -> :ok
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
|
@ -0,0 +1,15 @@
|
||||||
|
# Pleroma: A lightweight social networking server
|
||||||
|
# Copyright © 2017-2021 Pleroma Authors <https://pleroma.social/>
|
||||||
|
# SPDX-License-Identifier: AGPL-3.0-only
|
||||||
|
|
||||||
|
defmodule Pleroma.Repo.Migrations.UpgradeObanJobsToV9 do
|
||||||
|
use Ecto.Migration
|
||||||
|
|
||||||
|
def up do
|
||||||
|
Oban.Migrations.up(version: 9)
|
||||||
|
end
|
||||||
|
|
||||||
|
def down do
|
||||||
|
Oban.Migrations.down(version: 9)
|
||||||
|
end
|
||||||
|
end
|
|
@ -49,12 +49,18 @@ config :pleroma, Pleroma.Uploaders.Local, uploads: "<%= uploads_dir %>"
|
||||||
# sts: true
|
# sts: true
|
||||||
|
|
||||||
# Configure S3 support if desired.
|
# Configure S3 support if desired.
|
||||||
# The public S3 endpoint is different depending on region and provider,
|
# The public S3 endpoint (base_url) is different depending on region and provider,
|
||||||
# consult your S3 provider's documentation for details on what to use.
|
# consult your S3 provider's documentation for details on what to use.
|
||||||
#
|
#
|
||||||
|
# config :pleroma, Pleroma.Upload,
|
||||||
|
# uploader: Pleroma.Uploaders.S3,
|
||||||
|
# base_url: "https://s3.amazonaws.com"
|
||||||
|
#
|
||||||
# config :pleroma, Pleroma.Uploaders.S3,
|
# config :pleroma, Pleroma.Uploaders.S3,
|
||||||
# bucket: "some-bucket",
|
# bucket: "some-bucket",
|
||||||
# public_endpoint: "https://s3.amazonaws.com"
|
# bucket_namespace: "my-namespace",
|
||||||
|
# truncated_namespace: nil,
|
||||||
|
# streaming_enabled: true
|
||||||
#
|
#
|
||||||
# Configure S3 credentials:
|
# Configure S3 credentials:
|
||||||
# config :ex_aws, :s3,
|
# config :ex_aws, :s3,
|
||||||
|
|
|
@ -94,6 +94,15 @@ defmodule Pleroma.Config.DeprecationWarningsTest do
|
||||||
end) =~ "Your config is using old namespace for activity expiration configuration."
|
end) =~ "Your config is using old namespace for activity expiration configuration."
|
||||||
end
|
end
|
||||||
|
|
||||||
|
test "check_uploders_s3_public_endpoint/0" do
|
||||||
|
clear_config(Pleroma.Uploaders.S3, public_endpoint: "https://fake.amazonaws.com/bucket/")
|
||||||
|
|
||||||
|
assert capture_log(fn ->
|
||||||
|
DeprecationWarnings.check_uploders_s3_public_endpoint()
|
||||||
|
end) =~
|
||||||
|
"Your config is using the old setting for controlling the URL of media uploaded to your S3 bucket."
|
||||||
|
end
|
||||||
|
|
||||||
describe "check_gun_pool_options/0" do
|
describe "check_gun_pool_options/0" do
|
||||||
test "await_up_timeout" do
|
test "await_up_timeout" do
|
||||||
config = Config.get(:connections_pool)
|
config = Config.get(:connections_pool)
|
||||||
|
|
|
@ -19,7 +19,6 @@ defmodule Pleroma.Gun.ConnectionPoolTest do
|
||||||
:ok
|
:ok
|
||||||
end
|
end
|
||||||
|
|
||||||
setup :set_mox_from_context
|
|
||||||
setup :gun_mock
|
setup :gun_mock
|
||||||
|
|
||||||
test "gives the same connection to 2 concurrent requests" do
|
test "gives the same connection to 2 concurrent requests" do
|
||||||
|
|
|
@ -78,8 +78,8 @@ defmodule Pleroma.ObjectTest do
|
||||||
setup do: clear_config([:instance, :cleanup_attachments])
|
setup do: clear_config([:instance, :cleanup_attachments])
|
||||||
|
|
||||||
test "Disabled via config" do
|
test "Disabled via config" do
|
||||||
Pleroma.Config.put([Pleroma.Upload, :uploader], Pleroma.Uploaders.Local)
|
clear_config([Pleroma.Upload, :uploader], Pleroma.Uploaders.Local)
|
||||||
Pleroma.Config.put([:instance, :cleanup_attachments], false)
|
clear_config([:instance, :cleanup_attachments], false)
|
||||||
|
|
||||||
file = %Plug.Upload{
|
file = %Plug.Upload{
|
||||||
content_type: "image/jpeg",
|
content_type: "image/jpeg",
|
||||||
|
@ -112,8 +112,8 @@ defmodule Pleroma.ObjectTest do
|
||||||
end
|
end
|
||||||
|
|
||||||
test "in subdirectories" do
|
test "in subdirectories" do
|
||||||
Pleroma.Config.put([Pleroma.Upload, :uploader], Pleroma.Uploaders.Local)
|
clear_config([Pleroma.Upload, :uploader], Pleroma.Uploaders.Local)
|
||||||
Pleroma.Config.put([:instance, :cleanup_attachments], true)
|
clear_config([:instance, :cleanup_attachments], true)
|
||||||
|
|
||||||
file = %Plug.Upload{
|
file = %Plug.Upload{
|
||||||
content_type: "image/jpeg",
|
content_type: "image/jpeg",
|
||||||
|
@ -146,9 +146,9 @@ defmodule Pleroma.ObjectTest do
|
||||||
end
|
end
|
||||||
|
|
||||||
test "with dedupe enabled" do
|
test "with dedupe enabled" do
|
||||||
Pleroma.Config.put([Pleroma.Upload, :uploader], Pleroma.Uploaders.Local)
|
clear_config([Pleroma.Upload, :uploader], Pleroma.Uploaders.Local)
|
||||||
Pleroma.Config.put([Pleroma.Upload, :filters], [Pleroma.Upload.Filter.Dedupe])
|
clear_config([Pleroma.Upload, :filters], [Pleroma.Upload.Filter.Dedupe])
|
||||||
Pleroma.Config.put([:instance, :cleanup_attachments], true)
|
clear_config([:instance, :cleanup_attachments], true)
|
||||||
|
|
||||||
uploads_dir = Pleroma.Config.get!([Pleroma.Uploaders.Local, :uploads])
|
uploads_dir = Pleroma.Config.get!([Pleroma.Uploaders.Local, :uploads])
|
||||||
|
|
||||||
|
@ -184,8 +184,8 @@ defmodule Pleroma.ObjectTest do
|
||||||
end
|
end
|
||||||
|
|
||||||
test "with objects that have legacy data.url attribute" do
|
test "with objects that have legacy data.url attribute" do
|
||||||
Pleroma.Config.put([Pleroma.Upload, :uploader], Pleroma.Uploaders.Local)
|
clear_config([Pleroma.Upload, :uploader], Pleroma.Uploaders.Local)
|
||||||
Pleroma.Config.put([:instance, :cleanup_attachments], true)
|
clear_config([:instance, :cleanup_attachments], true)
|
||||||
|
|
||||||
file = %Plug.Upload{
|
file = %Plug.Upload{
|
||||||
content_type: "image/jpeg",
|
content_type: "image/jpeg",
|
||||||
|
@ -220,9 +220,9 @@ defmodule Pleroma.ObjectTest do
|
||||||
end
|
end
|
||||||
|
|
||||||
test "With custom base_url" do
|
test "With custom base_url" do
|
||||||
Pleroma.Config.put([Pleroma.Upload, :uploader], Pleroma.Uploaders.Local)
|
clear_config([Pleroma.Upload, :uploader], Pleroma.Uploaders.Local)
|
||||||
Pleroma.Config.put([Pleroma.Upload, :base_url], "https://sub.domain.tld/dir/")
|
clear_config([Pleroma.Upload, :base_url], "https://sub.domain.tld/dir/")
|
||||||
Pleroma.Config.put([:instance, :cleanup_attachments], true)
|
clear_config([:instance, :cleanup_attachments], true)
|
||||||
|
|
||||||
file = %Plug.Upload{
|
file = %Plug.Upload{
|
||||||
content_type: "image/jpeg",
|
content_type: "image/jpeg",
|
||||||
|
|
|
@ -0,0 +1,60 @@
|
||||||
|
# Pleroma: A lightweight social networking server
|
||||||
|
# Copyright © 2017-2021 Pleroma Authors <https://pleroma.social/>
|
||||||
|
# SPDX-License-Identifier: AGPL-3.0-only
|
||||||
|
|
||||||
|
defmodule Pleroma.Repo.Migrations.DeprecatePublicEndpointTest do
|
||||||
|
use Pleroma.DataCase
|
||||||
|
import Pleroma.Factory
|
||||||
|
import Pleroma.Tests.Helpers
|
||||||
|
alias Pleroma.ConfigDB
|
||||||
|
|
||||||
|
setup do: clear_config(Pleroma.Upload)
|
||||||
|
setup do: clear_config(Pleroma.Uploaders.S3)
|
||||||
|
setup_all do: require_migration("20210113225652_deprecate_public_endpoint")
|
||||||
|
|
||||||
|
test "up/0 migrates public_endpoint to base_url", %{migration: migration} do
|
||||||
|
s3_values = [
|
||||||
|
public_endpoint: "https://coolhost.com/",
|
||||||
|
bucket: "secret_bucket"
|
||||||
|
]
|
||||||
|
|
||||||
|
insert(:config, group: :pleroma, key: Pleroma.Uploaders.S3, value: s3_values)
|
||||||
|
|
||||||
|
upload_values = [
|
||||||
|
uploader: Pleroma.Uploaders.S3
|
||||||
|
]
|
||||||
|
|
||||||
|
insert(:config, group: :pleroma, key: Pleroma.Upload, value: upload_values)
|
||||||
|
|
||||||
|
migration.up()
|
||||||
|
|
||||||
|
assert [bucket: "secret_bucket"] ==
|
||||||
|
ConfigDB.get_by_params(%{group: :pleroma, key: Pleroma.Uploaders.S3}).value
|
||||||
|
|
||||||
|
assert [uploader: Pleroma.Uploaders.S3, base_url: "https://coolhost.com/"] ==
|
||||||
|
ConfigDB.get_by_params(%{group: :pleroma, key: Pleroma.Upload}).value
|
||||||
|
end
|
||||||
|
|
||||||
|
test "down/0 reverts base_url to public_endpoint", %{migration: migration} do
|
||||||
|
s3_values = [
|
||||||
|
bucket: "secret_bucket"
|
||||||
|
]
|
||||||
|
|
||||||
|
insert(:config, group: :pleroma, key: Pleroma.Uploaders.S3, value: s3_values)
|
||||||
|
|
||||||
|
upload_values = [
|
||||||
|
uploader: Pleroma.Uploaders.S3,
|
||||||
|
base_url: "https://coolhost.com/"
|
||||||
|
]
|
||||||
|
|
||||||
|
insert(:config, group: :pleroma, key: Pleroma.Upload, value: upload_values)
|
||||||
|
|
||||||
|
migration.down()
|
||||||
|
|
||||||
|
assert [bucket: "secret_bucket", public_endpoint: "https://coolhost.com/"] ==
|
||||||
|
ConfigDB.get_by_params(%{group: :pleroma, key: Pleroma.Uploaders.S3}).value
|
||||||
|
|
||||||
|
assert [uploader: Pleroma.Uploaders.S3] ==
|
||||||
|
ConfigDB.get_by_params(%{group: :pleroma, key: Pleroma.Upload}).value
|
||||||
|
end
|
||||||
|
end
|
|
@ -4,15 +4,14 @@
|
||||||
|
|
||||||
defmodule Pleroma.ScheduledActivityTest do
|
defmodule Pleroma.ScheduledActivityTest do
|
||||||
use Pleroma.DataCase
|
use Pleroma.DataCase
|
||||||
alias Pleroma.DataCase
|
|
||||||
alias Pleroma.ScheduledActivity
|
alias Pleroma.ScheduledActivity
|
||||||
|
|
||||||
import Pleroma.Factory
|
import Pleroma.Factory
|
||||||
|
|
||||||
setup do: clear_config([ScheduledActivity, :enabled])
|
setup do: clear_config([ScheduledActivity, :enabled])
|
||||||
|
|
||||||
setup context do
|
setup [:ensure_local_uploader]
|
||||||
DataCase.ensure_local_uploader(context)
|
|
||||||
end
|
|
||||||
|
|
||||||
describe "creation" do
|
describe "creation" do
|
||||||
test "scheduled activities with jobs when ScheduledActivity enabled" do
|
test "scheduled activities with jobs when ScheduledActivity enabled" do
|
||||||
|
|
|
@ -133,7 +133,7 @@ defmodule Pleroma.UploadTest do
|
||||||
|
|
||||||
assert %{"url" => [%{"href" => url}]} = data
|
assert %{"url" => [%{"href" => url}]} = data
|
||||||
|
|
||||||
assert String.starts_with?(url, Pleroma.Web.base_url() <> "/media/")
|
assert String.starts_with?(url, Pleroma.Upload.base_url())
|
||||||
end
|
end
|
||||||
|
|
||||||
test "copies the file to the configured folder with deduping" do
|
test "copies the file to the configured folder with deduping" do
|
||||||
|
@ -148,8 +148,8 @@ defmodule Pleroma.UploadTest do
|
||||||
{:ok, data} = Upload.store(file, filters: [Pleroma.Upload.Filter.Dedupe])
|
{:ok, data} = Upload.store(file, filters: [Pleroma.Upload.Filter.Dedupe])
|
||||||
|
|
||||||
assert List.first(data["url"])["href"] ==
|
assert List.first(data["url"])["href"] ==
|
||||||
Pleroma.Web.base_url() <>
|
Pleroma.Upload.base_url() <>
|
||||||
"/media/e30397b58d226d6583ab5b8b3c5defb0c682bda5c31ef07a9f57c1c4986e3781.jpg"
|
"e30397b58d226d6583ab5b8b3c5defb0c682bda5c31ef07a9f57c1c4986e3781.jpg"
|
||||||
end
|
end
|
||||||
|
|
||||||
test "copies the file to the configured folder without deduping" do
|
test "copies the file to the configured folder without deduping" do
|
||||||
|
|
|
@ -12,14 +12,10 @@ defmodule Pleroma.Uploaders.S3Test do
|
||||||
import ExUnit.CaptureLog
|
import ExUnit.CaptureLog
|
||||||
|
|
||||||
setup do
|
setup do
|
||||||
clear_config(Pleroma.Upload,
|
clear_config([Pleroma.Upload, :uploader], Pleroma.Uploaders.S3)
|
||||||
uploader: Pleroma.Uploaders.S3
|
clear_config([Pleroma.Upload, :base_url], "https://s3.amazonaws.com")
|
||||||
)
|
clear_config([Pleroma.Uploaders.S3])
|
||||||
|
clear_config([Pleroma.Uploaders.S3, :bucket], "test_bucket")
|
||||||
clear_config(Pleroma.Uploaders.S3,
|
|
||||||
bucket: "test_bucket",
|
|
||||||
public_endpoint: "https://s3.amazonaws.com"
|
|
||||||
)
|
|
||||||
end
|
end
|
||||||
|
|
||||||
describe "get_file/1" do
|
describe "get_file/1" do
|
||||||
|
@ -33,10 +29,12 @@ defmodule Pleroma.Uploaders.S3Test do
|
||||||
test "it returns path without bucket when truncated_namespace set to ''" do
|
test "it returns path without bucket when truncated_namespace set to ''" do
|
||||||
Config.put([Pleroma.Uploaders.S3],
|
Config.put([Pleroma.Uploaders.S3],
|
||||||
bucket: "test_bucket",
|
bucket: "test_bucket",
|
||||||
public_endpoint: "https://s3.amazonaws.com",
|
bucket_namespace: "myaccount",
|
||||||
truncated_namespace: ""
|
truncated_namespace: ""
|
||||||
)
|
)
|
||||||
|
|
||||||
|
Config.put([Pleroma.Upload, :base_url], "https://s3.amazonaws.com")
|
||||||
|
|
||||||
assert S3.get_file("test_image.jpg") == {
|
assert S3.get_file("test_image.jpg") == {
|
||||||
:ok,
|
:ok,
|
||||||
{:url, "https://s3.amazonaws.com/test_image.jpg"}
|
{:url, "https://s3.amazonaws.com/test_image.jpg"}
|
||||||
|
@ -46,7 +44,6 @@ defmodule Pleroma.Uploaders.S3Test do
|
||||||
test "it returns path with bucket namespace when namespace is set" do
|
test "it returns path with bucket namespace when namespace is set" do
|
||||||
Config.put([Pleroma.Uploaders.S3],
|
Config.put([Pleroma.Uploaders.S3],
|
||||||
bucket: "test_bucket",
|
bucket: "test_bucket",
|
||||||
public_endpoint: "https://s3.amazonaws.com",
|
|
||||||
bucket_namespace: "family"
|
bucket_namespace: "family"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
|
@ -195,12 +195,8 @@ defmodule Pleroma.User.BackupTest do
|
||||||
|
|
||||||
describe "it uploads and deletes a backup archive" do
|
describe "it uploads and deletes a backup archive" do
|
||||||
setup do
|
setup do
|
||||||
clear_config(Pleroma.Uploaders.S3,
|
clear_config([Pleroma.Upload, :base_url], "https://s3.amazonaws.com")
|
||||||
bucket: "test_bucket",
|
clear_config([Pleroma.Uploaders.S3, :bucket], "test_bucket")
|
||||||
public_endpoint: "https://s3.amazonaws.com"
|
|
||||||
)
|
|
||||||
|
|
||||||
clear_config([Pleroma.Upload, :uploader])
|
|
||||||
|
|
||||||
user = insert(:user, %{nickname: "cofe", name: "Cofe", ap_id: "http://cofe.io/users/cofe"})
|
user = insert(:user, %{nickname: "cofe", name: "Cofe", ap_id: "http://cofe.io/users/cofe"})
|
||||||
|
|
||||||
|
@ -219,7 +215,8 @@ defmodule Pleroma.User.BackupTest do
|
||||||
end
|
end
|
||||||
|
|
||||||
test "S3", %{path: path, backup: backup} do
|
test "S3", %{path: path, backup: backup} do
|
||||||
Pleroma.Config.put([Pleroma.Upload, :uploader], Pleroma.Uploaders.S3)
|
clear_config([Pleroma.Upload, :uploader], Pleroma.Uploaders.S3)
|
||||||
|
clear_config([Pleroma.Uploaders.S3, :streaming_enabled], false)
|
||||||
|
|
||||||
with_mock ExAws,
|
with_mock ExAws,
|
||||||
request: fn
|
request: fn
|
||||||
|
@ -229,13 +226,10 @@ defmodule Pleroma.User.BackupTest do
|
||||||
assert {:ok, %Pleroma.Upload{}} = Backup.upload(backup, path)
|
assert {:ok, %Pleroma.Upload{}} = Backup.upload(backup, path)
|
||||||
assert {:ok, _backup} = Backup.delete(backup)
|
assert {:ok, _backup} = Backup.delete(backup)
|
||||||
end
|
end
|
||||||
|
|
||||||
with_mock ExAws, request: fn %{http_method: :delete} -> {:ok, %{status_code: 204}} end do
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
|
|
||||||
test "Local", %{path: path, backup: backup} do
|
test "Local", %{path: path, backup: backup} do
|
||||||
Pleroma.Config.put([Pleroma.Upload, :uploader], Pleroma.Uploaders.Local)
|
clear_config([Pleroma.Upload, :uploader], Pleroma.Uploaders.Local)
|
||||||
|
|
||||||
assert {:ok, %Pleroma.Upload{}} = Backup.upload(backup, path)
|
assert {:ok, %Pleroma.Upload{}} = Backup.upload(backup, path)
|
||||||
assert {:ok, _backup} = Backup.delete(backup)
|
assert {:ok, _backup} = Backup.delete(backup)
|
||||||
|
|
|
@ -1563,31 +1563,15 @@ defmodule Pleroma.UserTest do
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
describe "delete/1 when confirmation is pending" do
|
test "delete/1 when confirmation is pending deletes the user" do
|
||||||
setup do
|
clear_config([:instance, :account_activation_required], true)
|
||||||
user = insert(:user, is_confirmed: false)
|
user = insert(:user, is_confirmed: false)
|
||||||
{:ok, user: user}
|
|
||||||
end
|
|
||||||
|
|
||||||
test "deletes user from database when activation required", %{user: user} do
|
{:ok, job} = User.delete(user)
|
||||||
clear_config([:instance, :account_activation_required], true)
|
{:ok, _} = ObanHelpers.perform(job)
|
||||||
|
|
||||||
{:ok, job} = User.delete(user)
|
refute User.get_cached_by_id(user.id)
|
||||||
{:ok, _} = ObanHelpers.perform(job)
|
refute User.get_by_id(user.id)
|
||||||
|
|
||||||
refute User.get_cached_by_id(user.id)
|
|
||||||
refute User.get_by_id(user.id)
|
|
||||||
end
|
|
||||||
|
|
||||||
test "deactivates user when activation is not required", %{user: user} do
|
|
||||||
clear_config([:instance, :account_activation_required], false)
|
|
||||||
|
|
||||||
{:ok, job} = User.delete(user)
|
|
||||||
{:ok, _} = ObanHelpers.perform(job)
|
|
||||||
|
|
||||||
assert %{deactivated: true} = User.get_cached_by_id(user.id)
|
|
||||||
assert %{deactivated: true} = User.get_by_id(user.id)
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
|
|
||||||
test "delete/1 when approval is pending deletes the user" do
|
test "delete/1 when approval is pending deletes the user" do
|
||||||
|
@ -1830,13 +1814,6 @@ defmodule Pleroma.UserTest do
|
||||||
assert User.visible_for(user, other_user) == :visible
|
assert User.visible_for(user, other_user) == :visible
|
||||||
end
|
end
|
||||||
|
|
||||||
test "returns true when the account is unconfirmed and confirmation is not required" do
|
|
||||||
user = insert(:user, local: true, is_confirmed: false)
|
|
||||||
other_user = insert(:user, local: true)
|
|
||||||
|
|
||||||
assert User.visible_for(user, other_user) == :visible
|
|
||||||
end
|
|
||||||
|
|
||||||
test "returns true when the account is unconfirmed and being viewed by a privileged account (confirmation required)" do
|
test "returns true when the account is unconfirmed and being viewed by a privileged account (confirmation required)" do
|
||||||
Pleroma.Config.put([:instance, :account_activation_required], true)
|
Pleroma.Config.put([:instance, :account_activation_required], true)
|
||||||
|
|
||||||
|
|
|
@ -165,14 +165,6 @@ defmodule Pleroma.Web.ActivityPub.SideEffectsTest do
|
||||||
{:ok, delete: delete_user, user: user}
|
{:ok, delete: delete_user, user: user}
|
||||||
end
|
end
|
||||||
|
|
||||||
test "when activation is not required", %{delete: delete, user: user} do
|
|
||||||
clear_config([:instance, :account_activation_required], false)
|
|
||||||
{:ok, _, _} = SideEffects.handle(delete)
|
|
||||||
ObanHelpers.perform_all()
|
|
||||||
|
|
||||||
assert User.get_cached_by_id(user.id).deactivated
|
|
||||||
end
|
|
||||||
|
|
||||||
test "when activation is required", %{delete: delete, user: user} do
|
test "when activation is required", %{delete: delete, user: user} do
|
||||||
clear_config([:instance, :account_activation_required], true)
|
clear_config([:instance, :account_activation_required], true)
|
||||||
{:ok, _, _} = SideEffects.handle(delete)
|
{:ok, _, _} = SideEffects.handle(delete)
|
||||||
|
|
|
@ -263,7 +263,7 @@ defmodule Pleroma.Web.MastodonAPI.StatusViewTest do
|
||||||
tags: [
|
tags: [
|
||||||
%{
|
%{
|
||||||
name: "#{object_data["tag"]}",
|
name: "#{object_data["tag"]}",
|
||||||
url: "/tag/#{object_data["tag"]}"
|
url: "http://localhost:4001/tag/#{object_data["tag"]}"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
application: %{
|
application: %{
|
||||||
|
@ -585,9 +585,9 @@ defmodule Pleroma.Web.MastodonAPI.StatusViewTest do
|
||||||
]
|
]
|
||||||
|
|
||||||
assert StatusView.build_tags(object_tags) == [
|
assert StatusView.build_tags(object_tags) == [
|
||||||
%{name: "fediverse", url: "/tag/fediverse"},
|
%{name: "fediverse", url: "http://localhost:4001/tag/fediverse"},
|
||||||
%{name: "mastodon", url: "/tag/mastodon"},
|
%{name: "mastodon", url: "http://localhost:4001/tag/mastodon"},
|
||||||
%{name: "nextcloud", url: "/tag/nextcloud"}
|
%{name: "nextcloud", url: "http://localhost:4001/tag/nextcloud"}
|
||||||
]
|
]
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -30,19 +30,5 @@ defmodule Pleroma.Web.ChannelCase do
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
setup tags do
|
setup tags, do: Pleroma.DataCase.setup_multi_process_mode(tags)
|
||||||
:ok = Ecto.Adapters.SQL.Sandbox.checkout(Pleroma.Repo)
|
|
||||||
|
|
||||||
if tags[:async] do
|
|
||||||
Mox.stub_with(Pleroma.CachexMock, Pleroma.NullCache)
|
|
||||||
Mox.set_mox_private()
|
|
||||||
else
|
|
||||||
Ecto.Adapters.SQL.Sandbox.mode(Pleroma.Repo, {:shared, self()})
|
|
||||||
Mox.stub_with(Pleroma.CachexMock, Pleroma.CachexProxy)
|
|
||||||
Mox.set_mox_global()
|
|
||||||
Pleroma.DataCase.clear_cachex()
|
|
||||||
end
|
|
||||||
|
|
||||||
:ok
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
|
|
|
@ -19,6 +19,8 @@ defmodule Pleroma.Web.ConnCase do
|
||||||
|
|
||||||
use ExUnit.CaseTemplate
|
use ExUnit.CaseTemplate
|
||||||
|
|
||||||
|
alias Pleroma.DataCase
|
||||||
|
|
||||||
using do
|
using do
|
||||||
quote do
|
quote do
|
||||||
# Import conveniences for testing with connections
|
# Import conveniences for testing with connections
|
||||||
|
@ -116,27 +118,9 @@ defmodule Pleroma.Web.ConnCase do
|
||||||
end
|
end
|
||||||
|
|
||||||
setup tags do
|
setup tags do
|
||||||
:ok = Ecto.Adapters.SQL.Sandbox.checkout(Pleroma.Repo)
|
DataCase.setup_multi_process_mode(tags)
|
||||||
|
DataCase.setup_streamer(tags)
|
||||||
if tags[:async] do
|
DataCase.stub_pipeline()
|
||||||
Mox.stub_with(Pleroma.CachexMock, Pleroma.NullCache)
|
|
||||||
Mox.set_mox_private()
|
|
||||||
else
|
|
||||||
Ecto.Adapters.SQL.Sandbox.mode(Pleroma.Repo, {:shared, self()})
|
|
||||||
Mox.stub_with(Pleroma.CachexMock, Pleroma.CachexProxy)
|
|
||||||
Mox.set_mox_global()
|
|
||||||
Pleroma.DataCase.clear_cachex()
|
|
||||||
end
|
|
||||||
|
|
||||||
if tags[:needs_streamer] do
|
|
||||||
start_supervised(%{
|
|
||||||
id: Pleroma.Web.Streamer.registry(),
|
|
||||||
start:
|
|
||||||
{Registry, :start_link, [[keys: :duplicate, name: Pleroma.Web.Streamer.registry()]]}
|
|
||||||
})
|
|
||||||
end
|
|
||||||
|
|
||||||
Pleroma.DataCase.stub_pipeline()
|
|
||||||
|
|
||||||
Mox.verify_on_exit!()
|
Mox.verify_on_exit!()
|
||||||
|
|
||||||
|
|
|
@ -18,6 +18,8 @@ defmodule Pleroma.DataCase do
|
||||||
|
|
||||||
use ExUnit.CaseTemplate
|
use ExUnit.CaseTemplate
|
||||||
|
|
||||||
|
import Pleroma.Tests.Helpers, only: [clear_config: 2]
|
||||||
|
|
||||||
using do
|
using do
|
||||||
quote do
|
quote do
|
||||||
alias Pleroma.Repo
|
alias Pleroma.Repo
|
||||||
|
@ -62,7 +64,7 @@ defmodule Pleroma.DataCase do
|
||||||
end)
|
end)
|
||||||
end
|
end
|
||||||
|
|
||||||
setup tags do
|
def setup_multi_process_mode(tags) do
|
||||||
:ok = Ecto.Adapters.SQL.Sandbox.checkout(Pleroma.Repo)
|
:ok = Ecto.Adapters.SQL.Sandbox.checkout(Pleroma.Repo)
|
||||||
|
|
||||||
if tags[:async] do
|
if tags[:async] do
|
||||||
|
@ -70,11 +72,16 @@ defmodule Pleroma.DataCase do
|
||||||
Mox.set_mox_private()
|
Mox.set_mox_private()
|
||||||
else
|
else
|
||||||
Ecto.Adapters.SQL.Sandbox.mode(Pleroma.Repo, {:shared, self()})
|
Ecto.Adapters.SQL.Sandbox.mode(Pleroma.Repo, {:shared, self()})
|
||||||
Mox.stub_with(Pleroma.CachexMock, Pleroma.CachexProxy)
|
|
||||||
Mox.set_mox_global()
|
Mox.set_mox_global()
|
||||||
|
Mox.stub_with(Pleroma.CachexMock, Pleroma.CachexProxy)
|
||||||
clear_cachex()
|
clear_cachex()
|
||||||
end
|
end
|
||||||
|
|
||||||
|
:ok
|
||||||
|
end
|
||||||
|
|
||||||
|
def setup_streamer(tags) do
|
||||||
if tags[:needs_streamer] do
|
if tags[:needs_streamer] do
|
||||||
start_supervised(%{
|
start_supervised(%{
|
||||||
id: Pleroma.Web.Streamer.registry(),
|
id: Pleroma.Web.Streamer.registry(),
|
||||||
|
@ -83,6 +90,12 @@ defmodule Pleroma.DataCase do
|
||||||
})
|
})
|
||||||
end
|
end
|
||||||
|
|
||||||
|
:ok
|
||||||
|
end
|
||||||
|
|
||||||
|
setup tags do
|
||||||
|
setup_multi_process_mode(tags)
|
||||||
|
setup_streamer(tags)
|
||||||
stub_pipeline()
|
stub_pipeline()
|
||||||
|
|
||||||
Mox.verify_on_exit!()
|
Mox.verify_on_exit!()
|
||||||
|
@ -105,17 +118,10 @@ defmodule Pleroma.DataCase do
|
||||||
end
|
end
|
||||||
|
|
||||||
def ensure_local_uploader(context) do
|
def ensure_local_uploader(context) do
|
||||||
test_uploader = Map.get(context, :uploader, Pleroma.Uploaders.Local)
|
test_uploader = Map.get(context, :uploader) || Pleroma.Uploaders.Local
|
||||||
uploader = Pleroma.Config.get([Pleroma.Upload, :uploader])
|
|
||||||
filters = Pleroma.Config.get([Pleroma.Upload, :filters])
|
|
||||||
|
|
||||||
Pleroma.Config.put([Pleroma.Upload, :uploader], test_uploader)
|
clear_config([Pleroma.Upload, :uploader], test_uploader)
|
||||||
Pleroma.Config.put([Pleroma.Upload, :filters], [])
|
clear_config([Pleroma.Upload, :filters], [])
|
||||||
|
|
||||||
on_exit(fn ->
|
|
||||||
Pleroma.Config.put([Pleroma.Upload, :uploader], uploader)
|
|
||||||
Pleroma.Config.put([Pleroma.Upload, :filters], filters)
|
|
||||||
end)
|
|
||||||
|
|
||||||
:ok
|
:ok
|
||||||
end
|
end
|
||||||
|
|
|
@ -8,6 +8,8 @@ defmodule Pleroma.Tests.Helpers do
|
||||||
"""
|
"""
|
||||||
alias Pleroma.Config
|
alias Pleroma.Config
|
||||||
|
|
||||||
|
require Logger
|
||||||
|
|
||||||
defmacro clear_config(config_path) do
|
defmacro clear_config(config_path) do
|
||||||
quote do
|
quote do
|
||||||
clear_config(unquote(config_path)) do
|
clear_config(unquote(config_path)) do
|
||||||
|
@ -18,6 +20,7 @@ defmodule Pleroma.Tests.Helpers do
|
||||||
defmacro clear_config(config_path, do: yield) do
|
defmacro clear_config(config_path, do: yield) do
|
||||||
quote do
|
quote do
|
||||||
initial_setting = Config.fetch(unquote(config_path))
|
initial_setting = Config.fetch(unquote(config_path))
|
||||||
|
|
||||||
unquote(yield)
|
unquote(yield)
|
||||||
|
|
||||||
on_exit(fn ->
|
on_exit(fn ->
|
||||||
|
@ -35,6 +38,15 @@ defmodule Pleroma.Tests.Helpers do
|
||||||
end
|
end
|
||||||
|
|
||||||
defmacro clear_config(config_path, temp_setting) do
|
defmacro clear_config(config_path, temp_setting) do
|
||||||
|
# NOTE: `clear_config([section, key], value)` != `clear_config([section], key: value)` (!)
|
||||||
|
# Displaying a warning to prevent unintentional clearing of all but one keys in section
|
||||||
|
if Keyword.keyword?(temp_setting) and length(temp_setting) == 1 do
|
||||||
|
Logger.warn(
|
||||||
|
"Please change to `clear_config([section]); clear_config([section, key], value)`: " <>
|
||||||
|
"#{inspect(config_path)}, #{inspect(temp_setting)}"
|
||||||
|
)
|
||||||
|
end
|
||||||
|
|
||||||
quote do
|
quote do
|
||||||
clear_config(unquote(config_path)) do
|
clear_config(unquote(config_path)) do
|
||||||
Config.put(unquote(config_path), unquote(temp_setting))
|
Config.put(unquote(config_path), unquote(temp_setting))
|
||||||
|
|
Loading…
Reference in New Issue