aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/mix/tasks/pleroma/ecto/ecto.ex40
-rw-r--r--lib/mix/tasks/pleroma/ecto/migrate.ex61
-rw-r--r--lib/mix/tasks/pleroma/ecto/rollback.ex65
-rw-r--r--lib/mix/tasks/pleroma/user.ex19
-rw-r--r--lib/pleroma/html.ex2
-rw-r--r--lib/pleroma/release_tasks.ex13
-rw-r--r--lib/pleroma/web/common_api/common_api.ex3
-rw-r--r--lib/pleroma/web/common_api/utils.ex14
-rw-r--r--lib/pleroma/web/mastodon_api/mastodon_api_controller.ex9
-rw-r--r--lib/pleroma/web/mastodon_api/views/account_view.ex4
-rw-r--r--lib/pleroma/web/rich_media/helpers.ex4
11 files changed, 214 insertions, 20 deletions
diff --git a/lib/mix/tasks/pleroma/ecto/ecto.ex b/lib/mix/tasks/pleroma/ecto/ecto.ex
new file mode 100644
index 000000000..af09cb289
--- /dev/null
+++ b/lib/mix/tasks/pleroma/ecto/ecto.ex
@@ -0,0 +1,40 @@
+# Pleroma: A lightweight social networking server
+# Copyright © 2017-2018 Pleroma Authors <https://pleroma.social/>
+# SPDX-License-Identifier: AGPL-3.0-onl
+defmodule Mix.Tasks.Pleroma.Ecto do
+ @doc """
+ Ensures the given repository's migrations path exists on the file system.
+ """
+ @spec ensure_migrations_path(Ecto.Repo.t(), Keyword.t()) :: String.t()
+ def ensure_migrations_path(repo, opts) do
+ path = opts[:migrations_path] || Path.join(source_repo_priv(repo), "migrations")
+
+ if not File.dir?(path) do
+ raise_missing_migrations(Path.relative_to_cwd(path), repo)
+ end
+
+ path
+ end
+
+ @doc """
+ Returns the private repository path relative to the source.
+ """
+ def source_repo_priv(repo) do
+ config = repo.config()
+ priv = config[:priv] || "priv/#{repo |> Module.split() |> List.last() |> Macro.underscore()}"
+ Path.join(File.cwd!(), priv)
+ end
+
+ defp raise_missing_migrations(path, repo) do
+ raise("""
+ Could not find migrations directory #{inspect(path)}
+ for repo #{inspect(repo)}.
+ This may be because you are in a new project and the
+ migration directory has not been created yet. Creating an
+ empty directory at the path above will fix this error.
+ If you expected existing migrations to be found, please
+ make sure your repository has been properly configured
+ and the configured path exists.
+ """)
+ end
+end
diff --git a/lib/mix/tasks/pleroma/ecto/migrate.ex b/lib/mix/tasks/pleroma/ecto/migrate.ex
new file mode 100644
index 000000000..22eafe76f
--- /dev/null
+++ b/lib/mix/tasks/pleroma/ecto/migrate.ex
@@ -0,0 +1,61 @@
+# Pleroma: A lightweight social networking server
+# Copyright © 2017-2018 Pleroma Authors <https://pleroma.social/>
+# SPDX-License-Identifier: AGPL-3.0-onl
+
+defmodule Mix.Tasks.Pleroma.Ecto.Migrate do
+ use Mix.Task
+ require Logger
+
+ @shortdoc "Wrapper on `ecto.migrate` task."
+
+ @aliases [
+ n: :step,
+ v: :to
+ ]
+
+ @switches [
+ all: :boolean,
+ step: :integer,
+ to: :integer,
+ quiet: :boolean,
+ log_sql: :boolean,
+ strict_version_order: :boolean,
+ migrations_path: :string
+ ]
+
+ @moduledoc """
+ Changes `Logger` level to `:info` before start migration.
+ Changes level back when migration ends.
+
+ ## Start migration
+
+ mix pleroma.ecto.migrate [OPTIONS]
+
+ Options:
+ - see https://hexdocs.pm/ecto/2.0.0/Mix.Tasks.Ecto.Migrate.html
+ """
+
+ @impl true
+ def run(args \\ []) do
+ {opts, _} = OptionParser.parse!(args, strict: @switches, aliases: @aliases)
+
+ opts =
+ if opts[:to] || opts[:step] || opts[:all],
+ do: opts,
+ else: Keyword.put(opts, :all, true)
+
+ opts =
+ if opts[:quiet],
+ do: Keyword.merge(opts, log: false, log_sql: false),
+ else: opts
+
+ path = Mix.Tasks.Pleroma.Ecto.ensure_migrations_path(Pleroma.Repo, opts)
+
+ level = Logger.level()
+ Logger.configure(level: :info)
+
+ {:ok, _, _} = Ecto.Migrator.with_repo(Pleroma.Repo, &Ecto.Migrator.run(&1, path, :up, opts))
+
+ Logger.configure(level: level)
+ end
+end
diff --git a/lib/mix/tasks/pleroma/ecto/rollback.ex b/lib/mix/tasks/pleroma/ecto/rollback.ex
new file mode 100644
index 000000000..0033ceba4
--- /dev/null
+++ b/lib/mix/tasks/pleroma/ecto/rollback.ex
@@ -0,0 +1,65 @@
+# Pleroma: A lightweight social networking server
+# Copyright © 2017-2018 Pleroma Authors <https://pleroma.social/>
+# SPDX-License-Identifier: AGPL-3.0-onl
+
+defmodule Mix.Tasks.Pleroma.Ecto.Rollback do
+ use Mix.Task
+ require Logger
+ @shortdoc "Wrapper on `ecto.rollback` task"
+
+ @aliases [
+ n: :step,
+ v: :to
+ ]
+
+ @switches [
+ all: :boolean,
+ step: :integer,
+ to: :integer,
+ start: :boolean,
+ quiet: :boolean,
+ log_sql: :boolean,
+ migrations_path: :string
+ ]
+
+ @moduledoc """
+ Changes `Logger` level to `:info` before start rollback.
+ Changes level back when rollback ends.
+
+ ## Start rollback
+
+ mix pleroma.ecto.rollback
+
+ Options:
+ - see https://hexdocs.pm/ecto/2.0.0/Mix.Tasks.Ecto.Rollback.html
+ """
+
+ @impl true
+ def run(args \\ []) do
+ {opts, _} = OptionParser.parse!(args, strict: @switches, aliases: @aliases)
+
+ opts =
+ if opts[:to] || opts[:step] || opts[:all],
+ do: opts,
+ else: Keyword.put(opts, :step, 1)
+
+ opts =
+ if opts[:quiet],
+ do: Keyword.merge(opts, log: false, log_sql: false),
+ else: opts
+
+ path = Mix.Tasks.Pleroma.Ecto.ensure_migrations_path(Pleroma.Repo, opts)
+
+ level = Logger.level()
+ Logger.configure(level: :info)
+
+ if Pleroma.Config.get(:env) == :test do
+ Logger.info("Rollback succesfully")
+ else
+ {:ok, _, _} =
+ Ecto.Migrator.with_repo(Pleroma.Repo, &Ecto.Migrator.run(&1, path, :down, opts))
+ end
+
+ Logger.configure(level: level)
+ end
+end
diff --git a/lib/mix/tasks/pleroma/user.ex b/lib/mix/tasks/pleroma/user.ex
index 7eaa49836..0efa745e4 100644
--- a/lib/mix/tasks/pleroma/user.ex
+++ b/lib/mix/tasks/pleroma/user.ex
@@ -8,6 +8,7 @@ defmodule Mix.Tasks.Pleroma.User do
alias Mix.Tasks.Pleroma.Common
alias Pleroma.User
alias Pleroma.UserInviteToken
+ alias Pleroma.Web.OAuth
@shortdoc "Manages Pleroma users"
@moduledoc """
@@ -49,6 +50,10 @@ defmodule Mix.Tasks.Pleroma.User do
mix pleroma.user delete_activities NICKNAME
+ ## Sign user out from all applications (delete user's OAuth tokens and authorizations).
+
+ mix pleroma.user sign_out NICKNAME
+
## Deactivate or activate the user's account.
mix pleroma.user toggle_activated NICKNAME
@@ -407,6 +412,20 @@ defmodule Mix.Tasks.Pleroma.User do
end
end
+ def run(["sign_out", nickname]) do
+ Common.start_pleroma()
+
+ with %User{local: true} = user <- User.get_cached_by_nickname(nickname) do
+ OAuth.Token.delete_user_tokens(user)
+ OAuth.Authorization.delete_user_authorizations(user)
+
+ Common.shell_info("#{nickname} signed out from all apps.")
+ else
+ _ ->
+ Common.shell_error("No local user #{nickname}")
+ end
+ end
+
defp set_moderator(user, value) do
info_cng = User.Info.admin_api_update(user.info, %{is_moderator: value})
diff --git a/lib/pleroma/html.ex b/lib/pleroma/html.ex
index 8c226c944..2fae7281c 100644
--- a/lib/pleroma/html.ex
+++ b/lib/pleroma/html.ex
@@ -89,7 +89,7 @@ defmodule Pleroma.HTML do
Cachex.fetch!(:scrubber_cache, key, fn _key ->
result =
content
- |> Floki.filter_out("a.mention,a.hashtag")
+ |> Floki.filter_out("a.mention,a.hashtag,a[rel~=\"tag\"]")
|> Floki.attribute("a", "href")
|> Enum.at(0)
diff --git a/lib/pleroma/release_tasks.ex b/lib/pleroma/release_tasks.ex
index 7726bc635..eb6eff61c 100644
--- a/lib/pleroma/release_tasks.ex
+++ b/lib/pleroma/release_tasks.ex
@@ -6,13 +6,12 @@ defmodule Pleroma.ReleaseTasks do
@repo Pleroma.Repo
def run(args) do
- Mix.Tasks.Pleroma.Common.start_pleroma()
[task | args] = String.split(args)
case task do
- "migrate" -> migrate()
+ "migrate" -> migrate(args)
"create" -> create()
- "rollback" -> rollback(String.to_integer(Enum.at(args, 0)))
+ "rollback" -> rollback(args)
task -> mix_task(task, args)
end
end
@@ -35,12 +34,12 @@ defmodule Pleroma.ReleaseTasks do
end
end
- def migrate do
- {:ok, _, _} = Ecto.Migrator.with_repo(@repo, &Ecto.Migrator.run(&1, :up, all: true))
+ def migrate(args) do
+ Mix.Tasks.Pleroma.Ecto.Migrate.run(args)
end
- def rollback(version) do
- {:ok, _, _} = Ecto.Migrator.with_repo(@repo, &Ecto.Migrator.run(&1, :down, to: version))
+ def rollback(args) do
+ Mix.Tasks.Pleroma.Ecto.Rollback.run(args)
end
def create do
diff --git a/lib/pleroma/web/common_api/common_api.ex b/lib/pleroma/web/common_api/common_api.ex
index f5193512e..42b78494d 100644
--- a/lib/pleroma/web/common_api/common_api.ex
+++ b/lib/pleroma/web/common_api/common_api.ex
@@ -212,7 +212,7 @@ defmodule Pleroma.Web.CommonAPI do
cw <- data["spoiler_text"] || "",
sensitive <- data["sensitive"] || Enum.member?(tags, {"#nsfw", "nsfw"}),
full_payload <- String.trim(status <> cw),
- length when length in 1..limit <- String.length(full_payload),
+ :ok <- validate_character_limit(full_payload, attachments, limit),
object <-
make_note_data(
user.ap_id,
@@ -247,6 +247,7 @@ defmodule Pleroma.Web.CommonAPI do
res
else
+ {:error, _} = e -> e
e -> {:error, e}
end
end
diff --git a/lib/pleroma/web/common_api/utils.ex b/lib/pleroma/web/common_api/utils.ex
index 6d82c0bd2..8b9477927 100644
--- a/lib/pleroma/web/common_api/utils.ex
+++ b/lib/pleroma/web/common_api/utils.ex
@@ -504,4 +504,18 @@ defmodule Pleroma.Web.CommonAPI.Utils do
"inReplyTo" => object.data["id"]
}
end
+
+ def validate_character_limit(full_payload, attachments, limit) do
+ length = String.length(full_payload)
+
+ if length < limit do
+ if length > 0 or Enum.count(attachments) > 0 do
+ :ok
+ else
+ {:error, "Cannot post an empty status without attachments"}
+ end
+ else
+ {:error, "The status is over the character limit"}
+ end
+ end
end
diff --git a/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex b/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
index 457709578..0c22790f2 100644
--- a/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
+++ b/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
@@ -544,15 +544,6 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do
end
end
- def post_status(conn, %{"status" => "", "media_ids" => media_ids} = params)
- when length(media_ids) > 0 do
- params =
- params
- |> Map.put("status", ".")
-
- post_status(conn, params)
- end
-
def post_status(%{assigns: %{user: user}} = conn, %{"status" => _} = params) do
params =
params
diff --git a/lib/pleroma/web/mastodon_api/views/account_view.ex b/lib/pleroma/web/mastodon_api/views/account_view.ex
index 72ae9bcda..62c516f8e 100644
--- a/lib/pleroma/web/mastodon_api/views/account_view.ex
+++ b/lib/pleroma/web/mastodon_api/views/account_view.ex
@@ -66,6 +66,8 @@ defmodule Pleroma.Web.MastodonAPI.AccountView do
end
defp do_render("account.json", %{user: user} = opts) do
+ display_name = HTML.strip_tags(user.name || user.nickname)
+
image = User.avatar_url(user) |> MediaProxy.url()
header = User.banner_url(user) |> MediaProxy.url()
user_info = User.get_cached_user_info(user)
@@ -96,7 +98,7 @@ defmodule Pleroma.Web.MastodonAPI.AccountView do
id: to_string(user.id),
username: username_from_nickname(user.nickname),
acct: user.nickname,
- display_name: user.name || user.nickname,
+ display_name: display_name,
locked: user_info.locked,
created_at: Utils.to_masto_date(user.inserted_at),
followers_count: user_info.follower_count,
diff --git a/lib/pleroma/web/rich_media/helpers.ex b/lib/pleroma/web/rich_media/helpers.ex
index f377125d7..94f56f70d 100644
--- a/lib/pleroma/web/rich_media/helpers.ex
+++ b/lib/pleroma/web/rich_media/helpers.ex
@@ -9,7 +9,9 @@ defmodule Pleroma.Web.RichMedia.Helpers do
alias Pleroma.Web.RichMedia.Parser
defp validate_page_url(page_url) when is_binary(page_url) do
- if AutoLinker.Parser.url?(page_url, true) do
+ validate_tld = Application.get_env(:auto_linker, :opts)[:validate_tld]
+
+ if AutoLinker.Parser.url?(page_url, scheme: true, validate_tld: validate_tld) do
URI.parse(page_url) |> validate_page_url
else
:error
generated by cgit v1.2.3 (git 2.26.2) at 2025-04-25 07:42:17 +0000