X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=include%2Flike.php;h=9a8b9b957b0db24fd2d7f459eb5c24be1132ca4f;hb=b4cf27e76731556c2b4d2941f51b74e1935e0ba7;hp=646e0727be4ec63f09773ed6fddea299ed635db0;hpb=e1bc0b4ff820c3d98ba2188ca408cc88ed9ba7eb;p=friendica.git
diff --git a/include/like.php b/include/like.php
index 646e0727be..9a8b9b957b 100644
--- a/include/like.php
+++ b/include/like.php
@@ -1,5 +1,12 @@
$like_item['id']));
$like_item_id = $like_item['id'];
- proc_run('php',"include/notifier.php","like","$like_item_id");
+ Worker::add(PRIORITY_HIGH, "Notifier", "like", $like_item_id);
- return true;
+ if (!$event_verb_flag || $like_item['verb'] == $activity) {
+ return true;
+ }
}
- $uri = item_new_uri($a->get_hostname(),$owner_uid);
+ // Verb is "un-something", just trying to delete existing entries
+ if (strpos($verb, 'un') === 0) {
+ return true;
+ }
+ // Else or if event verb different from existing row, create a new item row
$post_type = (($item['resource-id']) ? t('photo') : t('status'));
- if($item['obj_type'] === ACTIVITY_OBJ_EVENT)
+ if ($item['object-type'] === ACTIVITY_OBJ_EVENT) {
$post_type = t('event');
- $objtype = (($item['resource-id']) ? ACTIVITY_OBJ_PHOTO : ACTIVITY_OBJ_NOTE );
- $link = xmlify('' . "\n") ;
+ }
+ $objtype = $item['resource-id'] ? ACTIVITY_OBJ_IMAGE : ACTIVITY_OBJ_NOTE ;
+ $link = xmlify('' . "\n") ;
$body = $item['body'];
$obj = <<< EOT
@@ -180,219 +198,62 @@ function do_like($item_id, $verb) {
$body
EOT;
- if($verb === 'like')
- $bodyverb = t('%1$s likes %2$s\'s %3$s');
- if($verb === 'dislike')
- $bodyverb = t('%1$s doesn\'t like %2$s\'s %3$s');
- if($verb === 'attendyes')
- $bodyverb = t('%1$s is attending %2$s\'s %3$s');
- if($verb === 'attendno')
- $bodyverb = t('%1$s is not attending %2$s\'s %3$s');
- if($verb === 'attendmaybe')
- $bodyverb = t('%1$s may attend %2$s\'s %3$s');
-
- if(! isset($bodyverb))
- return false;
- $arr = array();
-
- $arr['uri'] = $uri;
- $arr['uid'] = $owner_uid;
- $arr['contact-id'] = $contact['id'];
- $arr['type'] = 'activity';
- $arr['wall'] = $item['wall'];
- $arr['origin'] = 1;
- $arr['gravity'] = GRAVITY_LIKE;
- $arr['parent'] = $item['id'];
- $arr['parent-uri'] = $item['uri'];
- $arr['thr-parent'] = $item['uri'];
- $arr['owner-name'] = $remote_owner['name'];
- $arr['owner-link'] = $remote_owner['url'];
- $arr['owner-avatar'] = $remote_owner['thumb'];
- $arr['author-name'] = $contact['name'];
- $arr['author-link'] = $contact['url'];
- $arr['author-avatar'] = $contact['thumb'];
-
- $ulink = '[url=' . $contact['url'] . ']' . $contact['name'] . '[/url]';
+ $ulink = '[url=' . $author_contact['url'] . ']' . $author_contact['name'] . '[/url]';
$alink = '[url=' . $item['author-link'] . ']' . $item['author-name'] . '[/url]';
- $plink = '[url=' . $a->get_baseurl() . '/display/' . $owner['nickname'] . '/' . $item['id'] . ']' . $post_type . '[/url]';
- $arr['body'] = sprintf( $bodyverb, $ulink, $alink, $plink );
-
- $arr['verb'] = $activity;
- $arr['object-type'] = $objtype;
- $arr['object'] = $obj;
- $arr['allow_cid'] = $item['allow_cid'];
- $arr['allow_gid'] = $item['allow_gid'];
- $arr['deny_cid'] = $item['deny_cid'];
- $arr['deny_gid'] = $item['deny_gid'];
- $arr['visible'] = 1;
- $arr['unseen'] = 1;
- $arr['last-child'] = 0;
-
- $post_id = item_store($arr);
-
- if(! $item['visible']) {
- $r = q("UPDATE `item` SET `visible` = 1 WHERE `id` = %d AND `uid` = %d",
+ $plink = '[url=' . System::baseUrl() . '/display/' . $owner_self_contact['nick'] . '/' . $item['id'] . ']' . $post_type . '[/url]';
+
+ $new_item = array(
+ 'guid' => get_guid(32),
+ 'uri' => item_new_uri($a->get_hostname(), $item['uid']),
+ 'uid' => $item['uid'],
+ 'contact-id' => $item_contact_id,
+ 'type' => 'activity',
+ 'wall' => $item['wall'],
+ 'origin' => 1,
+ 'gravity' => GRAVITY_LIKE,
+ 'parent' => $item['id'],
+ 'parent-uri' => $item['uri'],
+ 'thr-parent' => $item['uri'],
+ 'owner-id' => $item['owner-id'],
+ 'owner-name' => $item['owner-name'],
+ 'owner-link' => $item['owner-link'],
+ 'owner-avatar' => $item['owner-avatar'],
+ 'author-id' => $author_contact['id'],
+ 'author-name' => $author_contact['name'],
+ 'author-link' => $author_contact['url'],
+ 'author-avatar' => $author_contact['thumb'],
+ 'body' => sprintf($bodyverb, $ulink, $alink, $plink),
+ 'verb' => $activity,
+ 'object-type' => $objtype,
+ 'object' => $obj,
+ 'allow_cid' => $item['allow_cid'],
+ 'allow_gid' => $item['allow_gid'],
+ 'deny_cid' => $item['deny_cid'],
+ 'deny_gid' => $item['deny_gid'],
+ 'visible' => 1,
+ 'unseen' => 1,
+ 'last-child' => 0
+ );
+
+ $new_item_id = item_store($new_item);
+
+ // @todo: Explain this block
+ if (! $item['visible']) {
+ q("UPDATE `item` SET `visible` = 1 WHERE `id` = %d AND `uid` = %d",
intval($item['id']),
- intval($owner_uid)
+ intval($item['uid'])
);
}
-
// Save the author information for the like in case we need to relay to Diaspora
- store_diaspora_like_sig($activity, $post_type, $contact, $post_id);
+ Diaspora::storeLikeSignature($item_contact, $new_item_id);
- $arr['id'] = $post_id;
+ $new_item['id'] = $new_item_id;
- call_hooks('post_local_end', $arr);
+ call_hooks('post_local_end', $new_item);
- proc_run('php',"include/notifier.php","like","$post_id");
+ Worker::add(PRIORITY_HIGH, "Notifier", "like", $new_item_id);
return true;
}
-
-
-
-function store_diaspora_like_retract_sig($activity, $item, $like_item, $contact) {
- // Note that we can only create a signature for a user of the local server. We don't have
- // a key for remote users. That is ok, because if a remote user is "unlike"ing a post, it
- // means we are the relay, and for relayable_retractions, Diaspora
- // only checks the parent_author_signature if it doesn't have to relay further
- //
- // If $item['resource-id'] exists, it means the item is a photo. Diaspora doesn't support
- // likes on photos, so don't bother.
-
- $enabled = intval(get_config('system','diaspora_enabled'));
- if(! $enabled) {
- logger('mod_like: diaspora support disabled, not storing like retraction signature', LOGGER_DEBUG);
- return;
- }
-
- logger('mod_like: storing diaspora like retraction signature');
-
- if(($activity === ACTIVITY_LIKE) && (! $item['resource-id'])) {
- $signed_text = $like_item['guid'] . ';' . 'Like';
-
- // Only works for NETWORK_DFRN
- $contact_baseurl_start = strpos($contact['url'],'://') + 3;
- $contact_baseurl_length = strpos($contact['url'],'/profile') - $contact_baseurl_start;
- $contact_baseurl = substr($contact['url'], $contact_baseurl_start, $contact_baseurl_length);
- $diaspora_handle = $contact['nick'] . '@' . $contact_baseurl;
-
- // This code could never had worked (the return values form the queries were used in a wrong way.
- // Additionally it is needlessly complicated. Either the contact is owner or not. And we have this data already.
-/*
- // Get contact's private key if he's a user of the local Friendica server
- $r = q("SELECT `contact`.`uid` FROM `contact` WHERE `url` = '%s' AND `self` = 1 LIMIT 1",
- dbesc($contact['url'])
- );
-
- if( $r) {
- $contact_uid = $r['uid'];
- $r = q("SELECT prvkey FROM user WHERE uid = %d LIMIT 1",
- intval($contact_uid)
- );
-*/
- // Is the contact the owner? Then fetch the private key
- if ($contact['self'] AND ($contact['uid'] > 0)) {
- $r = q("SELECT prvkey FROM user WHERE uid = %d LIMIT 1",
- intval($contact['uid'])
- );
-
- if($r)
- $authorsig = base64_encode(rsa_sign($signed_text,$r[0]['prvkey'],'sha256'));
- }
-
- if(! isset($authorsig))
- $authorsig = '';
-
- q("insert into sign (`retract_iid`,`signed_text`,`signature`,`signer`) values (%d,'%s','%s','%s') ",
- intval($like_item['id']),
- dbesc($signed_text),
- dbesc($authorsig),
- dbesc($diaspora_handle)
- );
- }
-
- return;
-}
-
-function store_diaspora_like_sig($activity, $post_type, $contact, $post_id) {
- // Note that we can only create a signature for a user of the local server. We don't have
- // a key for remote users. That is ok, because if a remote user is "unlike"ing a post, it
- // means we are the relay, and for relayable_retractions, Diaspora
- // only checks the parent_author_signature if it doesn't have to relay further
-
- $enabled = intval(get_config('system','diaspora_enabled'));
- if(! $enabled) {
- logger('mod_like: diaspora support disabled, not storing like signature', LOGGER_DEBUG);
- return;
- }
-
- logger('mod_like: storing diaspora like signature');
-
- if(($activity === ACTIVITY_LIKE) && ($post_type === t('status'))) {
- // Only works for NETWORK_DFRN
- $contact_baseurl_start = strpos($contact['url'],'://') + 3;
- $contact_baseurl_length = strpos($contact['url'],'/profile') - $contact_baseurl_start;
- $contact_baseurl = substr($contact['url'], $contact_baseurl_start, $contact_baseurl_length);
- $diaspora_handle = $contact['nick'] . '@' . $contact_baseurl;
-
-
- // This code could never had worked (the return values form the queries were used in a wrong way.
- // Additionally it is needlessly complicated. Either the contact is owner or not. And we have this data already.
-/*
- // Get contact's private key if he's a user of the local Friendica server
- $r = q("SELECT `contact`.`uid` FROM `contact` WHERE `url` = '%s' AND `self` = 1 LIMIT 1",
- dbesc($contact['url'])
- );
-
- if( $r) {
- $contact_uid = $r['uid'];
- $r = q("SELECT prvkey FROM user WHERE uid = %d LIMIT 1",
- intval($contact_uid)
- );
-
- if( $r)
- $contact_uprvkey = $r['prvkey'];
- }
-*/
-
- // Is the contact the owner? Then fetch the private key
- if ($contact['self'] AND ($contact['uid'] > 0)) {
- $r = q("SELECT prvkey FROM user WHERE uid = %d LIMIT 1",
- intval($contact['uid'])
- );
-
- if($r)
- $contact_uprvkey = $r[0]['prvkey'];
- }
-
- $r = q("SELECT guid, parent FROM `item` WHERE id = %d LIMIT 1",
- intval($post_id)
- );
- if( $r) {
- $p = q("SELECT guid FROM `item` WHERE id = %d AND parent = %d LIMIT 1",
- intval($r[0]['parent']),
- intval($r[0]['parent'])
- );
- if( $p) {
- $signed_text = 'true;'.$r[0]['guid'].';Post;'.$p[0]['guid'].';'.$diaspora_handle;
-
- if(isset($contact_uprvkey))
- $authorsig = base64_encode(rsa_sign($signed_text,$contact_uprvkey,'sha256'));
- else
- $authorsig = '';
-
- q("insert into sign (`iid`,`signed_text`,`signature`,`signer`) values (%d,'%s','%s','%s') ",
- intval($post_id),
- dbesc($signed_text),
- dbesc($authorsig),
- dbesc($diaspora_handle)
- );
- }
- }
- }
-
- return;
-}