Merge pull request #3865 from annando/noscrape-last-active

[friendica.git] / mod / fetch.php

diff --git a/mod/fetch.php b/mod/fetch.php
index 753e286be75e5ba424154a78cdc835ed01f55b88..30c38bf543cbe75812c7fea37046cf06972f8e9d 100644 (file)
--- a/mod/fetch.php
+++ b/mod/fetch.php
@@ -2,13 +2,17 @@
 /*
 This file is part of the Diaspora protocol. It is used for fetching single public posts.
 */
+
+use Friendica\App;
+use Friendica\Core\System;
+
 require_once("include/crypto.php");
 require_once("include/diaspora.php");
 require_once("include/xml.php");
 
-function fetch_init($a){
+function fetch_init(App $a) {
 
-       if (($a->argc != 3) OR (!in_array($a->argv[1], array("post", "status_message", "reshare")))) {
+       if (($a->argc != 3) || (!in_array($a->argv[1], array("post", "status_message", "reshare")))) {
                header($_SERVER["SERVER_PROTOCOL"].' 404 '.t('Not Found'));
                killme();
        }
@@ -27,7 +31,7 @@ function fetch_init($a){
                        $parts = parse_url($r[0]["author-link"]);
                        $host = $parts["scheme"]."://".$parts["host"];
 
-                       if (normalise_link($host) != normalise_link(App::get_baseurl())) {
+                       if (normalise_link($host) != normalise_link(System::baseUrl())) {
                                $location = $host."/fetch/".$a->argv[1]."/".urlencode($guid);
 
                                header("HTTP/1.1 301 Moved Permanently");
@@ -42,7 +46,7 @@ function fetch_init($a){
 
        // Fetch some data from the author (We could combine both queries - but I think this is more readable)
        $r = q("SELECT `user`.`prvkey`, `contact`.`addr`, `user`.`nickname`, `contact`.`nick` FROM `user`
-               INNER JOIN `contact` ON `contact`.`uid` = `user`.`uid`
+               INNER JOIN `contact` ON `contact`.`uid` = `user`.`uid` AND `contact`.`self`
                WHERE `user`.`uid` = %d", intval($item[0]["uid"]));
        if (!$r) {
                header($_SERVER["SERVER_PROTOCOL"].' 404 '.t('Not Found'));