From 2bdadf27719c63b0fd2dcd7c12c1d922c413b945 Mon Sep 17 00:00:00 2001
From: promostarr <faceeatingtumor@gmail.com>
Date: Mon, 17 Apr 2017 16:15:47 +0100
Subject: [PATCH] Test fix for notification server

---
 .idea/workspace.xml | 39 ++++++++++++++++++++-------------------
 Janitor.rb          |  4 +---
 notification.rb     |  9 ++++++---
 3 files changed, 27 insertions(+), 25 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 78077f4..0e8b835 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -3,6 +3,7 @@
   <component name="ChangeListManager">
     <list default="true" id="ecb21532-0ae7-441d-90a8-4b144fd51290" name="Default" comment="">
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Janitor.rb" afterPath="$PROJECT_DIR$/Janitor.rb" />
+      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/notification.rb" afterPath="$PROJECT_DIR$/notification.rb" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="TRACKING_ENABLED" value="true" />
@@ -14,21 +15,21 @@
   <component name="ExecutionTargetManager" SELECTED_TARGET="default_target" />
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file leaf-file-name="Janitor.rb" pinned="false" current-in-tab="true">
+      <file leaf-file-name="Janitor.rb" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/Janitor.rb">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="340">
-              <caret line="62" column="32" lean-forward="true" selection-start-line="62" selection-start-column="32" selection-end-line="62" selection-end-column="32" />
+            <state relative-caret-position="300">
+              <caret line="60" column="0" lean-forward="false" selection-start-line="60" selection-start-column="0" selection-end-line="60" selection-end-column="0" />
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="notification.rb" pinned="false" current-in-tab="false">
+      <file leaf-file-name="notification.rb" pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/notification.rb">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="-271">
-              <caret line="8" column="8" lean-forward="true" selection-start-line="8" selection-start-column="8" selection-end-line="8" selection-end-column="8" />
+            <state relative-caret-position="300">
+              <caret line="15" column="4" lean-forward="false" selection-start-line="15" selection-start-column="4" selection-end-line="15" selection-end-column="4" />
               <folding />
             </state>
           </provider>
@@ -37,8 +38,8 @@
       <file leaf-file-name="core.rb" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/core.rb">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="700">
-              <caret line="35" column="21" lean-forward="true" selection-start-line="35" selection-start-column="21" selection-end-line="35" selection-end-column="21" />
+            <state relative-caret-position="200">
+              <caret line="10" column="5" lean-forward="true" selection-start-line="10" selection-start-column="5" selection-end-line="10" selection-end-column="5" />
               <folding />
             </state>
           </provider>
@@ -52,9 +53,9 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
-        <option value="$PROJECT_DIR$/notification.rb" />
         <option value="$PROJECT_DIR$/core.rb" />
         <option value="$PROJECT_DIR$/Janitor.rb" />
+        <option value="$PROJECT_DIR$/notification.rb" />
       </list>
     </option>
   </component>
@@ -268,12 +269,12 @@
       <option name="presentableId" value="Default" />
       <updated>1492353576138</updated>
       <workItem from="1492353577745" duration="1817000" />
-      <workItem from="1492433677612" duration="8322000" />
+      <workItem from="1492433677612" duration="8421000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="10139000" />
+    <option name="totallyTimeSpent" value="10238000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="0" y="27" width="1920" height="1020" extended-state="6" />
@@ -333,26 +334,26 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/notification.rb">
+    <entry file="file://$PROJECT_DIR$/Janitor.rb">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="-271">
-          <caret line="8" column="8" lean-forward="true" selection-start-line="8" selection-start-column="8" selection-end-line="8" selection-end-column="8" />
+        <state relative-caret-position="300">
+          <caret line="60" column="0" lean-forward="false" selection-start-line="60" selection-start-column="0" selection-end-line="60" selection-end-column="0" />
           <folding />
         </state>
       </provider>
     </entry>
     <entry file="file://$PROJECT_DIR$/core.rb">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="700">
-          <caret line="35" column="21" lean-forward="true" selection-start-line="35" selection-start-column="21" selection-end-line="35" selection-end-column="21" />
+        <state relative-caret-position="200">
+          <caret line="10" column="5" lean-forward="true" selection-start-line="10" selection-start-column="5" selection-end-line="10" selection-end-column="5" />
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/Janitor.rb">
+    <entry file="file://$PROJECT_DIR$/notification.rb">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="340">
-          <caret line="62" column="32" lean-forward="true" selection-start-line="62" selection-start-column="32" selection-end-line="62" selection-end-column="32" />
+        <state relative-caret-position="300">
+          <caret line="15" column="4" lean-forward="false" selection-start-line="15" selection-start-column="4" selection-end-line="15" selection-end-column="4" />
           <folding />
         </state>
       </provider>
diff --git a/Janitor.rb b/Janitor.rb
index 8f884c6..6b1b7cb 100644
--- a/Janitor.rb
+++ b/Janitor.rb
@@ -58,9 +58,7 @@ class Janitor
   end
 
   def move_self(cid)
-    client_id = whoami()
-    puts client_id
-    return move_client(client_id['client_id'], cid)
+    return move_client(whoami['client_id'], cid)
   end
 
 
diff --git a/notification.rb b/notification.rb
index 41256d3..1d2745c 100644
--- a/notification.rb
+++ b/notification.rb
@@ -6,10 +6,13 @@
   jan = Janitor.new
   while (i > 0)
 	begin
-		return_report = jan.listen(false)
 
-    invokerid = return_report['invokerid']
-    cmd = return_report['msg']
+    if i > 0
+			return_report = jan.listen(false)
+
+			invokerid = return_report['invokerid']
+			cmd = return_report['msg']
+    end
 
 		puts cmd + " - " + invokerid.to_s
 		if cmd == '!help'