From 50374458f75e7ee3e7fde2ae5a8d40f5cbfe1dad Mon Sep 17 00:00:00 2001
From: nipos <ni.pos@yandex.com>
Date: Sun, 2 Dec 2018 15:01:21 +0100
Subject: [PATCH] Added search suggestions,added instance info page,fixed bugs
 in profile and autocomplete,search for post urls now possible

---
 .htaccess                             |   4 ++
 Caddyfile                             |   4 ++
 README.md                             |   1 +
 assets/css/dark.css                   |  18 +++++
 assets/css/style.css                  | 100 ++++++++++++++++++++++++++
 assets/js/autocomplete/search.js      |  55 ++++++++++++++
 assets/js/autocomplete/textarea.js    |   4 ++
 assets/js/halcyon/halcyonFunctions.js |   2 +
 assets/js/halcyon/halcyonSettings.js  |  13 ++--
 assets/js/halcyon/halcyonUI.js        |  44 ++++++++++--
 footer.php                            |   2 -
 header.php                            |   6 +-
 instance.php                          |  65 +++++++++++++++++
 login/auth.php                        |   1 +
 nginx.conf                            |   3 +
 search_hash_tag.php                   |  12 +++-
 search_user.php                       |   5 ++
 version.txt                           |   2 +-
 widgets/side_footer.php               |   4 +-
 19 files changed, 324 insertions(+), 21 deletions(-)
 create mode 100644 assets/js/autocomplete/search.js
 create mode 100644 instance.php

diff --git a/.htaccess b/.htaccess
index 8e1bf87..e7122f1 100644
--- a/.htaccess
+++ b/.htaccess
@@ -36,6 +36,10 @@ RewriteRule ^whotofollow/?$ who_to_follow\.php [NC,L]
 RewriteBase /direct
 RewriteRule ^direct/?$ direct\.php [NC,L]
 
+# Instance
+RewriteBase /instance
+RewriteRule ^instance/?$ instance\.php [NC,L]
+
 # Lists
 RewriteBase /lists
 RewriteRule ^lists/?$ lists\.php [NC,L]
diff --git a/Caddyfile b/Caddyfile
index d5b8b4c..65a794b 100644
--- a/Caddyfile
+++ b/Caddyfile
@@ -63,6 +63,10 @@ r ^/direct/?$
 to direct.php
 }
 rewrite {
+r ^/instance/?$
+to instance.php
+}
+rewrite {
 r ^/lists/?$
 to lists.php
 }
diff --git a/README.md b/README.md
index 1e06ea0..764aacf 100644
--- a/README.md
+++ b/README.md
@@ -25,6 +25,7 @@ We moved our instances list to a wiki page: https://notabug.org/halcyon-suite/ha
 or read our new wiki pages to install it manually: https://notabug.org/halcyon-suite/halcyon/wiki
 
 ## Blog
+- Release of Version 2.1.6 - Added search suggestions,fixed autocomplete bug,added instance info page,fixed small bug in profile settings,search for posts now supported
 - Release of Version 2.1.5 - Added support for filter,added possibility to filter all bots,it's now easier to detect bots
 - Release of Version 2.1.4 - Added custom profile fields,verified links,custom profile link settings and improved regular expressions for links
 - Release of Version 2.1.3 - Added a autocomplete feature for usernames,hashtags and emojis,fixed a bug in the emoji picker (didn't open sometimes)
diff --git a/assets/css/dark.css b/assets/css/dark.css
index cb5efc1..7676a83 100644
--- a/assets/css/dark.css
+++ b/assets/css/dark.css
@@ -358,6 +358,21 @@ color:#fff;
 color:#fff;
 background-color:#189EFC;
 }
+#header .header_nav_wrap .header_right_box .search_form_wrap .header_search_suggestions {
+background-color:#243447;
+box-shadow:.5px .5px 3px rgba(0,0,0,0.26);
+}
+#header .header_nav_wrap .header_right_box .search_form_wrap .header_search_suggestions::before {
+background-color:#243447;
+border:.5px solid rgba(0,0,0,.26);
+}
+#header .header_nav_wrap .header_right_box .search_form_wrap .header_search_suggestions ul li.account_box h3,
+#header .header_nav_wrap .header_right_box .search_form_wrap .header_search_suggestions ul li.account_box:hover .un {
+color:#FFFFFF !important;
+}
+#header .header_nav_wrap .header_right_box .search_form_wrap .header_search_suggestions ul li.account_box:hover .un {
+color:#66757F;
+}
 #main .profile_nav_wrap {
 background-color:#1b2836;
 box-shadow:0 1px 3px 0 rgba(0,0,0,0.25);
@@ -594,3 +609,6 @@ color:#FFF;
 .hoverLi h3,.hoverLi .un {
 color:#FFF !important;
 }
+.instance_field {
+border:1px solid #000000;
+}
diff --git a/assets/css/style.css b/assets/css/style.css
index ec1286f..ca31990 100644
--- a/assets/css/style.css
+++ b/assets/css/style.css
@@ -1690,6 +1690,96 @@ background-color: #189EFC;
 text-decoration: none;
 color: #fff;
 }
+#header .header_nav_wrap .header_right_box .search_form_wrap .header_search_suggestions {
+display: block;
+position: absolute;
+cursor: pointer;
+top: 50px;
+width: 320px;
+font-size: 12px;
+border-radius: 3px;
+box-sizing: border-box;
+background-color: #fff;
+box-shadow: 0.5px 0.5px 3px rgba(0,0,0,0.26);
+margin-left:50px
+}
+#header .header_nav_wrap .header_right_box .search_form_wrap .header_search_suggestions::before {
+display: block;
+content: "";
+z-index: -1;
+width: 20px;
+height: 20px;
+position: absolute;
+transform: rotate(45deg);
+top: -5px;
+left: 8px;
+background-color: #fff;
+border: 0.5px solid rgba(0,0,0,.26);
+}
+#header .header_nav_wrap .header_right_box .search_form_wrap .header_search_suggestions ul li.account_box {
+margin-bottom:0;
+}
+#header .header_nav_wrap .header_right_box .search_form_wrap .header_search_suggestions ul li.account_box:hover {
+background-color:#189EFC;
+}
+#header .header_nav_wrap .header_right_box .search_form_wrap .header_search_suggestions ul li.account_box:hover h3,
+#header .header_nav_wrap .header_right_box .search_form_wrap .header_search_suggestions ul li.account_box:hover .un {
+color:#FFFFFF !important;
+}
+#header .header_nav_wrap .header_right_box .search_form_wrap .header_search_suggestions ul li.account_box:first-child {
+border-top-left-radius:3px;
+border-top-right-radius:3px;
+}
+#header .header_nav_wrap .header_right_box .search_form_wrap .header_search_suggestions ul li.account_box:last-child {
+border-bottom-left-radius:3px;
+border-bottom-right-radius:3px;
+}
+#header .header_nav_wrap .header_right_box .search_form_wrap .header_search_suggestions ul li .icon_box img {
+margin-left:12px;
+margin-top:8px;
+width:32px;
+height:32px;
+border-radius:5px;
+}
+#header .header_nav_wrap .header_right_box .search_form_wrap .header_search_suggestions ul li .icon_box img.emoji {
+border-radius:0;
+}
+#header .header_nav_wrap .header_right_box .search_form_wrap .header_search_suggestions ul li h3 {
+font-size:16px;
+}
+/*#header .header_nav_wrap .header_right_box .search_form_wrap .header_search_suggestions ul {
+margin: 0 -21px;
+margin-bottom: 8px;
+}
+#header .header_nav_wrap .header_right_box .search_form_wrap .header_search_suggestions ul::after {
+content: "";
+display: block;
+margin-top: 8px;
+border-bottom: 1px solid #E6ECF0;
+}
+#header .header_nav_wrap .header_right_box .search_form_wrap .header_search_suggestions ul:last-child::after {
+border-bottom: 0px solid #E6ECF0;
+}
+#header .header_nav_wrap .header_right_box .search_form_wrap .header_search_suggestions ul li {
+box-sizing: border-box;
+}
+#header .header_nav_wrap .header_right_box .search_form_wrap .header_search_suggestions ul li a .display_name {
+display: block;
+color: #000;
+font-size: 14px;
+font-weight: 600;
+margin-bottom: 4px;
+}
+#header .header_nav_wrap .header_right_box .search_form_wrap .header_search_suggestions a {
+display: block;
+padding: 8px 21px;
+}
+#header .header_nav_wrap .header_right_box .search_form_wrap .header_search_suggestions a:hover,
+#header .header_nav_wrap .header_right_box .search_form_wrap .header_search_suggestions ul li a:hover .display_name {
+background-color: #189EFC;
+text-decoration: none;
+color: #fff;
+}*/
 .toot_button {
 width: 90px;
 height: 100%;
@@ -2584,3 +2674,13 @@ display:inline;
 .hideDropDown {
 display:none;
 }
+.instance_field {
+width:100%;
+text-align:center;
+font-size:40px;
+font-weight:bold;
+border:1px solid #E6ECF0;
+border-radius:5px;
+padding-top:34px;
+padding-bottom:35px;
+}
diff --git a/assets/js/autocomplete/search.js b/assets/js/autocomplete/search.js
new file mode 100644
index 0000000..4004ef5
--- /dev/null
+++ b/assets/js/autocomplete/search.js
@@ -0,0 +1,55 @@
+function searchlocalfill() {
+var dropdown = $("<ul>").addClass("account_list");
+var searchsuggestions = new Array();
+current_search_history.reverse();
+for(var i=0;i<current_search_history.length;i++) {
+if(searchsuggestions.length == 10) break;
+if(searchsuggestions.indexOf(current_search_history[i]) == -1) {
+dropdown.append($("<li>").data("value",current_search_history[i]).addClass("account_box").append($("<div>").addClass("icon_box").append($("<span>").addClass("emoji_poss").html("#️⃣").css("float","left").css("font-size","32px")))
+.append($("<div>").addClass("label_box").append($("<span>").addClass("dn").append($("<h3>").html("#"+current_search_history[i])))).click(function() {
+window.location.href = "/search?q="+encodeURIComponent($(this).data("value"));
+}));
+searchsuggestions.push(current_search_history[i]);
+}
+}
+current_search_history.reverse();
+$(".header_search_suggestions").empty().removeClass("invisible").append(dropdown);
+replace_emoji();
+}
+function searchremotefill(text) {
+if(text == "@") searchlocalfill();
+else {
+api.get("search?q="+encodeURIComponent(text)+"&resolve=false&limit=5",function(data) {
+if(data.hashtags.length == 0 && data.accounts.length == 0) $(".header_search_suggestions").addClass("invisible");
+else {
+var dropdown = $("<ul>").addClass("account_list");
+for(var i=0;i<data.hashtags.length;i++) {
+if(i == 5) break;
+dropdown.append($("<li>").data("value",data.hashtags[i]).addClass("account_box").append($("<div>").addClass("icon_box").append($("<span>").addClass("emoji_poss").html("#️⃣").css("float","left").css("font-size","32px")))
+.append($("<div>").addClass("label_box").append($("<span>").addClass("dn").append($("<h3>").html("#"+data.hashtags[i])))).click(function() {
+window.location.href = "/search?q="+encodeURIComponent($(this).data("value"));
+}));
+}
+for(var i=0;i<data.accounts.length;i++) {
+if(i == 5) break;
+if(data.accounts[i].display_name == "") data.accounts[i].display_name = data.accounts[i].username;
+for(var a=0;a<data.accounts[i].emojis.length;a++) {
+data.accounts[i].display_name = data.accounts[i].display_name.replace(new RegExp(":"+data.accounts[i].emojis[a].shortcode+":","g"),"<img src='"+data.accounts[i].emojis[a].url+"' class='emoji'>");
+}
+dropdown.append($("<li>").data("value",getRelativeURL(data.accounts[i].url,data.accounts[i].id)).addClass("account_box").append($("<div>").addClass("icon_box").append($("<img>").attr("src",data.accounts[i].avatar).css("float","left")))
+.append($("<div>").addClass("label_box").css("width","unset").append($("<span>").addClass("dn").append($("<h3>").html(data.accounts[i].display_name).addClass("emoji_poss"))).append($("<span>").addClass("un").html(data.accounts[i].acct))).click(function() {
+window.location.href = $(this).data("value");
+}));
+}
+$(".header_search_suggestions").empty().removeClass("invisible").append(dropdown);
+replace_emoji();
+}
+});
+}
+}
+function searchredirect(text) {
+if(text[0] == "@") window.location.href = "/search/users?q="+encodeURIComponent(text.substr(1));
+else if(text[0] == "#") window.location.href = "/search?q="+encodeURIComponent(text.substr(1));
+else if(text.substr(0,8) == "https://") openStatus(text);
+else window.location.href = "/search?q="+encodeURIComponent(text);
+}
diff --git a/assets/js/autocomplete/textarea.js b/assets/js/autocomplete/textarea.js
index 47cc014..0bcdb42 100644
--- a/assets/js/autocomplete/textarea.js
+++ b/assets/js/autocomplete/textarea.js
@@ -63,6 +63,10 @@ getDropDown().removeClass('showDropDown').addClass('hideDropDown');
 });
 if(resultname) {
 if(resultname == "acct") {
+if(ele.display_name == "") ele.display_name = ele.username;
+for(var i=0;i<ele.emojis.length;i++) {
+ele.display_name = ele.display_name.replace(new RegExp(":"+ele.emojis[i].shortcode+":","g"),"<img src='"+ele.emojis[i].url+"' class='emoji'>");
+}
 $(liNode).data("value",prepend+ele[resultname]+" ");
 $(liNode).addClass("account_box").append($("<div>").addClass("icon_box").append($("<img>").attr("src",ele.avatar).css("float","left")))
 .append($("<div>").addClass("label_box").append($("<span>").addClass("dn").append($("<h3>").html(ele.display_name).addClass("emoji_poss"))).append($("<span>").addClass("un").html(prepend+ele.acct)));
diff --git a/assets/js/halcyon/halcyonFunctions.js b/assets/js/halcyon/halcyonFunctions.js
index 47c2159..15eae09 100644
--- a/assets/js/halcyon/halcyonFunctions.js
+++ b/assets/js/halcyon/halcyonFunctions.js
@@ -232,6 +232,7 @@ current_statuses_count_link = localStorage.getItem("current_statuses_count_link"
 current_following_count_link = localStorage.getItem("current_following_count_link");
 current_followers_count_link = localStorage.getItem("current_followers_count_link");
 current_favourites_link = localStorage.getItem("current_favourites_link");
+current_search_history = JSON.parse(localStorage.getItem("current_search_history"));
 setCurrentProfile();
 });
 api.get("accounts/"+current_id+"/following",function(data) {
@@ -319,6 +320,7 @@ current_instance_charlimit = localStorage.getItem("current_instance_charlimit");
 current_blocked_accts = localStorage.getItem("current_blocked_accts");
 current_muted_accts = localStorage.getItem("current_muted_accts");
 current_filters = JSON.parse(localStorage.getItem("current_filters"));
+current_search_history = JSON.parse(localStorage.getItem("current_search_history"));
 $(function() {setCurrentProfile()});
 }
 function setCurrentProfile() {
diff --git a/assets/js/halcyon/halcyonSettings.js b/assets/js/halcyon/halcyonSettings.js
index 545289e..68f6805 100644
--- a/assets/js/halcyon/halcyonSettings.js
+++ b/assets/js/halcyon/halcyonSettings.js
@@ -71,15 +71,10 @@ $('#js-settings_nav_profile').toggleClass('view');
 $(function() {
 api.get("accounts/verify_credentials",function(AccountObj) {
 $(".display_name_wrap input[name='display_name']").val(AccountObj["display_name"]);
-if(AccountObj["source"]["note"].length != 0) {
-$(".about_me_wrap textarea[name='about_me']").val(AccountObj["source"]["note"]);
-}
-else {
-$(".about_me_wrap textarea[name='about_me']").val(AccountObj["note"]);
-}
-if(AccountObj["locked"] == true) {
-$("#setting_lock_account")[0].checked = true;
-}
+if(AccountObj["source"]["note"].length != 0) $(".about_me_wrap textarea[name='about_me']").val(AccountObj["source"]["note"]);
+else if(AccountObj["note"] == "<p></p>") $(".about_me_wrap textarea[name='about_me']").val("");
+else $(".about_me_wrap textarea[name='about_me']").val(AccountObj["note"]);
+if(AccountObj["locked"] == true) $("#setting_lock_account")[0].checked = true;
 if(AccountObj.source && AccountObj.source.fields) {
 for(var i=0;i<AccountObj.source.fields.length;i++) {
 $("#setting_field_"+i+"_name").val(AccountObj.source.fields[i].name);
diff --git a/assets/js/halcyon/halcyonUI.js b/assets/js/halcyon/halcyonUI.js
index 9b5c00a..2836cc0 100644
--- a/assets/js/halcyon/halcyonUI.js
+++ b/assets/js/halcyon/halcyonUI.js
@@ -1004,6 +1004,29 @@ $(`<div class="profile_recent_images_item media_attachment" otype="image" sid="$
 }
 });
 };
+function setInstance() {
+api.get("instance",function(data) {
+$("#instance_title").html(data.title);
+$("#instance_description").html(data.description);
+$("#instance_thumbnail").attr("src",data.thumbnail);
+$("#js-follows_profile").append(follows_template(data.contact_account));
+api.get('accounts/relationships',[{name:'id',data:data.contact_account.id}],function(RelationshipsObj) {
+if(RelationshipsObj[0].following) {
+const button = $('#js-follows_profile .follow_button[mid="'+RelationshipsObj[0].id+'"]');
+button.removeClass("follow_button");
+button.addClass("following_button");
+button.children("span").text(__('Following'));
+button.children("i").removeClass("fa-user-plus").addClass("fa-user-times");
+}
+});
+$("#instance_users").text(data.stats.user_count);
+$("#instance_posts").text(data.stats.status_count);
+$("#instance_domains").text(data.stats.domain_count);
+$("#instance_version").text(data.version);
+$("#instance_contact").attr("href","mailto:"+data.email).text(data.email);
+$("#js-timeline_footer").remove();
+});
+}
 function badges_update(){
 let current_count = Number(localStorage.getItem("notification_count"));
 if ( current_count ) {
@@ -2054,18 +2077,31 @@ history.pushState(null, null, current_file);
 }
 }
 });
-})
+});
 $(function() {
 $("#enable_follow").click(function() {
 localStorage.setItem("setting_who_to_follow","true");
 setWhoToFollow(true);
 });
-})
-$(function() {
+$("#search_form").focus(function() {
+if($("#search_form").val() == "") searchlocalfill();
+else searchremotefill($("#search_form").val());
+$(".header_search_suggestions").removeClass("invisible");
+}).keyup(function() {
+if($("#search_form").val() == "") searchlocalfill();
+else searchremotefill($("#search_form").val());
+});
+$(document).click(function(e) {
+if(!$(e.target).closest('.header_search_suggestions').length && !$(e.target).closest('#search_form').length) $(".header_search_suggestions").addClass("invisible");
+});
+$(".search_form").submit(function(e) {
+e.preventDefault();
+searchredirect($("#search_form").val());
+});
 shortcut.add("n",function() {
 $("#creat_status").click();
 },{
- "disable_in_input":true,
+"disable_in_input":true,
 });
 shortcut.add("/",function() {
 $("#search_form").focus();
diff --git a/footer.php b/footer.php
index a92c438..83a0067 100644
--- a/footer.php
+++ b/footer.php
@@ -25,8 +25,6 @@ if($_SERVER["REQUEST_URI"] == "/settings/filters") include dirname(__FILE__).('/
 setOverlayStatus('<?php echo $_GET['status']; ?>');
 <?php endif; ?>
 badges_update();
-$('.footer_widget_about').attr('href','https://'+current_instance+'/about');
-$('.footer_widget_instance').attr('href','https://'+current_instance+'/about/more');
 $('.footer_widget_terms').attr('href','https://'+current_instance+'/terms');
 </script>
 </body>
diff --git a/header.php b/header.php
index 9be17a6..3b8f5ce 100644
--- a/header.php
+++ b/header.php
@@ -30,6 +30,7 @@ echo '<link rel="stylesheet" href="/assets/css/dark.css" media="all">';
 <script src="/assets/js/emojipicker/emojipicker.js"></script>
 <script src="/assets/js/halcyon/halcyonTemplates.js"></script>
 <script src="/assets/js/halcyon/halcyonUI.js"></script>
+<script src="/assets/js/autocomplete/search.js"></script>
 <script src="/assets/js/pomo/pomo.js"></script>
 <script src="/assets/js/twemoji/twemoji.min.js"></script>
 <script src="/assets/js/clipboard.js/clipboard.min.js"></script>
@@ -108,15 +109,16 @@ resetApp();
 </nav>
 <nav class="header_right_box">
 <ul class="header_nav_list">
-<li class="header_nav_item serch_form_wrap">
+<li class="header_nav_item search_form_wrap">
 <form class="search_form" action="/search" method="GET">
-<input id="search_form" class="search_form_input" placeholder="<?=_('Search Mastodon')?>" type="text" name="q" accesskey="/">
+<input id="search_form" class="search_form_input" placeholder="<?=_('Search Mastodon')?>" type="text" name="q" accesskey="/" autocomplete="off">
 <span class="search_form_submit">
 <button type="submit">
 <i class="fa fa-fw fa-search"></i>
 </button>
 </span>
 </form>
+<nav class="header_search_suggestions invisible"></nav>
 </li>
 <li class="header_nav_item my_account_wrap">
 <button class="header_account_avatar">
diff --git a/instance.php b/instance.php
new file mode 100644
index 0000000..75e20d2
--- /dev/null
+++ b/instance.php
@@ -0,0 +1,65 @@
+<?php include ('header.php'); ?>
+<main id="main">
+<div class="article_wrap">
+<aside class="left_column">
+<?php include dirname(__FILE__).('/widgets/side_current_user.php'); ?>
+<?php include dirname(__FILE__).('/widgets/side_footer.php'); ?>
+</aside>
+<article class="center_column">
+<header class="timeline_header">
+<ul class="header_items">
+<li class="item toots view" id="instance_title"></li>
+</ul>
+</header>
+<div class="timeline">
+<div id="instance_description" style="margin:10px"></div>
+<img id="instance_thumbnail" style="width:100%">
+<div id="instance_information" style="margin:10px">
+<div id="js-follows_profile" style="width:290px;float:left">
+<div style="width:100%">
+<center style="margin:5px"><?=_("Administrated by")?></center>
+</div>
+</div>
+<div style="float:left;width:calc(100% - 290px)">
+<div style="width:32%;float:left;margin-right:6px">
+<center style="margin:5px"><?=_("Users")?></center>
+<div class="instance_field" id="instance_users"></div>
+</div>
+<div style="width:32%;float:left;margin-right:6px">
+<center style="margin:5px"><?=_("Toots")?></center>
+<div class="instance_field" id="instance_posts"></div>
+</div>
+<div style="width:32%;float:left">
+<center style="margin:5px"><?=_("Connections")?></center>
+<div class="instance_field" id="instance_domains"></div>
+</div>
+</div>
+<div style="float:left;width:calc(100% - 290px)">
+<div style="width:32%;float:left;margin-right:6px">
+<center style="margin:5px"><?=_("Version")?></center>
+<div class="instance_field" id="instance_version"></div>
+</div>
+<div style="width:calc(66% - 5px);float:left">
+<center style="margin:5px"><?=_("Contact")?></center>
+<div class="instance_field" style="padding-top:21px;padding-bottom:22px">
+<i class="fa fa-envelope"></i>
+<div style="margin-top:-20px">
+<a id="instance_contact" style="font-size:16px"></a>
+</div>
+</div>
+</div>
+</div>
+<span style="visibility:hidden">-</span>
+</div>
+</div>
+<footer id="js-timeline_footer" class="timeline_footer">
+<i id="savestate" class="fa fa-spin fa-circle-o-notch" aria-hidden="true"></i>
+</footer>
+</article>
+</div>
+</main>
+<script>
+setInstance();
+$('title').text('Halcyon / Instance');
+</script>
+<?php include ('footer.php'); ?>
diff --git a/login/auth.php b/login/auth.php
index a68c078..7b38526 100644
--- a/login/auth.php
+++ b/login/auth.php
@@ -31,6 +31,7 @@ echo "
 localStorage.setItem('current_id','$account_id');
 localStorage.setItem('current_instance','$domain');
 localStorage.setItem('current_authtoken', '$access_token');
+localStorage.setItem('current_search_history', '[]');
 localStorage.setItem('setting_post_stream', 'auto');
 localStorage.setItem('setting_post_privacy', 'public');
 localStorage.setItem('setting_local_instance', 'default');
diff --git a/nginx.conf b/nginx.conf
index efcdaac..bf332f2 100644
--- a/nginx.conf
+++ b/nginx.conf
@@ -54,6 +54,9 @@ rewrite ^/whotofollow/?$ /who_to_follow.php break;
 # Direct
 rewrite ^/direct/?$ /direct.php break;
 
+# Instance
+rewrite ^/instance/?$ /instance.php break;
+
 # Lists
 rewrite ^/lists/?$ /lists.php break;
 rewrite ^/lists/(\d+)/?$ /lists_view.php?id=$1 break;
diff --git a/search_hash_tag.php b/search_hash_tag.php
index d21e7e9..906663a 100644
--- a/search_hash_tag.php
+++ b/search_hash_tag.php
@@ -33,12 +33,18 @@ current_file = location.pathname+location.search;
 $(function() {
 var query = "<?= htmlspecialchars((string)filter_input(INPUT_GET, 'q'), ENT_QUOTES) ?>";
 if(query[0] == "@") {
-window.location.href = "/search/users/?q="+query.substr(1);
+window.location.href = "/search/users?q="+query.substr(1);
 }
 else {
 if(query[0] == "#") {
 query = query.substr(1);
 }
+if(query.length > 0) {
+current_search_history.push(query);
+if(current_search_history.length > 99) {
+current_search_history.shift();
+}
+localStorage.current_search_history = JSON.stringify(current_search_history);
 $('#main > .article_wrap > .center_column > .timeline_header > .header_items > .item').text("#"+query);
 $('#js-header_title_box > h1').text(query);
 $('title').text('#'+query+' - Halcyon Search');
@@ -53,6 +59,10 @@ setTimeline("timelines/tag/"+query,[{name:"local",data:"true"}]);
 }
 replace_emoji();
 }
+else {
+history.back();
+}
+}
 });
 <?php } else { ?>
 window.location.href = "/";
diff --git a/search_user.php b/search_user.php
index f836936..12b9d83 100644
--- a/search_user.php
+++ b/search_user.php
@@ -19,12 +19,17 @@
 current_file = location.pathname+location.search;
 <?php if(isset($_GET['q'])): ?>
 const query = "<?= htmlspecialchars((string)filter_input(INPUT_GET, 'q'), ENT_QUOTES) ?>";
+if(query.length > 0) {
 $('title').text(query+' - Halcyon Search');
 $('#js-header_title_box > h1').text(query);
 $('#js-search_nav_peoples').toggleClass('view');
 $('#js-search_nav_toots a ').attr('href','/search'+location.search);
 $('#js-search_nav_peoples a ').attr('href','/search/users'+location.search);
 setUserSearch(query);
+}
+else {
+history.go(-2);
+}
 <?php endif; ?>
 </script>
 <?php include ('footer.php'); ?>
diff --git a/version.txt b/version.txt
index cd57a8b..399088b 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-2.1.5
+2.1.6
diff --git a/widgets/side_footer.php b/widgets/side_footer.php
index a9ed69f..a22df68 100644
--- a/widgets/side_footer.php
+++ b/widgets/side_footer.php
@@ -1,6 +1,6 @@
 <footer class="side_widgets_footer side_widget"><ul>
 <li><?=_('Halcyon for')?> <a href="https://github.com/tootsuite/mastodon">Mastodon</a> <?=_('and')?> <a href="https://git.pleroma.social/pleroma/pleroma">Pleroma</a></li>
-<li><a class="footer_widget_about"><?=_('About')?></a></li>
+<li><a href="/instance"><?=_('About')?></a></li>
 <li><a class="footer_widget_terms"><?=_('Terms')?></a></li>
 <li><a href="https://github.com/tootsuite/documentation/blob/master/Using-Mastodon/Apps.md"><?=_('Apps')?></a></li>
 <li><a href="https://notabug.org/halcyon-suite/halcyon"><?=_('Source code')?></a></li>
@@ -8,7 +8,7 @@
 <li><a href="/privacy"><?=_('Privacy policy')?></a></li>
 <?php
 if(file_exists("config/imprint.txt")) {
-echo "<li><a href='/imprint'>Imprint</a></li>";
+echo "<li><a href='/imprint'>"._("Imprint")."</a></li>";
 }
 if(file_exists("config/footerlinks.txt")) {
 $footerlinks = json_decode(file_get_contents("config/footerlinks.txt"));