From 4a460ed078f16a67731ddd4fc6c230ea8f960b16 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tobias=20H=C3=B6=C3=9Fl?= <tobias@hoessl.eu> Date: Tue, 17 Apr 2012 18:07:49 +0000 Subject: [PATCH 1/6] Synchronizing comments and likes of individual FB-comments --- facebook/facebook.php | 396 ++++++++++++++++++++++++++---------------- 1 file changed, 244 insertions(+), 152 deletions(-) diff --git a/facebook/facebook.php b/facebook/facebook.php index 4f534a0b9..9501d95d1 100644 --- a/facebook/facebook.php +++ b/facebook/facebook.php @@ -1,7 +1,7 @@ <?php /** * Name: Facebook Connector - * Version: 1.2 + * Version: 1.3 * Author: Mike Macgirvin <http://macgirvin.com/profile/mike> * Tobias Hößl <https://github.com/CatoTH/> */ @@ -516,7 +516,7 @@ function facebook_content(&$a) { return ''; } - $a->page['htmlhead'] .= '<link rel="stylesheet" type="text/css" href="' + $a->page['htmlhead'] .= '<link rel="stylesheet" type="text/css" href="' . $a->get_baseurl() . '/addon/facebook/facebook.css' . '" media="all" />' . "\r\n"; $o .= '<h3>' . t('Facebook Connect') . '</h3>'; @@ -693,6 +693,7 @@ function facebook_plugin_admin(&$a, &$o){ $appid = get_config('facebook', 'appid' ); $appsecret = get_config('facebook', 'appsecret' ); $poll_interval = get_config('facebook', 'poll_interval' ); + $sync_comments = get_config('facebook', 'sync_comments' ); if (!$poll_interval) $poll_interval = FACEBOOK_DEFAULT_POLL_INTERVAL; $ret1 = q("SELECT `v` FROM `config` WHERE `cat` = 'facebook' AND `k` = 'appid' LIMIT 1"); @@ -712,6 +713,7 @@ function facebook_plugin_admin(&$a, &$o){ $o .= '<label for="fb_appid">' . t('App-ID / API-Key') . '</label><input name="appid" type="text" value="' . escape_tags($appid ? $appid : "") . '"><br style="clear: both;">'; $o .= '<label for="fb_appsecret">' . t('Application secret') . '</label><input name="appsecret" type="text" value="' . escape_tags($appsecret ? $appsecret : "") . '"><br style="clear: both;">'; $o .= '<label for="fb_poll_interval">' . sprintf(t('Polling Interval (min. %1$s minutes)'), FACEBOOK_MIN_POLL_INTERVAL) . '</label><input name="poll_interval" type="number" min="' . FACEBOOK_MIN_POLL_INTERVAL . '" value="' . $poll_interval . '"><br style="clear: both;">'; + $o .= '<label for="fb_sync_comments">' . t('Synchronize comments (no comments on Facebook are missed, at the cost of increased system load)') . '</label><input name="sync_comments" id="fb_sync_comments" type="checkbox" ' . ($sync_comments ? 'checked' : '') . '><br style="clear: both;">'; $o .= '<input type="submit" name="fb_save_keys" value="' . t('Save') . '">'; if ($working_connection) { @@ -739,6 +741,7 @@ function facebook_plugin_admin_post(&$a, &$o){ set_config('facebook', 'appsecret', $_REQUEST['appsecret']); $poll_interval = IntVal($_REQUEST['poll_interval']); if ($poll_interval >= FACEBOOK_MIN_POLL_INTERVAL) set_config('facebook', 'poll_interval', $poll_interval); + set_config('facebook', 'sync_comments', (x($_REQUEST, 'sync_comments') ? 1 : 0)); del_config('facebook', 'app_access_token'); info(t('The new values have been saved.')); } @@ -1324,7 +1327,7 @@ function fb_consume_all($uid) { } } // Get the last date - $lastdate = get_pconfig($uid,'facebook','lastdate'); + $lastdate = get_pconfig($uid,'facebook','lastdate') - 10000; // fetch all items since the last date $j = fb_get_timeline($access_token, $lastdate); if (isset($j->data)) { @@ -1361,6 +1364,209 @@ function fb_get_photo($uid,$link) { return ""; } + +/** + * @param App $a + * @param array $user + * @param array $self + * @param string $fb_id + * @param bool $wall + * @param array $orig_post + * @param object $cmnt + */ +function fb_consume_comment(&$a, &$user, &$self, $fb_id, $wall, &$orig_post, &$cmnt) { + + if(! $orig_post) + return; + + $top_item = $orig_post['id']; + $uid = IntVal($user[0]['uid']); + + $r = q("SELECT * FROM `item` WHERE `uid` = %d AND ( `uri` = '%s' OR `extid` = '%s' ) LIMIT 1", + intval($uid), + dbesc('fb::' . $cmnt->id), + dbesc('fb::' . $cmnt->id) + ); + if(count($r)) + return; + + $cmntdata = array(); + $cmntdata['parent'] = $top_item; + $cmntdata['verb'] = ACTIVITY_POST; + $cmntdata['gravity'] = 6; + $cmntdata['uid'] = $uid; + $cmntdata['wall'] = (($wall) ? 1 : 0); + $cmntdata['uri'] = 'fb::' . $cmnt->id; + $cmntdata['parent-uri'] = $orig_post['uri']; + if($cmnt->from->id == $fb_id) { + $cmntdata['contact-id'] = $self[0]['id']; + } + else { + $r = q("SELECT * FROM `contact` WHERE `notify` = '%s' AND `uid` = %d LIMIT 1", + dbesc($cmnt->from->id), + intval($uid) + ); + if(count($r)) { + $cmntdata['contact-id'] = $r[0]['id']; + if($r[0]['blocked'] || $r[0]['readonly']) + return; + } + } + if(! x($cmntdata,'contact-id')) + $cmntdata['contact-id'] = $orig_post['contact-id']; + + $cmntdata['app'] = 'facebook'; + $cmntdata['created'] = datetime_convert('UTC','UTC',$cmnt->created_time); + $cmntdata['edited'] = datetime_convert('UTC','UTC',$cmnt->created_time); + $cmntdata['verb'] = ACTIVITY_POST; + $cmntdata['author-name'] = $cmnt->from->name; + $cmntdata['author-link'] = 'http://facebook.com/profile.php?id=' . $cmnt->from->id; + $cmntdata['author-avatar'] = 'https://graph.facebook.com/' . $cmnt->from->id . '/picture'; + $cmntdata['body'] = $cmnt->message; + $item = item_store($cmntdata); + + $myconv = q("SELECT `author-link`, `author-avatar`, `parent` FROM `item` WHERE `parent-uri` = '%s' AND `uid` = %d AND `parent` != 0 ", + dbesc($orig_post['uri']), + intval($uid) + ); + + if(count($myconv)) { + $importer_url = $a->get_baseurl() . '/profile/' . $user[0]['nickname']; + + foreach($myconv as $conv) { + + // now if we find a match, it means we're in this conversation + + if(! link_compare($conv['author-link'],$importer_url)) + continue; + + require_once('include/enotify.php'); + + $conv_parent = $conv['parent']; + + notification(array( + 'type' => NOTIFY_COMMENT, + 'notify_flags' => $user[0]['notify-flags'], + 'language' => $user[0]['language'], + 'to_name' => $user[0]['username'], + 'to_email' => $user[0]['email'], + 'uid' => $user[0]['uid'], + 'item' => $cmntdata, + 'link' => $a->get_baseurl() . '/display/' . $user[0]['nickname'] . '/' . $item, + 'source_name' => $cmntdata['author-name'], + 'source_link' => $cmntdata['author-link'], + 'source_photo' => $cmntdata['author-avatar'], + 'verb' => ACTIVITY_POST, + 'otype' => 'item', + 'parent' => $conv_parent, + )); + + // only send one notification + break; + } + } +} + + +/** + * @param App $a + * @param array $user + * @param array $self + * @param string $fb_id + * @param bool $wall + * @param array $orig_post + * @param object $likes + */ +function fb_consume_like(&$a, &$user, &$self, $fb_id, $wall, &$orig_post, &$likes) { + + $top_item = $orig_post['id']; + $uid = IntVal($user[0]['uid']); + + if(! $orig_post) + return; + + // If we posted the like locally, it will be found with our url, not the FB url. + + $second_url = (($likes->id == $fb_id) ? $self[0]['url'] : 'http://facebook.com/profile.php?id=' . $likes->id); + + $r = q("SELECT * FROM `item` WHERE `parent-uri` = '%s' AND `uid` = %d AND `verb` = '%s' + AND ( `author-link` = '%s' OR `author-link` = '%s' ) LIMIT 1", + dbesc($orig_post['uri']), + intval($uid), + dbesc(ACTIVITY_LIKE), + dbesc('http://facebook.com/profile.php?id=' . $likes->id), + dbesc($second_url) + ); + + if(count($r)) + return; + + $likedata = array(); + $likedata['parent'] = $top_item; + $likedata['verb'] = ACTIVITY_LIKE; + $likedata['gravity'] = 3; + $likedata['uid'] = $uid; + $likedata['wall'] = (($wall) ? 1 : 0); + $likedata['uri'] = item_new_uri($a->get_baseurl(), $uid); + $likedata['parent-uri'] = $orig_post['uri']; + if($likes->id == $fb_id) + $likedata['contact-id'] = $self[0]['id']; + else { + $r = q("SELECT * FROM `contact` WHERE `notify` = '%s' AND `uid` = %d AND `blocked` = 0 AND `readonly` = 0 LIMIT 1", + dbesc($likes->id), + intval($uid) + ); + if(count($r)) + $likedata['contact-id'] = $r[0]['id']; + } + if(! x($likedata,'contact-id')) + $likedata['contact-id'] = $orig_post['contact-id']; + + $likedata['app'] = 'facebook'; + $likedata['verb'] = ACTIVITY_LIKE; + $likedata['author-name'] = $likes->name; + $likedata['author-link'] = 'http://facebook.com/profile.php?id=' . $likes->id; + $likedata['author-avatar'] = 'https://graph.facebook.com/' . $likes->id . '/picture'; + + $author = '[url=' . $likedata['author-link'] . ']' . $likedata['author-name'] . '[/url]'; + $objauthor = '[url=' . $orig_post['author-link'] . ']' . $orig_post['author-name'] . '[/url]'; + $post_type = t('status'); + $plink = '[url=' . $orig_post['plink'] . ']' . $post_type . '[/url]'; + $likedata['object-type'] = ACTIVITY_OBJ_NOTE; + + $likedata['body'] = sprintf( t('%1$s likes %2$s\'s %3$s'), $author, $objauthor, $plink); + $likedata['object'] = '<object><type>' . ACTIVITY_OBJ_NOTE . '</type><local>1</local>' . + '<id>' . $orig_post['uri'] . '</id><link>' . xmlify('<link rel="alternate" type="text/html" href="' . xmlify($orig_post['plink']) . '" />') . '</link><title>' . $orig_post['title'] . '</title><content>' . $orig_post['body'] . '</content></object>'; + + item_store($likedata); +} + +/** + * @param App $a + * @param array $user + * @param object $entry + * @param array $self + * @param string $fb_id + * @param bool $wall + * @param array $orig_post + */ +function fb_consume_status(&$a, &$user, &$entry, &$self, $fb_id, $wall, &$orig_post) { + $uid = IntVal($user[0]['uid']); + $access_token = get_pconfig($uid, 'facebook', 'access_token'); + + $s = fetch_url('https://graph.facebook.com/' . $entry->id . '?access_token=' . $access_token); + if($s) { + $j = json_decode($s); + if (isset($j->comments) && isset($j->comments->data)) + foreach ($j->comments->data as $cmnt) + fb_consume_comment($a, $user, $self, $fb_id, $wall, $orig_post, $cmnt); + + if (isset($j->likes) && isset($j->likes->data)) + foreach ($j->likes->data as $likers) + fb_consume_like($a, $user, $self, $fb_id, $wall, $orig_post, $likers); + } +} + /** * @param int $uid * @param object $j @@ -1370,7 +1576,6 @@ function fb_consume_stream($uid,$j,$wall = false) { $a = get_app(); - $user = q("SELECT * FROM `user` WHERE `uid` = %d AND `account_expired` = 0 LIMIT 1", intval($uid) ); @@ -1390,6 +1595,9 @@ function fb_consume_stream($uid,$j,$wall = false) { $blocked_apps = get_pconfig($uid,'facebook','blocked_apps'); $blocked_apps_arr = explode(',',$blocked_apps); + $sync_comments = get_config('facebook', 'sync_comments'); + + /** @var string $self_id */ $self_id = get_pconfig($uid,'facebook','self_id'); if(! count($j->data) || (! strlen($self_id))) return; @@ -1591,169 +1799,53 @@ function fb_consume_stream($uid,$j,$wall = false) { } } + /** @var array $orig_post */ + + $likers_num = (isset($entry->likes) && isset($entry->likes->count) ? IntVal($entry->likes->count) : 0 ); if(isset($entry->likes) && isset($entry->likes->data)) $likers = $entry->likes->data; else $likers = null; + $comments_num = (isset($entry->comments) && isset($entry->comments->count) ? IntVal($entry->comments->count) : 0 ); if(isset($entry->comments) && isset($entry->comments->data)) $comments = $entry->comments->data; else $comments = null; - if(is_array($likers)) { - foreach($likers as $likes) { + $needs_sync = false; - if(! $orig_post) - continue; - - // If we posted the like locally, it will be found with our url, not the FB url. - - $second_url = (($likes->id == $self_id) ? $self[0]['url'] : 'http://facebook.com/profile.php?id=' . $likes->id); - - $r = q("SELECT * FROM `item` WHERE `parent-uri` = '%s' AND `uid` = %d AND `verb` = '%s' - AND ( `author-link` = '%s' OR `author-link` = '%s' ) LIMIT 1", - dbesc($orig_post['uri']), - intval($uid), - dbesc(ACTIVITY_LIKE), - dbesc('http://facebook.com/profile.php?id=' . $likes->id), - dbesc($second_url) - ); - - if(count($r)) - continue; - - $likedata = array(); - $likedata['parent'] = $top_item; - $likedata['verb'] = ACTIVITY_LIKE; - $likedata['gravity'] = 3; - $likedata['uid'] = $uid; - $likedata['wall'] = (($wall) ? 1 : 0); - $likedata['uri'] = item_new_uri($a->get_baseurl(), $uid); - $likedata['parent-uri'] = $orig_post['uri']; - if($likes->id == $self_id) - $likedata['contact-id'] = $self[0]['id']; - else { - $r = q("SELECT * FROM `contact` WHERE `notify` = '%s' AND `uid` = %d AND `blocked` = 0 AND `readonly` = 0 LIMIT 1", - dbesc($likes->id), - intval($uid) - ); - if(count($r)) - $likedata['contact-id'] = $r[0]['id']; - } - if(! x($likedata,'contact-id')) - $likedata['contact-id'] = $orig_post['contact-id']; - - $likedata['app'] = 'facebook'; - $likedata['verb'] = ACTIVITY_LIKE; - $likedata['author-name'] = $likes->name; - $likedata['author-link'] = 'http://facebook.com/profile.php?id=' . $likes->id; - $likedata['author-avatar'] = 'https://graph.facebook.com/' . $likes->id . '/picture'; - - $author = '[url=' . $likedata['author-link'] . ']' . $likedata['author-name'] . '[/url]'; - $objauthor = '[url=' . $orig_post['author-link'] . ']' . $orig_post['author-name'] . '[/url]'; - $post_type = t('status'); - $plink = '[url=' . $orig_post['plink'] . ']' . $post_type . '[/url]'; - $likedata['object-type'] = ACTIVITY_OBJ_NOTE; - - $likedata['body'] = sprintf( t('%1$s likes %2$s\'s %3$s'), $author, $objauthor, $plink); - $likedata['object'] = '<object><type>' . ACTIVITY_OBJ_NOTE . '</type><local>1</local>' . - '<id>' . $orig_post['uri'] . '</id><link>' . xmlify('<link rel="alternate" type="text/html" href="' . xmlify($orig_post['plink']) . '" />') . '</link><title>' . $orig_post['title'] . '</title><content>' . $orig_post['body'] . '</content></object>'; - - item_store($likedata); - } + if(is_array($likers)) { + foreach($likers as $likes) fb_consume_like($a, $user, $self, $self_id, $wall, $orig_post, $likes); + if ($sync_comments) { + $r = q("SELECT COUNT(*) likes FROM `item` WHERE `parent-uri` = '%s' AND `uid` = %d AND `verb` = '%s' AND `parent-uri` != `uri`", + dbesc($orig_post['uri']), + intval($uid), + dbesc(ACTIVITY_LIKE) + ); + if ($r[0]['likes'] < $likers_num) { + logger('fb_consume_stream: missing likes found for ' . $orig_post['uri'] . ' (we have ' . $r[0]['likes'] . ' of ' . $likers_num . '). Synchronizing...', LOGGER_DEBUG); + $needs_sync = true; + } + } } + if(is_array($comments)) { - foreach($comments as $cmnt) { - - if(! $orig_post) - continue; - - $r = q("SELECT * FROM `item` WHERE `uid` = %d AND ( `uri` = '%s' OR `extid` = '%s' ) LIMIT 1", - intval($uid), - dbesc('fb::' . $cmnt->id), - dbesc('fb::' . $cmnt->id) - ); - if(count($r)) - continue; - - $cmntdata = array(); - $cmntdata['parent'] = $top_item; - $cmntdata['verb'] = ACTIVITY_POST; - $cmntdata['gravity'] = 6; - $cmntdata['uid'] = $uid; - $cmntdata['wall'] = (($wall) ? 1 : 0); - $cmntdata['uri'] = 'fb::' . $cmnt->id; - $cmntdata['parent-uri'] = $orig_post['uri']; - if($cmnt->from->id == $self_id) { - $cmntdata['contact-id'] = $self[0]['id']; - } - else { - $r = q("SELECT * FROM `contact` WHERE `notify` = '%s' AND `uid` = %d LIMIT 1", - dbesc($cmnt->from->id), - intval($uid) - ); - if(count($r)) { - $cmntdata['contact-id'] = $r[0]['id']; - if($r[0]['blocked'] || $r[0]['readonly']) - continue; - } - } - if(! x($cmntdata,'contact-id')) - $cmntdata['contact-id'] = $orig_post['contact-id']; - - $cmntdata['app'] = 'facebook'; - $cmntdata['created'] = datetime_convert('UTC','UTC',$cmnt->created_time); - $cmntdata['edited'] = datetime_convert('UTC','UTC',$cmnt->created_time); - $cmntdata['verb'] = ACTIVITY_POST; - $cmntdata['author-name'] = $cmnt->from->name; - $cmntdata['author-link'] = 'http://facebook.com/profile.php?id=' . $cmnt->from->id; - $cmntdata['author-avatar'] = 'https://graph.facebook.com/' . $cmnt->from->id . '/picture'; - $cmntdata['body'] = $cmnt->message; - $item = item_store($cmntdata); - - $myconv = q("SELECT `author-link`, `author-avatar`, `parent` FROM `item` WHERE `parent-uri` = '%s' AND `uid` = %d AND `parent` != 0 ", - dbesc($orig_post['uri']), - intval($uid) - ); - - if(count($myconv)) { - $importer_url = $a->get_baseurl() . '/profile/' . $user[0]['nickname']; - - foreach($myconv as $conv) { - - // now if we find a match, it means we're in this conversation - - if(! link_compare($conv['author-link'],$importer_url)) - continue; - - require_once('include/enotify.php'); - - $conv_parent = $conv['parent']; - - notification(array( - 'type' => NOTIFY_COMMENT, - 'notify_flags' => $user[0]['notify-flags'], - 'language' => $user[0]['language'], - 'to_name' => $user[0]['username'], - 'to_email' => $user[0]['email'], - 'uid' => $user[0]['uid'], - 'item' => $cmntdata, - 'link' => $a->get_baseurl() . '/display/' . $user[0]['nickname'] . '/' . $item, - 'source_name' => $cmntdata['author-name'], - 'source_link' => $cmntdata['author-link'], - 'source_photo' => $cmntdata['author-avatar'], - 'verb' => ACTIVITY_POST, - 'otype' => 'item', - 'parent' => $conv_parent, - )); - - // only send one notification - break; - } - } + foreach($comments as $cmnt) fb_consume_comment($a, $user, $self, $self_id, $wall, $orig_post, $cmnt); + if ($sync_comments) { + $r = q("SELECT COUNT(*) comments FROM `item` WHERE `parent-uri` = '%s' AND `uid` = %d AND `verb` = '%s' AND `parent-uri` != `uri`", + dbesc($orig_post['uri']), + intval($uid), + ACTIVITY_POST + ); + if ($r[0]['comments'] < $comments_num) { + logger('fb_consume_stream: missing comments found for ' . $orig_post['uri'] . ' (we have ' . $r[0]['comments'] . ' of ' . $comments_num . '). Synchronizing...', LOGGER_DEBUG); + $needs_sync = true; + } } } + + if ($needs_sync) fb_consume_status($a, $user, $entry, $self, $self_id, $wall, $orig_post); } } From 4018885640d3864a7d4039f4a3ec297e8c8443b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tobias=20H=C3=B6=C3=9Fl?= <tobias@hoessl.eu> Date: Tue, 17 Apr 2012 18:18:58 +0000 Subject: [PATCH 2/6] Synchronizing comments and likes of individual FB-comments --- facebook/facebook.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/facebook/facebook.php b/facebook/facebook.php index 9501d95d1..aa388a177 100644 --- a/facebook/facebook.php +++ b/facebook/facebook.php @@ -1327,7 +1327,7 @@ function fb_consume_all($uid) { } } // Get the last date - $lastdate = get_pconfig($uid,'facebook','lastdate') - 10000; + $lastdate = get_pconfig($uid,'facebook','lastdate'); // fetch all items since the last date $j = fb_get_timeline($access_token, $lastdate); if (isset($j->data)) { From ec78e5eb8d13e23178f81d4e265f9a9b356445ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tobias=20H=C3=B6=C3=9Fl?= <tobias@hoessl.eu> Date: Wed, 18 Apr 2012 06:12:46 +0000 Subject: [PATCH 3/6] Synchronize all Likes --- facebook/facebook.php | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/facebook/facebook.php b/facebook/facebook.php index aa388a177..ee6780b5e 100644 --- a/facebook/facebook.php +++ b/facebook/facebook.php @@ -1561,9 +1561,19 @@ function fb_consume_status(&$a, &$user, &$entry, &$self, $fb_id, $wall, &$orig_p foreach ($j->comments->data as $cmnt) fb_consume_comment($a, $user, $self, $fb_id, $wall, $orig_post, $cmnt); - if (isset($j->likes) && isset($j->likes->data)) - foreach ($j->likes->data as $likers) - fb_consume_like($a, $user, $self, $fb_id, $wall, $orig_post, $likers); + if (isset($j->likes) && isset($j->likes->data) && isset($j->likes->count)) { + if (count($j->likes->data) == $j->likes->count) { + foreach ($j->likes->data as $likers) fb_consume_like($a, $user, $self, $fb_id, $wall, $orig_post, $likers); + } else { + $t = fetch_url('https://graph.facebook.com/' . $entry->id . '/likes?access_token=' . $access_token); + if ($t) { + $k = json_decode($t); + if (isset($k->data)) + foreach ($k->data as $likers) + fb_consume_like($a, $user, $self, $fb_id, $wall, $orig_post, $likers); + } + } + } } } From d5566e806b778ead55065395c8c51a78dd4076be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tobias=20H=C3=B6=C3=9Fl?= <tobias@hoessl.eu> Date: Wed, 18 Apr 2012 06:32:22 +0000 Subject: [PATCH 4/6] Use Markdown to link to the How-To --- facebook/{README => README.md} | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) rename facebook/{README => README.md} (70%) diff --git a/facebook/README b/facebook/README.md similarity index 70% rename from facebook/README rename to facebook/README.md index 5f74d2d4f..a02461e7d 100755 --- a/facebook/README +++ b/facebook/README.md @@ -1,7 +1,7 @@ Installing the Friendica/Facebook connector Detailed instructions how to use this plugin can be found at -https://github.com/friendica/friendica/wiki/How-to:-Friendica%E2%80%99s-Facebook-connector +the [How to: Friendica's Facebook Connector](https://github.com/friendica/friendica/wiki/How-to:-Friendica%E2%80%99s-Facebook-connector) page. Vidoes and embeds will not be posted if there is no other content. Links and images will be converted to a format suitable for the Facebook API and @@ -12,5 +12,4 @@ authenticate to your site to establish identity. We will address this in a future release. Info: please make sure that you understand all aspects due to Friendica's -default licence which is: MIT License (further info: -https://github.com/friendica/friendica/blob/master/LICENSE) +default licence which is: [MIT License](https://github.com/friendica/friendica/blob/master/LICENSE) From 24acdb2e2299eb3ef947d1f6c6b34ea3f441b3bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tobias=20H=C3=B6=C3=9Fl?= <tobias@hoessl.eu> Date: Sun, 22 Apr 2012 12:57:57 +0000 Subject: [PATCH 5/6] Set INPUT IDs --- facebook/facebook.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/facebook/facebook.php b/facebook/facebook.php index ee6780b5e..874ef3022 100644 --- a/facebook/facebook.php +++ b/facebook/facebook.php @@ -710,9 +710,9 @@ function facebook_plugin_admin(&$a, &$o){ } else $o .= t('The correctness of the API Key could not be detected. Somthing strange\'s going on.') . '<br>'; } - $o .= '<label for="fb_appid">' . t('App-ID / API-Key') . '</label><input name="appid" type="text" value="' . escape_tags($appid ? $appid : "") . '"><br style="clear: both;">'; - $o .= '<label for="fb_appsecret">' . t('Application secret') . '</label><input name="appsecret" type="text" value="' . escape_tags($appsecret ? $appsecret : "") . '"><br style="clear: both;">'; - $o .= '<label for="fb_poll_interval">' . sprintf(t('Polling Interval (min. %1$s minutes)'), FACEBOOK_MIN_POLL_INTERVAL) . '</label><input name="poll_interval" type="number" min="' . FACEBOOK_MIN_POLL_INTERVAL . '" value="' . $poll_interval . '"><br style="clear: both;">'; + $o .= '<label for="fb_appid">' . t('App-ID / API-Key') . '</label><input id="fb_appid" name="appid" type="text" value="' . escape_tags($appid ? $appid : "") . '"><br style="clear: both;">'; + $o .= '<label for="fb_appsecret">' . t('Application secret') . '</label><input id="fb_appsecret" name="appsecret" type="text" value="' . escape_tags($appsecret ? $appsecret : "") . '"><br style="clear: both;">'; + $o .= '<label for="fb_poll_interval">' . sprintf(t('Polling Interval (min. %1$s minutes)'), FACEBOOK_MIN_POLL_INTERVAL) . '</label><input name="poll_interval" id="fb_poll_interval" type="number" min="' . FACEBOOK_MIN_POLL_INTERVAL . '" value="' . $poll_interval . '"><br style="clear: both;">'; $o .= '<label for="fb_sync_comments">' . t('Synchronize comments (no comments on Facebook are missed, at the cost of increased system load)') . '</label><input name="sync_comments" id="fb_sync_comments" type="checkbox" ' . ($sync_comments ? 'checked' : '') . '><br style="clear: both;">'; $o .= '<input type="submit" name="fb_save_keys" value="' . t('Save') . '">'; From 33ccf200cb441a15d77c0be4b4059fb620d9b92f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tobias=20H=C3=B6=C3=9Fl?= <tobias@hoessl.eu> Date: Sun, 22 Apr 2012 13:19:45 +0000 Subject: [PATCH 6/6] Privacy Image Cache --- privacy_image_cache/README.md | 4 + privacy_image_cache/privacy_image_cache.php | 175 ++++++++++++++++++++ 2 files changed, 179 insertions(+) create mode 100644 privacy_image_cache/README.md create mode 100644 privacy_image_cache/privacy_image_cache.php diff --git a/privacy_image_cache/README.md b/privacy_image_cache/README.md new file mode 100644 index 000000000..63970d3d3 --- /dev/null +++ b/privacy_image_cache/README.md @@ -0,0 +1,4 @@ +Once activated, this addon acs as a proxy between the user and external image resources. +If external images are to be shown, like avatars or embedded images, the server retrieves the image and the local link is sent to the user. +By using this proxy, the server hosting the original image cannot retrieve personal information of the user like the IP address, User Agent or Cookies. +However, the remote server will be able to track the IP address of the server hosting the friendica installation. \ No newline at end of file diff --git a/privacy_image_cache/privacy_image_cache.php b/privacy_image_cache/privacy_image_cache.php new file mode 100644 index 000000000..45aeb0800 --- /dev/null +++ b/privacy_image_cache/privacy_image_cache.php @@ -0,0 +1,175 @@ +<?php + +/** + * Name: Privacy Image Cache + * Version: 0.1 + * Author: Tobias Hößl <https://github.com/CatoTH/> + */ + +define("PRIVACY_IMAGE_CACHE_DEFAULT_TIME", 86400); // 1 Day + +require_once('include/security.php'); + +function privacy_image_cache_install() { + register_hook('bbcode', 'addon/privacy_image_cache/privacy_image_cache.php', 'privacy_image_cache_bbcode_hook'); + register_hook('display_item', 'addon/privacy_image_cache/privacy_image_cache.php', 'privacy_image_cache_display_item_hook'); + register_hook('ping_xmlize', 'addon/privacy_image_cache/privacy_image_cache.php', 'privacy_image_cache_ping_xmlize_hook'); + register_hook('cron', 'addon/privacy_image_cache/privacy_image_cache.php', 'privacy_image_cache_cron'); +} + + +function privacy_image_cache_uninstall() { + unregister_hook('bbcode', 'addon/privacy_image_cache/privacy_image_cache.php', 'privacy_image_cache_bbcode_hook'); + unregister_hook('display_item', 'addon/privacy_image_cache/privacy_image_cache.php', 'privacy_image_cache_display_item_hook'); + unregister_hook('ping_xmlize', 'addon/privacy_image_cache/privacy_image_cache.php', 'privacy_image_cache_ping_xmlize_hook'); + unregister_hook('cron', 'addon/privacy_image_cache/privacy_image_cache.php', 'privacy_image_cache_cron'); +} + + +function privacy_image_cache_module() {} + + +function privacy_image_cache_init() { + $urlhash = 'pic:' . sha1($_REQUEST['url']); + $r = q("SELECT * FROM `photo` WHERE `resource-id` = '%s' LIMIT 1", $urlhash ); + if (count($r)) { + $img_str = $r[0]['data']; + } + else { + require_once("Photo.php"); + + $img_str = fetch_url($_REQUEST['url'],true); + $img = new Photo($img_str); + if($img->is_valid()) { + $img->store(0, 0, $urlhash, $_REQUEST['url'], '', 100); + $img_str = $img->imageString(); + } + } + + + header("Content-type: image/jpeg"); + header("Expires: " . gmdate("D, d M Y H:i:s", time() + (3600*24)) . " GMT"); + header("Cache-Control: max-age=" . (3600*24)); + + echo $img_str; + + killme(); +} + +/** + * @param $url string + * @return boolean + */ +function privacy_image_cache_is_local_image($url) { + if ($url[0] == '/') return true; + $baseurl = get_app()->get_baseurl(); + return (substr($url, 0, strlen($baseurl)) == $baseurl); +} + +/** + * @param array $matches + * @return string + */ +function privacy_image_cache_img_cb($matches) { + if (privacy_image_cache_is_local_image($matches[2])) return $matches[2]; + return $matches[1] . "/privacy_image_cache/?url=" . escape_tags(addslashes($matches[2])) . $matches[3]; +} + +/** + * @param App $a + * @param string $o + */ +function privacy_image_cache_bbcode_hook(&$a, &$o) { + $o = preg_replace_callback("/(<img [^>]*src *= *[\"'])([^\"']+)([\"'][^>]*>)/siU", "privacy_image_cache_img_cb", $o); +} + + +/** + * @param App $a + * @param string $o + */ +function privacy_image_cache_display_item_hook(&$a, &$o) { + if (isset($o["output"])) { + if (isset($o["output"]["thumb"]) && !privacy_image_cache_is_local_image($o["output"]["thumb"])) + $o["output"]["thumb"] = "/privacy_image_cache/?url=" . escape_tags(addslashes($o["output"]["thumb"])); + if (isset($o["output"]["author-avatar"]) && !privacy_image_cache_is_local_image($o["output"]["author-avatar"])) + $o["output"]["author-avatar"] = "/privacy_image_cache/?url=" . escape_tags(addslashes($o["output"]["author-avatar"])); + } +} + + +/** + * @param App $a + * @param string $o + */ +function privacy_image_cache_ping_xmlize_hook(&$a, &$o) { + if ($o["photo"] != "" && !privacy_image_cache_is_local_image($o["photo"])) + $o["photo"] = "/privacy_image_cache/?url=" . escape_tags(addslashes($o["photo"])); +} + + +/** + * @param App $a + * @param null|object $b + */ +function privacy_image_cache_cron(&$a, &$b) { + $cachetime = get_config('privacy_image_cache','cache_time'); + if (!$cachetime) $cachetime = PRIVACY_IMAGE_CACHE_DEFAULT_TIME; + + $last = get_config('pi_cache','last_delete'); + $time = time(); + if ($time < ($last + 3600)) return; + + logger("Purging old Cache of the Privacy Image Cache", LOGGER_DEBUG); + q('DELETE FROM `photo` WHERE `uid` = 0 AND `resource-id` LIKE "pic:%%" AND `created` < NOW() - INTERVAL %d SECOND', $cachetime); + set_config('pi_cache', 'last_delete', $time); +} + + + + +/** + * @param App $a + * @param null|object $o + */ +function privacy_image_cache_plugin_admin(&$a, &$o){ + + + $o = '<input type="hidden" name="form_security_token" value="' . get_form_security_token("picsave") . '">'; + + $cachetime = get_config('privacy_image_cache','cache_time'); + if (!$cachetime) $cachetime = PRIVACY_IMAGE_CACHE_DEFAULT_TIME; + $cachetime_h = Ceil($cachetime / 3600); + + $o .= '<label for="pic_cachetime">' . t('Lifetime of the cache (in hours)') . '</label> + <input id="pic_cachetime" name="cachetime" type="text" value="' . escape_tags($cachetime_h) . '"><br style="clear: both;">'; + + $o .= '<input type="submit" name="save" value="' . t('Save') . '">'; + + $o .= '<h4>' . t('Cache Statistics') . '</h4>'; + + $num = q('SELECT COUNT(*) num, SUM(LENGTH(data)) size FROM `photo` WHERE `uid`=0 AND `contact-id`=0 AND `resource-id` LIKE "pic:%%"'); + $o .= '<label for="statictics_num">' . t('Number of items') . '</label><input style="color: gray;" id="statistics_num" disabled value="' . escape_tags($num[0]['num']) . '"><br style="clear: both;">'; + $size = Ceil($num[0]['size'] / (1024 * 1024)); + $o .= '<label for="statictics_size">' . t('Size of the cache') . '</label><input style="color: gray;" id="statistics_size" disabled value="' . $size . ' MB"><br style="clear: both;">'; + + $o .= '<input type="submit" name="delete_all" value="' . t('Delete the whole cache') . '">'; +} + + +/** + * @param App $a + * @param null|object $o + */ +function privacy_image_cache_plugin_admin_post(&$a, &$o){ + check_form_security_token_redirectOnErr('/admin/plugins/privacy_image_cache', 'picsave'); + + if (isset($_REQUEST['save'])) { + $cachetime_h = IntVal($_REQUEST['cachetime']); + if ($cachetime_h < 1) $cachetime_h = 1; + set_config('privacy_image_cache','cache_time', $cachetime_h * 3600); + } + if (isset($_REQUEST['delete_all'])) { + q('DELETE FROM `photo` WHERE `uid` = 0 AND `resource-id` LIKE "pic:%%"'); + } +} \ No newline at end of file