Merge remote-tracking branch 'upstream/develop' into 1512-ostatus-picture-posts

diff --combined include/ostatus.php
index 593a9232a4eaab264ae3398773b11ac353fb8415,07eaec85d50f4b962a3b281507e84606ade94ce9..932fc1fa9a7ea142fe06518c14e50fab657e16e9
--- 1/include/ostatus.php
--- 2/include/ostatus.php
+++ b/include/ostatus.php
@@@ -9,7 -9,6 +9,7 @@@ require_once("include/socgraph.php")
  require_once("include/Photo.php");
  require_once("include/Scrape.php");
  require_once("include/follow.php");
 +require_once("mod/proxy.php");
  
  define('OSTATUS_DEFAULT_POLL_INTERVAL', 30); // given in minutes
  define('OSTATUS_DEFAULT_POLL_TIMEFRAME', 1440); // given in minutes
@@@ -1090,33 -1089,6 +1090,33 @@@ function xml_add_element($doc, $parent
        $parent->appendChild($element);
  }
  
 +function ostatus_format_picture_post($body) {
 +      $siteinfo = get_attached_data($body);
 +
 +      if (($siteinfo["type"] == "photo")) {
 +              if (isset($siteinfo["preview"]))
 +                      $preview = $siteinfo["preview"];
 +              else
 +                      $preview = $siteinfo["image"];
 +
 +              // Is it a remote picture? Then make a smaller preview here
 +              $preview = proxy_url($preview, false, PROXY_SIZE_SMALL);
 +
 +              // Is it a local picture? Then make it smaller here
 +              $preview = str_replace(array("-0.jpg", "-0.png"), array("-2.jpg", "-2.png"), $preview);
 +              $preview = str_replace(array("-1.jpg", "-1.png"), array("-2.jpg", "-2.png"), $preview);
 +
 +              if (isset($siteinfo["url"]))
 +                      $url = $siteinfo["url"];
 +              else
 +                      $url = $siteinfo["image"];
 +
 +              $body = trim($siteinfo["text"])." [url]".$url."[/url]\n[img]".$preview."[/img]";
 +      }
 +
 +      return $body;
 +}
 +
  function ostatus_add_header($doc, $owner) {
        $a = get_app();
  
@@@ -1310,6 -1282,14 +1310,14 @@@ function ostatus_add_author($doc, $owne
        return $author;
  }
  
+ /*
+ To-Do: Picture attachments should look like this:
+ 
+ <a href="https://status.pirati.ca/attachment/572819" title="https://status.pirati.ca/file/heluecht-20151202T222602-rd3u49p.gif"
+ class="attachment thumbnail" id="attachment-572819" rel="nofollow external">https://status.pirati.ca/attachment/572819</a>
+ 
+ */
+ 
  function ostatus_entry($doc, $item, $owner, $toplevel = false) {
        $a = get_app();
  
@@@ -1360,8 -1340,6 +1368,8 @@@
        else
                $body = $item['body'];
  
 +      $body = ostatus_format_picture_post($body);
 +
        if ($item['title'] != "")
                $body = "[b]".$item['title']."[/b]\n\n".$body;