X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fconversation.php;h=82a107c07c28bac989a39ae301cab2a0ca6f9a53;hb=11d1d309c28b7c09ae566c2a9e36bea0c5aee85a;hp=09623ff746550f6ace0662654d3382bda47eb27f;hpb=40aa6f33b57ab110d8b6123716584ad075081335;p=friendica.git

diff --git a/include/conversation.php b/include/conversation.php
index 09623ff746..82a107c07c 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -5,8 +5,7 @@
  */
 function localize_item(&$item){
 	
-	if ($item['verb']=="http://activitystrea.ms/schema/1.0/like" ||
-		$item['verb']=="http://activitystrea.ms/schema/1.0/dislike"){
+	if ($item['verb']=== ACTIVITY_LIKE || $item['verb']=== ACTIVITY_DISLIKE){
 
 		$r = q("SELECT * from `item`,`contact` WHERE 
 				`item`.`contact-id`=`contact`.`id` AND `item`.`uri`='%s';",
@@ -17,23 +16,42 @@ function localize_item(&$item){
 		$author	 = '[url=' . $item['author-link'] . ']' . $item['author-name'] . '[/url]';
 		$objauthor =  '[url=' . $obj['author-link'] . ']' . $obj['author-name'] . '[/url]';
 		
-		$post_type = (($obj['resource-id']) ? t('photo') : t('status'));		
+		switch($obj['verb']){
+			case ACTIVITY_POST:
+				switch ($obj['object-type']){
+					case ACTIVITY_OBJ_EVENT:
+						$post_type = t('event');
+						break;
+					default:
+						$post_type = t('status');
+				}
+				break;
+			default:
+				if($obj['resource-id']){
+					$post_type = t('photo');
+					$m=array();	preg_match("/\[url=([^]]*)\]/", $obj['body'], $m);
+					$rr['plink'] = $m[1];
+				} else {
+					$post_type = t('status');
+				}
+		}
+	
 		$plink = '[url=' . $obj['plink'] . ']' . $post_type . '[/url]';
                 
 		switch($item['verb']){
-			case "http://activitystrea.ms/schema/1.0/like":
+			case ACTIVITY_LIKE :
 				$bodyverb = t('%1$s likes %2$s\'s %3$s');
 				break;
-			case "http://activitystrea.ms/schema/1.0/dislike":
+			case ACTIVITY_DISLIKE:
 				$bodyverb = t('%1$s doesn\'t like %2$s\'s %3$s');
 				break;
 		}
 		$item['body'] = sprintf($bodyverb, $author, $objauthor, $plink);
 			
 	}
-	if ($item['verb']=='http://activitystrea.ms/schema/1.0/make-friend'){
+	if ($item['verb']=== ACTIVITY_FRIEND){
 
-		if ($item['object-type']=="" || $item['object-type']!='http://activitystrea.ms/schema/1.0/person') return;
+		if ($item['object-type']=="" || $item['object-type']!== ACTIVITY_OBJ_PERSON) return;
 
 		$Aname = $item['author-name'];
 		$Alink = $item['author-link'];
@@ -779,4 +797,4 @@ function status_editor($a,$x, $notes_cid = 0) {
 		));
 
 	return $o;
-}
\ No newline at end of file
+}