Procházet zdrojové kódy

Make credo happy

tags/v1.1.4
rinpatch před 5 roky
rodič
revize
ad681877df
9 změnil soubory, kde provedl 19 přidání a 14 odebrání
  1. +2
    -3
      lib/pleroma/web/activity_pub/transmogrifier.ex
  2. +4
    -4
      lib/pleroma/web/common_api/utils.ex
  3. +1
    -1
      lib/pleroma/web/federator/federator.ex
  4. +1
    -1
      lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
  5. +1
    -1
      lib/pleroma/web/mastodon_api/views/status_view.ex
  6. +1
    -1
      test/object/containment_test.exs
  7. +6
    -0
      test/object_test.exs
  8. +1
    -1
      test/web/common_api/common_api_test.exs
  9. +2
    -2
      test/web/mastodon_api/status_view_test.exs

+ 2
- 3
lib/pleroma/web/activity_pub/transmogrifier.ex Zobrazit soubor

@@ -6,13 +6,12 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier do
@moduledoc """
A module to handle coding from internal to wire ActivityPub and back.
"""
alias Pleroma.User
alias Pleroma.Object
alias Pleroma.Object.Containment
alias Pleroma.Activity
alias Pleroma.Object
alias Pleroma.Object.Containment
alias Pleroma.Repo
alias Pleroma.User
alias Pleroma.User
alias Pleroma.Web.ActivityPub.ActivityPub
alias Pleroma.Web.ActivityPub.Utils
alias Pleroma.Web.ActivityPub.Visibility


+ 4
- 4
lib/pleroma/web/common_api/utils.ex Zobrazit soubor

@@ -208,7 +208,7 @@ defmodule Pleroma.Web.CommonAPI.Utils do
context,
content_html,
attachments,
inReplyTo,
in_reply_to,
tags,
cw \\ nil,
cc \\ []
@@ -225,11 +225,11 @@ defmodule Pleroma.Web.CommonAPI.Utils do
"tag" => tags |> Enum.map(fn {_, tag} -> tag end) |> Enum.uniq()
}

if inReplyTo do
inReplyToObject = Object.normalize(inReplyTo.data["object"])
if in_reply_to do
in_reply_to_object = Object.normalize(inReplyTo.data["object"])

object
|> Map.put("inReplyTo", inReplyToObject.data["id"])
|> Map.put("inReplyTo", in_reply_to_object.data["id"])
else
object
end


+ 1
- 1
lib/pleroma/web/federator/federator.ex Zobrazit soubor

@@ -4,6 +4,7 @@

defmodule Pleroma.Web.Federator do
alias Pleroma.Activity
alias Pleroma.Object.Containment
alias Pleroma.User
alias Pleroma.Web.ActivityPub.ActivityPub
alias Pleroma.Web.ActivityPub.Relay
@@ -12,7 +13,6 @@ defmodule Pleroma.Web.Federator do
alias Pleroma.Web.ActivityPub.Visibility
alias Pleroma.Web.Federator.RetryQueue
alias Pleroma.Web.OStatus
alias Pleroma.Object.Containment
alias Pleroma.Web.Salmon
alias Pleroma.Web.WebFinger
alias Pleroma.Web.Websub


+ 1
- 1
lib/pleroma/web/mastodon_api/mastodon_api_controller.ex Zobrazit soubor

@@ -4,13 +4,13 @@

defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do
use Pleroma.Web, :controller
alias Pleroma.Object.Fetcher
alias Ecto.Changeset
alias Pleroma.Activity
alias Pleroma.Config
alias Pleroma.Filter
alias Pleroma.Notification
alias Pleroma.Object
alias Pleroma.Object.Fetcher
alias Pleroma.Pagination
alias Pleroma.Repo
alias Pleroma.ScheduledActivity


+ 1
- 1
lib/pleroma/web/mastodon_api/views/status_view.ex Zobrazit soubor

@@ -7,8 +7,8 @@ defmodule Pleroma.Web.MastodonAPI.StatusView do

alias Pleroma.Activity
alias Pleroma.HTML
alias Pleroma.Repo
alias Pleroma.Object
alias Pleroma.Repo
alias Pleroma.User
alias Pleroma.Web.CommonAPI
alias Pleroma.Web.CommonAPI.Utils


+ 1
- 1
test/object/containment_test.exs Zobrazit soubor

@@ -1,8 +1,8 @@
defmodule Pleroma.Object.ContainmentTest do
use Pleroma.DataCase

alias Pleroma.User
alias Pleroma.Object.Containment
alias Pleroma.User

import Pleroma.Factory



+ 6
- 0
test/object_test.exs Zobrazit soubor

@@ -5,9 +5,15 @@
defmodule Pleroma.ObjectTest do
use Pleroma.DataCase
import Pleroma.Factory
import Tesla.Mock
alias Pleroma.Object
alias Pleroma.Repo

setup do
mock(fn env -> apply(HttpRequestMock, :request, [env]) end)
:ok
end

test "returns an object by it's AP id" do
object = insert(:note)
found_object = Object.get_by_ap_id(object.data["id"])


+ 1
- 1
test/web/common_api/common_api_test.exs Zobrazit soubor

@@ -5,8 +5,8 @@
defmodule Pleroma.Web.CommonAPITest do
use Pleroma.DataCase
alias Pleroma.Activity
alias Pleroma.User
alias Pleroma.Object
alias Pleroma.User
alias Pleroma.Web.CommonAPI

import Pleroma.Factory


+ 2
- 2
test/web/mastodon_api/status_view_test.exs Zobrazit soubor

@@ -6,9 +6,9 @@ defmodule Pleroma.Web.MastodonAPI.StatusViewTest do
use Pleroma.DataCase

alias Pleroma.Activity
alias Pleroma.User
alias Pleroma.Repo
alias Pleroma.Object
alias Pleroma.Repo
alias Pleroma.User
alias Pleroma.Web.CommonAPI
alias Pleroma.Web.CommonAPI.Utils
alias Pleroma.Web.MastodonAPI.AccountView


Načítá se…
Zrušit
Uložit