Skip to content
This repository was archived by the owner on Nov 9, 2023. It is now read-only.

Commit 58554da

Browse files
faab007nlfaab007nl
committed
Updated updateserver
1 parent 3ba8184 commit 58554da

15 files changed

Lines changed: 609 additions & 124 deletions

‎build.gradle‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@ repositories {
1717

1818
dependencies {
1919
compile 'mysql:mysql-connector-java:5.1.17'
20-
implementation 'com.github.techscode:spigotapi:build-22'
20+
compile 'commons-io:commons-io:2.11.0'
21+
implementation 'com.github.techscode:spigotapi:build-35'
2122
implementation 'org.springframework.boot:spring-boot-starter-web'
2223
implementation 'com.auth0:java-jwt:3.9.0'
2324
implementation 'com.github.HayateLaTech:OAuth2Discord:-SNAPSHOT'

‎src/main/java/me/TechsCode/UpdateServer/ArtifactManager.java‎

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,16 @@
1414

1515
public abstract class ArtifactManager extends Thread {
1616

17-
private File importFolder, artifactsFolder;
17+
private final File importFolder;
18+
private final File artifactsFolder;
1819

1920
public ArtifactManager() {
2021
this.importFolder = new File("import");
2122
this.artifactsFolder = new File("artifacts");
2223

23-
importFolder.mkdir();
24+
if(!artifactsFolder.exists()){
25+
artifactsFolder.mkdirs();
26+
}
2427

2528
start();
2629
}
@@ -30,6 +33,11 @@ public ArtifactManager() {
3033
@Override
3134
public void run(){
3235
while (true){
36+
37+
if(importFolder.listFiles() == null){
38+
return;
39+
}
40+
3341
for(File file : Objects.requireNonNull(importFolder.listFiles())){
3442
if(!file.getName().endsWith(".jar")) continue;
3543

@@ -51,6 +59,9 @@ public void run(){
5159

5260
if(name.isPresent() && version.isPresent() && build.isPresent()){
5361
File destination = new File(artifactsFolder.getAbsolutePath()+"/"+name.get()+"/"+version.get()+"/"+build.get()+"/"+file.getName());
62+
if (destination.exists()){
63+
destination.delete();
64+
}
5465
FileUtils.moveFile(file, destination);
5566
}
5667
}

‎src/main/java/me/TechsCode/UpdateServer/Authentication.java‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
package me.TechsCode.UpdateServer;
22

3+
import java.util.List;
4+
35
public class Authentication {
46

57
private String uid, ipAddr;
6-
78
private String discordId, username;
9+
private List<DiscordRole> roles;
810

911
public Authentication(String uid, String ipAddr) {
1012
this.uid = uid;
@@ -19,6 +21,10 @@ public void setUsername(String username) {
1921
this.username = username;
2022
}
2123

24+
public void setRoles(List<DiscordRole> roles) {
25+
this.roles = roles;
26+
}
27+
2228
public String getUid() {
2329
return uid;
2430
}
@@ -34,4 +40,8 @@ public String getUsername() {
3440
public String getIpAddr() {
3541
return ipAddr;
3642
}
43+
44+
public List<DiscordRole> getRoles() {
45+
return roles;
46+
}
3747
}

‎src/main/java/me/TechsCode/UpdateServer/AuthenticationManager.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
public class AuthenticationManager {
66

77
private static HashMap<String, Authentication> authentications = new HashMap<>();
8-
8+
99
public static void newAuthentication(String ipAddr, String uid){
1010
authentications.put(ipAddr, new Authentication(uid, ipAddr));
1111
}

‎src/main/java/me/TechsCode/UpdateServer/Config.java‎

Lines changed: 51 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -38,18 +38,6 @@ public Config() {
3838
}
3939
}
4040

41-
public MySQLCredentials getMySQLCredentials(){
42-
JsonObject mysql = root.get("mysql").getAsJsonObject();
43-
44-
String host = mysql.get("host").getAsString();
45-
String port = mysql.get("port").getAsString();
46-
String database = mysql.get("database").getAsString();
47-
String username = mysql.get("username").getAsString();
48-
String password = mysql.get("password").getAsString();
49-
50-
return new MySQLCredentials(host, port, database, username, password);
51-
}
52-
5341
public DiscordCredentials getDiscordCredentials(){
5442
JsonObject discord = root.get("discord").getAsJsonObject();
5543

@@ -59,8 +47,25 @@ public DiscordCredentials getDiscordCredentials(){
5947
return new DiscordCredentials(clientId, clientSecret);
6048
}
6149

50+
public DiscordAPICredentials getDiscordAPICredentials(){
51+
JsonObject discord = root.get("discordAPI").getAsJsonObject();
52+
53+
String url = discord.get("url").getAsString();
54+
String key = discord.get("key").getAsString();
55+
56+
return new DiscordAPICredentials(url, key);
57+
}
58+
59+
public SpigetAPICredentials getSpigetAPICredentials(){
60+
JsonObject spigotApi = root.get("spigetApi").getAsJsonObject();
61+
62+
String url = spigotApi.get("url").getAsString();
63+
64+
return new SpigetAPICredentials(url);
65+
}
66+
6267
public SpigotAPICredentials getSpigotAPICredentials(){
63-
JsonObject spigotApi = root.get("spigotApi").getAsJsonObject();
68+
JsonObject spigotApi = root.get("techSpigotApi").getAsJsonObject();
6469

6570
String url = spigotApi.get("url").getAsString();
6671
String token = spigotApi.get("token").getAsString();
@@ -139,9 +144,41 @@ public String getClientSecret() {
139144
}
140145
}
141146

147+
public static class DiscordAPICredentials {
148+
149+
private final String url, key;
150+
151+
public DiscordAPICredentials(String url, String key) {
152+
this.url = url;
153+
this.key = key;
154+
}
155+
156+
public String getUrl() {
157+
return url;
158+
}
159+
160+
public String getKey() {
161+
return key;
162+
}
163+
}
164+
165+
public static class SpigetAPICredentials {
166+
167+
private final String url;
168+
169+
public SpigetAPICredentials(String url) {
170+
this.url = url;
171+
}
172+
173+
public String getUrl() {
174+
return url;
175+
}
176+
}
177+
142178
public static class SpigotAPICredentials {
143179

144-
private final String url, token;
180+
private final String url;
181+
private final String token;
145182

146183
public SpigotAPICredentials(String url, String token) {
147184
this.url = url;

‎src/main/java/me/TechsCode/UpdateServer/DiscordAPI.java‎

Lines changed: 113 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,113 @@
1+
package me.TechsCode.UpdateServer;
2+
3+
import com.google.gson.Gson;
4+
import com.google.gson.JsonArray;
5+
import com.google.gson.JsonObject;
6+
7+
import java.io.BufferedReader;
8+
import java.io.InputStreamReader;
9+
import java.net.HttpURLConnection;
10+
import java.net.URL;
11+
import java.nio.charset.StandardCharsets;
12+
import java.util.ArrayList;
13+
import java.util.List;
14+
15+
public class DiscordAPI {
16+
17+
private final String apiUrl;
18+
private final String apiKey;
19+
20+
public DiscordAPI(String url, String key){
21+
this.apiUrl = url;
22+
this.apiKey = key;
23+
}
24+
25+
private JsonObject MakeObjectRequest(String endpoint){
26+
JsonObject response = new JsonObject();
27+
try{
28+
URL url = new URL(apiUrl +"/api/"+ apiKey +"/"+endpoint);
29+
30+
HttpURLConnection con = (HttpURLConnection)url.openConnection();
31+
con.setRequestMethod("GET");
32+
con.setRequestProperty("Content-Type", "application/json; utf-8");
33+
con.setRequestProperty("Accept", "application/json");
34+
35+
try(BufferedReader br = new BufferedReader(
36+
new InputStreamReader(con.getInputStream(), StandardCharsets.UTF_8))) {
37+
StringBuilder responseText = new StringBuilder();
38+
String responseLine = null;
39+
while ((responseLine = br.readLine()) != null) {
40+
responseText.append(responseLine.trim());
41+
}
42+
response = new Gson().fromJson(responseText.toString(), JsonObject.class);
43+
response.addProperty("statusCode", con.getResponseCode());
44+
}
45+
}catch (Exception e){
46+
e.printStackTrace();
47+
}
48+
return response;
49+
}
50+
private JsonArray MakeArrayRequest(String endpoint){
51+
JsonArray response = new JsonArray();
52+
try{
53+
URL url = new URL(apiUrl +"/api/"+ apiKey +"/"+endpoint);
54+
55+
HttpURLConnection con = (HttpURLConnection)url.openConnection();
56+
con.setRequestMethod("GET");
57+
con.setRequestProperty("Content-Type", "application/json; utf-8");
58+
con.setRequestProperty("Accept", "application/json");
59+
60+
try(BufferedReader br = new BufferedReader(
61+
new InputStreamReader(con.getInputStream(), StandardCharsets.UTF_8))) {
62+
StringBuilder responseText = new StringBuilder();
63+
String responseLine = null;
64+
while ((responseLine = br.readLine()) != null) {
65+
responseText.append(responseLine.trim());
66+
}
67+
response = new Gson().fromJson(responseText.toString(), JsonArray.class);
68+
}
69+
}catch (Exception e){
70+
e.printStackTrace();
71+
}
72+
return response;
73+
}
74+
75+
public boolean HasRole(String memberId, String roleId){
76+
String url = "guild/member/"+memberId+"/roles/"+roleId;
77+
JsonObject response = MakeObjectRequest(url);
78+
return response.get("hasRole").getAsBoolean();
79+
}
80+
public boolean HasRoles(String memberId, String[] roleIds, Boolean RequireOne){
81+
boolean HasRoles = false;
82+
for (String roleId : roleIds) {
83+
String url = "guild/member/"+memberId+"/roles/"+roleId;
84+
JsonObject response = MakeObjectRequest(url);
85+
HasRoles = response.get("hasRole").getAsBoolean();
86+
if (RequireOne){
87+
if (HasRoles){
88+
return true;
89+
}
90+
}else{
91+
if (!HasRoles){
92+
return false;
93+
}
94+
}
95+
}
96+
return HasRoles;
97+
}
98+
public List<DiscordRole> GetRoles(String memberId){
99+
String url = "guild/member/"+memberId+"/roles";
100+
JsonArray response = MakeArrayRequest(url);
101+
List<DiscordRole> roles = new ArrayList<>();
102+
response.forEach(role -> {
103+
roles.add(new DiscordRole(role.getAsJsonObject()));
104+
});
105+
return roles;
106+
}
107+
public DiscordMember GetUserInfo(String memberId){
108+
String url = "guild/member/"+memberId+"/info";
109+
JsonObject response = MakeObjectRequest(url);
110+
return new DiscordMember(response);
111+
}
112+
113+
}

‎src/main/java/me/TechsCode/UpdateServer/DiscordMember.java‎

Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
package me.TechsCode.UpdateServer;
2+
3+
import com.google.gson.JsonObject;
4+
5+
public class DiscordMember {
6+
7+
private final String guildId, userID, nickname, displayName;
8+
private final long joinedTimestamp, lastMessageChannelID, premiumSinceTimestamp;
9+
private final boolean deleted;
10+
11+
public DiscordMember(JsonObject jsonObject){
12+
this.guildId = jsonObject.get("guildID").getAsString();
13+
this.userID = jsonObject.get("userID").getAsString();
14+
this.nickname = jsonObject.get("nickname").getAsString();
15+
this.displayName = !jsonObject.get("displayName").isJsonNull() ? jsonObject.get("displayName").getAsString() : null;
16+
this.joinedTimestamp = !jsonObject.get("joinedTimestamp").isJsonNull() ? jsonObject.get("joinedTimestamp").getAsLong(): 0;
17+
this.lastMessageChannelID = !jsonObject.get("lastMessageChannelID").isJsonNull() ? jsonObject.get("lastMessageChannelID").getAsLong(): 0;
18+
this.premiumSinceTimestamp = !jsonObject.get("premiumSinceTimestamp").isJsonNull() ? jsonObject.get("premiumSinceTimestamp").getAsLong(): 0;
19+
this.deleted = jsonObject.get("deleted").getAsBoolean();
20+
}
21+
22+
public String getGuildId() {
23+
return guildId;
24+
}
25+
26+
public String getUserID() {
27+
return userID;
28+
}
29+
30+
public String getNickname() {
31+
return nickname;
32+
}
33+
34+
public String getDisplayName() {
35+
return displayName;
36+
}
37+
38+
public long getJoinedTimestamp() {
39+
return joinedTimestamp;
40+
}
41+
42+
public long getLastMessageChannelID() {
43+
return lastMessageChannelID;
44+
}
45+
46+
public long getPremiumSinceTimestamp() {
47+
return premiumSinceTimestamp;
48+
}
49+
50+
public boolean isDeleted() {
51+
return deleted;
52+
}
53+
54+
}

0 commit comments

Comments
 (0)