nupplaPhil/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge remote-tracking branch 'upstream/develop' into 1511-new-ostatus-delivery

Browse source
This commit is contained in:
Michael Vogel 2015-11-24 09:38:46 +01:00
parent 7d7e2e74f4 b888382cc6
commit 3b101c9d98
2 changed files with 22 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
include/api.php
View file

@ -539,7 +539,8 @@
'verified' => true, 'verified' => true,
'statusnet_blocking' => false, 'statusnet_blocking' => false,
'notifications' => false, 'notifications' => false,
'statusnet_profile_url' => $a->get_baseurl()."/contacts/".$uinfo[0]['cid'], //'statusnet_profile_url' => $a->get_baseurl()."/contacts/".$uinfo[0]['cid'],
'statusnet_profile_url' => $uinfo[0]['url'],
'uid' => intval($uinfo[0]['uid']), 'uid' => intval($uinfo[0]['uid']),
'cid' => intval($uinfo[0]['cid']), 'cid' => intval($uinfo[0]['cid']),
'self' => $uinfo[0]['self'], 'self' => $uinfo[0]['self'],
@ -2849,15 +2850,29 @@ function api_share_as_retweet(&$item) {
function api_get_nick($profile) { function api_get_nick($profile) {
/* To-Do: /* To-Do:
- remove trailing jung from profile url - remove trailing junk from profile url
- pump.io check has to check the website - pump.io check has to check the website
*/ */
$nick = ""; $nick = "";
$friendica = preg_replace("=https?://(.*)/profile/(.*)=ism", "$2", $profile); $r = q("SELECT `nick` FROM `gcontact` WHERE `nurl` = '%s'",
if ($friendica != $profile) dbesc(normalise_link($profile)));
$nick = $friendica; if ($r)
$nick = $r[0]["nick"];
if (!$nick == "") {
$r = q("SELECT `nick` FROM `contact` WHERE `uid` = 0 AND `nurl` = '%s'",
dbesc(normalise_link($profile)));
if ($r)
$nick = $r[0]["nick"];
}
if (!$nick == "") {
$friendica = preg_replace("=https?://(.*)/profile/(.*)=ism", "$2", $profile);
if ($friendica != $profile)
$nick = $friendica;
}
if (!$nick == "") { if (!$nick == "") {
$diaspora = preg_replace("=https?://(.*)/u/(.*)=ism", "$2", $profile); $diaspora = preg_replace("=https?://(.*)/u/(.*)=ism", "$2", $profile);

3
mod/ping.php
View file

@ -41,8 +41,9 @@ function ping_init(&$a) {
FROM `item` INNER JOIN `item` as `pitem` ON `pitem`.`id`=`item`.`parent` FROM `item` INNER JOIN `item` as `pitem` ON `pitem`.`id`=`item`.`parent`
WHERE `item`.`unseen` = 1 AND `item`.`visible` = 1 AND WHERE `item`.`unseen` = 1 AND `item`.`visible` = 1 AND
`item`.`deleted` = 0 AND `item`.`uid` = %d AND `pitem`.`parent` != 0 `item`.`deleted` = 0 AND `item`.`uid` = %d AND `pitem`.`parent` != 0
AND `item`.`contact-id` != %d
ORDER BY `item`.`created` DESC", ORDER BY `item`.`created` DESC",
intval(local_user()) intval(local_user()), intval(local_user())
); );
if(count($r)) { if(count($r)) {