Changed what Jan sees as global and can now send messages to the channel he's sitting in

This commit is contained in:
promostarr 2017-04-17 16:22:25 +01:00
parent 0191c12628
commit a4869158c4
4 changed files with 31 additions and 30 deletions

47
.idea/workspace.xml generated
View file

@ -3,6 +3,7 @@
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="ecb21532-0ae7-441d-90a8-4b144fd51290" name="Default" comment=""> <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$/Janitor.rb" afterPath="$PROJECT_DIR$/Janitor.rb" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/core.rb" afterPath="$PROJECT_DIR$/core.rb" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/notification.rb" afterPath="$PROJECT_DIR$/notification.rb" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/notification.rb" afterPath="$PROJECT_DIR$/notification.rb" />
</list> </list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@ -18,28 +19,28 @@
<file leaf-file-name="Janitor.rb" pinned="false" current-in-tab="false"> <file leaf-file-name="Janitor.rb" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Janitor.rb"> <entry file="file://$PROJECT_DIR$/Janitor.rb">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="480"> <state relative-caret-position="280">
<caret line="33" column="6" lean-forward="false" selection-start-line="33" selection-start-column="6" selection-end-line="33" selection-end-column="6" /> <caret line="20" column="15" lean-forward="true" selection-start-line="20" selection-start-column="15" selection-end-line="20" selection-end-column="15" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="notification.rb" pinned="false" current-in-tab="true"> <file leaf-file-name="notification.rb" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/notification.rb"> <entry file="file://$PROJECT_DIR$/notification.rb">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="140"> <state relative-caret-position="220">
<caret line="7" column="2" lean-forward="false" selection-start-line="7" selection-start-column="2" selection-end-line="7" selection-end-column="2" /> <caret line="11" column="31" lean-forward="false" selection-start-line="11" selection-start-column="31" selection-end-line="11" selection-end-column="31" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="core.rb" pinned="false" current-in-tab="false"> <file leaf-file-name="core.rb" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/core.rb"> <entry file="file://$PROJECT_DIR$/core.rb">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="200"> <state relative-caret-position="438">
<caret line="10" column="5" lean-forward="true" selection-start-line="10" selection-start-column="5" selection-end-line="10" selection-end-column="5" /> <caret line="39" column="20" lean-forward="false" selection-start-line="39" selection-start-column="20" selection-end-line="39" selection-end-column="20" />
<folding /> <folding />
</state> </state>
</provider> </provider>
@ -53,9 +54,9 @@
<component name="IdeDocumentHistory"> <component name="IdeDocumentHistory">
<option name="CHANGED_PATHS"> <option name="CHANGED_PATHS">
<list> <list>
<option value="$PROJECT_DIR$/core.rb" />
<option value="$PROJECT_DIR$/Janitor.rb" /> <option value="$PROJECT_DIR$/Janitor.rb" />
<option value="$PROJECT_DIR$/notification.rb" /> <option value="$PROJECT_DIR$/notification.rb" />
<option value="$PROJECT_DIR$/core.rb" />
</list> </list>
</option> </option>
</component> </component>
@ -269,12 +270,12 @@
<option name="presentableId" value="Default" /> <option name="presentableId" value="Default" />
<updated>1492353576138</updated> <updated>1492353576138</updated>
<workItem from="1492353577745" duration="1817000" /> <workItem from="1492353577745" duration="1817000" />
<workItem from="1492433677612" duration="8556000" /> <workItem from="1492433677612" duration="8844000" />
</task> </task>
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="10373000" /> <option name="totallyTimeSpent" value="10661000" />
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="0" y="27" width="1920" height="1020" extended-state="6" /> <frame x="0" y="27" width="1920" height="1020" extended-state="6" />
@ -334,26 +335,26 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/core.rb">
<provider selected="true" editor-type-id="text-editor">
<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$/Janitor.rb">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="480"> <state relative-caret-position="280">
<caret line="33" column="6" lean-forward="false" selection-start-line="33" selection-start-column="6" selection-end-line="33" selection-end-column="6" /> <caret line="20" column="15" lean-forward="true" selection-start-line="20" selection-start-column="15" selection-end-line="20" selection-end-column="15" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/notification.rb"> <entry file="file://$PROJECT_DIR$/notification.rb">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="140"> <state relative-caret-position="220">
<caret line="7" column="2" lean-forward="false" selection-start-line="7" selection-start-column="2" selection-end-line="7" selection-end-column="2" /> <caret line="11" column="31" lean-forward="false" selection-start-line="11" selection-start-column="31" selection-end-line="11" selection-end-column="31" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/core.rb">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="438">
<caret line="39" column="20" lean-forward="false" selection-start-line="39" selection-start-column="20" selection-end-line="39" selection-end-column="20" />
<folding /> <folding />
</state> </state>
</provider> </provider>

View file

@ -1,10 +1,10 @@
require 'teamspeak-ruby' require 'teamspeak-ruby'
class Janitor class Janitor
debug_mode = true
def initialize def initialize
@ts = login() @ts = login()
@global = false
end end
def login() def login()
@ -19,16 +19,16 @@ class Janitor
end end
def gsay(msg) def gsay(msg)
if debug_mode == true if @global == true
@ts.command('sendtextmessage', {targetmode: 3, target: 1, msg: msg}) @ts.command('sendtextmessage', {targetmode: 3, target: 1, msg: msg})
else else
@ts.command('sendtextmessage', {targetmode: 1, target: 13, msg: msg}) @ts.command('sendtextmessage', {targetmode: 2, target: whoami['client_channel_id'], msg: msg})
end end
end end
def listen(global) def listen()
if global == true if @global == true
return @ts.command('servernotifyregister', event: 'textserver')[0] return @ts.command('servernotifyregister', event: 'textserver')[0]
else else
return @ts.command('servernotifyregister', event: 'textchannel', id: 218 )[0] return @ts.command('servernotifyregister', event: 'textchannel', id: 218 )[0]

View file

@ -37,7 +37,7 @@ OptionParser.new do |parser|
end end
parser.on("--listen") do parser.on("--listen") do
puts jan.listen(false) puts jan.listen()
end end
end.parse! end.parse!

View file

@ -9,7 +9,7 @@
while (i > 0) while (i > 0)
begin begin
return_report = jan.listen(false) return_report = jan.listen()
invokerid = return_report['invokerid'] invokerid = return_report['invokerid']
cmd = return_report['msg'] cmd = return_report['msg']