erik/mobibot
erik/mobibot
1
1
Fork 0
Code Issues Releases Activity

Changed Quote module to Joke, using the Internet Chuck Norris Database.

Browse source
This commit is contained in:
Erik C. Thauvin 2015-08-29 12:54:58 -07:00
parent 80921e2aea
commit b7e6cbe8ca
4 changed files with 138 additions and 198 deletions
Download patch file Download diff file Expand all files Collapse all files

288
mobibot.iws
View file

@ -34,13 +34,10 @@
</component> </component>
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="944923a8-a8d5-4232-a77e-02473b958f59" name="Default" comment=""> <list default="true" id="944923a8-a8d5-4232-a77e-02473b958f59" name="Default" comment="">
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/gradle/wrapper/gradle-wrapper.jar" afterPath="$PROJECT_DIR$/gradle/wrapper/gradle-wrapper.jar" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/net/thauvin/erik/mobibot/Commands.java" afterPath="$PROJECT_DIR$/src/main/java/net/thauvin/erik/mobibot/Commands.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/net/thauvin/erik/mobibot/CurrencyConverter.java" afterPath="$PROJECT_DIR$/src/main/java/net/thauvin/erik/mobibot/CurrencyConverter.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/net/thauvin/erik/mobibot/Mobibot.java" afterPath="$PROJECT_DIR$/src/main/java/net/thauvin/erik/mobibot/Mobibot.java" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/java/net/thauvin/erik/mobibot/Mobibot.java" afterPath="$PROJECT_DIR$/src/main/java/net/thauvin/erik/mobibot/Mobibot.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/buildnum.properties" afterPath="$PROJECT_DIR$/buildnum.properties" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/gradle/wrapper/gradle-wrapper.properties" afterPath="$PROJECT_DIR$/gradle/wrapper/gradle-wrapper.properties" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/mobibot.ipr" afterPath="$PROJECT_DIR$/mobibot.ipr" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/mobibot.iws" afterPath="$PROJECT_DIR$/mobibot.iws" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/mobibot.iws" afterPath="$PROJECT_DIR$/mobibot.iws" />
<change type="MOVED" beforePath="K:\java\mobibot\src\main\java\net\thauvin\erik\mobibot\Quote.java" afterPath="$PROJECT_DIR$/src/main/java/net/thauvin/erik/mobibot/Joke.java" />
</list> </list>
<ignored path="$USER_HOME$/.griffon/" /> <ignored path="$USER_HOME$/.griffon/" />
<ignored path="$USER_HOME$/.grails/" /> <ignored path="$USER_HOME$/.grails/" />
@ -201,9 +198,11 @@
<file leaf-file-name="Mobibot.java" pinned="false" current-in-tab="false"> <file leaf-file-name="Mobibot.java" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/main/java/net/thauvin/erik/mobibot/Mobibot.java"> <entry file="file://$PROJECT_DIR$/src/main/java/net/thauvin/erik/mobibot/Mobibot.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-16.034483"> <state vertical-scroll-proportion="-13.275862">
<caret line="1214" column="139" selection-start-line="1214" selection-start-column="139" selection-end-line="1214" selection-end-column="139" /> <caret line="1255" column="40" selection-start-line="1255" selection-start-column="40" selection-end-line="1255" selection-end-column="40" />
<folding /> <folding>
<element signature="e#0#68037#0" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
@ -212,7 +211,7 @@
<entry file="file://$PROJECT_DIR$/properties/mobibot.properties"> <entry file="file://$PROJECT_DIR$/properties/mobibot.properties">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0"> <state vertical-scroll-proportion="0.0">
<caret line="18" column="17" selection-start-line="18" selection-start-column="16" selection-end-line="18" selection-end-column="16" /> <caret line="18" column="16" selection-start-line="18" selection-start-column="16" selection-end-line="18" selection-end-column="16" />
<folding /> <folding />
</state> </state>
</provider> </provider>
@ -223,20 +222,7 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0"> <state vertical-scroll-proportion="0.0">
<caret line="0" column="2" selection-start-line="0" selection-start-column="2" selection-end-line="0" selection-end-column="2" /> <caret line="0" column="2" selection-start-line="0" selection-start-column="2" selection-end-line="0" selection-end-column="2" />
<folding> <folding />
<element signature="e#2506#2507#0" expanded="false" />
<element signature="e#2544#2545#0" expanded="false" />
<element signature="e#2646#2647#0" expanded="false" />
<element signature="e#2667#2668#0" expanded="false" />
<element signature="e#2832#2833#0" expanded="false" />
<element signature="e#2861#2862#0" expanded="false" />
<element signature="e#3011#3012#0" expanded="false" />
<element signature="e#3029#3030#0" expanded="false" />
<element signature="e#3159#3160#0" expanded="false" />
<element signature="e#3177#3178#0" expanded="false" />
<element signature="e#3321#3322#0" expanded="false" />
<element signature="e#3344#3345#0" expanded="false" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
@ -245,9 +231,9 @@
<entry file="file://$PROJECT_DIR$/src/main/java/net/thauvin/erik/mobibot/Commands.java"> <entry file="file://$PROJECT_DIR$/src/main/java/net/thauvin/erik/mobibot/Commands.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0"> <state vertical-scroll-proportion="0.0">
<caret line="87" column="80" selection-start-line="87" selection-start-column="47" selection-end-line="87" selection-end-column="47" /> <caret line="172" column="56" selection-start-line="172" selection-start-column="56" selection-end-line="172" selection-end-column="56" />
<folding> <folding>
<element signature="e#0#5577#0" expanded="true" /> <element signature="e#0#5574#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
@ -258,20 +244,7 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0"> <state vertical-scroll-proportion="0.0">
<caret line="117" column="55" selection-start-line="117" selection-start-column="55" selection-end-line="117" selection-end-column="55" /> <caret line="117" column="55" selection-start-line="117" selection-start-column="55" selection-end-line="117" selection-end-column="55" />
<folding> <folding />
<element signature="e#838#839#0" expanded="false" />
<element signature="e#859#860#0" expanded="false" />
<element signature="e#2201#2202#0" expanded="false" />
<element signature="e#2220#2221#0" expanded="false" />
<element signature="e#2353#2354#0" expanded="false" />
<element signature="e#2369#2370#0" expanded="false" />
<element signature="e#2950#2951#0" expanded="false" />
<element signature="e#2969#2970#0" expanded="false" />
<element signature="e#3002#3003#0" expanded="false" />
<element signature="e#3024#3025#0" expanded="false" />
<element signature="e#3057#3058#0" expanded="false" />
<element signature="e#3079#3080#0" expanded="false" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
@ -280,10 +253,9 @@
<entry file="file://$PROJECT_DIR$/src/main/java/net/thauvin/erik/mobibot/ReleaseInfo.java"> <entry file="file://$PROJECT_DIR$/src/main/java/net/thauvin/erik/mobibot/ReleaseInfo.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0"> <state vertical-scroll-proportion="0.0">
<caret line="112" column="5" selection-start-line="112" selection-start-column="5" selection-end-line="112" selection-end-column="5" /> <caret line="49" column="5" selection-start-line="49" selection-start-column="5" selection-end-line="49" selection-end-column="5" />
<folding> <folding>
<element signature="e#3167#3168#0" expanded="true" /> <element signature="e#1599#1600#0" expanded="true" />
<element signature="e#3188#3189#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
@ -293,31 +265,28 @@
<entry file="file://$PROJECT_DIR$/build.gradle"> <entry file="file://$PROJECT_DIR$/build.gradle">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0"> <state vertical-scroll-proportion="0.0">
<caret line="72" column="90" selection-start-line="72" selection-start-column="0" selection-end-line="72" selection-end-column="0" /> <caret line="72" column="0" selection-start-line="72" selection-start-column="0" selection-end-line="72" selection-end-column="0" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="buildnum.properties" pinned="false" current-in-tab="true"> <file leaf-file-name="buildnum.properties" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/buildnum.properties"> <entry file="file://$PROJECT_DIR$/buildnum.properties">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.030739672"> <state vertical-scroll-proportion="0.0">
<caret line="2" column="17" selection-start-line="2" selection-start-column="17" selection-end-line="2" selection-end-column="17" /> <caret line="2" column="16" selection-start-line="2" selection-start-column="16" selection-end-line="2" selection-end-column="16" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="StockQuote.java" pinned="false" current-in-tab="false"> <file leaf-file-name="Joke.java" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/main/java/net/thauvin/erik/mobibot/StockQuote.java"> <entry file="file://$PROJECT_DIR$/src/main/java/net/thauvin/erik/mobibot/Joke.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0"> <state vertical-scroll-proportion="0.554007">
<caret line="157" column="28" selection-start-line="157" selection-start-column="28" selection-end-line="157" selection-end-column="28" /> <caret line="102" column="91" selection-start-line="102" selection-start-column="91" selection-end-line="102" selection-end-column="91" />
<folding> <folding />
<element signature="e#0#4638#0" expanded="false" />
<element signature="imports" expanded="false" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
@ -772,10 +741,12 @@
<option name="CHANGED_PATHS"> <option name="CHANGED_PATHS">
<list> <list>
<option value="$PROJECT_DIR$/src/main/java/net/thauvin/erik/mobibot/EntryComment.java" /> <option value="$PROJECT_DIR$/src/main/java/net/thauvin/erik/mobibot/EntryComment.java" />
<option value="$PROJECT_DIR$/src/main/java/net/thauvin/erik/mobibot/Commands.java" />
<option value="$PROJECT_DIR$/src/main/java/net/thauvin/erik/mobibot/CurrencyConverter.java" /> <option value="$PROJECT_DIR$/src/main/java/net/thauvin/erik/mobibot/CurrencyConverter.java" />
<option value="$PROJECT_DIR$/src/main/java/net/thauvin/erik/mobibot/Mobibot.java" />
<option value="$PROJECT_DIR$/buildnum.properties" /> <option value="$PROJECT_DIR$/buildnum.properties" />
<option value="$PROJECT_DIR$/src/main/java/net/thauvin/erik/mobibot/Quote.java" />
<option value="$PROJECT_DIR$/src/main/java/net/thauvin/erik/mobibot/Commands.java" />
<option value="$PROJECT_DIR$/src/main/java/net/thauvin/erik/mobibot/Mobibot.java" />
<option value="$PROJECT_DIR$/src/main/java/net/thauvin/erik/mobibot/Joke.java" />
</list> </list>
</option> </option>
</component> </component>
@ -1543,46 +1514,6 @@
<sortByType /> <sortByType />
</navigator> </navigator>
<panes> <panes>
<pane id="Scope">
<subPane subId="All">
<PATH>
<PATH_ELEMENT USER_OBJECT="Root">
<option name="myItemId" value="" />
<option name="myItemType" value="" />
</PATH_ELEMENT>
<PATH_ELEMENT USER_OBJECT="mobibot">
<option name="myItemId" value="" />
<option name="myItemType" value="" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT USER_OBJECT="Root">
<option name="myItemId" value="" />
<option name="myItemType" value="" />
</PATH_ELEMENT>
<PATH_ELEMENT USER_OBJECT="mobibot">
<option name="myItemId" value="" />
<option name="myItemType" value="" />
</PATH_ELEMENT>
<PATH_ELEMENT USER_OBJECT="src">
<option name="myItemId" value="" />
<option name="myItemType" value="" />
</PATH_ELEMENT>
<PATH_ELEMENT USER_OBJECT="net/thauvin/erik/mobibot">
<option name="myItemId" value="" />
<option name="myItemType" value="" />
</PATH_ELEMENT>
</PATH>
</subPane>
<subPane subId="Project Files">
<PATH>
<PATH_ELEMENT USER_OBJECT="Root">
<option name="myItemId" value="" />
<option name="myItemType" value="" />
</PATH_ELEMENT>
</PATH>
</subPane>
</pane>
<pane id="PackagesPane"> <pane id="PackagesPane">
<subPane> <subPane>
<PATH> <PATH>
@ -1611,6 +1542,7 @@
</PATH> </PATH>
</subPane> </subPane>
</pane> </pane>
<pane id="Scratches" />
<pane id="ProjectPane"> <pane id="ProjectPane">
<subPane> <subPane>
<PATH> <PATH>
@ -1693,7 +1625,46 @@
</PATH> </PATH>
</subPane> </subPane>
</pane> </pane>
<pane id="Scratches" /> <pane id="Scope">
<subPane subId="All">
<PATH>
<PATH_ELEMENT USER_OBJECT="Root">
<option name="myItemId" value="" />
<option name="myItemType" value="" />
</PATH_ELEMENT>
<PATH_ELEMENT USER_OBJECT="mobibot">
<option name="myItemId" value="" />
<option name="myItemType" value="" />
</PATH_ELEMENT>
</PATH>
<PATH>
<PATH_ELEMENT USER_OBJECT="Root">
<option name="myItemId" value="" />
<option name="myItemType" value="" />
</PATH_ELEMENT>
<PATH_ELEMENT USER_OBJECT="mobibot">
<option name="myItemId" value="" />
<option name="myItemType" value="" />
</PATH_ELEMENT>
<PATH_ELEMENT USER_OBJECT="src">
<option name="myItemId" value="" />
<option name="myItemType" value="" />
</PATH_ELEMENT>
<PATH_ELEMENT USER_OBJECT="net/thauvin/erik/mobibot">
<option name="myItemId" value="" />
<option name="myItemType" value="" />
</PATH_ELEMENT>
</PATH>
</subPane>
<subPane subId="Project Files">
<PATH>
<PATH_ELEMENT USER_OBJECT="Root">
<option name="myItemId" value="" />
<option name="myItemType" value="" />
</PATH_ELEMENT>
</PATH>
</subPane>
</pane>
<pane id="Favorites" /> <pane id="Favorites" />
</panes> </panes>
</component> </component>
@ -1806,7 +1777,7 @@
<option name="referencePos" value="0" /> <option name="referencePos" value="0" />
<option name="showLabels" value="true" /> <option name="showLabels" value="true" />
</component> </component>
<component name="RunManager" selected="Gradle.mobibot [release]"> <component name="RunManager" selected="Gradle.mobibot [deploy]">
<configuration default="false" name="mobibot [distZip]" type="GradleRunConfiguration" factoryName="Gradle" temporary="true"> <configuration default="false" name="mobibot [distZip]" type="GradleRunConfiguration" factoryName="Gradle" temporary="true">
<ExternalSystemSettings> <ExternalSystemSettings>
<option name="executionName" /> <option name="executionName" />
@ -2419,11 +2390,12 @@
<workItem from="1422609958367" duration="95000" /> <workItem from="1422609958367" duration="95000" />
<workItem from="1440871303975" duration="34000" /> <workItem from="1440871303975" duration="34000" />
<workItem from="1440873148254" duration="1946000" /> <workItem from="1440873148254" duration="1946000" />
<workItem from="1440876283433" duration="1663000" />
</task> </task>
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="257370000" /> <option name="totallyTimeSpent" value="259033000" />
</component> </component>
<component name="TodoView" selected-index="0"> <component name="TodoView" selected-index="0">
<todo-panel id="selected-file"> <todo-panel id="selected-file">
@ -2447,7 +2419,7 @@
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="1592" y="-8" width="1616" height="1204" extended-state="0" /> <frame x="1592" y="-8" width="1616" height="1204" extended-state="0" />
<editor active="true" /> <editor active="false" />
<layout> <layout>
<window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="12" side_tool="false" content_ui="tabs" /> <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="12" side_tool="false" content_ui="tabs" />
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32798395" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" /> <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32798395" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
@ -2461,8 +2433,7 @@
<window_info id="Designer" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" /> <window_info id="Designer" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.19625" sideWeight="0.4710071" order="0" side_tool="false" content_ui="combo" /> <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.19625" sideWeight="0.4710071" order="0" side_tool="false" content_ui="combo" />
<window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32969153" sideWeight="0.5" order="13" side_tool="false" content_ui="tabs" /> <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32969153" sideWeight="0.5" order="13" side_tool="false" content_ui="tabs" />
<window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.2750234" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> <window_info id="Gradle" active="true" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.120625" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Gradle" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.120625" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.18055555" sideWeight="0.5289929" order="1" side_tool="true" content_ui="tabs" /> <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.18055555" sideWeight="0.5289929" order="1" side_tool="true" content_ui="tabs" />
<window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.09114249" sideWeight="0.60704356" order="2" side_tool="false" content_ui="tabs" /> <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.09114249" sideWeight="0.60704356" order="2" side_tool="false" content_ui="tabs" />
<window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
@ -2499,6 +2470,7 @@
<window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32704404" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" /> <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32704404" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" />
<window_info id="Jalopy" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32962963" sideWeight="0.5" order="18" side_tool="false" content_ui="tabs" /> <window_info id="Jalopy" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32962963" sideWeight="0.5" order="18" side_tool="false" content_ui="tabs" />
<window_info id="IDEtalk Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="12" side_tool="false" content_ui="tabs" /> <window_info id="IDEtalk Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="12" side_tool="false" content_ui="tabs" />
<window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.2750234" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
</layout> </layout>
<layout-to-restore> <layout-to-restore>
<window_info id="Maven projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" /> <window_info id="Maven projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
@ -2648,10 +2620,7 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0"> <state vertical-scroll-proportion="0.0">
<caret line="157" column="28" selection-start-line="157" selection-start-column="28" selection-end-line="157" selection-end-column="28" /> <caret line="157" column="28" selection-start-line="157" selection-start-column="28" selection-end-line="157" selection-end-column="28" />
<folding> <folding />
<element signature="e#0#4638#0" expanded="false" />
<element signature="imports" expanded="false" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
@ -2931,17 +2900,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/net/thauvin/erik/mobibot/Quote.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="70" column="47" selection-start-line="70" selection-start-column="47" selection-end-line="70" selection-end-column="47" />
<folding>
<element signature="e#0#3499#0" expanded="false" />
<element signature="imports" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/net/thauvin/erik/mobibot/FeedReader.java"> <entry file="file://$PROJECT_DIR$/src/main/java/net/thauvin/erik/mobibot/FeedReader.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0"> <state vertical-scroll-proportion="0.0">
@ -2957,10 +2915,7 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0"> <state vertical-scroll-proportion="0.0">
<caret line="157" column="28" selection-start-line="157" selection-start-column="28" selection-end-line="157" selection-end-column="28" /> <caret line="157" column="28" selection-start-line="157" selection-start-column="28" selection-end-line="157" selection-end-column="28" />
<folding> <folding />
<element signature="e#0#4638#0" expanded="false" />
<element signature="imports" expanded="false" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
@ -2968,20 +2923,7 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0"> <state vertical-scroll-proportion="0.0">
<caret line="117" column="55" selection-start-line="117" selection-start-column="55" selection-end-line="117" selection-end-column="55" /> <caret line="117" column="55" selection-start-line="117" selection-start-column="55" selection-end-line="117" selection-end-column="55" />
<folding> <folding />
<element signature="e#838#839#0" expanded="false" />
<element signature="e#859#860#0" expanded="false" />
<element signature="e#2201#2202#0" expanded="false" />
<element signature="e#2220#2221#0" expanded="false" />
<element signature="e#2353#2354#0" expanded="false" />
<element signature="e#2369#2370#0" expanded="false" />
<element signature="e#2950#2951#0" expanded="false" />
<element signature="e#2969#2970#0" expanded="false" />
<element signature="e#3002#3003#0" expanded="false" />
<element signature="e#3024#3025#0" expanded="false" />
<element signature="e#3057#3058#0" expanded="false" />
<element signature="e#3079#3080#0" expanded="false" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
@ -2989,30 +2931,7 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0"> <state vertical-scroll-proportion="0.0">
<caret line="0" column="2" selection-start-line="0" selection-start-column="2" selection-end-line="0" selection-end-column="2" /> <caret line="0" column="2" selection-start-line="0" selection-start-column="2" selection-end-line="0" selection-end-column="2" />
<folding> <folding />
<element signature="e#2506#2507#0" expanded="false" />
<element signature="e#2544#2545#0" expanded="false" />
<element signature="e#2646#2647#0" expanded="false" />
<element signature="e#2667#2668#0" expanded="false" />
<element signature="e#2832#2833#0" expanded="false" />
<element signature="e#2861#2862#0" expanded="false" />
<element signature="e#3011#3012#0" expanded="false" />
<element signature="e#3029#3030#0" expanded="false" />
<element signature="e#3159#3160#0" expanded="false" />
<element signature="e#3177#3178#0" expanded="false" />
<element signature="e#3321#3322#0" expanded="false" />
<element signature="e#3344#3345#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/net/thauvin/erik/mobibot/Commands.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="87" column="80" selection-start-line="87" selection-start-column="47" selection-end-line="87" selection-end-column="47" />
<folding>
<element signature="e#0#5577#0" expanded="true" />
</folding>
</state> </state>
</provider> </provider>
</entry> </entry>
@ -3026,18 +2945,10 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/main/java/net/thauvin/erik/mobibot/Mobibot.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-16.034483">
<caret line="1214" column="139" selection-start-line="1214" selection-start-column="139" selection-end-line="1214" selection-end-column="139" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/properties/mobibot.properties"> <entry file="file://$PROJECT_DIR$/properties/mobibot.properties">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0"> <state vertical-scroll-proportion="0.0">
<caret line="18" column="17" selection-start-line="18" selection-start-column="16" selection-end-line="18" selection-end-column="16" /> <caret line="18" column="16" selection-start-line="18" selection-start-column="16" selection-end-line="18" selection-end-column="16" />
<folding /> <folding />
</state> </state>
</provider> </provider>
@ -3045,26 +2956,53 @@
<entry file="file://$PROJECT_DIR$/src/main/java/net/thauvin/erik/mobibot/ReleaseInfo.java"> <entry file="file://$PROJECT_DIR$/src/main/java/net/thauvin/erik/mobibot/ReleaseInfo.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0"> <state vertical-scroll-proportion="0.0">
<caret line="112" column="5" selection-start-line="112" selection-start-column="5" selection-end-line="112" selection-end-column="5" /> <caret line="49" column="5" selection-start-line="49" selection-start-column="5" selection-end-line="49" selection-end-column="5" />
<folding> <folding>
<element signature="e#3167#3168#0" expanded="true" /> <element signature="e#1599#1600#0" expanded="true" />
<element signature="e#3188#3189#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/buildnum.properties">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0">
<caret line="2" column="16" selection-start-line="2" selection-start-column="16" selection-end-line="2" selection-end-column="16" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/build.gradle"> <entry file="file://$PROJECT_DIR$/build.gradle">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0"> <state vertical-scroll-proportion="0.0">
<caret line="72" column="90" selection-start-line="72" selection-start-column="0" selection-end-line="72" selection-end-column="0" /> <caret line="72" column="0" selection-start-line="72" selection-start-column="0" selection-end-line="72" selection-end-column="0" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/buildnum.properties"> <entry file="file://$PROJECT_DIR$/src/main/java/net/thauvin/erik/mobibot/Commands.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.030739672"> <state vertical-scroll-proportion="0.0">
<caret line="2" column="17" selection-start-line="2" selection-start-column="17" selection-end-line="2" selection-end-column="17" /> <caret line="172" column="56" selection-start-line="172" selection-start-column="56" selection-end-line="172" selection-end-column="56" />
<folding>
<element signature="e#0#5574#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/net/thauvin/erik/mobibot/Mobibot.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="-13.275862">
<caret line="1255" column="40" selection-start-line="1255" selection-start-column="40" selection-end-line="1255" selection-end-column="40" />
<folding>
<element signature="e#0#68037#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/main/java/net/thauvin/erik/mobibot/Joke.java">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.554007">
<caret line="102" column="91" selection-start-line="102" selection-start-column="91" selection-end-line="102" selection-end-column="91" />
<folding /> <folding />
</state> </state>
</provider> </provider>

10
src/main/java/net/thauvin/erik/mobibot/Commands.java
View file

@ -127,6 +127,11 @@ public class Commands
*/ */
public static final String INFO_CMD = "info"; public static final String INFO_CMD = "info";
/**
* The joke command.
*/
public static final String JOKE_CMD = "joke";
/** /**
* The link command. * The link command.
*/ */
@ -167,11 +172,6 @@ public class Commands
*/ */
public static final String PROPS_ARG = "properties"; public static final String PROPS_ARG = "properties";
/**
* The quote command.
*/
public static final String QUOTE_CMD = "quote";
/** /**
* The recap command. * The recap command.
*/ */

20
src/main/java/net/thauvin/erik/mobibot/Quote.java → src/main/java/net/thauvin/erik/mobibot/Joke.java
View file

@ -42,20 +42,20 @@ import java.net.URL;
import java.net.URLConnection; import java.net.URLConnection;
/** /**
* Processes the {@link Commands#QUOTE_CMD} command. * Processes the {@link Commands#JOKE_CMD} command.
* *
* @author <a href="mailto:erik@thauvin.net">Erik C. Thauvin</a> * @author <a href="mailto:erik@thauvin.net">Erik C. Thauvin</a>
* @created 2014-04-20 * @created 2014-04-20
* @since 1.0 * @since 1.0
*/ */
public class Quote implements Runnable public class Joke implements Runnable
{ {
/** /**
* The I Heart Quotes URL. * The I Heart Quotes URL.
*/ */
private static final String QUOTE_URL = private static final String JOKE_URL =
"http://www.iheartquotes.com/api/v1/random?format=json&max_lines=1&source=esr+humorix_misc+humorix_stories+joel_on_software+macintosh+math+mav_flame+osp_rules+paul_graham+prog_style+subversion"; "http://api.icndb.com/jokes/random";
/** /**
* The bot's instance. * The bot's instance.
@ -68,25 +68,25 @@ public class Quote implements Runnable
private final String sender; private final String sender;
/** /**
* Creates a new {@link StockQuote} instance. * Creates a new {@link Joke} instance.
* *
* @param bot The bot's instance. * @param bot The bot's instance.
* @param sender The nick of the person who sent the message. * @param sender The nick of the person who sent the message.
*/ */
public Quote(Mobibot bot, String sender) public Joke(Mobibot bot, String sender)
{ {
this.bot = bot; this.bot = bot;
this.sender = sender; this.sender = sender;
} }
/** /**
* Returns a random quote from <a href="http://iheartquotes.com/">I Heart Quote</a> * Returns a random joke from <a href="http://www.icndb.com/">The Internet Chuck Norris Database</a>
*/ */
public final void run() public final void run()
{ {
try try
{ {
final URL url = new URL(QUOTE_URL); final URL url = new URL(JOKE_URL);
final URLConnection conn = url.openConnection(); final URLConnection conn = url.openConnection();
final StringBuilder sb = new StringBuilder(); final StringBuilder sb = new StringBuilder();
@ -100,13 +100,13 @@ public class Quote implements Runnable
final JSONObject json = new JSONObject(sb.toString()); final JSONObject json = new JSONObject(sb.toString());
bot.send(bot.getChannel(), Colors.CYAN + json.getString("quote") + Colors.CYAN); bot.send(bot.getChannel(), Colors.CYAN + json.getJSONObject("value").get("joke") + Colors.CYAN);
reader.close(); reader.close();
} }
catch (Exception e) catch (Exception e)
{ {
bot.getLogger().warn("Unable to retrieve random quote.", e); bot.getLogger().warn("Unable to retrieve random joke.", e);
bot.send(sender, "An error has occurred: " + e.getMessage()); bot.send(sender, "An error has occurred: " + e.getMessage());
} }
} }

18
src/main/java/net/thauvin/erik/mobibot/Mobibot.java
View file

@ -1126,10 +1126,10 @@ public class Mobibot extends PircBot
send(sender, "For a listing of the supported countries:"); send(sender, "For a listing of the supported countries:");
send(sender, DOUBLE_INDENT + Utils.bold(getNick() + ": " + Commands.TIME_CMD)); send(sender, DOUBLE_INDENT + Utils.bold(getNick() + ": " + Commands.TIME_CMD));
} }
else if (lcTopic.endsWith(Commands.QUOTE_CMD)) else if (lcTopic.endsWith(Commands.JOKE_CMD))
{ {
send(sender, "To retrieve a random quote:"); send(sender, "To retrieve a random joke:");
send(sender, DOUBLE_INDENT + Utils.bold(getNick() + ": " + Commands.QUOTE_CMD)); send(sender, DOUBLE_INDENT + Utils.bold(getNick() + ": " + Commands.JOKE_CMD));
} }
else if (lcTopic.endsWith(Commands.STOCK_CMD)) else if (lcTopic.endsWith(Commands.STOCK_CMD))
{ {
@ -1212,7 +1212,9 @@ public class Mobibot extends PircBot
if (lcTopic.endsWith(Commands.CURRENCY_CMD)) if (lcTopic.endsWith(Commands.CURRENCY_CMD))
{ {
send(sender, "For a listing of currency rates:"); send(sender, "For a listing of currency rates:");
send(sender, DOUBLE_INDENT + Utils.bold(getNick() + ": " + Commands.CURRENCY_CMD) + ' ' + Commands.CURRENCY_RATES_KEYWORD); send(sender,
DOUBLE_INDENT + Utils.bold(getNick() + ": " + Commands.CURRENCY_CMD) + ' '
+ Commands.CURRENCY_RATES_KEYWORD);
send(sender, "For a listing of supported currencies:"); send(sender, "For a listing of supported currencies:");
send(sender, DOUBLE_INDENT + Utils.bold(getNick() + ": " + Commands.CURRENCY_CMD)); send(sender, DOUBLE_INDENT + Utils.bold(getNick() + ": " + Commands.CURRENCY_CMD));
} }
@ -1251,10 +1253,10 @@ public class Mobibot extends PircBot
cmds.add(Commands.GOOGLE_CMD); cmds.add(Commands.GOOGLE_CMD);
cmds.add(Commands.IGNORE_CMD); cmds.add(Commands.IGNORE_CMD);
cmds.add(Commands.INFO_CMD); cmds.add(Commands.INFO_CMD);
cmds.add(Commands.JOKE_CMD);
cmds.add(Commands.LOOKUP_CMD); cmds.add(Commands.LOOKUP_CMD);
cmds.add(channel.substring(1)); cmds.add(channel.substring(1));
cmds.add(Commands.HELP_POSTING_KEYWORD); cmds.add(Commands.HELP_POSTING_KEYWORD);
cmds.add(Commands.QUOTE_CMD);
cmds.add(Commands.RECAP_CMD); cmds.add(Commands.RECAP_CMD);
cmds.add(Commands.STOCK_CMD); cmds.add(Commands.STOCK_CMD);
cmds.add(Commands.HELP_TAGS_KEYWORD); cmds.add(Commands.HELP_TAGS_KEYWORD);
@ -1795,10 +1797,10 @@ public class Mobibot extends PircBot
{ {
stockResponse(sender, args); stockResponse(sender, args);
} }
// mobibot: quote // mobibot: joke
else if (cmd.startsWith(Commands.QUOTE_CMD)) else if (cmd.startsWith(Commands.JOKE_CMD))
{ {
new Thread(new Quote(this, sender)).start(); new Thread(new Joke(this, sender)).start();
} }
// mobibot: calc // mobibot: calc
else if (cmd.startsWith(Commands.CALC_CMD)) else if (cmd.startsWith(Commands.CALC_CMD))