AkkomaGang/akkoma
AkkomaGang/akkoma
15
65
Fork 92
Code Issues 177 Pull requests 24 Projects 2 Releases 14 Packages Wiki Activity

Fixing up deletes a bit #327

Merged
floatingghost merged 10 commits from delete-fixing into develop 2022-12-01 15:00:54 +00:00
Conversation 0 Commits 10 Files changed 22 +1 -3
3 changed files with 1 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 05ad2a758e - Show all commits

1
lib/pleroma/web/mastodon_api/controllers/account_controller.ex
View file

@ -222,7 +222,6 @@ def update_credentials(%{assigns: %{user: user}, body_params: params} = conn, _p
|> Maps.put_if_present(:language, Pleroma.Web.Gettext.normalize_locale(params[:language])) |> Maps.put_if_present(:language, Pleroma.Web.Gettext.normalize_locale(params[:language]))
|> Maps.put_if_present(:status_ttl_days, params[:status_ttl_days], status_ttl_days_value) |> Maps.put_if_present(:status_ttl_days, params[:status_ttl_days], status_ttl_days_value)
IO.inspect(user_params)
# What happens here: # What happens here:
# #
# We want to update the user through the pipeline, but the ActivityPub # We want to update the user through the pipeline, but the ActivityPub

2
test/pleroma/activity/pruner_test.exs
View file

@ -2,8 +2,6 @@ defmodule Pleroma.Activity.PrunerTest do
use Pleroma.DataCase, async: true use Pleroma.DataCase, async: true
alias Pleroma.Activity alias Pleroma.Activity
alias Pleroma.Object
alias Pleroma.Repo
alias Pleroma.Activity.Pruner alias Pleroma.Activity.Pruner
import Pleroma.Factory import Pleroma.Factory

1
test/pleroma/object/pruner_test.exs
View file

@ -2,6 +2,7 @@ defmodule Pleroma.Object.PrunerTest do
use Pleroma.DataCase, async: true use Pleroma.DataCase, async: true
alias Pleroma.Delivery alias Pleroma.Delivery
alias Pleroma.Object
alias Pleroma.Object.Pruner alias Pleroma.Object.Pruner
import Pleroma.Factory import Pleroma.Factory