friendica
/
friendica-addons
7
2
Fork 13
Code Issues 3 Pull Requests 2 Releases 16 Wiki Activity

[twitter] Restore source storing in conversation table

This commit is contained in:
Hypolite Petovan 2018-08-05 13:06:37 +02:00
parent 1d3ec58bfb
commit 6f0b79456e
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
twitter/twitter.php
View File

@ -73,6 +73,7 @@ use Friendica\Core\PConfig;
use Friendica\Core\Worker; use Friendica\Core\Worker;
use Friendica\Database\DBA; use Friendica\Database\DBA;
use Friendica\Model\Contact; use Friendica\Model\Contact;
use Friendica\Model\Conversation;
use Friendica\Model\GContact; use Friendica\Model\GContact;
use Friendica\Model\Group; use Friendica\Model\Group;
use Friendica\Model\Item; use Friendica\Model\Item;
@ -809,11 +810,12 @@ function twitter_prepare_body(App $a, array &$b)
*/ */
function twitter_do_mirrorpost(App $a, $uid, $post) function twitter_do_mirrorpost(App $a, $uid, $post)
{ {
// $datarray['object'] = json_encode($post); // Activate for debugging
$datarray['api_source'] = true; $datarray['api_source'] = true;
$datarray['profile_uid'] = $uid; $datarray['profile_uid'] = $uid;
$datarray['extid'] = NETWORK_TWITTER; $datarray['extid'] = NETWORK_TWITTER;
$datarray['message_id'] = Item::newURI($uid, NETWORK_TWITTER . ':' . $post->id); $datarray['message_id'] = Item::newURI($uid, NETWORK_TWITTER . ':' . $post->id);
$datarray['protocol'] = Conversation::PARCEL_TWITTER;
$datarray['source'] = json_encode($post);
$datarray['title'] = ''; $datarray['title'] = '';
if (!empty($post->retweeted_status)) { if (!empty($post->retweeted_status)) {
@ -1338,7 +1340,8 @@ function twitter_createpost(App $a, $uid, $post, array $self, $create_user, $onl
$postarray['uid'] = $uid; $postarray['uid'] = $uid;
$postarray['wall'] = 0; $postarray['wall'] = 0;
$postarray['uri'] = "twitter::" . $post->id_str; $postarray['uri'] = "twitter::" . $post->id_str;
// $postarray['object'] = json_encode($post); // Activate for debugging $postarray['protocol'] = Conversation::PARCEL_TWITTER;
$postarray['source'] = json_encode($post);
// Don't import our own comments // Don't import our own comments
if (DBA::exists('item', ['extid' => $postarray['uri'], 'uid' => $uid])) { if (DBA::exists('item', ['extid' => $postarray['uri'], 'uid' => $uid])) {
@ -1462,7 +1465,7 @@ function twitter_createpost(App $a, $uid, $post, array $self, $create_user, $onl
if (!empty($post->retweeted_status)) { if (!empty($post->retweeted_status)) {
$retweet = twitter_createpost($a, $uid, $post->retweeted_status, $self, false, false, $noquote); $retweet = twitter_createpost($a, $uid, $post->retweeted_status, $self, false, false, $noquote);
//$retweet['object'] = $postarray['object']; // Activate for debugging $retweet['source'] = $postarray['source'];
$retweet['private'] = $postarray['private']; $retweet['private'] = $postarray['private'];
$retweet['allow_cid'] = $postarray['allow_cid']; $retweet['allow_cid'] = $postarray['allow_cid'];
$retweet['contact-id'] = $postarray['contact-id']; $retweet['contact-id'] = $postarray['contact-id'];