Added twitter timer to allow for links editing, etc.
This commit is contained in:
parent
5bf6901ce2
commit
72961dadc9
3 changed files with 112 additions and 23 deletions
|
@ -55,13 +55,17 @@ public final class Constants {
|
||||||
*/
|
*/
|
||||||
public static final String NO_TITLE = "No Title";
|
public static final String NO_TITLE = "No Title";
|
||||||
/**
|
/**
|
||||||
* The Twitter handle property key.
|
* The timer delay in minutes.
|
||||||
*/
|
*/
|
||||||
public static final String TWITTER_HANDLE_PROP = "twitter-handle";
|
public static final long TIMER_DELAY = 10L;
|
||||||
/**
|
/**
|
||||||
* The twitter post flag property key.
|
* The twitter post flag property key.
|
||||||
*/
|
*/
|
||||||
public static final String TWITTER_AUTOPOST_PROP = "twitter-auto-post";
|
public static final String TWITTER_AUTOPOST_PROP = "twitter-auto-post";
|
||||||
|
/**
|
||||||
|
* The Twitter handle property key.
|
||||||
|
*/
|
||||||
|
public static final String TWITTER_HANDLE_PROP = "twitter-handle";
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Disables the default constructor.
|
* Disables the default constructor.
|
||||||
|
|
|
@ -92,6 +92,7 @@ import java.util.List;
|
||||||
import java.util.Properties;
|
import java.util.Properties;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
import java.util.StringTokenizer;
|
import java.util.StringTokenizer;
|
||||||
|
import java.util.Timer;
|
||||||
|
|
||||||
import static net.thauvin.erik.mobibot.Utils.bold;
|
import static net.thauvin.erik.mobibot.Utils.bold;
|
||||||
import static org.apache.commons.lang3.StringUtils.isNotBlank;
|
import static org.apache.commons.lang3.StringUtils.isNotBlank;
|
||||||
|
@ -140,7 +141,6 @@ public class Mobibot extends PircBot {
|
||||||
|
|
||||||
// Tags/categories marker
|
// Tags/categories marker
|
||||||
private static final String TAGS_MARKER = "tags:";
|
private static final String TAGS_MARKER = "tags:";
|
||||||
|
|
||||||
// Version strings
|
// Version strings
|
||||||
@SuppressWarnings("indentation")
|
@SuppressWarnings("indentation")
|
||||||
private static final String[] VERSION_STRS =
|
private static final String[] VERSION_STRS =
|
||||||
|
@ -153,6 +153,8 @@ public class Mobibot extends PircBot {
|
||||||
+ System.getProperty("java.vm.info") + ')' };
|
+ System.getProperty("java.vm.info") + ')' };
|
||||||
// Logger
|
// Logger
|
||||||
private static final Logger logger = LogManager.getLogger(Mobibot.class);
|
private static final Logger logger = LogManager.getLogger(Mobibot.class);
|
||||||
|
// Timer
|
||||||
|
private static final Timer timer = new Timer(true);
|
||||||
// Commands list
|
// Commands list
|
||||||
private final List<String> commandsList = new ArrayList<>();
|
private final List<String> commandsList = new ArrayList<>();
|
||||||
// Entries array
|
// Entries array
|
||||||
|
@ -175,6 +177,8 @@ public class Mobibot extends PircBot {
|
||||||
private final List<String> recap = new ArrayList<>(0);
|
private final List<String> recap = new ArrayList<>(0);
|
||||||
// Tell object
|
// Tell object
|
||||||
private final Tell tell;
|
private final Tell tell;
|
||||||
|
// The Twitter auto-posts list.
|
||||||
|
private final List<Integer> twitterAutoLinks = Collections.synchronizedList(new ArrayList<>());
|
||||||
// Automatically post links to Twitter
|
// Automatically post links to Twitter
|
||||||
private final boolean twitterAutoPost;
|
private final boolean twitterAutoPost;
|
||||||
// Twitter handle for channel join notifications
|
// Twitter handle for channel join notifications
|
||||||
|
@ -318,11 +322,9 @@ public class Mobibot extends PircBot {
|
||||||
* @param args The command line arguments.
|
* @param args The command line arguments.
|
||||||
*/
|
*/
|
||||||
@SuppressFBWarnings(
|
@SuppressFBWarnings(
|
||||||
{
|
{ "INFORMATION_EXPOSURE_THROUGH_AN_ERROR_MESSAGE",
|
||||||
"INFORMATION_EXPOSURE_THROUGH_AN_ERROR_MESSAGE",
|
"DM_DEFAULT_ENCODING",
|
||||||
"DM_DEFAULT_ENCODING",
|
"IOI_USE_OF_FILE_STREAM_CONSTRUCTORS" })
|
||||||
"IOI_USE_OF_FILE_STREAM_CONSTRUCTORS"
|
|
||||||
})
|
|
||||||
@SuppressWarnings({ "PMD.SystemPrintln", "PMD.AvoidFileStream", "PMD.CloseResource" })
|
@SuppressWarnings({ "PMD.SystemPrintln", "PMD.AvoidFileStream", "PMD.CloseResource" })
|
||||||
public static void main(final String[] args) {
|
public static void main(final String[] args) {
|
||||||
// Setup the command line options
|
// Setup the command line options
|
||||||
|
@ -851,6 +853,10 @@ public class Mobibot extends PircBot {
|
||||||
info.append(", Messages: ").append(tell.size());
|
info.append(", Messages: ").append(tell.size());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (twitterAutoPost && twitterModule.isEnabled()) {
|
||||||
|
info.append(", Twitter: ").append(twitterAutoLinks.size());
|
||||||
|
}
|
||||||
|
|
||||||
info.append(", Recap: ").append(recap.size()).append(']');
|
info.append(", Recap: ").append(recap.size()).append(']');
|
||||||
|
|
||||||
send(sender, info.toString(), isPrivate);
|
send(sender, info.toString(), isPrivate);
|
||||||
|
@ -988,18 +994,10 @@ public class Mobibot extends PircBot {
|
||||||
pinboard.addPost(entry);
|
pinboard.addPost(entry);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Post link to twitter
|
// Queue link for posting to twitter
|
||||||
if (twitterAutoPost && twitterModule.isEnabled()) {
|
if (twitterAutoPost && twitterModule.isEnabled()) {
|
||||||
final String msg = title + ' ' + link + " via " + sender + " on " + getChannel();
|
twitterAutoLinks.add(index);
|
||||||
new Thread(() -> {
|
timer.schedule(new TwitterTimer(this, index), Constants.TIMER_DELAY * 60L * 1000L);
|
||||||
try {
|
|
||||||
twitterModule.post(twitterHandle, msg, false);
|
|
||||||
} catch (ModuleException e) {
|
|
||||||
if (logger.isWarnEnabled()) {
|
|
||||||
logger.warn("Failed to post link on twitter.", e);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}).start();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
saveEntries(isBackup);
|
saveEntries(isBackup);
|
||||||
|
@ -1088,9 +1086,15 @@ public class Mobibot extends PircBot {
|
||||||
pinboard.deletePost(entry);
|
pinboard.deletePost(entry);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (twitterAutoPost && twitterModule.isEnabled()) {
|
||||||
|
twitterAutoLinks.remove(index);
|
||||||
|
}
|
||||||
|
|
||||||
entries.remove(index);
|
entries.remove(index);
|
||||||
send(channel, "Entry " + Commands.LINK_CMD + (index + 1) + " removed.");
|
send(channel, "Entry " + Commands.LINK_CMD + (index + 1) + " removed.");
|
||||||
saveEntries(false);
|
saveEntries(false);
|
||||||
|
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
send(sender, "Please ask a channel op to remove this entry for you.");
|
send(sender, "Please ask a channel op to remove this entry for you.");
|
||||||
}
|
}
|
||||||
|
@ -1257,9 +1261,11 @@ public class Mobibot extends PircBot {
|
||||||
System.exit(0);
|
System.exit(0);
|
||||||
} else if (Commands.DIE_CMD.equals(cmd) && isOp(sender)) {
|
} else if (Commands.DIE_CMD.equals(cmd) && isOp(sender)) {
|
||||||
send(ircChannel, sender + " has just signed my death sentence.");
|
send(ircChannel, sender + " has just signed my death sentence.");
|
||||||
|
timer.cancel();
|
||||||
|
twitterShutdown();
|
||||||
twitterNotification("killed by " + sender + " on " + ircChannel);
|
twitterNotification("killed by " + sender + " on " + ircChannel);
|
||||||
saveEntries(true);
|
saveEntries(true);
|
||||||
sleep(3);
|
sleep(10);
|
||||||
quitServer("The Bot Is Out There!");
|
quitServer("The Bot Is Out There!");
|
||||||
System.exit(0);
|
System.exit(0);
|
||||||
} else if (Commands.CYCLE_CMD.equals(cmd)) {
|
} else if (Commands.CYCLE_CMD.equals(cmd)) {
|
||||||
|
@ -1291,7 +1297,7 @@ public class Mobibot extends PircBot {
|
||||||
if (MODULES.isEmpty()) {
|
if (MODULES.isEmpty()) {
|
||||||
send(sender, "There are not enabled modules.", true);
|
send(sender, "There are not enabled modules.", true);
|
||||||
} else {
|
} else {
|
||||||
send(sender, "The enabled modules are:");
|
send(sender, "The enabled modules are: ");
|
||||||
for (final AbstractModule mod : MODULES) {
|
for (final AbstractModule mod : MODULES) {
|
||||||
send(sender, helpIndent(mod.getClass().getSimpleName()));
|
send(sender, helpIndent(mod.getClass().getSimpleName()));
|
||||||
}
|
}
|
||||||
|
@ -1564,14 +1570,39 @@ public class Mobibot extends PircBot {
|
||||||
* @param isAction Set to <code>true</code> if the message is an action.
|
* @param isAction Set to <code>true</code> if the message is an action.
|
||||||
*/
|
*/
|
||||||
private void storeRecap(final String sender, final String message, final boolean isAction) {
|
private void storeRecap(final String sender, final String message, final boolean isAction) {
|
||||||
recap.add(Utils.utcDateTime(LocalDateTime.now(Clock.systemUTC())) + " -> " + sender + (isAction ? " " : ": ")
|
recap.add(
|
||||||
+ message);
|
Utils.utcDateTime(LocalDateTime.now(Clock.systemUTC())) + " -> " + sender + (isAction ? " " : ": ")
|
||||||
|
+ message);
|
||||||
|
|
||||||
if (recap.size() > MAX_RECAP) {
|
if (recap.size() > MAX_RECAP) {
|
||||||
recap.remove(0);
|
recap.remove(0);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Auto-post to twitter.
|
||||||
|
*
|
||||||
|
* @param index The post entry index.
|
||||||
|
*/
|
||||||
|
final void twitterAutoPost(final int index) {
|
||||||
|
if (twitterAutoPost && twitterModule.isEnabled()
|
||||||
|
&& twitterAutoLinks.contains(index) && entries.size() >= index) {
|
||||||
|
final EntryLink entry = entries.get(index);
|
||||||
|
final String msg =
|
||||||
|
entry.getTitle() + ' ' + entry.getLink() + " via " + entry.getNick() + " on " + getChannel();
|
||||||
|
new Thread(() -> {
|
||||||
|
try {
|
||||||
|
twitterModule.post(twitterHandle, msg, false);
|
||||||
|
} catch (ModuleException e) {
|
||||||
|
if (logger.isWarnEnabled()) {
|
||||||
|
logger.warn("Failed to post link on twitter.", e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}).start();
|
||||||
|
twitterAutoLinks.remove((Object) index);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Send a notification to the registered Twitter handle.
|
* Send a notification to the registered Twitter handle.
|
||||||
*
|
*
|
||||||
|
@ -1594,6 +1625,19 @@ public class Mobibot extends PircBot {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Post all the links on twitter on shutdown.
|
||||||
|
*/
|
||||||
|
final void twitterShutdown() {
|
||||||
|
if (twitterModule.isEnabled() && isNotBlank(twitterHandle)) {
|
||||||
|
synchronized (twitterAutoLinks) {
|
||||||
|
for (final int i : twitterAutoLinks) {
|
||||||
|
twitterAutoPost(i);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Responds with the users on a channel.
|
* Responds with the users on a channel.
|
||||||
*
|
*
|
||||||
|
|
41
src/main/java/net/thauvin/erik/mobibot/TwitterTimer.kt
Normal file
41
src/main/java/net/thauvin/erik/mobibot/TwitterTimer.kt
Normal file
|
@ -0,0 +1,41 @@
|
||||||
|
/*
|
||||||
|
* TwitterTimer.kt
|
||||||
|
*
|
||||||
|
* Copyright (c) 2004-2020, Erik C. Thauvin (erik@thauvin.net)
|
||||||
|
* All rights reserved.
|
||||||
|
*
|
||||||
|
* Redistribution and use in source and binary forms, with or without
|
||||||
|
* modification, are permitted provided that the following conditions are met:
|
||||||
|
*
|
||||||
|
* Redistributions of source code must retain the above copyright notice, this
|
||||||
|
* list of conditions and the following disclaimer.
|
||||||
|
*
|
||||||
|
* Redistributions in binary form must reproduce the above copyright notice,
|
||||||
|
* this list of conditions and the following disclaimer in the documentation
|
||||||
|
* and/or other materials provided with the distribution.
|
||||||
|
*
|
||||||
|
* Neither the name of this project nor the names of its contributors may be
|
||||||
|
* used to endorse or promote products derived from this software without
|
||||||
|
* specific prior written permission.
|
||||||
|
*
|
||||||
|
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
|
||||||
|
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
||||||
|
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
||||||
|
* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
|
||||||
|
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
||||||
|
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
|
||||||
|
* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
|
||||||
|
* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
|
||||||
|
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
||||||
|
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package net.thauvin.erik.mobibot
|
||||||
|
|
||||||
|
import java.util.*
|
||||||
|
|
||||||
|
class TwitterTimer(var bot: Mobibot, private var index: Int) : TimerTask() {
|
||||||
|
override fun run() {
|
||||||
|
bot.twitterAutoPost(index)
|
||||||
|
}
|
||||||
|
}
|
Loading…
Add table
Add a link
Reference in a new issue