aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/pleroma/plugs/authentication_plug.ex7
-rw-r--r--lib/pleroma/upload.ex12
-rw-r--r--lib/pleroma/user.ex18
-rw-r--r--lib/pleroma/web/activity_pub/activity_pub.ex19
-rw-r--r--lib/pleroma/web/ostatus/activity_representer.ex2
-rw-r--r--lib/pleroma/web/ostatus/feed_representer.ex3
-rw-r--r--lib/pleroma/web/ostatus/ostatus_controller.ex5
-rw-r--r--lib/pleroma/web/ostatus/user_representer.ex16
-rw-r--r--lib/pleroma/web/router.ex6
-rw-r--r--lib/pleroma/web/salmon/salmon.ex1
-rw-r--r--lib/pleroma/web/twitter_api/representers/activity_representer.ex67
-rw-r--r--lib/pleroma/web/twitter_api/twitter_api.ex88
-rw-r--r--lib/pleroma/web/twitter_api/twitter_api_controller.ex30
-rw-r--r--lib/pleroma/web/web.ex10
-rw-r--r--lib/pleroma/web/web_finger/web_finger.ex17
-rw-r--r--lib/pleroma/web/web_finger/web_finger_controller.ex2
-rw-r--r--lib/pleroma/web/websub/websub.ex25
-rw-r--r--lib/xml_builder.ex4
18 files changed, 176 insertions, 156 deletions
diff --git a/lib/pleroma/plugs/authentication_plug.ex b/lib/pleroma/plugs/authentication_plug.ex
index a3317f432..d47c3fdae 100644
--- a/lib/pleroma/plugs/authentication_plug.ex
+++ b/lib/pleroma/plugs/authentication_plug.ex
@@ -1,4 +1,5 @@
defmodule Pleroma.Plugs.AuthenticationPlug do
+ alias Comeonin.Pbkdf2
import Plug.Conn
def init(options) do
@@ -25,12 +26,12 @@ defmodule Pleroma.Plugs.AuthenticationPlug do
end
defp verify(nil, _password, _user_id) do
- Comeonin.Pbkdf2.dummy_checkpw
+ Pbkdf2.dummy_checkpw
:error
end
defp verify(user, password, _user_id) do
- if Comeonin.Pbkdf2.checkpw(password, user.password_hash) do
+ if Pbkdf2.checkpw(password, user.password_hash) do
{:ok, user}
else
:error
@@ -42,7 +43,7 @@ defmodule Pleroma.Plugs.AuthenticationPlug do
{:ok, userinfo} <- Base.decode64(header),
[username, password] <- String.split(userinfo, ":")
do
- { :ok, username, password }
+ {:ok, username, password}
end
end
diff --git a/lib/pleroma/upload.ex b/lib/pleroma/upload.ex
index 3aabf8157..9275eff87 100644
--- a/lib/pleroma/upload.ex
+++ b/lib/pleroma/upload.ex
@@ -1,6 +1,8 @@
defmodule Pleroma.Upload do
+ alias Ecto.UUID
+ alias Pleroma.Web
def store(%Plug.Upload{} = file) do
- uuid = Ecto.UUID.generate
+ uuid = UUID.generate
upload_folder = Path.join(upload_path(), uuid)
File.mkdir_p!(upload_folder)
result_file = Path.join(upload_folder, file.filename)
@@ -21,7 +23,7 @@ defmodule Pleroma.Upload do
def store(%{"img" => "data:image/" <> image_data}) do
parsed = Regex.named_captures(~r/(?<filetype>jpeg|png|gif);base64,(?<data>.*)/, image_data)
data = Base.decode64!(parsed["data"])
- uuid = Ecto.UUID.generate
+ uuid = UUID.generate
upload_folder = Path.join(upload_path(), uuid)
File.mkdir_p!(upload_folder)
filename = Base.encode16(:crypto.hash(:sha256, data)) <> ".#{parsed["filetype"]}"
@@ -44,11 +46,11 @@ defmodule Pleroma.Upload do
end
defp upload_path do
- Application.get_env(:pleroma, Pleroma.Upload)
- |> Keyword.fetch!(:uploads)
+ settings = Application.get_env(:pleroma, Pleroma.Upload)
+ Keyword.fetch!(settings, :uploads)
end
defp url_for(file) do
- "#{Pleroma.Web.base_url()}/media/#{file}"
+ "#{Web.base_url()}/media/#{file}"
end
end
diff --git a/lib/pleroma/user.ex b/lib/pleroma/user.ex
index 5e579dc44..65925caed 100644
--- a/lib/pleroma/user.ex
+++ b/lib/pleroma/user.ex
@@ -1,8 +1,8 @@
defmodule Pleroma.User do
use Ecto.Schema
- import Ecto.Changeset
- import Ecto.Query
- alias Pleroma.{Repo, User, Activity, Object}
+ import Ecto.{Changeset, Query}
+ alias Pleroma.{Repo, User, Object, Web}
+ alias Comeonin.Pbkdf2
schema "users" do
field :bio, :string
@@ -12,7 +12,7 @@ defmodule Pleroma.User do
field :password_hash, :string
field :password, :string, virtual: true
field :password_confirmation, :string, virtual: true
- field :following, { :array, :string }, default: []
+ field :following, {:array, :string}, default: []
field :ap_id, :string
field :avatar, :map
@@ -27,7 +27,7 @@ defmodule Pleroma.User do
end
def ap_id(%User{nickname: nickname}) do
- "#{Pleroma.Web.base_url}/users/#{nickname}"
+ "#{Web.base_url}/users/#{nickname}"
end
def ap_followers(%User{} = user) do
@@ -66,7 +66,7 @@ defmodule Pleroma.User do
|> validate_format(:nickname, ~r/^[a-zA-Z\d]+$/)
if changeset.valid? do
- hashed = Comeonin.Pbkdf2.hashpwsalt(changeset.changes[:password])
+ hashed = Pbkdf2.hashpwsalt(changeset.changes[:password])
ap_id = User.ap_id(%User{nickname: changeset.changes[:nickname]})
followers = User.ap_followers(%User{nickname: changeset.changes[:nickname]})
changeset
@@ -81,8 +81,8 @@ defmodule Pleroma.User do
def follow(%User{} = follower, %User{} = followed) do
ap_followers = User.ap_followers(followed)
if following?(follower, followed) do
- { :error,
- "Could not follow user: #{followed.nickname} is already on your list." }
+ {:error,
+ "Could not follow user: #{followed.nickname} is already on your list."}
else
following = [ap_followers | follower.following]
|> Enum.uniq
@@ -103,7 +103,7 @@ defmodule Pleroma.User do
|> follow_changeset(%{following: following})
|> Repo.update
else
- { :error, "Not subscribed!" }
+ {:error, "Not subscribed!"}
end
end
diff --git a/lib/pleroma/web/activity_pub/activity_pub.ex b/lib/pleroma/web/activity_pub/activity_pub.ex
index e9f0dcd32..02255e0a4 100644
--- a/lib/pleroma/web/activity_pub/activity_pub.ex
+++ b/lib/pleroma/web/activity_pub/activity_pub.ex
@@ -1,6 +1,6 @@
defmodule Pleroma.Web.ActivityPub.ActivityPub do
- alias Pleroma.Repo
- alias Pleroma.{Activity, Object, Upload, User}
+ alias Pleroma.{Activity, Repo, Object, Upload, User, Web}
+ alias Ecto.{Changeset, UUID}
import Ecto.Query
def insert(map) when is_map(map) do
@@ -19,7 +19,7 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
Repo.insert(%Activity{data: map})
end
- def like(%User{ap_id: ap_id} = user, %Object{data: %{ "id" => id}} = object) do
+ def like(%User{ap_id: ap_id} = user, %Object{data: %{"id" => id}} = object) do
cond do
# There's already a like here, so return the original activity.
ap_id in (object.data["likes"] || []) ->
@@ -44,7 +44,7 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
|> Map.put("like_count", length(likes))
|> Map.put("likes", likes)
- changeset = Ecto.Changeset.change(object, data: new_data)
+ changeset = Changeset.change(object, data: new_data)
{:ok, object} = Repo.update(changeset)
update_object_in_activities(object)
@@ -58,7 +58,7 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
relevant_activities = Activity.all_by_object_ap_id(id)
Enum.map(relevant_activities, fn (activity) ->
new_activity_data = activity.data |> Map.put("object", object.data)
- changeset = Ecto.Changeset.change(activity, data: new_activity_data)
+ changeset = Changeset.change(activity, data: new_activity_data)
Repo.update(changeset)
end)
end
@@ -79,7 +79,7 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
|> Map.put("like_count", length(likes))
|> Map.put("likes", likes)
- changeset = Ecto.Changeset.change(object, data: new_data)
+ changeset = Changeset.change(object, data: new_data)
{:ok, object} = Repo.update(changeset)
update_object_in_activities(object)
@@ -103,7 +103,7 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
end
def generate_id(type) do
- "#{Pleroma.Web.base_url()}/#{type}/#{Ecto.UUID.generate}"
+ "#{Web.base_url()}/#{type}/#{UUID.generate}"
end
def fetch_public_activities(opts \\ %{}) do
@@ -140,8 +140,7 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
query
end
- Repo.all(query)
- |> Enum.reverse
+ Enum.reverse(Repo.all(query))
end
def announce(%User{ap_id: ap_id} = user, %Object{data: %{"id" => id}} = object) do
@@ -160,7 +159,7 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
|> Map.put("announcement_count", length(announcements))
|> Map.put("announcements", announcements)
- changeset = Ecto.Changeset.change(object, data: new_data)
+ changeset = Changeset.change(object, data: new_data)
{:ok, object} = Repo.update(changeset)
update_object_in_activities(object)
diff --git a/lib/pleroma/web/ostatus/activity_representer.ex b/lib/pleroma/web/ostatus/activity_representer.ex
index 590abc8bb..d7ea61321 100644
--- a/lib/pleroma/web/ostatus/activity_representer.ex
+++ b/lib/pleroma/web/ostatus/activity_representer.ex
@@ -23,5 +23,5 @@ defmodule Pleroma.Web.OStatus.ActivityRepresenter do
] ++ attachments
end
- def to_simple_form(_,_), do: nil
+ def to_simple_form(_, _), do: nil
end
diff --git a/lib/pleroma/web/ostatus/feed_representer.ex b/lib/pleroma/web/ostatus/feed_representer.ex
index 14ac3ebf4..86c6f9d4f 100644
--- a/lib/pleroma/web/ostatus/feed_representer.ex
+++ b/lib/pleroma/web/ostatus/feed_representer.ex
@@ -8,7 +8,8 @@ defmodule Pleroma.Web.OStatus.FeedRepresenter do
h = fn(str) -> [to_charlist(str)] end
- entries = Enum.map(activities, fn(activity) ->
+ entries = activities
+ |> Enum.map(fn(activity) ->
{:entry, ActivityRepresenter.to_simple_form(activity, user)}
end)
|> Enum.filter(fn ({_, form}) -> form end)
diff --git a/lib/pleroma/web/ostatus/ostatus_controller.ex b/lib/pleroma/web/ostatus/ostatus_controller.ex
index 3c8d8c0f1..ed7618d2b 100644
--- a/lib/pleroma/web/ostatus/ostatus_controller.ex
+++ b/lib/pleroma/web/ostatus/ostatus_controller.ex
@@ -16,7 +16,8 @@ defmodule Pleroma.Web.OStatus.OStatusController do
activities = query
|> Repo.all
- response = FeedRepresenter.to_simple_form(user, activities, [user])
+ response = user
+ |> FeedRepresenter.to_simple_form(activities, [user])
|> :xmerl.export_simple(:xmerl_xml)
|> to_string
@@ -25,7 +26,7 @@ defmodule Pleroma.Web.OStatus.OStatusController do
|> send_resp(200, response)
end
- def temp(conn, params) do
+ def temp(_conn, params) do
IO.inspect(params)
end
end
diff --git a/lib/pleroma/web/ostatus/user_representer.ex b/lib/pleroma/web/ostatus/user_representer.ex
index 65dfc5643..273d7524a 100644
--- a/lib/pleroma/web/ostatus/user_representer.ex
+++ b/lib/pleroma/web/ostatus/user_representer.ex
@@ -7,14 +7,14 @@ defmodule Pleroma.Web.OStatus.UserRepresenter do
bio = to_charlist(user.bio)
avatar_url = to_charlist(User.avatar_url(user))
[
- { :id, [ap_id] },
- { :"activity:object", ['http://activitystrea.ms/schema/1.0/person'] },
- { :uri, [ap_id] },
- { :"poco:preferredUsername", [nickname] },
- { :"poco:displayName", [name] },
- { :"poco:note", [bio] },
- { :name, [nickname] },
- { :link, [rel: 'avatar', href: avatar_url], []}
+ {:id, [ap_id]},
+ {:"activity:object", ['http://activitystrea.ms/schema/1.0/person']},
+ {:uri, [ap_id]},
+ {:"poco:preferredUsername", [nickname]},
+ {:"poco:displayName", [name]},
+ {:"poco:note", [bio]},
+ {:name, [nickname]},
+ {:link, [rel: 'avatar', href: avatar_url], []}
]
end
end
diff --git a/lib/pleroma/web/router.ex b/lib/pleroma/web/router.ex
index a4f13c879..2c94d071f 100644
--- a/lib/pleroma/web/router.ex
+++ b/lib/pleroma/web/router.ex
@@ -1,7 +1,7 @@
defmodule Pleroma.Web.Router do
use Pleroma.Web, :router
- alias Pleroma.{Repo, User}
+ alias Pleroma.{Repo, User, Web.Router}
def user_fetcher(username) do
{:ok, Repo.get_by(User, %{nickname: username})}
@@ -10,13 +10,13 @@ defmodule Pleroma.Web.Router do
pipeline :api do
plug :accepts, ["json"]
plug :fetch_session
- plug Pleroma.Plugs.AuthenticationPlug, %{fetcher: &Pleroma.Web.Router.user_fetcher/1, optional: true}
+ plug Pleroma.Plugs.AuthenticationPlug, %{fetcher: &Router.user_fetcher/1, optional: true}
end
pipeline :authenticated_api do
plug :accepts, ["json"]
plug :fetch_session
- plug Pleroma.Plugs.AuthenticationPlug, %{fetcher: &Pleroma.Web.Router.user_fetcher/1}
+ plug Pleroma.Plugs.AuthenticationPlug, %{fetcher: &Router.user_fetcher/1}
end
pipeline :well_known do
diff --git a/lib/pleroma/web/salmon/salmon.ex b/lib/pleroma/web/salmon/salmon.ex
index 3881f2758..f26daf824 100644
--- a/lib/pleroma/web/salmon/salmon.ex
+++ b/lib/pleroma/web/salmon/salmon.ex
@@ -10,7 +10,6 @@ defmodule Pleroma.Web.Salmon do
{:xmlObj, :string, encoding} = :xmerl_xpath.string('string(//me:encoding[1])', doc)
{:xmlObj, :string, type} = :xmerl_xpath.string('string(//me:data[1]/@type)', doc)
-
{:ok, data} = Base.url_decode64(to_string(data), ignore: :whitespace)
{:ok, sig} = Base.url_decode64(to_string(sig), ignore: :whitespace)
alg = to_string(alg)
diff --git a/lib/pleroma/web/twitter_api/representers/activity_representer.ex b/lib/pleroma/web/twitter_api/representers/activity_representer.ex
index f2bf93abb..b58572829 100644
--- a/lib/pleroma/web/twitter_api/representers/activity_representer.ex
+++ b/lib/pleroma/web/twitter_api/representers/activity_representer.ex
@@ -1,17 +1,17 @@
defmodule Pleroma.Web.TwitterAPI.Representers.ActivityRepresenter do
use Pleroma.Web.TwitterAPI.Representers.BaseRepresenter
alias Pleroma.Web.TwitterAPI.Representers.{UserRepresenter, ObjectRepresenter}
- alias Pleroma.Activity
-
+ alias Pleroma.{Activity, User}
+ alias Calendar.Strftime
defp user_by_ap_id(user_list, ap_id) do
Enum.find(user_list, fn (%{ap_id: user_id}) -> ap_id == user_id end)
end
- def to_map(%Activity{data: %{"type" => "Announce", "actor" => actor}} = activity, %{users: users, announced_activity: announced_activity} = opts) do
+ def to_map(%Activity{data: %{"type" => "Announce", "actor" => actor, "published" => created_at}} = activity,
+ %{users: users, announced_activity: announced_activity} = opts) do
user = user_by_ap_id(users, actor)
- created_at = get_in(activity.data, ["published"])
- |> date_to_asctime
+ created_at = created_at |> date_to_asctime
text = "#{user.nickname} retweeted a status."
@@ -30,16 +30,16 @@ defmodule Pleroma.Web.TwitterAPI.Representers.ActivityRepresenter do
}
end
- def to_map(%Activity{data: %{"type" => "Like"}} = activity, %{user: user, liked_activity: liked_activity} = opts) do
- created_at = get_in(activity.data, ["published"])
- |> date_to_asctime
+ def to_map(%Activity{data: %{"type" => "Like", "published" => created_at}} = activity,
+ %{user: user, liked_activity: liked_activity} = opts) do
+ created_at = created_at |> date_to_asctime
text = "#{user.nickname} favorited a status."
%{
"id" => activity.id,
"user" => UserRepresenter.to_map(user, opts),
- "statusnet_html" => text, # TODO: add summary
+ "statusnet_html" => text,
"text" => text,
"is_local" => true,
"is_post_verb" => false,
@@ -49,16 +49,17 @@ defmodule Pleroma.Web.TwitterAPI.Representers.ActivityRepresenter do
}
end
- def to_map(%Activity{data: %{"type" => "Follow"}} = activity, %{user: user} = opts) do
- created_at = get_in(activity.data, ["published"])
- |> date_to_asctime
+ def to_map(%Activity{data: %{"type" => "Follow", "published" => created_at, "object" => followed_id}} = activity, %{user: user} = opts) do
+ created_at = created_at |> date_to_asctime
+ followed = User.get_cached_by_ap_id(followed_id)
+ text = "#{user.nickname} started following #{followed.nickname}"
%{
"id" => activity.id,
"user" => UserRepresenter.to_map(user, opts),
"attentions" => [],
- "statusnet_html" => "", # TODO: add summary
- "text" => "",
+ "statusnet_html" => text,
+ "text" => text,
"is_local" => true,
"is_post_verb" => false,
"created_at" => created_at,
@@ -66,14 +67,12 @@ defmodule Pleroma.Web.TwitterAPI.Representers.ActivityRepresenter do
}
end
- def to_map(%Activity{} = activity, %{user: user} = opts) do
- content = get_in(activity.data, ["object", "content"])
- created_at = get_in(activity.data, ["object", "published"])
- |> date_to_asctime
- like_count = get_in(activity.data, ["object", "like_count"]) || 0
- announcement_count = get_in(activity.data, ["object", "announcement_count"]) || 0
- favorited = opts[:for] && opts[:for].ap_id in (activity.data["object"]["likes"] || [])
- repeated = opts[:for] && opts[:for].ap_id in (activity.data["object"]["announcements"] || [])
+ def to_map(%Activity{data: %{"object" => %{"content" => content} = object}} = activity, %{user: user} = opts) do
+ created_at = object["published"] |> date_to_asctime
+ like_count = object["like_count"] || 0
+ announcement_count = object["announcement_count"] || 0
+ favorited = opts[:for] && opts[:for].ap_id in (object["likes"] || [])
+ repeated = opts[:for] && opts[:for].ap_id in (object["announcements"] || [])
mentions = opts[:mentioned] || []
@@ -91,22 +90,34 @@ defmodule Pleroma.Web.TwitterAPI.Representers.ActivityRepresenter do
"is_local" => true,
"is_post_verb" => true,
"created_at" => created_at,
- "in_reply_to_status_id" => activity.data["object"]["inReplyToStatusId"],
- "statusnet_conversation_id" => activity.data["object"]["statusnetConversationId"],
- "attachments" => (activity.data["object"]["attachment"] || []) |> ObjectRepresenter.enum_to_list(opts),
+ "in_reply_to_status_id" => object["inReplyToStatusId"],
+ "statusnet_conversation_id" => object["statusnetConversationId"],
+ "attachments" => (object["attachment"] || []) |> ObjectRepresenter.enum_to_list(opts),
"attentions" => attentions,
"fave_num" => like_count,
"repeat_num" => announcement_count,
- "favorited" => !!favorited,
- "repeated" => !!repeated,
+ "favorited" => to_boolean(favorited),
+ "repeated" => to_boolean(repeated),
}
end
defp date_to_asctime(date) do
with {:ok, date, _offset} <- date |> DateTime.from_iso8601 do
- Calendar.Strftime.strftime!(date, "%a %b %d %H:%M:%S %z %Y")
+ Strftime.strftime!(date, "%a %b %d %H:%M:%S %z %Y")
else _e ->
""
end
end
+
+ defp to_boolean(false) do
+ false
+ end
+
+ defp to_boolean(nil) do
+ false
+ end
+
+ defp to_boolean(_) do
+ true
+ end
end
diff --git a/lib/pleroma/web/twitter_api/twitter_api.ex b/lib/pleroma/web/twitter_api/twitter_api.ex
index f2b2b4418..649936b76 100644
--- a/lib/pleroma/web/twitter_api/twitter_api.ex
+++ b/lib/pleroma/web/twitter_api/twitter_api.ex
@@ -1,19 +1,19 @@
defmodule Pleroma.Web.TwitterAPI.TwitterAPI do
+ alias Ecto.Changeset
alias Pleroma.{User, Activity, Repo, Object}
- alias Pleroma.Web.ActivityPub.ActivityPub
+ alias Pleroma.Web.{ActivityPub.ActivityPub, Websub, OStatus}
alias Pleroma.Web.TwitterAPI.Representers.{ActivityRepresenter, UserRepresenter}
import Ecto.Query
- def create_status(user = %User{}, data = %{}) do
+ def create_status(%User{} = user, %{} = data) do
attachments = Enum.map(data["media_ids"] || [], fn (media_id) ->
Repo.get(Object, media_id).data
end)
context = ActivityPub.generate_context_id
- content = HtmlSanitizeEx.strip_tags(data["status"])
- |> String.replace("\n", "<br>")
+ content = data["status"] |> HtmlSanitizeEx.strip_tags |> String.replace("\n", "<br>")
mentions = parse_mentions(content)
@@ -40,10 +40,10 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPI do
"context" => context,
"attachment" => attachments,
"actor" => user.ap_id
- },
+ },
"published" => date,
"context" => context
- }
+ }
# Wire up reply info.
activity = with inReplyToId when not is_nil(inReplyToId) <- data["in_reply_to_status_id"],
@@ -67,34 +67,34 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPI do
with {:ok, activity} <- ActivityPub.insert(activity) do
{:ok, activity} = add_conversation_id(activity)
- Pleroma.Web.Websub.publish(Pleroma.Web.OStatus.feed_path(user), user, activity)
+ Websub.publish(OStatus.feed_path(user), user, activity)
{:ok, activity}
end
end
def fetch_friend_statuses(user, opts \\ %{}) do
- ActivityPub.fetch_activities([user.ap_id | user.following], opts)
- |> activities_to_statuses(%{for: user})
+ activities = ActivityPub.fetch_activities([user.ap_id | user.following], opts)
+ activities_to_statuses(activities, %{for: user})
end
def fetch_public_statuses(user, opts \\ %{}) do
- ActivityPub.fetch_public_activities(opts)
- |> activities_to_statuses(%{for: user})
+ activities = ActivityPub.fetch_public_activities(opts)
+ activities_to_statuses(activities, %{for: user})
end
def fetch_user_statuses(user, opts \\ %{}) do
- ActivityPub.fetch_activities([], opts)
- |> activities_to_statuses(%{for: user})
+ activities = ActivityPub.fetch_activities([], opts)
+ activities_to_statuses(activities, %{for: user})
end
def fetch_mentions(user, opts \\ %{}) do
- ActivityPub.fetch_activities([user.ap_id], opts)
- |> activities_to_statuses(%{for: user})
+ activities = ActivityPub.fetch_activities([user.ap_id], opts)
+ activities_to_statuses(activities, %{for: user})
end
def fetch_conversation(user, id) do
query = from activity in Activity,
- where: fragment("? @> ?", activity.data, ^%{ statusnetConversationId: id}),
+ where: fragment("? @> ?", activity.data, ^%{statusnetConversationId: id}),
limit: 1
with %Activity{} = activity <- Repo.one(query),
@@ -116,26 +116,26 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPI do
end
def follow(%User{} = follower, params) do
- with { :ok, %User{} = followed } <- get_user(params),
- { :ok, follower } <- User.follow(follower, followed),
- { :ok, activity } <- ActivityPub.insert(%{
- "type" => "Follow",
- "actor" => follower.ap_id,
- "object" => followed.ap_id,
- "published" => make_date()
- })
+ with {:ok, %User{} = followed} <- get_user(params),
+ {:ok, follower} <- User.follow(follower, followed),
+ {:ok, activity} <- ActivityPub.insert(%{
+ "type" => "Follow",
+ "actor" => follower.ap_id,
+ "object" => followed.ap_id,
+ "published" => make_date()
+ })
do
- { :ok, follower, followed, activity }
+ {:ok, follower, followed, activity}
else
err -> err
end
end
def unfollow(%User{} = follower, params) do
- with { :ok, %User{} = unfollowed } <- get_user(params),
- { :ok, follower } <- User.unfollow(follower, unfollowed)
+ with {:ok, %User{} = unfollowed} <- get_user(params),
+ {:ok, follower} <- User.unfollow(follower, unfollowed)
do
- { :ok, follower, unfollowed}
+ {:ok, follower, unfollowed}
else
err -> err
end
@@ -207,7 +207,7 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPI do
media_id_string: "#{object.id}}",
media_url: href,
size: 0
- } |> Poison.encode!
+ } |> Poison.encode!
end
end
@@ -215,15 +215,18 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPI do
# Modified from https://www.w3.org/TR/html5/forms.html#valid-e-mail-address
regex = ~r/@[a-zA-Z0-9.!#$%&'*+\/=?^_`{|}~-]+@?[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*/
- Regex.scan(regex, text)
+ regex
+ |> Regex.scan(text)
|> List.flatten
|> Enum.uniq
- |> Enum.map(fn ("@" <> match = full_match) -> {full_match, User.get_cached_by_nickname(match)} end)
+ |> Enum.map(fn ("@" <> match = full_match) ->
+ {full_match, User.get_cached_by_nickname(match)} end)
|> Enum.filter(fn ({_match, user}) -> user end)
end
def add_user_links(text, mentions) do
- Enum.reduce(mentions, text, fn ({match, %User{ap_id: ap_id}}, text) -> String.replace(text, match, "<a href='#{ap_id}'>#{match}</a>") end)
+ Enum.reduce(mentions, text, fn ({match, %User{ap_id: ap_id}}, text) ->
+ String.replace(text, match, "<a href='#{ap_id}'>#{match}</a>") end)
end
defp add_conversation_id(activity) do
@@ -236,10 +239,10 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPI do
object = Object.get_by_ap_id(activity.data["object"]["id"])
- changeset = Ecto.Changeset.change(object, data: data["object"])
+ changeset = Changeset.change(object, data: data["object"])
Repo.update(changeset)
- changeset = Ecto.Changeset.change(activity, data: data)
+ changeset = Changeset.change(activity, data: data)
Repo.update(changeset)
end
end
@@ -252,7 +255,7 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPI do
email: params["email"],
password: params["password"],
password_confirmation: params["confirm"]
- }
+ }
changeset = User.register_changeset(%User{}, params)
@@ -260,22 +263,21 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPI do
{:ok, UserRepresenter.to_map(user)}
else
{:error, changeset} ->
- errors = Ecto.Changeset.traverse_errors(changeset, fn {msg, _opts} -> msg end)
- |> Poison.encode!
+ errors = Poison.encode!(Changeset.traverse_errors(changeset, fn {msg, _opts} -> msg end))
{:error, %{error: errors}}
end
end
def get_user(user \\ nil, params) do
case params do
- %{ "user_id" => user_id } ->
+ %{"user_id" => user_id} ->
case target = Repo.get(User, user_id) do
nil ->
{:error, "No user with such user_id"}
_ ->
{:ok, target}
end
- %{ "screen_name" => nickname } ->
+ %{"screen_name" => nickname} ->
case target = Repo.get_by(User, nickname: nickname) do
nil ->
{:error, "No user with such screen_name"}
@@ -303,7 +305,8 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPI do
user = User.get_cached_by_ap_id(actor)
[liked_activity] = Activity.all_by_object_ap_id(activity.data["object"])
- ActivityRepresenter.to_map(activity, Map.merge(opts, %{user: user, liked_activity: liked_activity}))
+ ActivityRepresenter.to_map(activity,
+ Map.merge(opts, %{user: user, liked_activity: liked_activity}))
end
# For announces, fetch the announced activity and the user.
@@ -313,7 +316,8 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPI do
[announced_activity] = Activity.all_by_object_ap_id(activity.data["object"])
announced_actor = User.get_cached_by_ap_id(announced_activity.data["actor"])
- ActivityRepresenter.to_map(activity, Map.merge(opts, %{users: [user, announced_actor], announced_activity: announced_activity}))
+ ActivityRepresenter.to_map(activity,
+ Map.merge(opts, %{users: [user, announced_actor], announced_activity: announced_activity}))
end
defp activity_to_status(activity, opts) do
@@ -323,7 +327,7 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPI do
mentioned_users = Enum.map(activity.data["to"] || [], fn (ap_id) ->
User.get_cached_by_ap_id(ap_id)
end)
- |> Enum.filter(&(&1))
+ mentioned_users = mentioned_users |> Enum.filter(&(&1))
ActivityRepresenter.to_map(activity, Map.merge(opts, %{user: user, mentioned: mentioned_users}))
end
diff --git a/lib/pleroma/web/twitter_api/twitter_api_controller.ex b/lib/pleroma/web/twitter_api/twitter_api_controller.ex
index b5b829ca0..bbfc04a6a 100644
--- a/lib/pleroma/web/twitter_api/twitter_api_controller.ex
+++ b/lib/pleroma/web/twitter_api/twitter_api_controller.ex
@@ -2,8 +2,9 @@ defmodule Pleroma.Web.TwitterAPI.Controller do
use Pleroma.Web, :controller
alias Pleroma.Web.TwitterAPI.TwitterAPI
alias Pleroma.Web.TwitterAPI.Representers.{UserRepresenter, ActivityRepresenter}
- alias Pleroma.{Repo, Activity}
+ alias Pleroma.{Web, Repo, Activity}
alias Pleroma.Web.ActivityPub.ActivityPub
+ alias Ecto.Changeset
def verify_credentials(%{assigns: %{user: user}} = conn, _params) do
response = user |> UserRepresenter.to_json(%{for: user})
@@ -15,7 +16,7 @@ defmodule Pleroma.Web.TwitterAPI.Controller do
def status_update(%{assigns: %{user: user}} = conn, %{"status" => status_text} = status_data) do
if status_text |> String.trim |> String.length != 0 do
media_ids = extract_media_ids(status_data)
- {:ok, activity} = TwitterAPI.create_status(user, Map.put(status_data, "media_ids", media_ids ))
+ {:ok, activity} = TwitterAPI.create_status(user, Map.put(status_data, "media_ids", media_ids))
conn
|> json_reply(200, ActivityRepresenter.to_json(activity, %{user: user}))
else
@@ -79,34 +80,34 @@ defmodule Pleroma.Web.TwitterAPI.Controller do
def follow(%{assigns: %{user: user}} = conn, params) do
case TwitterAPI.follow(user, params) do
- { :ok, user, followed, _activity } ->
+ {:ok, user, followed, _activity} ->
response = followed |> UserRepresenter.to_json(%{for: user})
conn
|> json_reply(200, response)
- { :error, msg } -> forbidden_json_reply(conn, msg)
+ {:error, msg} -> forbidden_json_reply(conn, msg)
end
end
def unfollow(%{assigns: %{user: user}} = conn, params) do
case TwitterAPI.unfollow(user, params) do
- { :ok, user, unfollowed, } ->
+ {:ok, user, unfollowed} ->
response = unfollowed |> UserRepresenter.to_json(%{for: user})
conn
|> json_reply(200, response)
- { :error, msg } -> forbidden_json_reply(conn, msg)
+ {:error, msg} -> forbidden_json_reply(conn, msg)
end
end
- def fetch_status(%{assigns: %{user: user}} = conn, %{ "id" => id }) do
- response = TwitterAPI.fetch_status(user, id) |> Poison.encode!
+ def fetch_status(%{assigns: %{user: user}} = conn, %{"id" => id}) do
+ response = Poison.encode!(TwitterAPI.fetch_status(user, id))
conn
|> json_reply(200, response)
end
- def fetch_conversation(%{assigns: %{user: user}} = conn, %{ "id" => id }) do
+ def fetch_conversation(%{assigns: %{user: user}} = conn, %{"id" => id}) do
id = String.to_integer(id)
- response = TwitterAPI.fetch_conversation(user, id) |> Poison.encode!
+ response = Poison.encode!(TwitterAPI.fetch_conversation(user, id))
conn
|> json_reply(200, response)
@@ -132,8 +133,8 @@ defmodule Pleroma.Web.TwitterAPI.Controller do
def config(conn, _params) do
response = %{
site: %{
- name: Pleroma.Web.base_url,
- server: Pleroma.Web.base_url,
+ name: Web.base_url,
+ server: Web.base_url,
textlimit: -1
}
}
@@ -188,11 +189,10 @@ defmodule Pleroma.Web.TwitterAPI.Controller do
def update_avatar(%{assigns: %{user: user}} = conn, params) do
{:ok, object} = ActivityPub.upload(params)
- change = Ecto.Changeset.change(user, %{avatar: object.data})
+ change = Changeset.change(user, %{avatar: object.data})
{:ok, user} = Repo.update(change)
- response = UserRepresenter.to_map(user, %{for: user})
- |> Poison.encode!
+ response = Poison.encode!(UserRepresenter.to_map(user, %{for: user}))
conn
|> json_reply(200, response)
diff --git a/lib/pleroma/web/web.ex b/lib/pleroma/web/web.ex
index a81e3e6e1..19b1ff848 100644
--- a/lib/pleroma/web/web.ex
+++ b/lib/pleroma/web/web.ex
@@ -20,8 +20,7 @@ defmodule Pleroma.Web do
quote do
use Phoenix.Controller, namespace: Pleroma.Web
import Plug.Conn
- import Pleroma.Web.Router.Helpers
- import Pleroma.Web.Gettext
+ import Pleroma.Web.{Gettext, Router.Helpers}
end
end
@@ -33,9 +32,7 @@ defmodule Pleroma.Web do
# Import convenience functions from controllers
import Phoenix.Controller, only: [get_csrf_token: 0, get_flash: 2, view_module: 1]
- import Pleroma.Web.Router.Helpers
- import Pleroma.Web.ErrorHelpers
- import Pleroma.Web.Gettext
+ import Pleroma.Web.{ErrorHelpers, Gettext, Router.Helpers}
end
end
@@ -75,7 +72,8 @@ defmodule Pleroma.Web do
protocol = settings |> Keyword.fetch!(:protocol)
- port_fragment = with {:ok, protocol_info} <- settings |> Keyword.fetch(String.to_atom(protocol)),
+ port_fragment = with {:ok, protocol_info} <- settings
+ |> Keyword.fetch(String.to_atom(protocol)),
{:ok, port} <- protocol_info |> Keyword.fetch(:port)
do
":#{port}"
diff --git a/lib/pleroma/web/web_finger/web_finger.ex b/lib/pleroma/web/web_finger/web_finger.ex
index eb540e92a..3d6ca4e05 100644
--- a/lib/pleroma/web/web_finger/web_finger.ex
+++ b/lib/pleroma/web/web_finger/web_finger.ex
@@ -1,21 +1,20 @@
defmodule Pleroma.Web.WebFinger do
- alias Pleroma.XmlBuilder
- alias Pleroma.User
- alias Pleroma.Web.OStatus
+ alias Pleroma.{User, XmlBuilder}
+ alias Pleroma.{Web, Web.OStatus}
- def host_meta() do
- base_url = Pleroma.Web.base_url
+ def host_meta do
+ base_url = Web.base_url
{
- :XRD, %{ xmlns: "http://docs.oasis-open.org/ns/xri/xrd-1.0" },
+ :XRD, %{xmlns: "http://docs.oasis-open.org/ns/xri/xrd-1.0"},
{
- :Link, %{ rel: "lrdd", type: "application/xrd+xml", template: "#{base_url}/.well-known/webfinger?resource={uri}" }
+ :Link, %{rel: "lrdd", type: "application/xrd+xml", template: "#{base_url}/.well-known/webfinger?resource={uri}"}
}
}
|> XmlBuilder.to_doc
end
def webfinger(resource) do
- host = Pleroma.Web.host
+ host = Web.host
regex = ~r/acct:(?<username>\w+)@#{host}/
case Regex.named_captures(regex, resource) do
%{"username" => username} ->
@@ -29,7 +28,7 @@ defmodule Pleroma.Web.WebFinger do
{
:XRD, %{xmlns: "http://docs.oasis-open.org/ns/xri/xrd-1.0"},
[
- {:Subject, "acct:#{user.nickname}@#{Pleroma.Web.host}"},
+ {:Subject, "acct:#{user.nickname}@#{Web.host}"},
{:Alias, user.ap_id},
{:Link, %{rel: "http://schemas.google.com/g/2010#updates-from", type: "application/atom+xml", href: OStatus.feed_path(user)}}
]
diff --git a/lib/pleroma/web/web_finger/web_finger_controller.ex b/lib/pleroma/web/web_finger/web_finger_controller.ex
index 7c0fd3142..d8959a96f 100644
--- a/lib/pleroma/web/web_finger/web_finger_controller.ex
+++ b/lib/pleroma/web/web_finger/web_finger_controller.ex
@@ -12,7 +12,7 @@ defmodule Pleroma.Web.WebFinger.WebFingerController do
end
def webfinger(conn, %{"resource" => resource}) do
- {:ok, response} = Pleroma.Web.WebFinger.webfinger(resource)
+ {:ok, response} = WebFinger.webfinger(resource)
conn
|> put_resp_content_type("application/xrd+xml")
diff --git a/lib/pleroma/web/websub/websub.ex b/lib/pleroma/web/websub/websub.ex
index cc66b52dd..ba699db24 100644
--- a/lib/pleroma/web/websub/websub.ex
+++ b/lib/pleroma/web/websub/websub.ex
@@ -1,4 +1,5 @@
defmodule Pleroma.Web.Websub do
+ alias Ecto.Changeset
alias Pleroma.Repo
alias Pleroma.Web.Websub.WebsubServerSubscription
alias Pleroma.Web.OStatus.FeedRepresenter
@@ -8,9 +9,10 @@ defmodule Pleroma.Web.Websub do
@websub_verifier Application.get_env(:pleroma, :websub_verifier)
- def verify(subscription, getter \\ &HTTPoison.get/3 ) do
+ def verify(subscription, getter \\ &HTTPoison.get/3) do
challenge = Base.encode16(:crypto.strong_rand_bytes(8))
- lease_seconds = NaiveDateTime.diff(subscription.valid_until, subscription.updated_at) |> to_string
+ lease_seconds = NaiveDateTime.diff(subscription.valid_until, subscription.updated_at)
+ lease_seconds = lease_seconds |> to_string
params = %{
"hub.challenge": challenge,
@@ -25,11 +27,11 @@ defmodule Pleroma.Web.Websub do
with {:ok, response} <- getter.(url, [], [params: params]),
^challenge <- response.body
do
- changeset = Ecto.Changeset.change(subscription, %{state: "active"})
+ changeset = Changeset.change(subscription, %{state: "active"})
Repo.update(changeset)
else _e ->
- changeset = Ecto.Changeset.change(subscription, %{state: "rejected"})
- {:ok, subscription } = Repo.update(changeset)
+ changeset = Changeset.change(subscription, %{state: "rejected"})
+ {:ok, subscription} = Repo.update(changeset)
{:error, subscription}
end
end
@@ -39,10 +41,11 @@ defmodule Pleroma.Web.Websub do
where: sub.topic == ^topic and sub.state == "active"
subscriptions = Repo.all(query)
Enum.each(subscriptions, fn(sub) ->
- response = FeedRepresenter.to_simple_form(user, [activity], [user])
+ response = user
+ |> FeedRepresenter.to_simple_form([activity], [user])
|> :xmerl.export_simple(:xmerl_xml)
- signature = :crypto.hmac(:sha, sub.secret, response) |> Base.encode16
+ signature = Base.encode16(:crypto.hmac(:sha, sub.secret, response))
HTTPoison.post(sub.callback, response, [
{"Content-Type", "application/atom+xml"},
@@ -65,10 +68,11 @@ defmodule Pleroma.Web.Websub do
callback: callback
}
- change = Ecto.Changeset.change(subscription, data)
+ change = Changeset.change(subscription, data)
websub = Repo.insert_or_update!(change)
- change = Ecto.Changeset.change(websub, %{valid_until: NaiveDateTime.add(websub.updated_at, lease_time)})
+ change = Changeset.change(websub, %{valid_until:
+ NaiveDateTime.add(websub.updated_at, lease_time)})
websub = Repo.update!(change)
# Just spawn that for now, maybe pool later.
@@ -81,7 +85,8 @@ defmodule Pleroma.Web.Websub do
end
defp get_subscription(topic, callback) do
- Repo.get_by(WebsubServerSubscription, topic: topic, callback: callback) || %WebsubServerSubscription{}
+ Repo.get_by(WebsubServerSubscription, topic: topic, callback: callback) ||
+ %WebsubServerSubscription{}
end
defp lease_time(%{"hub.lease_seconds" => lease_seconds}) do
diff --git a/lib/xml_builder.ex b/lib/xml_builder.ex
index ac1ac8a74..c6d144903 100644
--- a/lib/xml_builder.ex
+++ b/lib/xml_builder.ex
@@ -30,13 +30,13 @@ defmodule Pleroma.XmlBuilder do
NaiveDateTime.to_iso8601(time)
end
- def to_doc(content), do: "<?xml version=\"1.0\" encoding=\"UTF-8\"?>" <> to_xml(content)
+ def to_doc(content), do: ~s(<?xml version="1.0" encoding="UTF-8"?>) <> to_xml(content)
defp make_open_tag(tag, attributes) do
attributes_string = for {attribute, value} <- attributes do
"#{attribute}=\"#{value}\""
end |> Enum.join(" ")
- Enum.join([tag, attributes_string], " ") |> String.strip
+ [tag, attributes_string] |> Enum.join(" ") |> String.strip
end
end
generated by cgit v1.2.3 (git 2.26.2) at 2025-04-24 12:50:37 +0000