diff options
| author | friendica <info@friendica.com> | 2012-10-25 21:58:33 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2012-10-25 21:58:33 -0700 |
| commit | 26774310b1537341299233b8709825dc349240dd (patch) | |
| tree | bb4acf65451c60a32a0eab615216299629c6be02 /include/ConversationObject.php | |
| parent | 3b394ea43fd3bc011f98a9160a8b408283f97ebc (diff) | |
| download | volse-hubzilla-26774310b1537341299233b8709825dc349240dd.tar.gz volse-hubzilla-26774310b1537341299233b8709825dc349240dd.tar.bz2 volse-hubzilla-26774310b1537341299233b8709825dc349240dd.zip | |
move things to the newer conversation object, a few minor bugs - will sort it out eventually
Diffstat (limited to 'include/ConversationObject.php')
| -rw-r--r-- | include/ConversationObject.php | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/include/ConversationObject.php b/include/ConversationObject.php index ca2ae7dd6..d9a3974eb 100644 --- a/include/ConversationObject.php +++ b/include/ConversationObject.php @@ -35,7 +35,6 @@ class Conversation extends BaseObject { switch($mode) { case 'network': - case 'notes': $this->profile_owner = local_user(); $this->writable = true; break; @@ -104,12 +103,8 @@ class Conversation extends BaseObject { /* * Only add will be displayed */ - if($item->get_data_value('network') === NETWORK_MAIL && local_user() != $item->get_data_value('uid')) { - logger('[WARN] Conversation::add_thread : Thread is a mail ('. $item->get_id() .').', LOGGER_DEBUG); - return false; - } - if($item->get_data_value('verb') === ACTIVITY_LIKE || $item->get_data_value('verb') === ACTIVITY_DISLIKE) { - logger('[WARN] Conversation::add_thread : Thread is a (dis)like ('. $item->get_id() .').', LOGGER_DEBUG); + + if(activity_match($item->get_data_value('verb'),ACTIVITY_LIKE) || activity_match($item->get_data_value('verb'),ACTIVITY_DISLIKE)) { return false; } $item->set_conversation($this); @@ -130,8 +125,7 @@ class Conversation extends BaseObject { $result = array(); foreach($this->threads as $item) { - if($item->get_data_value('network') === NETWORK_MAIL && local_user() != $item->get_data_value('uid')) - continue; + $item_data = $item->get_template_data($alike, $dlike); if(!$item_data) { logger('[ERROR] Conversation::get_template_data : Failed to get item template data ('. $item->get_id() .').', LOGGER_DEBUG); @@ -159,4 +153,3 @@ class Conversation extends BaseObject { return false; } } -?> |