From 20497f1be30348cddc4c16f7ffa5615cc17a4225 Mon Sep 17 00:00:00 2001
From: zotlabs <mike@macgirvin.com>
Date: Thu, 10 Nov 2016 15:59:49 -0800
Subject: [PATCH] Some minor tweaks to zotsh.py, document that it needs the
 twitter_api plugin on the first hop since we no longer provide the twitter
 api by default

---
 include/channel.php                   |   4 ++--
 util/zotsh/README.txt                 |   4 +++-
 util/zotsh/easywebdav/__init__.pyc    | Bin 455 -> 457 bytes
 util/zotsh/easywebdav/__version__.pyc | Bin 173 -> 174 bytes
 util/zotsh/easywebdav/client.pyc      | Bin 8846 -> 8871 bytes
 util/zotsh/zotsh.py                   |   4 ++--
 6 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/include/channel.php b/include/channel.php
index c02d5266e..e35f453de 100644
--- a/include/channel.php
+++ b/include/channel.php
@@ -1539,11 +1539,11 @@ function remote_online_status($webbie) {
  */
 
 function identity_selector() {
-	if (local_channel()) {
+	if(local_channel()) {
 		$r = q("select channel.*, xchan.* from channel left join xchan on channel.channel_hash = xchan.xchan_hash where channel.channel_account_id = %d and channel_removed = 0 order by channel_name ",
 			intval(get_account_id())
 		);
-		if (count($r) > 1) {
+		if($r && count($r) > 1) {
 			//$account = App::get_account();
 			$o = replace_macros(get_markup_template('channel_id_select.tpl'), array(
 				'$channels' => $r,
diff --git a/util/zotsh/README.txt b/util/zotsh/README.txt
index 3f31bba7f..facddc850 100644
--- a/util/zotsh/README.txt
+++ b/util/zotsh/README.txt
@@ -8,6 +8,8 @@ Install
 ZotSH requires 'requests'(1).
 Please refer to requests docs on how to install it (2)
 
+The initially connected server must have the twitter_api plugin installed
+
 Extract somewere and launch zotsh.py
 
 
@@ -106,4 +108,4 @@ Links
 
 _0 : https://github.com/amnong/easywebdav
 _1 : http://docs.python-requests.org/en/latest/
-_2 : http://docs.python-requests.org/en/latest/user/install/
\ No newline at end of file
+_2 : http://docs.python-requests.org/en/latest/user/install/
diff --git a/util/zotsh/easywebdav/__init__.pyc b/util/zotsh/easywebdav/__init__.pyc
index b609b06c1dd1303b7cd1d7259c2e770015c5ba76..4f30c1871f17d184e480c6fd40eb6cb0738066c5 100644
GIT binary patch
delta 72
zcmX@ke3F@i`7<w9WSdgNM2<hACJYP=`WgATsrtEz$?2IzWtn;U8IyY$RVLdo+TfJ6
F1^_I!7Lxz~

delta 70
zcmX@fe4Lqs`7<w<oc6tti5!1Kj2Rdh^fU5vQ}uHblhZSc$};oxC-*U`OtxjT!6j)8
E00RgW<^TWy

diff --git a/util/zotsh/easywebdav/__version__.pyc b/util/zotsh/easywebdav/__version__.pyc
index 5da5a28ec09f718e25598b5ae5b65d44a2d2aaf9..b19bf50b046e332e539cb36f14570542c14b236c 100644
GIT binary patch
delta 41
wcmZ3>xQ>y7`7<w9WSdgNM2=8Va|Q+m{fzwFRQ=q<<n+v<vdldFjERLd0Q6@Jq5uE@

delta 40
vcmZ3-xR#NF`7<w9iq^f5i5#IKW(*7r`WgATsrtEz$?2IzWtn;U6N_vB^9c-~

diff --git a/util/zotsh/easywebdav/client.pyc b/util/zotsh/easywebdav/client.pyc
index 4c42d2603fd477c62ab4ddd65a8d4e6ddba4ffea..cf074d522992608541b3e5c1a02975c518853e8f 100644
GIT binary patch
delta 418
zcmeBkUGB=k{F#?4vP~&sBZnRnqtWC>31P;J$&K7flXIBTQ1~3oHE_P6lG5Z|%zu&j
zo8PhsF`@{VvMoV2QE@XL=M{tskQEZ#p)ehr8@U~rVH}YCo4@l-M5qQ?xKH33ih@&u
z(Fg^N+=`R=IQb@L2<O2Sfi&@moIvJp<`SKc&;(L&U+fdIg30U>m2f`DjoTzXqww!b
wu1Db?k@}Cq|0#VGnZNmq%sPaHAOmm69fm6aIpCsv4~)OLP+<*1v7u5d0FpR+?f?J)

delta 374
zcmZ4P+ULr_{F#?a%KKi(Mh-nDM#IU5!ori!ODavyWlBThaWU7xcq~ej_cH&5@HU@k
zF=0eVY_?)s0yl$2adMh4-)1GwV{jFcN|X3mCM$CX!n8;#ZC=eS$Bf`^;-3gt4YcTl
zz%_*2=Bt9y2uYCX$ZnDpIRR73qO@5;bUs3<(&TqypAeFh#U(0XJfKI9OMHg&F2Y$#
vldnttN8<6y97XUpbIPuR8xJ(%o!nuVB+$_><a=N|kpC3A;7Wm#IZD<5SUGcY

diff --git a/util/zotsh/zotsh.py b/util/zotsh/zotsh.py
index d5e1aa527..36506b39d 100755
--- a/util/zotsh/zotsh.py
+++ b/util/zotsh/zotsh.py
@@ -55,7 +55,7 @@ class ZotSH(object):
     @session.setter
     def session(self, session):
         self._session = session
-        self.davclient = easywebdav.connect( self.hostname, protocol='https', session=session, path="dav", verify_ssl=VERIFY_SSL)
+        self.davclient = easywebdav.connect( self.hostname, protocol='https', session=session, path="cloud", verify_ssl=VERIFY_SSL)
         
     @property
     def PS1(self):
@@ -205,7 +205,7 @@ class ZotSH(object):
                 print _fmt('d', 0, "../")
                 
         for f in r:
-            name = f.name.replace("/dav"+self.davclient.cwd,"")
+            name = f.name.replace("/cloud"+self.davclient.cwd,"")
             type = "-"
             if name.endswith("/"):
                 type = "d"