Merge remote-tracking branch 'upstream/dev' into wiki

3 files changed, 68 insertions, 6 deletions

diff --git a/Zotlabs/Lib/ThreadItem.php b/Zotlabs/Lib/ThreadItem.php
index 0ba0c0a13..e55931f40 100644
--- a/Zotlabs/Lib/ThreadItem.php
+++ b/Zotlabs/Lib/ThreadItem.php
@@ -14,6 +14,8 @@ class ThreadItem {
 	private $template = 'conv_item.tpl';
 	private $comment_box_template = 'comment_item.tpl';
 	private $commentable = false;
+	// list of supported reaction emojis - a site can over-ride this via config system.reactions
+	private $reactions = ['1f60a','1f44f','1f37e','1f48b','1f61e','2665','1f622','1f62e','1f634','1f61c','1f607','1f608'];
 	private $toplevel = false;
 	private $children = array();
 	private $parent = null;
@@ -50,6 +52,14 @@ class ThreadItem {
 				$this->add_child($child);
 			}
 		}
+
+		// allow a site to configure the order and content of the reaction emoji list
+		if($this->toplevel) {
+			$x = get_config('system','reactions');
+			if($x && is_array($x) && count($x)) {
+				$this->reactions = $x;
+			}
+		}
 	}
 
 	/**
@@ -345,8 +355,9 @@ class ThreadItem {
 			'photo' => $body['photo'],
 			'event' => $body['event'],
 			'has_tags' => $has_tags,
-
+			'reactions' => $this->reactions,
 // Item toolbar buttons
+			'emojis'   => (($this->is_toplevel() && $this->is_commentable() && feature_enabled($conv->get_profile_owner(),'emojis')) ? '1' : ''),
 			'like'      => $like,
 			'dislike'   => ((feature_enabled($conv->get_profile_owner(),'dislike')) ? $dislike : ''),
 			'share'     => $share,
diff --git a/Zotlabs/Module/Manage.php b/Zotlabs/Module/Manage.php
index 5ae79dbb2..4ca044c4a 100644
--- a/Zotlabs/Module/Manage.php
+++ b/Zotlabs/Module/Manage.php
@@ -93,9 +93,9 @@ class Manage extends \Zotlabs\Web\Controller {
 						$channels[$x]['mail'] = intval($mails[0]['total']);
 			
 	
-					$events = q("SELECT type, start, adjust FROM `event`
-						WHERE `event`.`uid` = %d AND start < '%s' AND start > '%s' and `ignore` = 0
-						ORDER BY `start` ASC ",
+					$events = q("SELECT etype, dtstart, adjust FROM `event`
+						WHERE `event`.`uid` = %d AND dtstart < '%s' AND dtstart > '%s' and `dismissed` = 0
+						ORDER BY `dtstart` ASC ",
 						intval($channels[$x]['channel_id']),
 						dbesc(datetime_convert('UTC', date_default_timezone_get(), 'now + 7 days')),
 						dbesc(datetime_convert('UTC', date_default_timezone_get(), 'now - 1 days'))
@@ -108,14 +108,14 @@ class Manage extends \Zotlabs\Web\Controller {
 							$str_now = datetime_convert('UTC', date_default_timezone_get(), 'now', 'Y-m-d');
 							foreach($events as $e) {
 								$bd = false;
-								if($e['type'] === 'birthday') {
+								if($e['etype'] === 'birthday') {
 									$channels[$x]['birthdays'] ++;
 									$bd = true;
 								}
 								else {
 									$channels[$x]['events'] ++;
 								}
-								if(datetime_convert('UTC', ((intval($e['adjust'])) ? date_default_timezone_get() : 'UTC'), $e['start'], 'Y-m-d') === $str_now) {
+								if(datetime_convert('UTC', ((intval($e['adjust'])) ? date_default_timezone_get() : 'UTC'), $e['dtstart'], 'Y-m-d') === $str_now) {
 									$channels[$x]['all_events_today'] ++;
 									if($bd)
 										$channels[$x]['birthdays_today'] ++;
diff --git a/Zotlabs/Module/React.php b/Zotlabs/Module/React.php
new file mode 100644
index 000000000..28c7c239c
--- /dev/null
+++ b/Zotlabs/Module/React.php
@@ -0,0 +1,51 @@
+<?php
+
+namespace Zotlabs\Module;
+
+
+class React extends \Zotlabs\Web\Controller {
+
+	function get() {
+		if(! local_channel())
+			return;
+
+		$postid = $_REQUEST['postid'];
+
+		if(! $postid)
+			return;
+
+		$emoji = $_REQUEST['emoji'];
+		if($_REQUEST['emoji']) {
+
+			$i = q("select * from item where id = %d and uid = %d",
+				intval($postid),
+				intval(local_channel())
+			);
+
+			if(! $i)
+				return;
+
+			$channel = \App::get_channel();
+
+			$n = array();
+			$n['aid'] = $channel['channel_account_id'];
+			$n['uid'] = $channel['channel_id'];
+			$n['item_origin'] = true;
+			$n['parent'] = $postid;
+			$n['parent_mid'] = $i[0]['mid'];
+			$n['mid'] = item_message_id();
+			$n['verb'] = ACTIVITY_REACT . '#' . $emoji;
+			$n['body'] = "\n\n[zmg]" . z_root() . '/images/emoji/' . $emoji . '.png[/zmg]' . "\n\n";
+			$n['author_xchan'] = $channel['channel_hash'];
+
+			$x = item_store($n); 
+			if($x['success']) {
+				$nid = $x['item_id'];
+				 \Zotlabs\Daemon\Master::Summon(array('Notifier','like',$nid));
+			}
+
+		}
+
+	}
+
+}
\ No newline at end of file