Skip to content
This repository was archived by the owner on Nov 8, 2022. It is now read-only.

Commit 3b81bdd

Browse files
committed
chore(clean-up): rm warnings
1 parent e805f18 commit 3b81bdd

File tree

11 files changed

+25
-44
lines changed

11 files changed

+25
-44
lines changed

lib/groupher_server/accounts/delegates/fans.ex

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ defmodule GroupherServer.Accounts.Delegate.Fans do
5050
User |> ORM.find(user_follower.user_id)
5151
end
5252

53-
defp follow_result({:error, :create_follower, %Ecto.Changeset{} = result, _steps}) do
53+
defp follow_result({:error, :create_follower, %Ecto.Changeset{}, _steps}) do
5454
{:error, [message: "already followed", code: ecode(:already_did)]}
5555
end
5656

lib/groupher_server/cms/delegates/article_curd.ex

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -382,7 +382,7 @@ defmodule GroupherServer.CMS.Delegate.ArticleCURD do
382382

383383
normal_entries = normal_contents |> Map.get(:entries)
384384

385-
pind_count = pined_content |> Map.get(:total_count)
385+
# pind_count = pined_content |> Map.get(:total_count)
386386
normal_count = normal_contents |> Map.get(:total_count)
387387

388388
# remote the pined content from normal_entries (if have)

lib/groupher_server/cms/delegates/comment_curd.ex

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,9 +73,7 @@ defmodule GroupherServer.CMS.Delegate.CommentCURD do
7373
@doc """
7474
Creates a comment for psot, job ...
7575
"""
76-
def update_comment(thread, id, %{body: body} = args, %Accounts.User{id: user_id}) do
77-
{:ok, action} = match_action(thread, :comment)
78-
76+
def update_comment(thread, id, %{body: body}, %Accounts.User{id: user_id}) do
7977
with {:ok, action} <- match_action(thread, :comment),
8078
{:ok, content} <- ORM.find(action.reactor, id),
8179
true <- content.author_id == user_id do

lib/groupher_server/cms/delegates/community_operation.ex

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ defmodule GroupherServer.CMS.Delegate.CommunityOperation do
166166
def unsubscribe_community(
167167
%Community{id: community_id},
168168
%User{id: user_id, geo_city: city},
169-
remote_ip
169+
_remote_ip
170170
) do
171171
with {:ok, community} <- ORM.find(Community, community_id),
172172
true <- community.raw !== "home",

lib/groupher_server_web/resolvers/accounts_resolver.ex

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -182,11 +182,11 @@ defmodule GroupherServerWeb.Resolvers.Accounts do
182182
Accounts.list_editable_communities(cur_user, filter)
183183
end
184184

185-
def editable_communities(_root, ~m(filter)a, %{
186-
context: %{cur_user: %{cur_passport: %{"cms" => %{"root" => true}}} = _cur_user}
187-
}) do
188-
CMS.Community |> ORM.find_all(filter)
189-
end
185+
# def editable_communities(_root, ~m(filter)a, %{
186+
# context: %{cur_user: %{cur_passport: %{"cms" => %{"root" => true}}} = _cur_user}
187+
# }) do
188+
# CMS.Community |> ORM.find_all(filter)
189+
# end
190190

191191
def editable_communities(root, ~m(filter)a, _info) do
192192
Accounts.list_editable_communities(%User{id: root.id}, filter)
@@ -292,8 +292,7 @@ defmodule GroupherServerWeb.Resolvers.Accounts do
292292
_ -> %{}
293293
end
294294

295-
customization =
296-
Map.merge(customization, %{sidebar_communities_index: sidebar_communities_index})
295+
Map.merge(customization, %{sidebar_communities_index: sidebar_communities_index})
297296

298297
false ->
299298
customization

lib/groupher_server_web/schema/cms/cms_misc.ex

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,7 @@ defmodule GroupherServerWeb.Schema.CMS.Misc do
263263
field(:sort, :repo_sort_enum)
264264
end
265265

266-
@doc """
266+
@desc """
267267
cms github repo contribotor
268268
"""
269269
input_object :repo_contributor_input do
@@ -272,7 +272,7 @@ defmodule GroupherServerWeb.Schema.CMS.Misc do
272272
field(:nickname, :string)
273273
end
274274

275-
@doc """
275+
@desc """
276276
cms github repo contribotor, detail version
277277
"""
278278
input_object :github_contributor_input do
@@ -285,7 +285,7 @@ defmodule GroupherServerWeb.Schema.CMS.Misc do
285285
field(:company, :string)
286286
end
287287

288-
@doc """
288+
@desc """
289289
cms github repo lang
290290
"""
291291
input_object :repo_lang_input do

lib/helper/parse_remote_ip.ex

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ defmodule Helper.RemoteIP do
1414
def parse([proxy_ips]) do
1515
client_ip = proxy_ips |> String.split(",") |> List.first()
1616

17-
case client_ip not in slb_ips do
17+
case client_ip not in slb_ips() do
1818
true ->
1919
{:ok, client_ip}
2020

test/groupher_server_web/mutation/accounts/customization_test.exs

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,6 @@
11
defmodule GroupherServer.Test.Mutation.Account.Customization do
22
use GroupherServer.TestTools
33

4-
# alias GroupherServer.{Accounts}
5-
# alias Helper.ORM
6-
import Helper.Utils, only: [get_config: 2]
7-
8-
@max_page_size get_config(:general, :page_size)
9-
104
setup do
115
{:ok, user} = db_insert(:user)
126

@@ -86,7 +80,7 @@ defmodule GroupherServer.Test.Mutation.Account.Customization do
8680
}
8781
}
8882

89-
hello = user_conn |> mutation_result(@query, variables, "setCustomization")
83+
user_conn |> mutation_result(@query, variables, "setCustomization")
9084

9185
variables = %{filter: %{page: 1}}
9286
results = user_conn |> query_result(@paged_post_query, variables, "pagedPosts")

test/groupher_server_web/mutation/cms/post_test.exs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,19 +63,18 @@ defmodule GroupherServer.Test.Mutation.Post do
6363
assert {:ok, _} = ORM.find_by(CMS.Author, user_id: user.id)
6464
end
6565

66-
@tag :wip
6766
test "create post should excape xss attracts" do
6867
{:ok, user} = db_insert(:user)
6968
user_conn = simu_conn(:user, user)
7069

7170
{:ok, community} = db_insert(:community)
72-
post_attr = mock_attrs(:post, %{body: "<script>alert(\"hello,world\")</script>"})
71+
post_attr = mock_attrs(:post, %{body: assert_v(:xss_string)})
7372

7473
variables = post_attr |> Map.merge(%{communityId: community.id})
7574
created = user_conn |> mutation_result(@create_post_query, variables, "createPost")
7675
{:ok, post} = ORM.find(CMS.Post, created["id"])
7776

78-
assert post.body == "&lt;script&gt;alert(&quot;hello,world&quot;)&lt;/script&gt;"
77+
assert post.body == assert_v(:xss_safe_string)
7978
end
8079

8180
# NOTE: this test is IMPORTANT, cause json_codec: Jason in router will cause

test/support/assert_helper.ex

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -108,14 +108,6 @@ defmodule GroupherServer.Test.AssertHelper do
108108
"""
109109
def mutation_get_error?(conn, query, variables, flag \\ false)
110110

111-
def mutation_get_error?(conn, query, variables, flag) do
112-
conn
113-
|> post("/graphiql", query: query, variables: variables)
114-
|> json_response(200)
115-
|> log_debug_info(flag)
116-
|> Map.has_key?("errors")
117-
end
118-
119111
@doc """
120112
Graphiql murate error with code equal check
121113
"""
@@ -136,6 +128,14 @@ defmodule GroupherServer.Test.AssertHelper do
136128
end
137129
end
138130

131+
def mutation_get_error?(conn, query, variables, flag) do
132+
conn
133+
|> post("/graphiql", query: query, variables: variables)
134+
|> json_response(200)
135+
|> log_debug_info(flag)
136+
|> Map.has_key?("errors")
137+
end
138+
139139
def query_result(conn, query, variables, key, flag \\ false) do
140140
conn
141141
|> get("/graphiql", query: query, variables: variables)

test/support/factory.ex

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -104,14 +104,6 @@ defmodule GroupherServer.Support.Factory do
104104
mock_meta(:wiki)
105105
end
106106

107-
defp mock_meta(:repo_contributor) do
108-
%{
109-
avatar: Faker.Avatar.image_url(),
110-
html_url: Faker.Avatar.image_url(),
111-
nickname: "mydearxym2"
112-
}
113-
end
114-
115107
defp mock_meta(:github_contributor) do
116108
unique_num = System.unique_integer([:positive, :monotonic])
117109

@@ -256,7 +248,6 @@ defmodule GroupherServer.Support.Factory do
256248
%{
257249
avatar: Faker.Avatar.image_url(),
258250
html_url: Faker.Avatar.image_url(),
259-
htmlUrl: Faker.Avatar.image_url(),
260251
nickname: "mydearxym2"
261252
}
262253
end

0 commit comments

Comments
 (0)