Merge develop-new into event-attendance-new

[friendica.git] / include / items.php

diff --git a/include/items.php b/include/items.php
index 5c7aa52e6fa70df0822da0aa9eb873bd3f06826c..4e86a5200af6d3a74e2e1939c624d0bca07555da 100644 (file)
--- a/include/items.php
+++ b/include/items.php
@@ -2765,7 +2765,11 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $pass = 0)
                                $datarray['parent-uri'] = $parent_uri;
                                $datarray['uid'] = $importer['uid'];
                                $datarray['contact-id'] = $contact['id'];
-                               if((activity_match($datarray['verb'],ACTIVITY_LIKE)) || (activity_match($datarray['verb'],ACTIVITY_DISLIKE))) {
+                               if(($datarray['verb'] === ACTIVITY_LIKE)
+                                       || ($datarray['verb'] === ACTIVITY_DISLIKE)
+                                       || ($datarray['verb'] === ACTIVITY_ATTEND)
+                                       || ($datarray['verb'] === ACTIVITY_ATTENDNO)
+                                       || ($datarray['verb'] === ACTIVITY_ATTENDMAYBE)) {
                                        $datarray['type'] = 'activity';
                                        $datarray['gravity'] = GRAVITY_LIKE;
                                        // only one like or dislike per person
@@ -3752,7 +3756,11 @@ function local_delivery($importer,$data) {
                                $datarray['owner-avatar'] = $own[0]['thumb'];
                                $datarray['contact-id'] = $importer['id'];
 
-                               if(($datarray['verb'] === ACTIVITY_LIKE) || ($datarray['verb'] === ACTIVITY_DISLIKE)) {
+                               if(($datarray['verb'] === ACTIVITY_LIKE) 
+                                       || ($datarray['verb'] === ACTIVITY_DISLIKE)
+                                       || ($datarray['verb'] === ACTIVITY_ATTEND)
+                                       || ($datarray['verb'] === ACTIVITY_ATTENDNO)
+                                       || ($datarray['verb'] === ACTIVITY_ATTENDMAYBE)) {
                                        $is_like = true;
                                        $datarray['type'] = 'activity';
                                        $datarray['gravity'] = GRAVITY_LIKE;
@@ -3941,7 +3949,11 @@ function local_delivery($importer,$data) {
                                $datarray['parent-uri'] = $parent_uri;
                                $datarray['uid'] = $importer['importer_uid'];
                                $datarray['contact-id'] = $importer['id'];
-                               if(($datarray['verb'] == ACTIVITY_LIKE) || ($datarray['verb'] == ACTIVITY_DISLIKE)) {
+                               if(($datarray['verb'] === ACTIVITY_LIKE) 
+                                       || ($datarray['verb'] === ACTIVITY_DISLIKE)
+                                       || ($datarray['verb'] === ACTIVITY_ATTEND)
+                                       || ($datarray['verb'] === ACTIVITY_ATTENDNO)
+                                       || ($datarray['verb'] === ACTIVITY_ATTENDMAYBE)) {
                                        $datarray['type'] = 'activity';
                                        $datarray['gravity'] = GRAVITY_LIKE;
                                        // only one like or dislike per person