harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sync flags even if post has not been edited

Browse Source
This commit is contained in:
redmatrix 2016-06-30 21:12:39 -07:00
parent eef8f3b417
commit 7f8dcf4f12
2 changed files with 24 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Zotlabs/Module/Starred.php
View File

@ -30,7 +30,20 @@ class Starred extends \Zotlabs\Web\Controller {
intval(local_channel()), intval(local_channel()),
intval($message_id) intval($message_id)
); );
$r = q("select * from item where id = %d",
intval($message_id)
);
if($r) {
xchan_query($r);
$sync_item = fetch_post_tags($r);
build_sync_packet(local_channel(),[
'item' => [
encode_item($sync_item[0],true)
]
]);
}
header('Content-type: application/json'); header('Content-type: application/json');
echo json_encode(array('result' => $item_starred)); echo json_encode(array('result' => $item_starred));
killme(); killme();

29
include/import.php
View File

@ -575,12 +575,20 @@ function import_items($channel,$items,$sync = false,$relocate = null) {
if(! $item) if(! $item)
continue; continue;
if($relocate && $item['mid'] === $item['parent_mid']) {
item_url_replace($channel,$item,$relocate['url'],z_root(),$relocate['channel_address']);
}
$r = q("select id, edited from item where mid = '%s' and uid = %d limit 1", $r = q("select id, edited from item where mid = '%s' and uid = %d limit 1",
dbesc($item['mid']), dbesc($item['mid']),
intval($channel['channel_id']) intval($channel['channel_id'])
); );
if($r) { if($r) {
if($item['edited'] > $r[0]['edited']) {
// flags may have changed and we are probably relocating the post,
// so force an update even if we have the same timestamp
if($item['edited'] >= $r[0]['edited']) {
$item['id'] = $r[0]['id']; $item['id'] = $r[0]['id'];
$item['uid'] = $channel['channel_id']; $item['uid'] = $channel['channel_id'];
$item_result = item_store_update($item,$allow_code,$deliver); $item_result = item_store_update($item,$allow_code,$deliver);
@ -595,24 +603,7 @@ function import_items($channel,$items,$sync = false,$relocate = null) {
if($sync && $item['item_wall']) { if($sync && $item['item_wall']) {
// deliver singletons if we have any // deliver singletons if we have any
if($item_result && $item_result['success']) { if($item_result && $item_result['success']) {
Zotlabs\Daemon\Master::Summon(array('Notifier','single_activity',$item_result['item_id'])); Zotlabs\Daemon\Master::Summon( [ 'Notifier','single_activity',$item_result['item_id'] ]);
}
}
if($relocate && $item_result['item_id']) {
$item = $item_result['item'];
if($item['mid'] === $item['parent_mid']) {
item_url_replace($channel,$item,$relocate['url'],z_root(),$relocate['channel_address']);
dbesc_array($item);
$item_id = $item_result['item_id'];
unset($item['id']);
$str = '';
foreach($item as $k => $v) {
if($str)
$str .= ",";
$str .= " `" . $k . "` = '" . $v . "' ";
}
$r = dbq("update `item` set " . $str . " where id = " . $item_id );
} }
} }
} }