hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Attachment parsing, better magic key fetching.

Browse source
This commit is contained in:
Roger Braun 2017-05-03 14:26:49 +02:00
commit 8141024259
12 changed files with 161 additions and 84 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/pleroma/web/ostatus/ostatus_controller.ex
View file

@ -33,7 +33,7 @@ defmodule Pleroma.Web.OStatus.OStatusController do
def salmon_incoming(conn, params) do
{:ok, body, _conn} = read_body(conn)
magic_key = Pleroma.Web.Salmon.fetch_magic_key(body)
{:ok, magic_key} = Pleroma.Web.Salmon.fetch_magic_key(body)
{:ok, doc} = Pleroma.Web.Salmon.decode_and_validate(magic_key, body)
Pleroma.Web.OStatus.handle_incoming(doc)