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

Cleanup.

Browse source
This commit is contained in:
Erik C. Thauvin 2020-06-20 20:21:56 -07:00
parent 8f35d050df
commit 52c5e2dba7
2 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/main/java/net/thauvin/erik/mobibot/commands/Versions.java
View file

@ -40,7 +40,7 @@ import org.jetbrains.annotations.NotNull;
import java.util.List; import java.util.List;
public class Versions extends AbstractCommand { public class Versions extends AbstractCommand {
private final List<String> versions = private final List<String> verList =
List.of("Version: " + ReleaseInfo.VERSION + " (" + Utils.isoLocalDate(ReleaseInfo.BUILDDATE) + ')', List.of("Version: " + ReleaseInfo.VERSION + " (" + Utils.isoLocalDate(ReleaseInfo.BUILDDATE) + ')',
"Platform: " + System.getProperty("os.name") + " (" + System.getProperty("os.version") + ", " "Platform: " + System.getProperty("os.name") + " (" + System.getProperty("os.version") + ", "
+ System.getProperty("os.arch") + ", " + System.getProperty("user.country") + ')', + System.getProperty("os.arch") + ", " + System.getProperty("user.country") + ')',
@ -64,8 +64,7 @@ public class Versions extends AbstractCommand {
@NotNull @NotNull
@Override @Override
public List<String> getHelp() { public List<String> getHelp() {
return List.of("To view the versions data (bot, java, etc.):", return List.of("To view the versions data (bot, platform, java, etc.):", Utils.helpIndent("%c " + getName()));
Utils.helpIndent("%s " + getName()));
} }
@Override @Override
@ -90,7 +89,7 @@ public class Versions extends AbstractCommand {
final boolean isOp, final boolean isOp,
final boolean isPrivate) { final boolean isPrivate) {
if (isOp) { if (isOp) {
for (final String v : versions) { for (final String v : verList) {
getBot().send(sender, v, isPrivate); getBot().send(sender, v, isPrivate);
} }
} else { } else {

10
src/test/java/net/thauvin/erik/mobibot/PinboardUtilsTest.kt
View file

@ -37,8 +37,6 @@ import net.thauvin.erik.pinboard.PinboardPoster
import org.testng.Assert import org.testng.Assert
import org.testng.annotations.Test import org.testng.annotations.Test
import java.net.URL import java.net.URL
import java.net.URLEncoder
import java.nio.charset.StandardCharsets
class PinboardUtilsTest : LocalProperties() { class PinboardUtilsTest : LocalProperties() {
@Test @Test
@ -61,8 +59,12 @@ class PinboardUtilsTest : LocalProperties() {
} }
private fun validatePin(apiToken: String, ircServer: String = "", url: String): Boolean { private fun validatePin(apiToken: String, ircServer: String = "", url: String): Boolean {
val response = Utils.urlReader(URL("https://api.pinboard.in/v1/posts/get?auth_token=${apiToken}&tag=test&" val response = Utils.urlReader(
+ Utils.encodeUrl(url))) URL(
"https://api.pinboard.in/v1/posts/get?auth_token=${apiToken}&tag=test&"
+ Utils.encodeUrl(url)
)
)
return response.contains(url) && response.contains(ircServer) return response.contains(url) && response.contains(ircServer)
} }