anna
/
ChatTwo
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix: keep old detection methods for history

This commit is contained in:
Anna 2023-02-27 20:31:04 -05:00
parent 9a42b1b9da
commit 0e3adfcbfa
2 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ChatTwo/PayloadHandler.cs
View File

@ -14,7 +14,8 @@ using ImGuiNET;
using ImGuiScene; using ImGuiScene;
using Lumina.Excel.GeneratedSheets; using Lumina.Excel.GeneratedSheets;
using Action = System.Action; using Action = System.Action;
using PartyFinderPayload = Dalamud.Game.Text.SeStringHandling.Payloads.PartyFinderPayload; using DalamudPartyFinderPayload = Dalamud.Game.Text.SeStringHandling.Payloads.PartyFinderPayload;
using ChatTwoPartyFinderPayload = ChatTwo.Util.PartyFinderPayload;
namespace ChatTwo; namespace ChatTwo;
@ -295,8 +296,8 @@ internal sealed class PayloadHandler {
this.ClickLinkPayload(chunk, payload, link); this.ClickLinkPayload(chunk, payload, link);
break; break;
} }
case PartyFinderPayload pf: { case DalamudPartyFinderPayload pf: {
if (pf.LinkType == PartyFinderPayload.PartyFinderLinkType.PartyFinderNotification) { if (pf.LinkType == DalamudPartyFinderPayload.PartyFinderLinkType.PartyFinderNotification) {
GameFunctions.GameFunctions.OpenPartyFinder(); GameFunctions.GameFunctions.OpenPartyFinder();
} else { } else {
this.Ui.Plugin.Functions.OpenPartyFinder(pf.ListingId); this.Ui.Plugin.Functions.OpenPartyFinder(pf.ListingId);
@ -304,10 +305,21 @@ internal sealed class PayloadHandler {
break; break;
} }
case ChatTwoPartyFinderPayload pf: {
this.Ui.Plugin.Functions.OpenPartyFinder(pf.Id);
break;
}
case AchievementPayload achievement: { case AchievementPayload achievement: {
this.Ui.Plugin.Functions.OpenAchievement(achievement.Id); this.Ui.Plugin.Functions.OpenAchievement(achievement.Id);
break; break;
} }
case RawPayload raw: {
if (Equals(raw, ChunkUtil.PeriodicRecruitmentLink)) {
GameFunctions.GameFunctions.OpenPartyFinder();
}
break;
}
} }
} }

5
ChatTwo/Util/ChunkUtil.cs
View File

@ -71,6 +71,11 @@ internal static class ChunkUtil {
if (rawPayload.Data.Length > 1 && rawPayload.Data[1] == 0x13) { if (rawPayload.Data.Length > 1 && rawPayload.Data[1] == 0x13) {
foreground.Pop(); foreground.Pop();
glow.Pop(); glow.Pop();
} else if (rawPayload.Data.Length > 7 && rawPayload.Data[1] == 0x27 && rawPayload.Data[3] == 0x0A) {
// pf payload
var reader = new BinaryReader(new MemoryStream(rawPayload.Data[4..]));
var id = GetInteger(reader);
link = new PartyFinderPayload(id);
} else if (rawPayload.Data.Length > 5 && rawPayload.Data[1] == 0x27 && rawPayload.Data[3] == 0x06) { } else if (rawPayload.Data.Length > 5 && rawPayload.Data[1] == 0x27 && rawPayload.Data[3] == 0x06) {
// achievement payload // achievement payload
var reader = new BinaryReader(new MemoryStream(rawPayload.Data[4..])); var reader = new BinaryReader(new MemoryStream(rawPayload.Data[4..]));