Browse Source

Fix a bunch of unused variable warnings

tags/v0.9.9
Mark Felder 6 years ago
parent
commit
ab4aa5720a
10 changed files with 19 additions and 19 deletions
  1. +2
    -2
      lib/pleroma/plugs/http_signature.ex
  2. +1
    -1
      lib/pleroma/web/activity_pub/mrf/simple_policy.ex
  3. +2
    -2
      lib/pleroma/web/activity_pub/transmogrifier.ex
  4. +2
    -2
      lib/pleroma/web/common_api/utils.ex
  5. +4
    -4
      lib/pleroma/web/federator/federator.ex
  6. +1
    -1
      lib/pleroma/web/http_signatures/http_signatures.ex
  7. +2
    -2
      lib/pleroma/web/twitter_api/twitter_api.ex
  8. +1
    -1
      lib/pleroma/web/xml/xml.ex
  9. +1
    -1
      test/support/builders/activity_builder.ex
  10. +3
    -3
      test/support/httpoison_mock.ex

+ 2
- 2
lib/pleroma/plugs/http_signature.ex View File

@@ -7,11 +7,11 @@ defmodule Pleroma.Web.Plugs.HTTPSignaturePlug do
options
end

def call(%{assigns: %{valid_signature: true}} = conn, opts) do
def call(%{assigns: %{valid_signature: true}} = conn, _opts) do
conn
end

def call(conn, opts) do
def call(conn, _opts) do
user = conn.params["actor"]
Logger.debug("Checking sig for #{user}")
[signature | _] = get_req_header(conn, "signature")


+ 1
- 1
lib/pleroma/web/activity_pub/mrf/simple_policy.ex View File

@@ -70,7 +70,7 @@ defmodule Pleroma.Web.ActivityPub.MRF.SimplePolicy do
{:ok, object} <- check_ftl_removal(actor_info, object) do
{:ok, object}
else
e -> {:reject, nil}
_e -> {:reject, nil}
end
end
end

+ 2
- 2
lib/pleroma/web/activity_pub/transmogrifier.ex View File

@@ -143,12 +143,12 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier do
end

def handle_incoming(
%{"type" => "Like", "object" => object_id, "actor" => actor, "id" => id} = data
%{"type" => "Like", "object" => object_id, "actor" => actor, "id" => id} = _data
) do
with %User{} = actor <- User.get_or_fetch_by_ap_id(actor),
{:ok, object} <-
get_obj_helper(object_id) || ActivityPub.fetch_object_from_id(object_id),
{:ok, activity, object} <- ActivityPub.like(actor, object, id, false) do
{:ok, activity, _object} <- ActivityPub.like(actor, object, id, false) do
{:ok, activity}
else
_e -> :error


+ 2
- 2
lib/pleroma/web/common_api/utils.ex View File

@@ -49,7 +49,7 @@ defmodule Pleroma.Web.CommonAPI.Utils do
{[user.follower_address | to], cc}
end

def to_for_user_and_mentions(user, mentions, inReplyTo, "direct") do
def to_for_user_and_mentions(_user, mentions, inReplyTo, "direct") do
mentioned_users = Enum.map(mentions, fn {_, %{ap_id: ap_id}} -> ap_id end)

if inReplyTo do
@@ -69,7 +69,7 @@ defmodule Pleroma.Web.CommonAPI.Utils do
def make_context(%Activity{data: %{"context" => context}}), do: context
def make_context(_), do: Utils.generate_context_id()

def maybe_add_attachments(text, attachments, _no_links = true), do: text
def maybe_add_attachments(text, _attachments, _no_links = true), do: text

def maybe_add_attachments(text, attachments, _no_links) do
add_attachments(text, attachments)


+ 4
- 4
lib/pleroma/web/federator/federator.ex View File

@@ -89,12 +89,12 @@ defmodule Pleroma.Web.Federator do

with {:ok, _user} <- ap_enabled_actor(params["actor"]),
nil <- Activity.get_by_ap_id(params["id"]),
{:ok, activity} <- Transmogrifier.handle_incoming(params) do
{:ok, _activity} <- Transmogrifier.handle_incoming(params) do
else
%Activity{} ->
Logger.info("Already had #{params["id"]}")

e ->
_e ->
# Just drop those for now
Logger.info("Unhandled activity")
Logger.info(Poison.encode!(params, pretty: 2))
@@ -154,7 +154,7 @@ defmodule Pleroma.Web.Federator do
end
end

def handle_cast({:enqueue, type, payload, priority}, state)
def handle_cast({:enqueue, type, payload, _priority}, state)
when type in [:incoming_doc, :incoming_ap_doc] do
%{in: {i_running_jobs, i_queue}, out: {o_running_jobs, o_queue}} = state
i_queue = enqueue_sorted(i_queue, {type, payload}, 1)
@@ -162,7 +162,7 @@ defmodule Pleroma.Web.Federator do
{:noreply, %{in: {i_running_jobs, i_queue}, out: {o_running_jobs, o_queue}}}
end

def handle_cast({:enqueue, type, payload, priority}, state) do
def handle_cast({:enqueue, type, payload, _priority}, state) do
%{in: {i_running_jobs, i_queue}, out: {o_running_jobs, o_queue}} = state
o_queue = enqueue_sorted(o_queue, {type, payload}, 1)
{o_running_jobs, o_queue} = maybe_start_job(o_running_jobs, o_queue)


+ 1
- 1
lib/pleroma/web/http_signatures/http_signatures.ex View File

@@ -45,7 +45,7 @@ defmodule Pleroma.Web.HTTPSignatures do
end
end
else
e ->
_e ->
Logger.debug("Could not public key!")
false
end


+ 2
- 2
lib/pleroma/web/twitter_api/twitter_api.ex View File

@@ -184,7 +184,7 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPI do

defp parse_int(_, default), do: default

def search(user, %{"q" => query} = params) do
def search(_user, %{"q" => query} = params) do
limit = parse_int(params["rpp"], 20)
page = parse_int(params["page"], 1)
offset = (page - 1) * limit
@@ -206,7 +206,7 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPI do
order_by: [desc: :inserted_at]
)

activities = Repo.all(q)
_activities = Repo.all(q)
end

defp make_date do


+ 1
- 1
lib/pleroma/web/xml/xml.ex View File

@@ -14,7 +14,7 @@ defmodule Pleroma.Web.XML do

if res == "", do: nil, else: res
catch
e ->
_e ->
Logger.debug("Couldn't find xpath #{xpath} in XML doc")
nil
end


+ 1
- 1
test/support/builders/activity_builder.ex View File

@@ -26,7 +26,7 @@ defmodule Pleroma.Builders.ActivityBuilder do
end

def insert_list(times, data \\ %{}, opts \\ %{}) do
Enum.map(1..times, fn n ->
Enum.map(1..times, fn _n ->
{:ok, activity} = insert(data, opts)
activity
end)


+ 3
- 3
test/support/httpoison_mock.ex View File

@@ -367,7 +367,7 @@ defmodule HTTPoisonMock do

def post(
"https://social.heldscal.la/main/push/hub",
{:form, data},
{:form, _data},
"Content-type": "application/x-www-form-urlencoded"
) do
{:ok,
@@ -711,11 +711,11 @@ defmodule HTTPoisonMock do
}"}
end

def post(url, body, headers) do
def post(url, _body, _headers) do
{:error, "Not implemented the mock response for post #{inspect(url)}"}
end

def post(url, body, headers, options) do
def post(url, _body, _headers, _options) do
{:error, "Not implemented the mock response for post #{inspect(url)}"}
end
end

Loading…
Cancel
Save