Release 1.0.2 - Bugs fixed,version info and cookie notice added

README.md

@@ -6,12 +6,13 @@ A Mastodon web client that looks like Twitter
 <img src="https://halcyon.cybre.space/login/assets/images/preview0.png">
 
 ## Blog
+- Release of Version 1.0.2 - Fixed a Firefox-only bug and some wrong links, added version info and an annoying cookie notice (sorry, but that's EU law)
 - Release of Version 1.0.1 - Two bugfixes
 - [Release of Version 1.0.0](http://nikisoft.myblog.de/nikisoft/art/11264555/The-first-new-Halcyon-release-is-on-Github)
 
 ## Instances
 These instances are publicly accessible and usable by everyone, no matter which Mastodon instance you use.
-- https://halcyon.toromino.de - 1.0.1
+- https://halcyon.toromino.de - 1.0.2
 - https://social.dev-wiki.de - 1.0.1
 - https://halcyon.cybre.space - Outdated
 

assets/js/halcyon/halcyonFunctions.js

@@ -1,5 +1,5 @@
 function getLinkFromXHRHeader(xhrheaderstring) {
-const re = xhrheaderstring.match(/link: <.+api\/v1\/(.+?)>; rel="(.+?)", <.+api\/v1\/(.+?)>; rel="(.+?)"/);
+const re = xhrheaderstring.match(/link: <.+api\/v1\/(.+?)>; rel="(.+?)", <.+api\/v1\/(.+?)>; rel="(.+?)"/i);
 let di = new Object();
 if(re){
 di[re[2]] = re[1];
@@ -58,27 +58,27 @@ var posted_time_original = posted_time,
 posted_time = getConversionedDate(null, posted_time_original).getTime(),
 elapsedTime = Math.ceil((current_time-posted_time)/1000);
 if (elapsedTime < 60) {
-const datetime ="・" + elapsedTime + "s";
+const datetime ="・" + elapsedTime + "s";
 return datetime;
 }
 else if (elapsedTime < 120) {
-const datetime ="・1m";
+const datetime ="・1m";
 return datetime;
 }
 else if (elapsedTime < (60*60)) {
-const datetime ="・" + (Math.floor(elapsedTime / 60) < 10 ? " " : "") + Math.floor(elapsedTime / 60) + "m";
+const datetime ="・" + (Math.floor(elapsedTime / 60) < 10 ? " " : "") + Math.floor(elapsedTime / 60) + "m";
 return datetime;
 }
 else if (elapsedTime < (120*60)) {
-const datetime ="・1h";
+const datetime ="・1h";
 return datetime;
 }
 else if (elapsedTime < (24*60*60)) {
-const datetime ="・" + (Math.floor(elapsedTime / 3600) < 10 ? " " : "") + Math.floor(elapsedTime / 3600) + "h";
+const datetime ="・" + (Math.floor(elapsedTime / 3600) < 10 ? " " : "") + Math.floor(elapsedTime / 3600) + "h";
 return datetime;
 }
 else {
-const datetime ="・" + calendar[posted_time_original.getMonth()] + " " + posted_time_original.getDate();
+const datetime ="・" + calendar[posted_time_original.getMonth()] + " " + posted_time_original.getDate();
 return datetime;
 }
 }
@@ -171,4 +171,4 @@ $('#overlay_message section span').text(Message);
 setTimeout(function(){
 $("#overlay_message").removeClass("view");
 },3000);
-};
+};

assets/js/halcyon/halcyonUI.js

@@ -1414,7 +1414,7 @@ function setFollows(mid, param, load_options) {
 let isSyncing = true,
 followsList = [];
 api.get('accounts/'+mid+'/'+param, load_options, function(follows) {
- 
+
 for (let i in follows) {
 follows_template(follows[i]).appendTo("#js-follows_profile");
 followsList.unshift(follows[i].id);

config.ini.sample

@@ -1,4 +1,5 @@
 ; Registar App Settings
 [App]
-api_client_name = APPLICATION'S NAME
+api_client_name = Your application name
-api_client_website = HTTPS://YOURDOMAIN.COM/
+api_client_website = https://example.com/
+

login/login.php

@@ -32,7 +32,9 @@ die();
 <link rel="shortcut icon" href="/assets/images/favicon.ico">
 <link rel="stylesheet" href="/login/assets/css/style.css" media="all">
 <link rel="stylesheet" href="//cdn.staticfile.org/font-awesome/4.7.0/css/font-awesome.min.css" media="all">
+<link rel="stylesheet" href="//cdn.staticfile.org/cookieconsent2/3.0.4/cookieconsent.min.css">
 <script src="//yastatic.net/jquery/3.2.1/jquery.min.js"></script>
+<script src="//cdn.staticfile.org/cookieconsent2/3.0.4/cookieconsent.min.js"></script>
 <script src="/assets/js/jquery-cookie/src/jquery.cookie.js"></script>
 <script src="/login/assets/js/halcyon_login.js"></script>
 <script>
@@ -68,7 +70,7 @@ location.href = "/";
 <span><i class="fa fa-code" aria-hidden="true"></i>Source</span>
 </li>
 </a>
-<a class="no-underline">
+<a href="/terms/" class="no-underline">
 <li>
 <span><i class="fa fa-balance-scale" aria-hidden="true"></i>Terms</span>
 </li>
@@ -132,7 +134,7 @@ Halcyon is standard <span style="font-weight: bold">Twitter like client</span> o
 </div>
 <h2>Contact / Feedback</h2>
 <p>
-Mastodon: <a href="https://social.csswg.org/@halcyon" target="_blank">＠halcyon@social.csswg.org</a><br />
+Mastodon: <a href="https://social.csswg.org/@halcyon" target="_blank">ï¼ halcyon@social.csswg.org</a><br />
 Email: <a href="http://www.nikisoft.one/contact.php" target="_blank">Use my contact form</a><br />
 Github: <a href="https://github.com/halcyon-suite/halcyon" target="_blank">halcyon-suite/halcyon</a>
 </p>
@@ -149,9 +151,24 @@ Bitcoin: 1D6GThQqHQYnruKYrKyW9JC86ZGWxjt1hK<br />
 <i class="fa fa-angle-up" aria-hidden="true"></i>
 </a>
 </div>
-<span>Photo by <a href="https://www.flickr.com/photos/95387826@N08/">Michio Morimoto on Flickr</a> (CC BY 2.0)</span>
+<span>Photo by <a href="https://www.flickr.com/photos/95387826@N08/">Michio Morimoto on Flickr</a> (CC BY 2.0)</span><br/>
+<span>Halcyon version <?php echo file_get_contents("../version.txt") ?></span>
 </footer>
 </body>
+<script>
+window.cookieconsent.initialise({
+"palette": {
+"popup": {
+"background": "#000"
+},
+"button": {
+"background": "#f1d600"
+}
+},
+"theme": "classic",
+"position": "bottom"
+});
+</script>
 <?php if (isset($_GET['cause'])): ?>
 <script>
 $(function() {

login/terms.php

@@ -8,7 +8,9 @@
 <link rel="shortcut icon" href="/assets/images/favicon.ico">
 <link rel="stylesheet" href="/login/assets/css/style.css" media="all">
 <link rel="stylesheet" href="//cdn.staticfile.org/font-awesome/4.7.0/css/font-awesome.min.css" media="all">
+<link rel="stylesheet" href="//cdn.staticfile.org/cookieconsent2/3.0.4/cookieconsent.min.css">
 <script src="//yastatic.net/jquery/3.2.1/jquery.min.js"></script>
+<script src="//cdn.staticfile.org/cookieconsent2/3.0.4/cookieconsent.min.js"></script>
 <script src="/assets/js/jquery-cookie/src/jquery.cookie.js"></script>
 <script src="/login/assets/js/halcyon_login.js"></script>
 </head>
@@ -45,7 +47,7 @@
 <span><i class="fa fa-envelope" aria-hidden="true"></i>Contact</span>
 </li>
 </a>
-<a href="#login_form_wrap" class="no-underline">
+<a href="/login/#login_form_wrap" class="no-underline">
 <li>
 <span><i class="fa fa-user-circle-o" aria-hidden="true"></i>Login</span>
 </li>
@@ -55,10 +57,11 @@
 </div>
 </div>
 </header>
+<?php $config = parse_ini_file('../config.ini',true) ?>
 <main id="main">
 <article id="article">
 <h1>Halcyon Terms of Use</h1>
-<p class="description">This terms of use agreement is for the users of web service Halcyon for Mastodon (Halcyon for short) hosted at <a href="http://example.com">example.com</a>.</p>
+<p class="description">This terms of use agreement is for the users of web service Halcyon for Mastodon (Halcyon for short) hosted at <a href="<?php echo $config["App"]["api_client_website"] ?>"><?php echo $config["App"]["api_client_website"] ?></a>.</p>
 <br/>
 <h2>1. Agreement</h2>
 <p>By logging into Halcyon you agree to this terms of use agreement. Do not use this service if you do not agree to these terms.</p>
@@ -77,7 +80,7 @@
 <ul>
 <li>actions violating the laws of countries</li>
 <li>actions contrary to public order and standards of decency</li>
-<li>violation of third party’s right to intellectual property, brand, privacy, etc.</li>
+<li>violation of third party’s right to intellectual property, brand, privacy, etc.</li>
 <li>acts of violence, sexual nature, of discrimination</li>
 <li>phishing or spamming</li>
 <li>actions causing problem to the network infrastructure of Halcyon</li>
@@ -95,6 +98,21 @@
 <i class="fa fa-angle-up" aria-hidden="true"></i>
 </a>
 </div>
-<span>Photo by <a href="https://www.flickr.com/photos/95387826@N08/">Michio Morimoto on Flickr</a> (CC BY 2.0)</span>
+<span>Halcyon version <?php echo file_get_contents("../version.txt") ?></span>
 </footer>
-</body>
+</body>
+<script>
+window.cookieconsent.initialise({
+"palette": {
+"popup": {
+"background": "#000"
+},
+"button": {
+"background": "#f1d600"
+}
+},
+"theme": "classic",
+"position": "bottom"
+});
+</script>
+</html>

version.txt

@@ -0,0 +1 @@
+1.0.2

widgets/side_footer.php

@@ -16,8 +16,12 @@ Halcyon for <a href="https://github.com/tootsuite/mastodon">Mastodon</a>
 <a href="https://github.com/halcyon-suite/halcyon">Source code</a>
 </li>
 <li>
-<a href="http://instances.list">Other instances</a>
+<a href="http://instances.social">Other instances</a>
+</li>
+<li>
+Version <?php echo file_get_contents("version.txt") ?>
 </li>
 </ul>
 </footer>
 <img style="display:block;margin:16px auto;width: 30%;opacity: .3;" src="/assets/images/halcyon.png">
+