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

Added API end point for Delicious.

Browse source
This commit is contained in:
Erik C. Thauvin 2017-05-15 21:45:26 -07:00
parent 80d7f7c9db
commit 16953c8f98
9 changed files with 93 additions and 178 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/generated/java/net/thauvin/erik/mobibot/ReleaseInfo.java
View file

@ -18,12 +18,12 @@ public final class ReleaseInfo {
public final static String PROJECT = "mobibot";
public final static LocalDateTime BUILDDATE =
LocalDateTime.ofInstant(Instant.ofEpochMilli(1493879846880L), ZoneId.systemDefault());
LocalDateTime.ofInstant(Instant.ofEpochMilli(1494906988487L), ZoneId.systemDefault());
public final static int MAJOR = 0;
public final static int MINOR = 7;
public final static int PATCH = 1;
public final static String PRERELEASE = "beta";
public final static String BUILDMETA = "018";
public final static String BUILDMETA = "020";
/**
* The full version string.

5
src/main/java/net/thauvin/erik/mobibot/DeliciousPoster.java
View file

@ -49,12 +49,13 @@ class DeliciousPoster {
/**
* Creates a new {@link DeliciousPoster} instance.
*
* @param apiEndPoint The API end point.
* @param username The del.icio.us user name.
* @param password The del.icio.us password.
* @param ircServer The IRC server.
*/
public DeliciousPoster(final String username, final String password, final String ircServer) {
delicious = new Delicious(username, password);
public DeliciousPoster(final String apiEndPoint, final String username, final String password, final String ircServer) {
delicious = new Delicious(username, password, apiEndPoint);
this.ircServer = ircServer;
}

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

@ -32,6 +32,7 @@
package net.thauvin.erik.mobibot;
import com.rometools.rome.io.FeedException;
import del.icio.us.DeliciousConstants;
import net.thauvin.erik.mobibot.modules.*;
import net.thauvin.erik.semver.Version;
import org.apache.commons.cli.*;
@ -70,7 +71,7 @@ public class Mobibot extends PircBot {
// The info strings.
private static final String[] INFO_STRS = {
ReleaseInfo.PROJECT + " v" + ReleaseInfo.VERSION + " by Erik C. Thauvin (erik@thauvin.net)",
"http://www.mobitopia.org/mobibot/"
"https://www.mobitopia.org/mobibot/"
};
// The link match string.
@ -358,6 +359,7 @@ public class Mobibot extends PircBot {
// Get the del.icio.us properties
final String dname = p.getProperty("delicious-user");
final String dpwd = p.getProperty("delicious-pwd");
final String dapi = p.getProperty("declicious-api-endpoint", DeliciousConstants.API_ENDPOINT);
// Create the bot
final Mobibot bot = new Mobibot(server, port, nickname, channel, logsDir);
@ -379,7 +381,7 @@ public class Mobibot extends PircBot {
bot.setBacklogsUrl(backlogsURL);
// Set the del.icio.us authentication
bot.setDeliciousAuth(dname, dpwd);
bot.setDeliciousAuth(dapi, dname, dpwd);
// Load the modules properties
MODULES.stream().filter(AbstractModule::hasProperties).forEach(
@ -1492,12 +1494,13 @@ public class Mobibot extends PircBot {
/**
* Sets the del.icio.us authentication.
*
* @param apiEndPoint The API end point.
* @param username The del.icio.us user name.
* @param password The del.icio.us password.
*/
private void setDeliciousAuth(final String username, final String password) {
private void setDeliciousAuth(final String apiEndPoint, final String username, final String password) {
if (Utils.isValidString(username) && Utils.isValidString(password)) {
delicious = new DeliciousPoster(username, password, ircServer);
delicious = new DeliciousPoster(apiEndPoint, username, password, ircServer);
}
}