aboutsummaryrefslogtreecommitdiff
path: root/shardweb/lib
diff options
context:
space:
mode:
authorAlex Auvolat <alex@adnab.me>2018-11-05 16:03:56 +0100
committerAlex Auvolat <alex@adnab.me>2018-11-05 16:03:56 +0100
commit0e5b82f3348508eb7f4291a08722522a49edd752 (patch)
tree40bf4c9aa8d5b1920369c176665f5a4e7285de55 /shardweb/lib
parent0b27af3dab56b667b50fd80590cdfd9df0feffbd (diff)
downloadshard-0e5b82f3348508eb7f4291a08722522a49edd752.tar.gz
shard-0e5b82f3348508eb7f4291a08722522a49edd752.zip
Facilitate file sending in chat0.0.4
Diffstat (limited to 'shardweb/lib')
-rw-r--r--shardweb/lib/controllers/directory_controller.ex4
-rw-r--r--shardweb/lib/templates/identity/view.html.eex4
2 files changed, 4 insertions, 4 deletions
diff --git a/shardweb/lib/controllers/directory_controller.ex b/shardweb/lib/controllers/directory_controller.ex
index ad5c426..d1b7136 100644
--- a/shardweb/lib/controllers/directory_controller.ex
+++ b/shardweb/lib/controllers/directory_controller.ex
@@ -84,12 +84,12 @@ defmodule ShardWeb.DirectoryController do
info = SApp.File.get_info(pid)
if info[:missing_blocks] == 0 do
conn
- |> put_resp_content_type(info[:mime_type])
+ |> put_resp_content_type(String.trim(info[:mime_type]))
|> send_file(200, info[:path])
else
conn
|> put_status(:not_found)
- |> text("File not found or not yet completely downloaded.\n#{inspect(info)}")
+ |> text("File not found or not yet completely downloaded. Come back later!\n#{inspect(info)}")
end
end
end
diff --git a/shardweb/lib/templates/identity/view.html.eex b/shardweb/lib/templates/identity/view.html.eex
index c81caf6..cc58ed5 100644
--- a/shardweb/lib/templates/identity/view.html.eex
+++ b/shardweb/lib/templates/identity/view.html.eex
@@ -20,10 +20,10 @@
<%= render ShardWeb.LayoutView, "flashes.html", assigns %>
<%= if @view_pk != @pk do %>
- <a class="btn btn-s btn-primary" href="<%= chat_path(@conn, :privchat, @pk |> Base.encode16) %>"><i class="fa fa-comments"></i> PM</a>
+ <a class="btn btn-s btn-primary" href="<%= chat_path(@conn, :privchat, @view_pk |> Base.encode16) %>"><i class="fa fa-comments"></i> PM</a>
<% end %>
- <a class="btn btn-s btn-success" href="<%= directory_path(@conn, :view_pub, @pk |> Base.encode16, "collection") %>"><i class="fa fa-folder"></i> Public stuff</a>
+ <a class="btn btn-s btn-success" href="<%= directory_path(@conn, :view_pub, @view_pk |> Base.encode16, "collection") %>"><i class="fa fa-folder"></i> Public stuff</a>
<pre>
<%= inspect(SApp.Identity.get_info(@pid), pretty: true, width: 40) %>