Linking module, add linked/unlinked events

api/src/main/java/com/discordsrv/api/event/events/linking/AccountLinkedEvent.java

@@ -0,0 +1,56 @@
+package com.discordsrv.api.event.events.linking;
+
+import com.discordsrv.api.event.events.Event;
+import com.discordsrv.api.profile.IProfile;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.UUID;
+
+/**
+ * An event for when an account pair has been linked successfully.
+ */
+public class AccountLinkedEvent implements Event {
+
+    private final IProfile profile;
+
+    public AccountLinkedEvent(@NotNull IProfile profile) {
+        if (!profile.isLinked()) {
+            throw new IllegalStateException("Profile is not linked");
+        }
+        this.profile = profile;
+    }
+
+    /**
+     * The profile of the linked account pair.
+     * @return the profile
+     */
+    @NotNull
+    public IProfile getProfile() {
+        return profile;
+    }
+
+    /**
+     * The UUID of the player that was linked, this player may not be connected to the server at the time of this event.
+     * @return the player's {@link UUID}
+     */
+    @NotNull
+    public UUID getPlayerUUID() {
+        UUID uuid = profile.playerUUID();
+        if (uuid == null) {
+            throw new IllegalStateException("playerUUID is null");
+        }
+        return uuid;
+    }
+
+    /**
+     * The user id of the user that was linked.
+     * @return the user's Discord user id
+     */
+    public long getUserId() {
+        Long userId = profile.userId();
+        if (userId == null) {
+            throw new IllegalStateException("userId is null");
+        }
+        return userId;
+    }
+}

api/src/main/java/com/discordsrv/api/event/events/linking/AccountUnlinkedEvent.java

@@ -0,0 +1,37 @@
+package com.discordsrv.api.event.events.linking;
+
+import com.discordsrv.api.event.events.Event;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.UUID;
+
+/**
+ * An event for when an account pair has been unlinked successfully.
+ */
+public class AccountUnlinkedEvent implements Event {
+
+    private final UUID playerUUID;
+    private final long userId;
+
+    public AccountUnlinkedEvent(@NotNull UUID playerUUID, long userId) {
+        this.playerUUID = playerUUID;
+        this.userId = userId;
+    }
+
+    /**
+     * The UUID of the player that was unlinked, this player may not be connected to the server at the time of this event.
+     * @return the player's {@link UUID}
+     */
+    @NotNull
+    public UUID getPlayerUUID() {
+        return playerUUID;
+    }
+
+    /**
+     * The user id of the user that was unlinked.
+     * @return the user's Discord user id
+     */
+    public long getUserId() {
+        return userId;
+    }
+}

common/src/main/java/com/discordsrv/common/AbstractDiscordSRV.java

@@ -51,6 +51,7 @@ import com.discordsrv.common.function.CheckedFunction;
 import com.discordsrv.common.groupsync.GroupSyncModule;
 import com.discordsrv.common.invite.DiscordInviteModule;
 import com.discordsrv.common.linking.LinkProvider;
+import com.discordsrv.common.linking.LinkingModule;
 import com.discordsrv.common.linking.impl.MemoryLinker;
 import com.discordsrv.common.linking.impl.MinecraftAuthenticationLinker;
 import com.discordsrv.common.linking.impl.StorageLinker;
@@ -542,6 +543,7 @@ public abstract class AbstractDiscordSRV<B extends IBootstrap, C extends MainCon
         registerModule(LeaveMessageModule::new);
         registerModule(DiscordInviteModule::new);
         registerModule(MentionCachingModule::new);
+        registerModule(LinkingModule::new);
 
         // Integrations
         registerIntegration("com.discordsrv.common.integration.LuckPermsIntegration");

common/src/main/java/com/discordsrv/common/linking/LinkingModule.java

@@ -0,0 +1,30 @@
+package com.discordsrv.common.linking;
+
+import com.discordsrv.api.event.events.linking.AccountLinkedEvent;
+import com.discordsrv.api.event.events.linking.AccountUnlinkedEvent;
+import com.discordsrv.api.profile.IProfile;
+import com.discordsrv.common.DiscordSRV;
+import com.discordsrv.common.logging.NamedLogger;
+import com.discordsrv.common.module.type.AbstractModule;
+
+import java.util.UUID;
+
+public class LinkingModule extends AbstractModule<DiscordSRV> {
+
+    public LinkingModule(DiscordSRV discordSRV) {
+        super(discordSRV, new NamedLogger(discordSRV, "LINKING"));
+    }
+
+    public void linked(UUID playerUUID, long userId) {
+        IProfile profile = discordSRV.profileManager().getProfile(playerUUID);
+        if (profile == null || !profile.isLinked()) {
+            throw new IllegalStateException("Notified that account linked, but profile is null or unlinked");
+        }
+
+        discordSRV.eventBus().publish(new AccountLinkedEvent(profile));
+    }
+
+    public void unlinked(UUID playerUUID, long userId) {
+        discordSRV.eventBus().publish(new AccountUnlinkedEvent(playerUUID, userId));
+    }
+}

common/src/main/java/com/discordsrv/common/linking/impl/MinecraftAuthenticationLinker.java

@@ -23,6 +23,7 @@ import com.discordsrv.common.function.CheckedSupplier;
 import com.discordsrv.common.future.util.CompletableFutureUtil;
 import com.discordsrv.common.linking.LinkProvider;
 import com.discordsrv.common.linking.LinkStore;
+import com.discordsrv.common.linking.LinkingModule;
 import com.discordsrv.common.logging.Logger;
 import com.discordsrv.common.logging.NamedLogger;
 import me.minecraftauth.lib.AuthService;
@@ -80,14 +81,35 @@ public class MinecraftAuthenticationLinker extends CachedLinkProvider implements
 
     private void linked(UUID playerUUID, long userId) {
         logger.debug("New link: " + playerUUID + " & " + Long.toUnsignedString(userId));
-        linkStore.createLink(playerUUID, userId);
+        linkStore.createLink(playerUUID, userId).whenComplete((v, t) -> {
+            if (t != null) {
+                logger.error("Failed to link player persistently", t);
+                return;
+            }
+
+            module().linked(playerUUID, userId);
+        });
 
     }
 
     private void unlinked(UUID playerUUID, long userId) {
         logger.debug("Unlink: " + playerUUID + " & " + Long.toUnsignedString(userId));
-        linkStore.createLink(playerUUID, userId);
+        linkStore.createLink(playerUUID, userId).whenComplete((v, t) -> {
+            if (t != null) {
+                logger.error("Failed to unlink player in persistent storage", t);
+                return;
+            }
 
+            module().unlinked(playerUUID, userId);
+        });
+    }
+
+    private LinkingModule module() {
+        LinkingModule module = discordSRV.getModule(LinkingModule.class);
+        if (module == null) {
+            throw new IllegalStateException("LinkingModule not available");
+        }
+        return module;
     }
 
     private <T> CompletableFuture<Optional<T>> query(