From a454aad124f999e59e8bffb625c103b975aef107 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Wed, 7 Mar 2018 15:39:14 -0800
Subject: federated polls: GNU-Social requires us to preserve the original
 order of the poll answers for use in making a vote, unlike diaspora (which
 selects by guid) and activitypub (which selects by non-localisable text).

---
 Zotlabs/Update/_1209.php | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 Zotlabs/Update/_1209.php

(limited to 'Zotlabs')

diff --git a/Zotlabs/Update/_1209.php b/Zotlabs/Update/_1209.php
new file mode 100644
index 000000000..5ec449395
--- /dev/null
+++ b/Zotlabs/Update/_1209.php
@@ -0,0 +1,26 @@
+<?php
+
+namespace Zotlabs\Update;
+
+class _1209 {
+
+	function run() {
+
+		if(ACTIVE_DBTYPE == DBTYPE_POSTGRES) {
+			$r1 = q("ALTER TABLE poll_elm ADD pelm_order numeric(6) NOT NULL DEFAULT '0' ");
+ 			$r2 = q("create index \"pelm_order_idx\" on poll_elm \"pelm_order\"");
+
+			$r = ($r1 && $r2);
+		}
+		else {
+			$r = q("ALTER TABLE `poll_elm` ADD `pelm_order` int(11) NOT NULL DEFAULT 0, 
+				ADD INDEX `pelm_order` (`pelm_order`)");
+		}
+
+		if($r)
+			return UPDATE_SUCCESS;
+		return UPDATE_FAILED;
+
+	}
+
+}
-- 
cgit v1.2.3


From 48b1042347d098672e583010fe9dbf71eb81623c Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Wed, 7 Mar 2018 16:59:55 -0800
Subject: hashtag autocomplete

---
 Zotlabs/Module/Hashtags.php | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 Zotlabs/Module/Hashtags.php

(limited to 'Zotlabs')

diff --git a/Zotlabs/Module/Hashtags.php b/Zotlabs/Module/Hashtags.php
new file mode 100644
index 000000000..d87a82818
--- /dev/null
+++ b/Zotlabs/Module/Hashtags.php
@@ -0,0 +1,29 @@
+<?php
+
+namespace Zotlabs\Module;
+
+
+class Hashtags extends \Zotlabs\Web\Controller {
+
+	function init() {
+		$result = [];
+
+		logger(print_r($_REQUEST,true));
+
+		$t = escape_tags($_REQUEST['t']);
+		if(! $t)
+			json_return_and_die($result);
+
+		$r = q("select distinct(term) from term where term like '%s' and ttype = %d order by term",
+			dbesc($t . '%'),
+			intval(TERM_HASHTAG)
+		);
+		if($r) {
+			foreach($r as $rv) {
+				$result[] = [ 'text' => strtolower($rv['term']) ];
+			}
+		}
+		logger(print_r($result,true));
+		json_return_and_die($result); 
+	}
+}
\ No newline at end of file
-- 
cgit v1.2.3


From 1700aedbed9050ca2eee621c04c29e5b34150bc5 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Wed, 7 Mar 2018 17:29:01 -0800
Subject: remove extraneous logging

---
 Zotlabs/Module/Hashtags.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'Zotlabs')

diff --git a/Zotlabs/Module/Hashtags.php b/Zotlabs/Module/Hashtags.php
index d87a82818..edb631871 100644
--- a/Zotlabs/Module/Hashtags.php
+++ b/Zotlabs/Module/Hashtags.php
@@ -8,8 +8,6 @@ class Hashtags extends \Zotlabs\Web\Controller {
 	function init() {
 		$result = [];
 
-		logger(print_r($_REQUEST,true));
-
 		$t = escape_tags($_REQUEST['t']);
 		if(! $t)
 			json_return_and_die($result);
@@ -23,7 +21,7 @@ class Hashtags extends \Zotlabs\Web\Controller {
 				$result[] = [ 'text' => strtolower($rv['term']) ];
 			}
 		}
-		logger(print_r($result,true));
+
 		json_return_and_die($result); 
 	}
 }
\ No newline at end of file
-- 
cgit v1.2.3