keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

suppress blank diaspora messages which are awaiting a photo that hasn't arrived

Browse source
This commit is contained in:
Friendika 2011-10-19 15:18:41 -07:00
parent 19129e06c3
commit 10b2661176
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
include/diaspora.php
View file

@ -570,6 +570,10 @@ function diaspora_post($importer,$xml) {
$datarray['tag'] = $str_tags; $datarray['tag'] = $str_tags;
$datarray['app'] = 'Diaspora'; $datarray['app'] = 'Diaspora';
// if empty content it might be a photo that hasn't arrived yet. If a photo arrives, we'll make it visible.
$datarray['visible'] = ((strlen($body)) ? 1 : 0);
$message_id = item_store($datarray); $message_id = item_store($datarray);
if($message_id) { if($message_id) {
@ -1007,7 +1011,7 @@ function diaspora_photo($importer,$xml,$msg) {
$link_text = '[img]' . $remote_photo_path . $remote_photo_name . '[/img]' . "\n"; $link_text = '[img]' . $remote_photo_path . $remote_photo_name . '[/img]' . "\n";
if(strpos($parent_item['body'],$link_text) === false) { if(strpos($parent_item['body'],$link_text) === false) {
$r = q("update item set `body` = '%s' where `id` = %d and `uid` = %d limit 1", $r = q("update item set `body` = '%s', `visible` = 1 where `id` = %d and `uid` = %d limit 1",
dbesc($link_text . $parent_item['body']), dbesc($link_text . $parent_item['body']),
intval($parent_item['id']), intval($parent_item['id']),
intval($parent_item['uid']) intval($parent_item['uid'])