For now we will use standard Create verb for emoji reactions

2 files changed, 51 insertions, 58 deletions

diff --git a/Zotlabs/Lib/Activity.php b/Zotlabs/Lib/Activity.php
index 844dc5905..6b2c4d58a 100644
--- a/Zotlabs/Lib/Activity.php
+++ b/Zotlabs/Lib/Activity.php
@@ -1227,11 +1227,6 @@ class Activity {
 			return $acts[$verb];
 		}
 
-		// Reactions will just map to normal activities
-
-		if (strpos($verb, ACTIVITY_REACT) !== false)
-			return 'Create';
-
 		if (strpos($verb, ACTIVITY_MOOD) !== false)
 			return 'Create';
 
@@ -2178,6 +2173,7 @@ class Activity {
 				$content['content'] = sprintf(t('🔁 Repeated %1$s\'s %2$s'), $mention, $act->obj['type']);
 			}
 
+			// TODO: Deprecated
 			if ($act->type === 'emojiReaction') {
 				$content['content'] = (($act->tgt && $act->tgt['type'] === 'Image') ? '[img=32x32]' . $act->tgt['url'] . '[/img]' : '&#x' . $act->tgt['name'] . ';');
 			}
diff --git a/Zotlabs/Module/React.php b/Zotlabs/Module/React.php
index f80b04a3f..6a3b525b2 100644
--- a/Zotlabs/Module/React.php
+++ b/Zotlabs/Module/React.php
@@ -2,82 +2,79 @@
 
 namespace Zotlabs\Module;
 
+use App;
+use Zotlabs\Web\Controller;
+use Zotlabs\Lib\Activity;
+use Zotlabs\Daemon\Master;
 
-class React extends \Zotlabs\Web\Controller {
+class React extends Controller {
 
 	function get() {
 
-		if(! local_channel())
+		if (!local_channel()) {
 			return;
+		}
 
 		$sys = get_sys_channel();
-		$channel = \App::get_channel();
+		$channel = App::get_channel();
 
 		$postid = $_REQUEST['postid'];
 
-		if(! $postid)
+		if (!$postid) {
 			return;
+		}
 
 		$emoji = $_REQUEST['emoji'];
 
+		if (!$emoji) {
+			return;
+		}
 
-		if($_REQUEST['emoji']) {
+		$i = q("select * from item where id = %d and uid = %d",
+			intval($postid),
+			intval(local_channel())
+		);
 
+		if (!$i) {
 			$i = q("select * from item where id = %d and uid = %d",
 				intval($postid),
-				intval(local_channel())
+				intval($sys['channel_id'])
 			);
 
-			if(! $i) {
-				$i = q("select * from item where id = %d and uid = %d",
-					intval($postid),
-					intval($sys['channel_id'])
-				);
-
-				if($i) {
-					$i = [ copy_of_pubitem($channel, $i[0]['mid']) ];
-					$postid = (($i) ? $i[0]['id'] : 0);
-				}
-			}
-
-			if(! $i) {
-				return;
-			}
-
-			$uuid = item_message_id();
-
-			$n = array();
-			$n['aid'] = $channel['channel_account_id'];
-			$n['uid'] = $channel['channel_id'];
-			$n['item_origin'] = true;
-			$n['item_type'] = $i[0]['item_type'];
-			$n['parent'] = $postid;
-			$n['parent_mid'] = $i[0]['mid'];
-			$n['uuid'] = $uuid;
-			$n['mid'] = z_root() . '/item/' . $uuid;
-			$n['verb'] = ACTIVITY_REACT . '#' . $emoji;
-			$n['body'] = "\n\n[zmg=32x32]" . z_root() . '/images/emoji/' . $emoji . '.png[/zmg]' . "\n\n";
-			$n['author_xchan'] = $channel['channel_hash'];
-
-			$n['tgt_type'] = 'Image';
-			$n['target'] = [
-				'type' => 'Image',
-				'name' => $emoji,
-				'url'  => z_root() . '/images/emoji/' . $emoji . '.png'
-			];
-
-
-			$x = item_store($n); 
-
-			retain_item($postid);
-
-			if($x['success']) {
-				$nid = $x['item_id'];
-				 \Zotlabs\Daemon\Master::Summon(array('Notifier','like',$nid));
+			if ($i) {
+				$i = [ copy_of_pubitem($channel, $i[0]['mid']) ];
+				$postid = (($i) ? $i[0]['id'] : 0);
 			}
+		}
 
+		if (!$i) {
+			return;
 		}
 
+		$uuid = item_message_id();
+
+		$n['aid'] = $channel['channel_account_id'];
+		$n['uid'] = $channel['channel_id'];
+		$n['item_origin'] = true;
+		$n['item_type'] = $i[0]['item_type'];
+		$n['parent'] = $postid;
+		$n['parent_mid'] = $i[0]['mid'];
+		$n['uuid'] = $uuid;
+		$n['mid'] = z_root() . '/item/' . $uuid;
+		$n['verb'] = 'Create';
+		$n['body'] = '[zmg=32x32]' . z_root() . '/images/emoji/' . $emoji . '.png[/zmg]';
+		$n['author_xchan'] = $channel['channel_hash'];
+		$n['obj'] = Activity::fetch_item(['id' => $item['mid']]);
+		$n['obj_type'] = ((array_path_exists('obj/type', $n)) ? $n['obj']['type'] : EMPTY_STR);
+
+		$x = item_store($n);
+
+		retain_item($postid);
+
+		if ($x['success']) {
+			$nid = $x['item_id'];
+			Master::Summon(['Notifier', 'like', $nid]);
+		}
 	}
 
-}
\ No newline at end of file
+}