diff --git a/http-api/pom.xml b/http-api/pom.xml index 6372ff417d..78e1fb0eef 100644 --- a/http-api/pom.xml +++ b/http-api/pom.xml @@ -34,6 +34,11 @@ Web API http-api + + nogit + false + + com.squareup.okhttp3 @@ -86,5 +91,31 @@ true + + + pl.project13.maven + git-commit-id-plugin + 2.2.5 + + + query-git-info + + revision + + + false + false + + true + + + git.commit.id.abbrev + git.dirty + + + + + + diff --git a/http-api/src/main/java/net/runelite/http/api/RuneLiteAPI.java b/http-api/src/main/java/net/runelite/http/api/RuneLiteAPI.java index 49387a233e..2a2ae1357f 100644 --- a/http-api/src/main/java/net/runelite/http/api/RuneLiteAPI.java +++ b/http-api/src/main/java/net/runelite/http/api/RuneLiteAPI.java @@ -44,6 +44,7 @@ public class RuneLiteAPI public static final OkHttpClient CLIENT; public static final Gson GSON = new Gson(); + public static String userAgent; private static final String BASE = "https://api.runelite.net"; private static final String WSBASE = "wss://api.runelite.net/runelite-"; @@ -61,6 +62,10 @@ public class RuneLiteAPI version = properties.getProperty("runelite.version"); rsVersion = Integer.parseInt(properties.getProperty("rs.version")); + String commit = properties.getProperty("runelite.commit"); + boolean dirty = Boolean.parseBoolean(properties.getProperty("runelite.dirty")); + + userAgent = "RuneLite/" + version + "-" + commit + (dirty ? "+" : ""); } catch (NumberFormatException e) { @@ -74,14 +79,13 @@ public class RuneLiteAPI CLIENT = new OkHttpClient.Builder() .addNetworkInterceptor(new Interceptor() { - private final String USER_AGENT = "RuneLite/" + version; @Override public Response intercept(Chain chain) throws IOException { Request userAgentRequest = chain.request() .newBuilder() - .header("User-Agent", USER_AGENT) + .header("User-Agent", userAgent) .build(); return chain.proceed(userAgentRequest); } diff --git a/http-api/src/main/resources/runelite.properties b/http-api/src/main/resources/runelite.properties index 51d6be8768..3abfd6390e 100644 --- a/http-api/src/main/resources/runelite.properties +++ b/http-api/src/main/resources/runelite.properties @@ -1,2 +1,4 @@ runelite.version=${project.version} -rs.version=${rs.version} \ No newline at end of file +rs.version=${rs.version} +runelite.commit=${git.commit.id.abbrev} +runelite.dirty=${git.dirty} \ No newline at end of file