Chapril/mobilizon.chapril.org-mobilizon
Chapril/mobilizon.chapril.org-mobilizon
25
0
Fork 0
Code Issues Pull Requests Releases Activity

Apply formatting

Browse Source
This commit is contained in:
miffigriffy 2019-09-13 02:28:09 +02:00
parent 5967b30bb1
commit f6800665e7
3 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/mobilizon/actors/actor.ex
View File

@ -180,11 +180,17 @@ defmodule Mobilizon.Actors.Actor do
a distant actor. a distant actor.
""" """
@spec preferred_username_and_domain(t) :: String.t() @spec preferred_username_and_domain(t) :: String.t()
def preferred_username_and_domain(%__MODULE__{preferred_username: preferred_username, domain: nil}) do def preferred_username_and_domain(%__MODULE__{
preferred_username: preferred_username,
domain: nil
}) do
preferred_username preferred_username
end end
def preferred_username_and_domain(%__MODULE__{preferred_username: preferred_username, domain: domain}) do def preferred_username_and_domain(%__MODULE__{
preferred_username: preferred_username,
domain: domain
}) do
"#{preferred_username}@#{domain}" "#{preferred_username}@#{domain}"
end end

4
priv/repo/migrations/20190130151607_split_event_visibility_and_join_options.exs
View File

@ -14,7 +14,7 @@ defmodule Mobilizon.Repo.Migrations.SplitEventVisibilityAndJoinOptions do
EventVisibility.create_type() EventVisibility.create_type()
execute( execute(
"ALTER TABLE events ALTER COLUMN visibility TYPE event_visibility_type USING visibility::event_visibility" "ALTER TABLE events ALTER COLUMN visibility TYPE event_visibility USING visibility::event_visibility"
) )
JoinOptions.create_type() JoinOptions.create_type()
@ -42,7 +42,7 @@ defmodule Mobilizon.Repo.Migrations.SplitEventVisibilityAndJoinOptions do
EventVisibility.create_type() EventVisibility.create_type()
execute( execute(
"ALTER TABLE events ALTER COLUMN visibility TYPE event_visibility_type USING visibility::event_visibility" "ALTER TABLE events ALTER COLUMN visibility TYPE event_visibility USING visibility::event_visibility"
) )
end end
end end

3
test/mobilizon/service/activity_pub/transmogrifier_test.exs
View File

@ -115,8 +115,7 @@ defmodule Mobilizon.Service.ActivityPub.TransmogrifierTest do
test "it works for incoming notices" do test "it works for incoming notices" do
data = File.read!("test/fixtures/mastodon-post-activity.json") |> Jason.decode!() data = File.read!("test/fixtures/mastodon-post-activity.json") |> Jason.decode!()
{:ok, %Activity{data: data, local: false}, _} = {:ok, %Activity{data: data, local: false}, _} = Transmogrifier.handle_incoming(data)
Transmogrifier.handle_incoming(data)
assert data["id"] == "https://framapiaf.org/users/admin/statuses/99512778738411822/activity" assert data["id"] == "https://framapiaf.org/users/admin/statuses/99512778738411822/activity"