Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/xdnw/locutus
Browse files Browse the repository at this point in the history
  • Loading branch information
@xdnw
xdnw committed May 11, 2024
2 parents 94854b4 + d3e29ce commit 2237abc
Show file tree
Hide file tree
Showing 12 changed files with 288 additions and 42 deletions.
12 changes: 7 additions & 5 deletions src/main/java/link/locutus/discord/Locutus.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -231,12 +231,14 @@ private Locutus() throws SQLException, ClassNotFoundException, LoginException, I
throw new IllegalStateException("Please set API_KEY_PRIMARY or USERNAME/PASSWORD in " + Settings.INSTANCE.getDefaultFile());
}

Settings.INSTANCE.NATION_ID = 0;
Integer nationIdFromKey = Locutus.imp().getDiscordDB().getNationFromApiKey(Settings.INSTANCE.API_KEY_PRIMARY);
if (nationIdFromKey == null) {
throw new IllegalStateException("Could not get NATION_ID from key. Please ensure a valid API_KEY is set in " + Settings.INSTANCE.getDefaultFile());
if (Settings.INSTANCE.NATION_ID <= 0) {
Settings.INSTANCE.NATION_ID = 0;
Integer nationIdFromKey = Locutus.imp().getDiscordDB().getNationFromApiKey(Settings.INSTANCE.API_KEY_PRIMARY);
if (nationIdFromKey == null) {
throw new IllegalStateException("Could not get NATION_ID from key. Please ensure a valid API_KEY is set in " + Settings.INSTANCE.getDefaultFile());
}
Settings.INSTANCE.NATION_ID = nationIdFromKey;
}
Settings.INSTANCE.NATION_ID = nationIdFromKey;

System.out.println("remove:|| nationid " + (((-start)) + (start = System.currentTimeMillis())));

Expand Down
4 changes: 4 additions & 0 deletions src/main/java/link/locutus/discord/commands/manager/v2/impl/pw/CommandManager2.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -192,6 +192,10 @@ public CommandManager2 registerDefaults() {
getCommands().registerMethod(new UtilityCommands(), List.of("land"), "landROI", "roi");
getCommands().registerMethod(new UtilityCommands(), List.of("infra"), "infraROI", "roi");

getCommands().registerMethod(new ConflictCommands(), List.of("conflict", "featured"), "featureConflicts", "add_rule");
getCommands().registerMethod(new ConflictCommands(), List.of("conflict", "featured"), "removeFeature", "remove_rule");
getCommands().registerMethod(new ConflictCommands(), List.of("conflict", "featured"), "listFeaturedRuleset", "list_rules");

getCommands().registerMethod(new ConflictCommands(), List.of("conflict"), "info", "info");
getCommands().registerMethod(new ConflictCommands(), List.of("conflict"), "listConflicts", "list");
getCommands().registerMethod(new VirtualConflictCommands(), List.of("conflict"), "createTemporary", "create_temp");
Expand Down
118 changes: 102 additions & 16 deletions ...main/java/link/locutus/discord/commands/manager/v2/impl/pw/commands/ConflictCommands.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
import link.locutus.discord.commands.manager.v2.impl.discord.permission.WhitelistPermission;
import link.locutus.discord.commands.manager.v2.impl.pw.refs.CM;
import link.locutus.discord.config.Settings;
import link.locutus.discord.db.GuildDB;
import link.locutus.discord.db.conflict.CoalitionSide;
import link.locutus.discord.db.conflict.CtownedFetcher;
import link.locutus.discord.db.entities.*;
Expand All @@ -27,6 +28,7 @@
import link.locutus.discord.util.math.ArrayUtil;
import link.locutus.discord.web.jooby.AwsManager;
import link.locutus.discord.web.jooby.WebRoot;
import net.dv8tion.jda.api.entities.Guild;
import net.dv8tion.jda.api.entities.User;
import org.json.JSONObject;
import org.jsoup.Jsoup;
Expand Down Expand Up @@ -107,14 +109,14 @@ public String info(ConflictManager manager, Conflict conflict, boolean showParti
@Command(desc = "Sets the wiki page for a conflict")
@RolePermission(value = Roles.MILCOM)
@CoalitionPermission(Coalition.MANAGE_CONFLICTS)
public String setWiki(ConflictManager manager, Conflict conflict, String url) throws IOException {
public String setWiki(@Me GuildDB db, ConflictManager manager, Conflict conflict, String url) throws IOException {
if (url.startsWith("http")) {
if (url.endsWith("/")) url = url.substring(0, url.length() - 1);
url = url.substring(url.lastIndexOf("/") + 1);
}
conflict.setWiki(url);
return "Set wiki to: `" + url + "`. Attempting to load additional wiki information...\n\n" +
importWikiPage(manager, conflict.getName(), url, false);
importWikiPage(db, manager, conflict.getName(), url, false);
}

@Command(desc = "Sets the wiki page for a conflict")
Expand Down Expand Up @@ -328,7 +330,7 @@ private int getFighting(DBAlliance alliance, Set<DBAlliance> enemyCoalition) {
@Command(desc = "Manually create an ongoing conflict between two coalitions")
@RolePermission(Roles.MILCOM)
@CoalitionPermission(Coalition.MANAGE_CONFLICTS)
public String addConflict(ConflictManager manager, @Me User user, ConflictCategory category, Set<DBAlliance> coalition1, Set<DBAlliance> coalition2, @Switch("n") String conflictName, @Switch("d") @Timestamp Long start) {
public String addConflict(@Me GuildDB db, ConflictManager manager, @Me User user, ConflictCategory category, Set<DBAlliance> coalition1, Set<DBAlliance> coalition2, @Switch("n") String conflictName, @Switch("d") @Timestamp Long start) {
if (conflictName != null) {
if (MathMan.isInteger(conflictName)) {
throw new IllegalArgumentException("Conflict name cannot be a number (`" + conflictName + "`)");
Expand Down Expand Up @@ -379,7 +381,7 @@ public String addConflict(ConflictManager manager, @Me User user, ConflictCatego
if (manager.getConflict(conflictName) != null) {
throw new IllegalArgumentException("Conflict with name `" + conflictName + "` already exists");
}
Conflict conflict = manager.addConflict(conflictName, category, "Coalition 1", "Coalition 2", "", "", "", TimeUtil.getTurn(start), Long.MAX_VALUE);
Conflict conflict = manager.addConflict(conflictName, db.getIdLong(), category, "Coalition 1", "Coalition 2", "", "", "", TimeUtil.getTurn(start), Long.MAX_VALUE);
StringBuilder response = new StringBuilder();
response.append("Created conflict `" + conflictName + "`\n");
// add coalitions
Expand Down Expand Up @@ -508,12 +510,12 @@ public String addCoalition(@Me User user, Conflict conflict, Set<DBAlliance> all
"This does not push the data to the site")
@RolePermission(Roles.MILCOM)
@CoalitionPermission(Coalition.MANAGE_CONFLICTS)
public String importCtowned(ConflictManager manager,
public String importCtowned(@Me GuildDB db, ConflictManager manager,
@Default("true") @Arg("If the cached version of the site is used")
boolean useCache) throws SQLException, IOException, ParseException, ClassNotFoundException {
CtownedFetcher fetcher = new CtownedFetcher(manager);
fetcher.loadCtownedConflicts(useCache, ConflictCategory.NON_MICRO, "conflicts", "conflicts");
fetcher.loadCtownedConflicts(useCache, ConflictCategory.MICRO, "conflicts/micros", "conflicts-micros");
fetcher.loadCtownedConflicts(db, useCache, ConflictCategory.NON_MICRO, "conflicts", "conflicts");
fetcher.loadCtownedConflicts(db, useCache, ConflictCategory.MICRO, "conflicts/micros", "conflicts-micros");
return "Done!\nNote: this does not push the data to the site";
}

Expand All @@ -535,7 +537,10 @@ public String importAllianceNames(ConflictManager manager) throws IOException, P
"This does not push the data to the site")
@RolePermission(Roles.MILCOM)
@CoalitionPermission(Coalition.MANAGE_CONFLICTS)
public String importWikiPage(ConflictManager manager, String name, @Default String url, @Default("true") boolean useCache) throws IOException {
public String importWikiPage(@Me GuildDB db, ConflictManager manager,
String name,
@Default String url,
@Default("true") boolean useCache) throws IOException {
if (name.contains("http")) return "Please specify the name of the wiki page, not the URL for `name`";
if (url == null) {
url = Normalizer.normalize(name.replace(" ", "_"), Normalizer.Form.NFKC);
Expand All @@ -553,7 +558,7 @@ public String importWikiPage(ConflictManager manager, String name, @Default Stri
if (conflict.getStartTurn() < TimeUtil.getTurn(1577836800000L)) {
response.append("Conflict `" + name + "` before the war cutoff date of " + DiscordUtil.timestamp(1577836800000L, null) + "\n");
} else {
loadWikiConflicts(manager, List.of(conflict));
loadWikiConflicts(db, manager, List.of(conflict));
response.append("Loaded conflict `" + name + "` with url `https://politicsandwar.com/wiki/" + url + "`\n");
response.append("See: " +
CM.conflict.info.cmd.toSlashMention() +
Expand All @@ -566,7 +571,7 @@ public String importWikiPage(ConflictManager manager, String name, @Default Stri
return response.toString() + "\n\nNote: this does not push the data to the site";
}

private String loadWikiConflicts(ConflictManager manager, List<Conflict> conflicts) {
private String loadWikiConflicts(GuildDB db, ConflictManager manager, List<Conflict> conflicts) {
Map<String, Set<Conflict>> conflictsByWiki = manager.getConflictMap().values().stream().collect(Collectors.groupingBy(Conflict::getWiki, Collectors.toSet()));
// Cutoff date
conflicts.removeIf(f -> f.getStartTurn() < TimeUtil.getTurn(1577836800000L));
Expand All @@ -575,7 +580,7 @@ private String loadWikiConflicts(ConflictManager manager, List<Conflict> conflic
Conflict original = conflict;
Set<Conflict> existingSet = conflictsByWiki.get(conflict.getWiki());
if (existingSet == null) {
conflict = manager.addConflict(conflict.getName(), conflict.getCategory(), conflict.getSide(true).getName(), conflict.getSide(false).getName(), conflict.getWiki(), conflict.getCasusBelli(), conflict.getStatusDesc(), conflict.getStartTurn(), conflict.getEndTurn());
conflict = manager.addConflict(conflict.getName(), db.getIdLong(), conflict.getCategory(), conflict.getSide(true).getName(), conflict.getSide(false).getName(), conflict.getWiki(), conflict.getCasusBelli(), conflict.getStatusDesc(), conflict.getStartTurn(), conflict.getEndTurn());
existingSet = Set.of(conflict);
}
for (Conflict existing : existingSet) {
Expand Down Expand Up @@ -609,11 +614,11 @@ private String loadWikiConflicts(ConflictManager manager, List<Conflict> conflic
"This does not push the data to the site")
@RolePermission(Roles.MILCOM)
@CoalitionPermission(Coalition.MANAGE_CONFLICTS)
public String importWikiAll(ConflictManager manager, @Default("true") boolean useCache) throws IOException {
public String importWikiAll(@Me GuildDB db, ConflictManager manager, @Default("true") boolean useCache) throws IOException {
Map<String, String> errors = new LinkedHashMap<>();
List<Conflict> conflicts = PWWikiUtil.loadWikiConflicts(errors, useCache);

return loadWikiConflicts(manager, conflicts);
return loadWikiConflicts(db, manager, conflicts);
}


Expand Down Expand Up @@ -642,7 +647,12 @@ public String recalculateGraphs(ConflictManager manager, Set<Conflict> conflicts
"This does not push the data to the site")
@RolePermission(Roles.MILCOM)
@CoalitionPermission(Coalition.MANAGE_CONFLICTS)
public String importConflictData(ConflictManager manager, @Switch("c") boolean ctowned, @Switch("g") Set<Conflict> graphData, @Switch("a") boolean allianceNames, @Switch("w") boolean wiki, @Switch("s") boolean all) throws IOException, SQLException, ClassNotFoundException, ParseException {
public String importConflictData(@Me GuildDB db, ConflictManager manager,
@Switch("c") boolean ctowned,
@Switch("g") Set<Conflict> graphData,
@Switch("a") boolean allianceNames,
@Switch("w") boolean wiki,
@Switch("s") boolean all) throws IOException, SQLException, ClassNotFoundException, ParseException {
boolean loadGraphData = false;
if (all) {
Locutus.imp().getWarDb().loadWarCityCountsLegacy();
Expand All @@ -655,10 +665,10 @@ public String importConflictData(ConflictManager manager, @Switch("c") boolean c
importAllianceNames(manager);
}
if (ctowned) {
importCtowned(manager, true);
importCtowned(db, manager, true);
}
if (wiki) {
importWikiAll(manager, true);
importWikiAll(db, manager, true);
}
if (loadGraphData && graphData == null) {
graphData = new LinkedHashSet<>(manager.getConflictMap().values());
Expand All @@ -669,4 +679,80 @@ public String importConflictData(ConflictManager manager, @Switch("c") boolean c
}
return "Done!\nNote: this does not push the data to the site";
}

@Command(desc = "Configure the guilds and conflict ids that will be featured by this guild\n" +
"By default all conflicts are featured\n" +
"Specify either a set of conflicts, or a guild to feature all conflicts from that guild")
@RolePermission(Roles.MILCOM)
@CoalitionPermission(Coalition.MANAGE_CONFLICTS)
public String featureConflicts(ConflictManager manager, @Me GuildDB db, @Default Set<Conflict> conflicts, @Default Guild guild) {
if (conflicts == null && guild == null) {
throw new IllegalArgumentException("Please specify either `conflicts` or `guild`");
}
List<String> messages = new ArrayList<>();
if (conflicts != null) {
for (Conflict conflict : conflicts) {
manager.addSource(db.getIdLong(), conflict.getId(), 0);
}
messages.add("Added " + conflicts.size() + " conflicts to the featured list");
}
if (guild != null) {
manager.addSource(db.getIdLong(), guild.getIdLong(), 1);
messages.add("Added all conflicts from " + guild.toString() + " to the featured list");
}
manager.pushIndex();
messages.add("Pushed changed to site index");
return StringMan.join(messages, "\n");
}

@Command(desc = "Configure the guilds and conflict ids that will be featured by this guild\n" +
"By default all conflicts are featured\n" +
"Specify either a set of conflicts, or a guild to feature all conflicts from that guild")
@RolePermission(Roles.MILCOM)
@CoalitionPermission(Coalition.MANAGE_CONFLICTS)
public String removeFeature(ConflictManager manager, @Me GuildDB db, @Default Set<Conflict> conflicts, @Default Guild guild) {
if (conflicts == null && guild == null) {
throw new IllegalArgumentException("Please specify either `conflicts` or `guild`");
}
List<String> messages = new ArrayList<>();
if (conflicts != null) {
for (Conflict conflict : conflicts) {
manager.removeSource(db.getIdLong(), conflict.getId(), 0);
}
messages.add("Removed " + conflicts.size() + " conflicts from the featured list");
}
if (guild != null) {
manager.removeSource(db.getIdLong(), guild.getIdLong(), 1);
messages.add("Removed all conflicts from " + guild.toString() + " from the featured list");
}
manager.pushIndex();
messages.add("Pushed changed to site index");
messages.add("See: TODO CM REF to view the current featured conflict settings");
return StringMan.join(messages, "\n");
}

@Command(desc = "List the ruleset for which conflicts are featured by this guild (if any are set)\n" +
"This consists of a list of either guilds that created the conflict, or individual conflicts")
public String listFeaturedRuleset(ConflictManager manager, @Me GuildDB db) {
List<Long> config = manager.getSourceSets().get(db.getIdLong());
if (config == null || config.isEmpty()) {
return "This guild has no customized featured conflict ruleset. All conflicts are featured by default\n" +
"Use TODO CM REF to set what conflicts are featured";
}

List<String> items = new ArrayList<>();

for (long id : config) {
String name;
if (id > Long.MAX_VALUE) {
GuildDB guild = Locutus.imp().getGuildDB(id);
name = guild == null ? "guild:" + id : guild.getGuild().toString();
} else {
Conflict conflict = manager.getConflictById((int) id);
name = conflict == null ? "conflict:" + id : conflict.getName() + "/" + id;
}
items.add(name);
}
return "Featured conflicts:\n" + StringMan.join(items, "\n");
}
}
5 changes: 3 additions & 2 deletions ...va/link/locutus/discord/commands/manager/v2/impl/pw/commands/VirtualConflictCommands.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
import link.locutus.discord.db.entities.conflict.ConflictCategory;
import link.locutus.discord.user.Roles;
import link.locutus.discord.util.TimeUtil;
import net.dv8tion.jda.api.entities.Guild;
import net.dv8tion.jda.api.entities.User;

import java.io.IOException;
Expand All @@ -23,7 +24,7 @@ public class VirtualConflictCommands {
@Command(desc = "Create a temporary conflict between two coalitions\n" +
"Conflict is not auto updated")
@RolePermission(Roles.ADMIN)
public String createTemporary(ConflictManager manager, @Me DBNation nation, @Me User author, Set<DBAlliance> col1, Set<DBAlliance> col2, @Timestamp long start, @Default @Timestamp Long end, @Switch("g") boolean includeGraphs) throws IOException, ParseException {
public String createTemporary(@Me Guild guild, ConflictManager manager, @Me DBNation nation, @Me User author, Set<DBAlliance> col1, Set<DBAlliance> col2, @Timestamp long start, @Default @Timestamp Long end, @Switch("g") boolean includeGraphs) throws IOException, ParseException {
if (end == null) end = Long.MAX_VALUE;
if (includeGraphs && (Math.min(System.currentTimeMillis(), end) - start > TimeUnit.DAYS.toMillis(90))) {
throw new IllegalArgumentException("Graph generation is limited to 90 days of data. Please reduce the time range or set `includeGraphs: false`");
Expand All @@ -35,7 +36,7 @@ public String createTemporary(ConflictManager manager, @Me DBNation nation, @Me

long turnStart = TimeUtil.getTurn(start);
long turnEnd = end == Long.MAX_VALUE ? Long.MAX_VALUE : TimeUtil.getTurn(end);
Conflict conflict = new Conflict(-1, -1, ConflictCategory.GENERATED,
Conflict conflict = new Conflict(-1, -1, guild.getIdLong(), ConflictCategory.GENERATED,
conflictName,
col1Name,
col2Name,
Expand Down
Loading

0 comments on commit 2237abc

Please sign in to comment.