summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoger Braun <roger@rogerbraun.net>2017-05-01 20:38:01 +0200
committerRoger Braun <roger@rogerbraun.net>2017-05-01 20:38:01 +0200
commit8ae13d94dc69e4fcb7f454c2eb7665955c8e37fb (patch)
tree71c6f40b6b6316374db4a6c6888712be76330063
parentaa209414164cf098376d8aefb3f2af16111bd220 (diff)
downloadpleroma-8ae13d94dc69e4fcb7f454c2eb7665955c8e37fb.tar.gz
pleroma-8ae13d94dc69e4fcb7f454c2eb7665955c8e37fb.zip
Use empty context id if we get none
Thanks mastodon.
-rw-r--r--lib/pleroma/web/ostatus/ostatus.ex2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/pleroma/web/ostatus/ostatus.ex b/lib/pleroma/web/ostatus/ostatus.ex
index 01d6745ef..6a6f43acf 100644
--- a/lib/pleroma/web/ostatus/ostatus.ex
+++ b/lib/pleroma/web/ostatus/ostatus.ex
@@ -45,7 +45,7 @@ defmodule Pleroma.Web.OStatus do
uri = string_from_xpath("/entry/author/uri[1]", entry) || string_from_xpath("/feed/author/uri[1]", doc)
{:ok, actor} = find_or_make_user(uri)
- context = string_from_xpath("/entry/ostatus:conversation[1]", entry) |> String.trim
+ context = (string_from_xpath("/entry/ostatus:conversation[1]", entry) || "") |> String.trim
context = if String.length(context) > 0 do
context
else