Now uses setAutoNickChange()
This commit is contained in:
parent
d8c915bc4e
commit
50bd9f9a10
2 changed files with 25 additions and 57 deletions
42
mobibot.iws
42
mobibot.iws
|
@ -108,7 +108,7 @@
|
||||||
<first-group selected-file="file://$PROJECT_DIR$/src/net/thauvin/erik/mobibot/Mobibot.java">
|
<first-group selected-file="file://$PROJECT_DIR$/src/net/thauvin/erik/mobibot/Mobibot.java">
|
||||||
<entry file="file://$PROJECT_DIR$/src/net/thauvin/erik/mobibot/Mobibot.java" pinned="false">
|
<entry file="file://$PROJECT_DIR$/src/net/thauvin/erik/mobibot/Mobibot.java" pinned="false">
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
<state line="82" column="67" selection-start="2578" selection-end="2578" vertical-scroll-proportion="0.5821326">
|
<state line="2291" column="12" selection-start="55270" selection-end="55270" vertical-scroll-proportion="0.28818443">
|
||||||
<folding>
|
<folding>
|
||||||
<element signature="imports" expanded="true" />
|
<element signature="imports" expanded="true" />
|
||||||
</folding>
|
</folding>
|
||||||
|
@ -117,7 +117,7 @@
|
||||||
</entry>
|
</entry>
|
||||||
<entry file="file://$PROJECT_DIR$/src/net/thauvin/erik/mobibot/StockQuote.java" pinned="false">
|
<entry file="file://$PROJECT_DIR$/src/net/thauvin/erik/mobibot/StockQuote.java" pinned="false">
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
<state line="53" column="13" selection-start="2037" selection-end="2037" vertical-scroll-proportion="0.6023055">
|
<state line="53" column="13" selection-start="2037" selection-end="2037" vertical-scroll-proportion="0.8818444">
|
||||||
<folding>
|
<folding>
|
||||||
<element signature="imports" expanded="true" />
|
<element signature="imports" expanded="true" />
|
||||||
</folding>
|
</folding>
|
||||||
|
@ -126,7 +126,7 @@
|
||||||
</entry>
|
</entry>
|
||||||
<entry file="file://$PROJECT_DIR$/src/net/thauvin/erik/mobibot/CurrencyConverter.java" pinned="false">
|
<entry file="file://$PROJECT_DIR$/src/net/thauvin/erik/mobibot/CurrencyConverter.java" pinned="false">
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
<state line="63" column="13" selection-start="2150" selection-end="2150" vertical-scroll-proportion="0.5792507">
|
<state line="63" column="13" selection-start="2150" selection-end="2150" vertical-scroll-proportion="1.1613833">
|
||||||
<folding>
|
<folding>
|
||||||
<element signature="imports" expanded="true" />
|
<element signature="imports" expanded="true" />
|
||||||
</folding>
|
</folding>
|
||||||
|
@ -149,7 +149,7 @@
|
||||||
</entry>
|
</entry>
|
||||||
<entry file="file://$PROJECT_DIR$/src/net/thauvin/erik/mobibot/FeedReader.java" pinned="false">
|
<entry file="file://$PROJECT_DIR$/src/net/thauvin/erik/mobibot/FeedReader.java" pinned="false">
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
<state line="141" column="26" selection-start="3819" selection-end="3826" vertical-scroll-proportion="0.6023055">
|
<state line="141" column="26" selection-start="3819" selection-end="3826" vertical-scroll-proportion="1.2103746">
|
||||||
<folding>
|
<folding>
|
||||||
<element signature="imports" expanded="true" />
|
<element signature="imports" expanded="true" />
|
||||||
</folding>
|
</folding>
|
||||||
|
@ -158,7 +158,7 @@
|
||||||
</entry>
|
</entry>
|
||||||
<entry file="file://$PROJECT_DIR$/src/net/thauvin/erik/mobibot/EntryLink.java" pinned="false">
|
<entry file="file://$PROJECT_DIR$/src/net/thauvin/erik/mobibot/EntryLink.java" pinned="false">
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
<state line="55" column="13" selection-start="2034" selection-end="2034" vertical-scroll-proportion="0.519337">
|
<state line="55" column="13" selection-start="2034" selection-end="2034" vertical-scroll-proportion="0.9033149">
|
||||||
<folding>
|
<folding>
|
||||||
<element signature="imports" expanded="true" />
|
<element signature="imports" expanded="true" />
|
||||||
</folding>
|
</folding>
|
||||||
|
@ -167,7 +167,7 @@
|
||||||
</entry>
|
</entry>
|
||||||
<entry file="file://$PROJECT_DIR$/src/net/thauvin/erik/mobibot/EntryComment.java" pinned="false">
|
<entry file="file://$PROJECT_DIR$/src/net/thauvin/erik/mobibot/EntryComment.java" pinned="false">
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
<state line="53" column="13" selection-start="2016" selection-end="2016" vertical-scroll-proportion="0.519337">
|
<state line="53" column="13" selection-start="2016" selection-end="2016" vertical-scroll-proportion="0.8453039">
|
||||||
<folding>
|
<folding>
|
||||||
<element signature="imports" expanded="true" />
|
<element signature="imports" expanded="true" />
|
||||||
</folding>
|
</folding>
|
||||||
|
@ -189,20 +189,20 @@
|
||||||
</component>
|
</component>
|
||||||
<component name="J2EEProjectPane" />
|
<component name="J2EEProjectPane" />
|
||||||
<component name="PackagesPane">
|
<component name="PackagesPane">
|
||||||
<expanded_node url="net" module="mobibot" type="package" />
|
|
||||||
<expanded_node url="net.thauvin.erik.mobibot" module="mobibot" type="package" />
|
<expanded_node url="net.thauvin.erik.mobibot" module="mobibot" type="package" />
|
||||||
<expanded_node url="net.thauvin.erik" module="mobibot" type="package" />
|
<expanded_node url="net.thauvin.erik" module="mobibot" type="package" />
|
||||||
<expanded_node url="net.thauvin" module="mobibot" type="package" />
|
|
||||||
<expanded_node url="" module="mobibot" type="module" />
|
<expanded_node url="" module="mobibot" type="module" />
|
||||||
|
<expanded_node url="net" module="mobibot" type="package" />
|
||||||
|
<expanded_node url="net.thauvin" module="mobibot" type="package" />
|
||||||
</component>
|
</component>
|
||||||
<component name="ProjectPane">
|
<component name="ProjectPane">
|
||||||
<expanded_node url="file://$PROJECT_DIR$/src/net" module="mobibot" type="directory" />
|
<expanded_node url="file://$PROJECT_DIR$/src/net/thauvin/erik/mobibot" module="mobibot" type="directory" />
|
||||||
|
<expanded_node url="file://$PROJECT_DIR$/src/net/thauvin" module="mobibot" type="directory" />
|
||||||
|
<expanded_node url="file://$PROJECT_DIR$" module="mobibot" type="directory" />
|
||||||
|
<expanded_node url="file://$PROJECT_DIR$/src/net/thauvin/erik" module="mobibot" type="directory" />
|
||||||
<expanded_node url="file://$PROJECT_DIR$/src" module="mobibot" type="directory" />
|
<expanded_node url="file://$PROJECT_DIR$/src" module="mobibot" type="directory" />
|
||||||
<expanded_node url="" module="mobibot" type="module" />
|
<expanded_node url="" module="mobibot" type="module" />
|
||||||
<expanded_node url="file://$PROJECT_DIR$" module="mobibot" type="directory" />
|
<expanded_node url="file://$PROJECT_DIR$/src/net" module="mobibot" type="directory" />
|
||||||
<expanded_node url="file://$PROJECT_DIR$/src/net/thauvin" module="mobibot" type="directory" />
|
|
||||||
<expanded_node url="file://$PROJECT_DIR$/src/net/thauvin/erik/mobibot" module="mobibot" type="directory" />
|
|
||||||
<expanded_node url="file://$PROJECT_DIR$/src/net/thauvin/erik" module="mobibot" type="directory" />
|
|
||||||
</component>
|
</component>
|
||||||
<component name="ProjectView">
|
<component name="ProjectView">
|
||||||
<navigator currentView="PackagesPane" splitterProportion="0.5">
|
<navigator currentView="PackagesPane" splitterProportion="0.5">
|
||||||
|
@ -330,7 +330,7 @@
|
||||||
</todo-panel>
|
</todo-panel>
|
||||||
</component>
|
</component>
|
||||||
<component name="ToolWindowManager">
|
<component name="ToolWindowManager">
|
||||||
<frame x="-4" y="-4" width="1032" height="776" extended-state="6" />
|
<frame x="-4" y="-4" width="1032" height="776" extended-state="1" />
|
||||||
<editor active="false" />
|
<editor active="false" />
|
||||||
<layout>
|
<layout>
|
||||||
<window_info id="CVS" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33024693" order="8" />
|
<window_info id="CVS" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33024693" order="8" />
|
||||||
|
@ -341,7 +341,7 @@
|
||||||
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.22857143" order="1" />
|
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.22857143" order="1" />
|
||||||
<window_info id="Messages" active="true" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="true" weight="0.33024693" order="9" />
|
<window_info id="Messages" active="true" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="true" weight="0.33024693" order="9" />
|
||||||
<window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.39969134" order="6" />
|
<window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.39969134" order="6" />
|
||||||
<window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="true" weight="0.14591837" order="1" />
|
<window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="true" weight="0.13979591" order="1" />
|
||||||
<window_info id="Run" active="false" anchor="bottom" auto_hide="true" internal_type="docked" type="docked" visible="false" weight="0.39660493" order="2" x="22" y="277" width="980" height="213" />
|
<window_info id="Run" active="false" anchor="bottom" auto_hide="true" internal_type="docked" type="docked" visible="false" weight="0.39660493" order="2" x="22" y="277" width="980" height="213" />
|
||||||
<window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.25" order="2" />
|
<window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.25" order="2" />
|
||||||
<window_info id="CVS File View" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="3" />
|
<window_info id="CVS File View" active="false" anchor="right" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="3" />
|
||||||
|
@ -471,7 +471,7 @@
|
||||||
</entry>
|
</entry>
|
||||||
<entry file="file://$PROJECT_DIR$/src/net/thauvin/erik/mobibot/Mobibot.java">
|
<entry file="file://$PROJECT_DIR$/src/net/thauvin/erik/mobibot/Mobibot.java">
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
<state line="82" column="67" selection-start="2578" selection-end="2578" vertical-scroll-proportion="0.5821326">
|
<state line="2291" column="12" selection-start="55270" selection-end="55270" vertical-scroll-proportion="0.28818443">
|
||||||
<folding>
|
<folding>
|
||||||
<element signature="imports" expanded="true" />
|
<element signature="imports" expanded="true" />
|
||||||
</folding>
|
</folding>
|
||||||
|
@ -480,7 +480,7 @@
|
||||||
</entry>
|
</entry>
|
||||||
<entry file="file://$PROJECT_DIR$/src/net/thauvin/erik/mobibot/StockQuote.java">
|
<entry file="file://$PROJECT_DIR$/src/net/thauvin/erik/mobibot/StockQuote.java">
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
<state line="53" column="13" selection-start="2037" selection-end="2037" vertical-scroll-proportion="0.6023055">
|
<state line="53" column="13" selection-start="2037" selection-end="2037" vertical-scroll-proportion="0.8818444">
|
||||||
<folding>
|
<folding>
|
||||||
<element signature="imports" expanded="true" />
|
<element signature="imports" expanded="true" />
|
||||||
</folding>
|
</folding>
|
||||||
|
@ -489,7 +489,7 @@
|
||||||
</entry>
|
</entry>
|
||||||
<entry file="file://$PROJECT_DIR$/src/net/thauvin/erik/mobibot/CurrencyConverter.java">
|
<entry file="file://$PROJECT_DIR$/src/net/thauvin/erik/mobibot/CurrencyConverter.java">
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
<state line="63" column="13" selection-start="2150" selection-end="2150" vertical-scroll-proportion="0.5792507">
|
<state line="63" column="13" selection-start="2150" selection-end="2150" vertical-scroll-proportion="1.1613833">
|
||||||
<folding>
|
<folding>
|
||||||
<element signature="imports" expanded="true" />
|
<element signature="imports" expanded="true" />
|
||||||
</folding>
|
</folding>
|
||||||
|
@ -512,7 +512,7 @@
|
||||||
</entry>
|
</entry>
|
||||||
<entry file="file://$PROJECT_DIR$/src/net/thauvin/erik/mobibot/FeedReader.java">
|
<entry file="file://$PROJECT_DIR$/src/net/thauvin/erik/mobibot/FeedReader.java">
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
<state line="141" column="26" selection-start="3819" selection-end="3826" vertical-scroll-proportion="0.6023055">
|
<state line="141" column="26" selection-start="3819" selection-end="3826" vertical-scroll-proportion="1.2103746">
|
||||||
<folding>
|
<folding>
|
||||||
<element signature="imports" expanded="true" />
|
<element signature="imports" expanded="true" />
|
||||||
</folding>
|
</folding>
|
||||||
|
@ -521,7 +521,7 @@
|
||||||
</entry>
|
</entry>
|
||||||
<entry file="file://$PROJECT_DIR$/src/net/thauvin/erik/mobibot/EntryLink.java">
|
<entry file="file://$PROJECT_DIR$/src/net/thauvin/erik/mobibot/EntryLink.java">
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
<state line="55" column="13" selection-start="2034" selection-end="2034" vertical-scroll-proportion="0.519337">
|
<state line="55" column="13" selection-start="2034" selection-end="2034" vertical-scroll-proportion="0.9033149">
|
||||||
<folding>
|
<folding>
|
||||||
<element signature="imports" expanded="true" />
|
<element signature="imports" expanded="true" />
|
||||||
</folding>
|
</folding>
|
||||||
|
@ -530,7 +530,7 @@
|
||||||
</entry>
|
</entry>
|
||||||
<entry file="file://$PROJECT_DIR$/src/net/thauvin/erik/mobibot/EntryComment.java">
|
<entry file="file://$PROJECT_DIR$/src/net/thauvin/erik/mobibot/EntryComment.java">
|
||||||
<provider selected="true" editor-type-id="text-editor">
|
<provider selected="true" editor-type-id="text-editor">
|
||||||
<state line="53" column="13" selection-start="2016" selection-end="2016" vertical-scroll-proportion="0.519337">
|
<state line="53" column="13" selection-start="2016" selection-end="2016" vertical-scroll-proportion="0.8453039">
|
||||||
<folding>
|
<folding>
|
||||||
<element signature="imports" expanded="true" />
|
<element signature="imports" expanded="true" />
|
||||||
</folding>
|
</folding>
|
||||||
|
|
|
@ -80,7 +80,7 @@ public class Mobibot extends PircBot
|
||||||
*/
|
*/
|
||||||
private static final String[] INFO_STRS =
|
private static final String[] INFO_STRS =
|
||||||
{
|
{
|
||||||
"Mobibot v0.1.3b3 by Erik C. Thauvin (erik@thauvin.net)",
|
"Mobibot v0.1.3b4 by Erik C. Thauvin (erik@thauvin.net)",
|
||||||
"<http://www.thauvin.net/mobitopia/mobibot/>"
|
"<http://www.thauvin.net/mobitopia/mobibot/>"
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -630,6 +630,7 @@ public class Mobibot extends PircBot
|
||||||
|
|
||||||
// Initialize the bot
|
// Initialize the bot
|
||||||
bot.setVerbose(true);
|
bot.setVerbose(true);
|
||||||
|
bot.setAutoNickChange(true);
|
||||||
bot.setName(nickname);
|
bot.setName(nickname);
|
||||||
bot.setLogin(login);
|
bot.setLogin(login);
|
||||||
bot.setVersion(weblogURL);
|
bot.setVersion(weblogURL);
|
||||||
|
@ -651,31 +652,14 @@ public class Mobibot extends PircBot
|
||||||
{
|
{
|
||||||
int retries = 0;
|
int retries = 0;
|
||||||
|
|
||||||
while ((retries < MAX_RECONNECT) && !bot.isConnected())
|
while ((retries++ < MAX_RECONNECT) && !bot.isConnected())
|
||||||
{
|
{
|
||||||
sleep(10);
|
sleep(10);
|
||||||
|
|
||||||
if ((retries > 0) && (e instanceof NickAlreadyInUseException))
|
|
||||||
{
|
|
||||||
bot.setName(nickname + retries);
|
|
||||||
}
|
|
||||||
|
|
||||||
retries++;
|
|
||||||
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
bot.connect(server);
|
bot.connect(server);
|
||||||
}
|
}
|
||||||
catch (NickAlreadyInUseException ex)
|
|
||||||
{
|
|
||||||
if (retries == MAX_RECONNECT)
|
|
||||||
{
|
|
||||||
System.err.println("Unable to connect to " + server + " after " + MAX_RECONNECT +
|
|
||||||
" retries. Nickname already in use.");
|
|
||||||
e.printStackTrace(System.err);
|
|
||||||
System.exit(1);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
catch (Exception ex)
|
catch (Exception ex)
|
||||||
{
|
{
|
||||||
if (retries == MAX_RECONNECT)
|
if (retries == MAX_RECONNECT)
|
||||||
|
@ -992,30 +976,14 @@ public class Mobibot extends PircBot
|
||||||
{
|
{
|
||||||
int retries = 0;
|
int retries = 0;
|
||||||
|
|
||||||
while ((retries < MAX_RECONNECT) && !isConnected())
|
while ((retries++ < MAX_RECONNECT) && !isConnected())
|
||||||
{
|
{
|
||||||
sleep(10);
|
sleep(10);
|
||||||
|
|
||||||
if ((retries > 0) && (e instanceof NickAlreadyInUseException))
|
|
||||||
{
|
|
||||||
setName(getNick() + retries);
|
|
||||||
}
|
|
||||||
|
|
||||||
retries++;
|
|
||||||
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
connect(_ircServer);
|
connect(_ircServer);
|
||||||
}
|
}
|
||||||
catch (NickAlreadyInUseException ex)
|
|
||||||
{
|
|
||||||
if (retries == MAX_RECONNECT)
|
|
||||||
{
|
|
||||||
_logger.debug("Unable to reconnect to " + _ircServer + " after " + MAX_RECONNECT +
|
|
||||||
" retries. Nickname already in use.", e);
|
|
||||||
System.exit(1);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
catch (Exception ex)
|
catch (Exception ex)
|
||||||
{
|
{
|
||||||
if (retries == MAX_RECONNECT)
|
if (retries == MAX_RECONNECT)
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue