first shot at getting like/unlike functions to work consistently
This commit is contained in:
parent
77962aa79d
commit
cde0de965f
5 changed files with 142 additions and 22 deletions
113
mod/like.php
113
mod/like.php
|
@ -104,6 +104,7 @@ function like_content(&$a) {
|
|||
return;
|
||||
}
|
||||
|
||||
|
||||
$r = q("SELECT `id` FROM `item` WHERE `verb` = '%s' AND `deleted` = 0
|
||||
AND `contact-id` = %d AND ( `parent` = '%s' OR `parent-uri` = '%s') LIMIT 1",
|
||||
dbesc($activity),
|
||||
|
@ -118,7 +119,58 @@ function like_content(&$a) {
|
|||
intval($r[0]['id'])
|
||||
);
|
||||
|
||||
proc_run('php',"include/notifier.php","like","$post_id");
|
||||
// Clean up the `sign` table
|
||||
$r2 = q("DELETE FROM `sign` WHERE `iid` = %d",
|
||||
intval($r[0]['id'])
|
||||
);
|
||||
|
||||
// Save the author information for the unlike in case we need to relay to Diaspora
|
||||
// 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.
|
||||
|
||||
if(($activity === ACTIVITY_LIKE) && (! $item['resource-id'])) {
|
||||
$signed_text = $r[0]['guid'] . ';' . 'Like';
|
||||
|
||||
if( contact['network'] === NETWORK_DIASPORA)
|
||||
$diaspora_handle = $contact['addr'];
|
||||
else { // Only works for NETWORK_DFRN
|
||||
$contact_baseurl = substr($contact['url'], strpos($contact['url'],'://') + 3, strpos($contact['url'],'/profile') - 1);
|
||||
$diaspora_handle = $contact['nick'] . '@' . $contact_baseurl;
|
||||
|
||||
// Get contact's private key if he's a user of the local Friendica server
|
||||
$r2 = q("SELECT `contact`.`uid` FROM `contact` WHERE `url` = '%s' AND `self` = 1 LIMIT 1",
|
||||
dbesc(contact['url'])
|
||||
);
|
||||
|
||||
if( $r2) {
|
||||
$contact_uid = $r2['uid'];
|
||||
$r2 = q("SELECT prvkey FROM user WHERE id = %d LIMIT 1",
|
||||
intval($contact_uid)
|
||||
);
|
||||
|
||||
if( $r2)
|
||||
$authorsig = base64_encode(rsa_sign($signed_text,$r2['prvkey'],'sha256'));
|
||||
}
|
||||
}
|
||||
|
||||
if(! isset($authorsig))
|
||||
$authorsig = '';
|
||||
|
||||
q("insert into sign (`retract_iid`,`signed_text`,`signature`,`signer`) values (%d,'%s','%s','%s') ",
|
||||
intval($r[0]['id']),
|
||||
dbesc($signed_text),
|
||||
dbesc($authorsig),
|
||||
dbesc($diaspora_handle)
|
||||
);
|
||||
}
|
||||
|
||||
// proc_run('php',"include/notifier.php","like","$post_id"); // $post_id isn't defined here!
|
||||
proc_run('php',"include/notifier.php","like","$r[0]['id']");
|
||||
return;
|
||||
}
|
||||
|
||||
|
@ -191,6 +243,63 @@ EOT;
|
|||
);
|
||||
}
|
||||
|
||||
|
||||
// Save the author information for the like in case we need to relay to Diaspora
|
||||
// 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(($activity === ACTIVITY_LIKE) && ($post_type === t('status'))) {
|
||||
if( contact['network'] === NETWORK_DIASPORA)
|
||||
$diaspora_handle = $contact['addr'];
|
||||
else { // Only works for NETWORK_DFRN
|
||||
$contact_baseurl = substr($contact['url'], strpos($contact['url'],'://') + 3, strpos($contact['url'],'/profile') - 1);
|
||||
$diaspora_handle = $contact['nick'] . '@' . $contact_baseurl;
|
||||
|
||||
// Get contact's private key if he's a user of the local Friendica server
|
||||
$r2 = q("SELECT `contact`.`uid` FROM `contact` WHERE `url` = '%s' AND `self` = 1 LIMIT 1",
|
||||
dbesc(contact['url'])
|
||||
);
|
||||
|
||||
if( $r2) {
|
||||
$contact_uid = $r2['uid'];
|
||||
$r2 = q("SELECT prvkey FROM user WHERE id = %d LIMIT 1",
|
||||
intval($contact_uid)
|
||||
);
|
||||
|
||||
if( $r2)
|
||||
$contact_uprvkey = $r2['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 = $r[0]['guid'] . ';Post;' . $p[0]['guid'] . ';true;' . $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)
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
$arr['id'] = $post_id;
|
||||
|
||||
call_hooks('post_local_end', $arr);
|
||||
|
@ -199,4 +308,4 @@ EOT;
|
|||
|
||||
killme();
|
||||
// return; // NOTREACHED
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue