From a2146021f3218ae66d32d6a28f3a79a2d1cee6ac Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 1 Sep 2014 16:32:35 -0700 Subject: [PATCH] use feed icon as default avatar for rss connections --- images/rss_icon.png | Bin 0 -> 9478 bytes include/Contact.php | 2 +- include/network.php | 7 +++++-- 3 files changed, 6 insertions(+), 3 deletions(-) create mode 100644 images/rss_icon.png diff --git a/images/rss_icon.png b/images/rss_icon.png new file mode 100644 index 0000000000000000000000000000000000000000..9ad743d48aef70138e8a544d7594c36a9cc62f87 GIT binary patch literal 9478 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 YA2%=B-MG%<5&!@I07*qoM6N<$g4vQG$p8QV literal 0 HcmV?d00001 diff --git a/include/Contact.php b/include/Contact.php index 66c94ef50..a9e737bde 100644 --- a/include/Contact.php +++ b/include/Contact.php @@ -323,7 +323,7 @@ function mark_orphan_hubsxchans() { return; $r = q("update hubloc set hubloc_status = (hubloc_status | %d) where not (hubloc_status & %d) - and hubloc_connected < utc_timestamp() - interval 36 day", + and hubloc_network != 'zot' and hubloc_connected < utc_timestamp() - interval 36 day", intval(HUBLOC_OFFLINE), intval(HUBLOC_OFFLINE) ); diff --git a/include/network.php b/include/network.php index 89bcbdc25..c44ed77c4 100644 --- a/include/network.php +++ b/include/network.php @@ -938,6 +938,9 @@ function discover_by_url($url,$arr = null) { if($r) return true; + if(! $photo) + $photo = z_root() . '/images/rss_icon.png'; + $r = q("insert into xchan ( xchan_hash, xchan_guid, xchan_pubkey, xchan_addr, xchan_url, xchan_name, xchan_network, xchan_instance_url, xchan_name_date ) values ('%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s') ", dbesc($guid), dbesc($guid), @@ -950,9 +953,9 @@ function discover_by_url($url,$arr = null) { dbesc(datetime_convert()) ); - $photos = import_profile_photo($photo,$profile); + $photos = import_profile_photo($photo,$guid); $r = q("update xchan set xchan_photo_date = '%s', xchan_photo_l = '%s', xchan_photo_m = '%s', xchan_photo_s = '%s', xchan_photo_mimetype = '%s' where xchan_hash = '%s' limit 1", - dbesc(datetime_convert('UTC','UTC',$arr['photo_updated'])), + dbesc(datetime_convert()), dbesc($photos[0]), dbesc($photos[1]), dbesc($photos[2]),