From 88c076ad11c465abce76e91595743bf95e09e68c Mon Sep 17 00:00:00 2001
From: Hannes Mannerheim <h@nnesmannerhe.im>
Date: Tue, 25 Aug 2015 14:00:07 +0200
Subject: [PATCH] further refinements for #96

---
 actions/qvitter.php  |  1 +
 js/dom-functions.js  | 11 ++++++++++-
 js/misc-functions.js |  3 ++-
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/actions/qvitter.php b/actions/qvitter.php
index 9babecb..a3cedf7 100644
--- a/actions/qvitter.php
+++ b/actions/qvitter.php
@@ -236,6 +236,7 @@ class QvitterAction extends ApiAction
 					window.siteLicenseTitle = '<?php print common_config('license', 'title'); ?>';
 					window.siteLicenseURL = '<?php print common_config('license', 'url'); ?>';
 					window.customTermsOfUse = <?php print json_encode(QvitterPlugin::settings("customtermsofuse")); ?>;
+                    window.siteLocalOnlyDefaultPath = <?php print (common_config('public', 'localonly') ? 'true' : 'false'); ?>;
 
 					// available language files and their last update time
 					window.availableLanguages = {<?php
diff --git a/js/dom-functions.js b/js/dom-functions.js
index 32d134d..5cb7bfb 100644
--- a/js/dom-functions.js
+++ b/js/dom-functions.js
@@ -827,7 +827,16 @@ function getStreamFromUrl() {
 	var loc = window.location.href.replace('http://','').replace('https://','').replace(window.siteRootDomain,'');
 
 	// default/fallback
-	var streamToSet = 'statuses/public_timeline.json';
+	if(window.loggedIn) {
+		var streamToSet = 'statuses/friends_timeline.json';
+		}
+	else if(window.siteLocalOnlyDefaultPath) {
+		var streamToSet = 'statuses/public_timeline.json';
+		}
+	else {
+		var streamToSet = 'statuses/public_and_external_timeline.json';
+		}
+
 
 	// main/all, i.e. full network
 	if (loc == '/main/all') {
diff --git a/js/misc-functions.js b/js/misc-functions.js
index c450373..844f5dd 100644
--- a/js/misc-functions.js
+++ b/js/misc-functions.js
@@ -677,7 +677,8 @@ function isValidHexColor(maybeValidHexColor) {
 function changeDesign(obj) {
 
 	// if we're logged out and this is the front page, we use the default design
-	if(!window.loggedIn && window.currentStream == 'statuses/public_timeline.json') {
+	if(!window.loggedIn &&
+	(window.currentStream == 'statuses/public_timeline.json' || window.currentStream == 'statuses/public_and_external_timeline.json')) {
 		obj.backgroundimage = window.fullUrlToThisQvitterApp + window.siteBackground;
 		obj.backgroundcolor = window.defaultBackgroundColor;
 		obj.linkcolor = window.defaultLinkColor;