Reset Discord status after a while of being in menu (#9116)

Closes #667

runelite-client/src/main/java/net/runelite/client/discord/DiscordPresence.java

@@ -31,7 +31,7 @@ import lombok.Value;
 /**
  * Represents Discord Rich Presence RPC data
  */
-@Builder
+@Builder(toBuilder = true)
 @Value
 public class DiscordPresence
 {

runelite-client/src/main/java/net/runelite/client/plugins/discord/DiscordState.java

@@ -122,9 +122,7 @@ class DiscordState
 		}
 		else
 		{
-			// If we aren't showing the elapsed time within Discord then
-			// We null out the event start property
-			event = new EventWithTime(eventType, config.hideElapsedTime() ? null : Instant.now());
+			event = new EventWithTime(eventType, Instant.now());
 
 			events.add(event);
 		}
@@ -177,7 +175,7 @@ class DiscordState
 			.state(MoreObjects.firstNonNull(state, ""))
 			.details(MoreObjects.firstNonNull(details, ""))
 			.largeImageText(RuneLiteProperties.getTitle() + " v" + versionShortHand)
-			.startTimestamp(event.getStart())
+			.startTimestamp(config.hideElapsedTime() ? null : event.getStart())
 			.smallImageKey(imageKey)
 			.partyMax(PARTY_MAX)
 			.partySize(party.getMembers().size());
@@ -203,8 +201,25 @@ class DiscordState
 	 */
 	void checkForTimeout()
 	{
+		if (events.isEmpty())
+		{
+			return;
+		}
+
 		final Duration actionTimeout = Duration.ofMinutes(config.actionTimeout());
 		final Instant now = Instant.now();
+		final EventWithTime eventWithTime = events.get(0);
+
 		events.removeIf(event -> event.getType().isShouldTimeout() && now.isAfter(event.getUpdated().plus(actionTimeout)));
+
+		if (eventWithTime.getType().getState().equals(DiscordGameEventType.IN_MENU.getState()) && now.isAfter(eventWithTime.getStart().plus(actionTimeout)))
+		{
+			final DiscordPresence presence = lastPresence
+				.toBuilder()
+				.startTimestamp(null)
+				.build();
+			lastPresence = presence;
+			discordService.updatePresence(presence);
+		}
 	}
 }