anthorob/netneutrality
1
0 Fork 0
Code Issues 1 Pull Requests 10 Actions Packages Projects Releases Wiki Activity

cleanup

Browse Source
This commit is contained in:
anthorob committed 2026-09-10 08:32:16 -04:00
1 parent 868dbea8df
commit a507b471b4
13 files changed
+33 -95
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

docs/contexts.md
+3 -3
View File
@@ -90,7 +90,7 @@ and exposes type-safe option access, e.g. `getOption(name, resolver)`. Concrete
specific JDA event to this API.
| Class | Wraps | Notes |
|---|---|---|
|-------------------------|----------------------------------|--------------------------------------------------------------------------------------------------------------------------------------------------|
| `SlashCommandContext` | `SlashCommandInteractionEvent` | Options already parsed by Discord; maps `OptionMapping` → `SlashCommandOption`. Interaction-based replies. |
| `MessageCommandContext` | `MessageReceivedEvent` (prefix) | Contains the **manual parser** that turns the raw message string into `CommandOption`s (mentions, integers, booleans, …). Message-based replies. |
| `MessageMenuContext` | `MessageContextInteractionEvent` | "Apps → …" action on a message; exposes the target `Message`. |
@@ -107,7 +107,7 @@ Abstract base for the [task flow](tasks.md). Two things distinguish it:
- **`contextData` map** — a small state bag used to carry values between steps of a multi-step flow.
| Class | Wraps | `getId()` derived from |
|---|---|---|
|----------------------|------------------------------------|------------------------------------------------------------|
| `ButtonTaskContext` | `ButtonInteractionEvent` | `getComponentId()` of the clicked button |
| `ModalTaskContext` | `ModalInteractionEvent` | modal `customId` |
| `EmojiTaskContext` | `MessageReactionAddEvent` | composite `guildId:messageId` |
@@ -146,7 +146,7 @@ correct channel even when playback state changes without a fresh user interactio
## End-to-end summary
| Event | Context | Flow | Async result wraps |
|---|---|---|---|
|---------------------------------|-------------------------|---------|--------------------|
| `SlashCommandInteractionEvent` | `SlashCommandContext` | Command | `InteractionHook` |
| `MessageReceivedEvent` (prefix) | `MessageCommandContext` | Command | `Message` |
| `ButtonInteractionEvent` | `ButtonTaskContext` | Task | `InteractionHook` |
docs/persistence.md
+3 -3
View File
@@ -7,7 +7,7 @@
## Stack
| Concern | Technology |
|---|---|
|------------|-------------------------------------------------------------------------------|
| ORM | Hibernate 7.1.9 (Jakarta JPA) |
| Engine | MariaDB 11 (per `docker-compose.yml`), MySQL Connector/J 9.7.0 driver, InnoDB |
| Pooling | HikariCP (via `hibernate-hikaricp`) |
@@ -48,7 +48,7 @@ Entities live in `me.bobert.netneutrality.data.entity` and are prefixed with `O`
of a star-shaped model; most other tables reference `guild_id` with `ON DELETE CASCADE`.
| Entity | Table | Key | Relationships / notes |
|---|---|---|---|
|-----------------|------------------|--------------------------|--------------------------------------------------------------------------------------------------------|
| `OGuild` | `guilds` | `guild_id` (String) | Central entity; one-to-many with settings, blacklist, log messages, logging. |
| `OGuildSetting` | `guild_settings` | `id` (auto int) | Many-to-one `OGuild`; key/value guild settings. |
| `OBlacklist` | `blacklist` | `id` (auto int) | Many-to-one `OGuild`; blacklisted words. |
@@ -110,7 +110,7 @@ Services wrap repositories with business logic and **caching**.
`GSettings` is an **enum** of the available per-guild configuration keys and their defaults:
| Setting | Default |
|---|---|
|-------------------------|---------|
| `MUSIC_ROLE` | (none) |
| `MUSIC_CHANNEL` | (none) |
| `MUSIC_VOLUME` | `30` |
docs/tasks.md
+5 -5
View File
@@ -13,7 +13,7 @@ inserted earlier (typically by the command that created the button), so the `Tas
the task and execute it. The system has since grown to cover several task subtypes:
| Subtype | Trigger | Id source |
|---|---|---|
|----------------------------------------------|------------------------------------|----------------------------------------|
| [Button task](#button-emoji-and-modal-tasks) | `ButtonInteractionEvent` | button `componentId` |
| [Modal task](#button-emoji-and-modal-tasks) | `ModalInteractionEvent` | modal `customId` |
| [Emoji task](#button-emoji-and-modal-tasks) | `MessageReactionAddEvent` | composite `guildId:messageId` |
@@ -38,7 +38,7 @@ The id is the **primary lookup key** used by `TaskManager`. How it is derived de
`TaskManager` what to do with the task afterwards:
| Lifecycle | Meaning |
|---|---|
|----------------------------|-------------------------------------------------------------------|
| `BUILTIN` | Task is static and stays registered indefinitely. |
| `KEEP` | Keep the task in memory after execution (can run again). |
| `REMOVE_SELF` | Remove this task after execution (one-shot). |
@@ -138,7 +138,7 @@ The file declares, for each persistable task class, the constructor parameters a
Schema:
| Key | Meaning |
|---|---|
|----------|------------------------------------------------------------------|
| `tasks` | array of task mappings |
| `class` | fully-qualified class name; **must** implement `PersistableTask` |
| `params` | ordered list of payload field names |
@@ -259,7 +259,7 @@ Tasks can opt into extra behavior by implementing marker/behavior interfaces in
`core.tasks.trait`:
| Trait | Effect |
|---|---|
|----------------------|------------------------------------------------------------------------------------------|
| `Deletable` | After successful execution, `TaskManager` deletes the original message/interaction. |
| `NotAcknowledgeable` | Suppresses the default acknowledgement (the task sends its own response). |
| `WithButton` | The task can render itself as a JDA `Button` (`createButton()`). |
@@ -269,7 +269,7 @@ Tasks can opt into extra behavior by implementing marker/behavior interfaces in
## Concrete task catalog
| Task | Package | Base type | Description |
|---|---|---|---|
|-----------------------------|-------------|------------------------------|--------------------------------------------------------------|
| `EmojiReactionRoleTask` | `emoji` | `EmojiTask` (persistable) | Assign/remove a role when a user reacts with a mapped emoji. |
| `AcceptButton` | `generic` | `ButtonTask` | Generic "accept" button running a supplied function. |
| `CancelButton` | `generic` | `ButtonTask` | Generic "cancel" button running a supplied function. |
src/main/java/me/bobert/netneutrality/command/bot/ConfigureCommand.java
+1 -1
View File
@@ -1,4 +1,4 @@
package me.bobert.netneutrality.command.basic;
package me.bobert.netneutrality.command.bot;
/*
* Copyright (c) anthorob
*
src/main/java/me/bobert/netneutrality/core/command/UsageValidator.java
-2
View File
@@ -14,8 +14,6 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import static java.util.function.Predicate.not;
public class UsageValidator {
public boolean validate(CommandContext context, CommandContainer container) {
src/main/java/me/bobert/netneutrality/core/context/CommandContext.java
+1 -1
View File
@@ -100,7 +100,7 @@ public abstract class CommandContext extends AbstractContext {
public CommandOption getOption(String name) {
List<CommandOption> options = getOptionsByName(name);
return options.isEmpty() ? null : options.get(0);
return options.isEmpty() ? null : options.getFirst();
}
public List<CommandOption> getOptionsByName(String name) {
src/main/java/me/bobert/netneutrality/core/scheduled/ScheduledTaskManager.java
+1 -1
View File
@@ -89,7 +89,7 @@ public class ScheduledTaskManager implements Lifecycle {
public void cancelAll() {
logger.info("Cancelling all {} scheduled tasks", scheduledTasks.size());
scheduledTasks.forEach((id, future) -> future.cancel(false));
scheduledTasks.forEach((_, future) -> future.cancel(false));
scheduledTasks.clear();
}
src/main/java/me/bobert/netneutrality/core/tasks/TaskManagerImpl.java
+1 -1
View File
@@ -182,7 +182,7 @@ public class TaskManagerImpl implements TaskManager {
String lockId = task.getLockId();
ReentrantLock lock = (task instanceof PersistableTask || task instanceof BuiltInTask)
? null
: tasksLock.computeIfAbsent(lockId, k -> new ReentrantLock());
: tasksLock.computeIfAbsent(lockId, _ -> new ReentrantLock());
try {
if (lock != null) {
src/main/java/me/bobert/netneutrality/http/WebModule.java
+5 -31
View File
@@ -105,7 +105,7 @@ public class WebModule {
try (Response response = client.newCall(request).execute()) {
long elapsedTime = System.currentTimeMillis() - startTime;
Sentry.addBreadcrumb(Breadcrumb.http(url, method.name(), response.code()));
String body = response.body() != null ? response.body().string() : null;
String body = response.body().string();
this.cachedResponse = new CachedResponse(
response.code(),
@@ -168,13 +168,13 @@ public class WebModule {
}
public boolean isSuccess() {
return cachedResponse != null && cachedResponse.getStatusCode() >= 200 && cachedResponse.getStatusCode() < 400;
return cachedResponse != null && cachedResponse.statusCode() >= 200 && cachedResponse.statusCode() < 400;
}
public static class Builder {
private Request request;
private final String url;
private String version;
private final String version;
private Method method = Method.GET;
private long timeout = 5;
private TimeUnit timeUnit = TimeUnit.MINUTES;
@@ -328,39 +328,13 @@ public class WebModule {
}
}
private static class CachedResponse {
private final int statusCode;
private final Headers headers;
private final long elapsedTime;
private final String body;
private final long expirationTime;
private final String errorMessage;
public CachedResponse(int statusCode, Headers headers, long elapsedTime, String body, long expirationTime, String errorMessage) {
this.statusCode = statusCode;
this.headers = headers;
this.elapsedTime = elapsedTime;
this.body = body;
this.expirationTime = expirationTime;
this.errorMessage = errorMessage;
}
private record CachedResponse(int statusCode, Headers headers, long elapsedTime, String body, long expirationTime,
String errorMessage) {
public boolean isExpired() {
return System.currentTimeMillis() > expirationTime;
}
public int getStatusCode() {
return statusCode;
}
public Headers getHeaders() {
return headers;
}
public long getElapsedTime() {
return elapsedTime;
}
public Optional<String> getBody() {
return Optional.ofNullable(body);
}
src/test/java/me/bobert/netneutrality/bootstrap/ApplicationContextTest.java
+2 -17
View File
@@ -16,18 +16,8 @@ import static org.junit.jupiter.api.Assertions.assertNull;
public class ApplicationContextTest {
private static final class RecordingComponent implements Lifecycle {
private final String name;
private final int priority;
private final List<String> startLog;
private final List<String> stopLog;
private RecordingComponent(String name, int priority, List<String> startLog, List<String> stopLog) {
this.name = name;
this.priority = priority;
this.startLog = startLog;
this.stopLog = stopLog;
}
private record RecordingComponent(String name, int priority, List<String> startLog,
List<String> stopLog) implements Lifecycle {
@Override
public void start() {
@@ -38,11 +28,6 @@ public class ApplicationContextTest {
public void stop() {
stopLog.add(name);
}
@Override
public int priority() {
return priority;
}
}
@Test
src/test/java/me/bobert/netneutrality/bootstrap/ReflectionInjectionTest.java
+8 -22
View File
@@ -25,30 +25,16 @@ public class ReflectionInjectionTest {
public interface Fixture {
}
/** Dependency registered in the test context. */
public static final class SampleDependency {
private final String label;
public SampleDependency(String label) {
this.label = label;
/**
* Dependency registered in the test context.
*/
public record SampleDependency(String label) {
}
public String label() {
return label;
}
}
/** Fixture that requires a registered dependency via constructor injection. */
public static final class InjectedFixture implements Fixture {
private final SampleDependency dependency;
public InjectedFixture(SampleDependency dependency) {
this.dependency = dependency;
}
public SampleDependency dependency() {
return dependency;
}
/**
* Fixture that requires a registered dependency via constructor injection.
*/
public record InjectedFixture(SampleDependency dependency) implements Fixture {
}
/** Fixture that only exposes a no-arg constructor (fallback path). */
src/test/java/me/bobert/netneutrality/music/QueueManagerTest.java
+2 -4
View File
@@ -22,19 +22,17 @@ import static org.mockito.Mockito.*;
public class QueueManagerTest {
private AudioPlayer player;
private TrackScheduler scheduler;
private MusicManager musicManager;
private MusicManagerCallback callback;
private Guild guild;
private QueueManager queueManager;
@BeforeEach
void setUp() {
player = mock(AudioPlayer.class);
guild = mock(Guild.class);
Guild guild = mock(Guild.class);
when(guild.getId()).thenReturn("guild1");
scheduler = mock(TrackScheduler.class);
TrackScheduler scheduler = mock(TrackScheduler.class);
musicManager = mock(MusicManager.class);
callback = mock(MusicManagerCallback.class);
src/test/java/me/bobert/netneutrality/music/TrackSchedulerTest.java
+1 -4
View File
@@ -17,8 +17,6 @@ import static org.mockito.Mockito.*;
public class TrackSchedulerTest {
private AudioPlayer player;
private MusicManager musicManager;
private QueueManager queueManager;
private TrackScheduler scheduler;
@BeforeEach
@@ -27,12 +25,11 @@ public class TrackSchedulerTest {
Guild guild = mock(Guild.class);
when(guild.getId()).thenReturn("guild1");
musicManager = mock(MusicManager.class);
MusicManager musicManager = mock(MusicManager.class);
when(musicManager.getPlayer()).thenReturn(player);
when(musicManager.getGuild()).thenReturn(guild);
scheduler = new TrackScheduler(musicManager);
queueManager = scheduler.getQueueManager();
}
@Test