Announce support

Author: jedediah

API/api/src/main/java/tc/oc/api/ApiManifest.java

@@ -3,6 +3,7 @@
 import tc.oc.api.document.DocumentsManifest;
 import tc.oc.api.engagement.EngagementModelManifest;
 import tc.oc.api.games.GameModelManifest;
+import tc.oc.api.http.HttpManifest;
 import tc.oc.api.maps.MapModelManifest;
 import tc.oc.api.match.MatchModelManifest;
 import tc.oc.api.message.MessagesManifest;
@@ -29,6 +30,7 @@ protected void configure() {
         install(new DocumentsManifest());
         install(new MessagesManifest());
         install(new ModelsManifest());
+        install(new HttpManifest());
 
         install(new ServerModelManifest());
         install(new UserModelManifest());

API/api/src/main/java/tc/oc/api/http/HttpClient.java

@@ -3,6 +3,8 @@
 import java.io.IOException;
 import java.io.OutputStream;
 import java.lang.reflect.Type;
+import java.net.MalformedURLException;
+import java.net.URL;
 import java.time.Duration;
 import java.util.concurrent.Callable;
 import java.util.concurrent.Executors;
@@ -105,10 +107,6 @@ private HttpRequestFactory createRequestFactory() {
         });
     }
 
-    public String getBaseUrl() {
-        return this.config.getBaseUrl();
-    }
-
     public ListenableFuture<?> get(String path, HttpOption... options) {
         return get(path, (TypeToken) null, options);
     }
@@ -166,11 +164,17 @@ protected ListenableFuture<?> request(String method, String path, @Nullable Obje
     }
 
     protected <T> ListenableFuture<T> request(String method, String path, @Nullable Object content, @Nullable TypeToken<T> returnType, HttpOption...options) {
+        final GenericUrl url;
+        try {
+            url = new GenericUrl(new URL(config.getBaseUrl(), path));
+        } catch(MalformedURLException e) {
+            throw new IllegalArgumentException(e.getMessage());
+        }
+
         // NOTE: Serialization must happen synchronously, because getter methods may not be thread-safe
         final HttpContent httpContent = content == null ? null : new Content(gson.toJson(content));
 
-        GenericUrl url = new GenericUrl(this.getBaseUrl() + path);
-        HttpRequest request;
+        final HttpRequest request;
         try {
             request = requestFactory.buildRequest(method, url, httpContent).setThrowExceptionOnExecuteError(false);
         } catch (IOException e) {

API/api/src/main/java/tc/oc/api/http/HttpClientConfiguration.java

@@ -1,5 +1,7 @@
 package tc.oc.api.http;
 
+import java.net.URL;
+
 public interface HttpClientConfiguration {
 
     int DEFAULT_THREADS = 0;
@@ -10,7 +12,7 @@ public interface HttpClientConfiguration {
     /**
      * Base URL of the API. End points will be appended to this address.
      */
-    String getBaseUrl();
+    URL getBaseUrl();
 
     /**
      * Number of threads to execute requests. 0 indicates an unbounded number

API/api/src/main/java/tc/oc/api/http/HttpClientConfigurationImpl.java

@@ -1,7 +1,9 @@
 package tc.oc.api.http;
 
+import java.net.URL;
 import javax.inject.Inject;
 
+import tc.oc.commons.core.configuration.ConfigUtils;
 import tc.oc.minecraft.api.configuration.Configuration;
 import tc.oc.minecraft.api.configuration.ConfigurationSection;
 
@@ -24,8 +26,8 @@ public class HttpClientConfigurationImpl implements HttpClientConfiguration {
     }
 
     @Override
-    public String getBaseUrl() {
-        return config.getString(BASE_URL_PATH);
+    public URL getBaseUrl() {
+        return ConfigUtils.needUrl(config, BASE_URL_PATH);
     }
 
     @Override

API/api/src/main/java/tc/oc/api/http/HttpManifest.java

@@ -7,7 +7,7 @@ public class HttpManifest extends HybridManifest {
     @Override
     protected void configure() {
         expose(HttpClient.class);
-        bind(HttpClient.class);
+        bind(HttpClient.class).asEagerSingleton();
         bind(HttpClientConfiguration.class)
             .to(HttpClientConfigurationImpl.class);
     }

API/api/src/main/resources/config.yml

@@ -33,5 +33,3 @@ queue:
 logging:
   root:
     level: INFO
-  tc-oc-api-bukkit-BukkitApi:
-    level: INFO

API/ocn/src/main/java/tc/oc/api/ocn/OCNApiManifest.java

@@ -1,6 +1,5 @@
 package tc.oc.api.ocn;
 
-import tc.oc.api.http.HttpManifest;
 import tc.oc.api.minecraft.queue.MinecraftQueueManifest;
 import tc.oc.api.model.ModelBinders;
 import tc.oc.commons.core.inject.HybridManifest;
@@ -11,6 +10,5 @@ public class OCNApiManifest extends HybridManifest implements ModelBinders {
     protected void configure() {
         install(new OCNModelsManifest());
         install(new MinecraftQueueManifest());
-        install(new HttpManifest());
     }
 }

Commons/core/src/main/i18n/templates/pgm/PGMMessages.properties

@@ -223,4 +223,7 @@ tnt.license.use.restricted = You need a TNT license to use TNT or Redstone on th
 
 item.locked = This item cannot be removed from its slot
 
-stats.hotbar = {0} kills ({1} streak)  {2} deaths  {3} K/D
+stats.hotbar = {0} kills ({1} streak)  {2} deaths  {3} K/D
+
+announce.online = Announced server as online
+announce.offline = Announced server as offline

PGM/src/main/java/tc/oc/pgm/PGMManifest.java

@@ -19,6 +19,7 @@
 import tc.oc.pgm.listeners.BlockTransformListener;
 import tc.oc.pgm.listeners.MatchAnnouncer;
 import tc.oc.pgm.listeners.PGMListener;
+import tc.oc.pgm.listing.ListingManifest;
 import tc.oc.pgm.map.MapLibrary;
 import tc.oc.pgm.map.MapLibraryImpl;
 import tc.oc.pgm.map.MapLoader;
@@ -56,6 +57,8 @@ protected void configure() {
         install(new MatchPlayerEventRouter.Manifest());
         install(new MatchAnalyticsManifest());
 
+        install(new ListingManifest());
+
         bind(MatchManager.class);
         bind(MatchLoader.class);
         bind(MatchFinder.class).to(MatchLoader.class);

PGM/src/main/java/tc/oc/pgm/listing/ListingCommands.java

@@ -0,0 +1,34 @@
+package tc.oc.pgm.listing;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
+import com.google.common.collect.ImmutableList;
+import com.sk89q.minecraft.util.commands.Command;
+import com.sk89q.minecraft.util.commands.CommandContext;
+import com.sk89q.minecraft.util.commands.CommandException;
+import com.sk89q.minecraft.util.commands.CommandPermissions;
+import com.sk89q.minecraft.util.commands.SuggestException;
+import org.bukkit.command.CommandSender;
+
+@Singleton
+public class ListingCommands {
+
+    private final ListingService listingService;
+
+    @Inject ListingCommands(ListingService listingService) {
+        this.listingService = listingService;
+    }
+
+    @Command(
+        aliases = "announce",
+        usage = "[on|off]",
+        desc = "Announce the server to the public listing service",
+        min = 0,
+        max = 1
+    )
+    @CommandPermissions("pgm.listing.announce")
+    public void announce(CommandContext args, CommandSender sender) throws CommandException, SuggestException {
+        listingService.update("on".equals(args.tryString(0, ImmutableList.of("on", "off")).orElse("on")), sender);
+    }
+}