Merge branch 'dev': hide Velvet on the Chinese game version

# Conflicts:
#	repo.json

Author: XeldarAlz

Directory.Build.props

@@ -6,7 +6,7 @@
   -->
 
   <PropertyGroup Label="Identity">
-    <Version>1.0.0.1</Version>
+    <Version>1.0.0.2</Version>
     <Authors>XeldarAlz</Authors>
     <Copyright>Copyright (c) XeldarAlz</Copyright>
     <PackageProjectUrl>https://github.com/XeldarAlz/FFXIV-Aetherphone</PackageProjectUrl>

README.md

@@ -68,7 +68,7 @@ https://raw.githubusercontent.com/XeldarAlz/DalamudPlugins/main/repo.json
 
 Tick **Enabled**, click **+**, then **Save and Close**. Open `/xlplugins` → **All Plugins**, search for **Aetherphone**, and install.
 
-Playing the Chinese game version? The phone detects it, hides the apps that can't work there (Music, AetherStream, News), and signs you in through your Rising Stones (石之家) profile instead of the Lodestone.
+Playing the Chinese game version? The phone detects it, hides the apps that are unavailable there (Music, AetherStream, News, Velvet), and signs you in through your Rising Stones (石之家) profile instead of the Lodestone.
 
 ## Commands
 

repo.json

@@ -3,8 +3,8 @@
     "Author": "XeldarAlz",
     "Name": "Aetherphone",
     "InternalName": "Aetherphone",
-    "AssemblyVersion": "1.0.0.1",
-    "TestingAssemblyVersion": "1.0.0.1",
+    "AssemblyVersion": "1.0.0.2",
+    "TestingAssemblyVersion": "1.0.0.2",
     "Description": "An in-game smartphone that puts everything you do into a single window: one device, endless things to do.",
     "Punchline": "A smartphone, built for you.",
     "RepoUrl": "https://github.com/XeldarAlz/FFXIV-Aetherphone",

src/Aetherphone/Apps/Velvet/VelvetShell.cs

@@ -222,8 +222,9 @@ public void Draw(in PhoneContext context)
             TourHolds.Hold(Id);
             store.EnsureMe();
             TickHeartbeat();
+            var reason = store.RegionBlocked ? L.Velvet.UnavailableRegionBody : L.Velvet.UnavailableBody;
             EmptyState.Draw(context.Content, ui, FontAwesomeIcon.Ban, Loc.T(L.Velvet.UnavailableTitle),
-                Loc.T(L.Velvet.UnavailableBody));
+                Loc.T(reason));
             return;
         }
 

src/Aetherphone/Apps/Velvet/VelvetStore.cs

@@ -4,6 +4,7 @@
 using Aetherphone.Core.Aethernet.Contracts;
 using Aetherphone.Core.Crypto;
 using Aetherphone.Core.Home;
+using Aetherphone.Core.Localization;
 using Aetherphone.Core.Media;
 using Aetherphone.Core.Message;
 using Aetherphone.Core.Net;
@@ -33,6 +34,7 @@ internal sealed class VelvetStore : ChatThreadStoreBase<VelvetMessageDto, Velvet
     private volatile VelvetProfileDto? me;
     private volatile bool loadingMe;
     private volatile bool accessBlocked;
+    private volatile bool regionBlocked;
     private volatile bool avatarBusy;
     private volatile AvatarUploadOutcome avatarFailure = AvatarUploadOutcome.Unreachable;
     private volatile bool introBusy;
@@ -161,6 +163,7 @@ private void OnVelvetPinged()
 
     public VelvetProfileDto? Me => me;
     public bool AccessBlocked => accessBlocked;
+    public bool RegionBlocked => regionBlocked;
     public bool HasProfile => me is not null;
     public bool AvatarBusy => avatarBusy;
 
@@ -252,6 +255,7 @@ protected override void OnAccountSwitched()
         discoverEpoch++;
         me = null;
         accessBlocked = false;
+        regionBlocked = false;
         meGate.Reset();
         discoverResults = Array.Empty<VelvetProfileDto>();
 
@@ -526,7 +530,9 @@ public void EnsureMe()
         work.Run("profile load", async token =>
         {
             var status = 0;
-            var profile = await client.MeAsync(token, code => status = code).ConfigureAwait(false);
+            var refusal = AepFailure.None;
+            var profile = await client.MeAsync(token, code => status = code, failure => refusal = failure)
+                .ConfigureAwait(false);
             if (epoch != accountEpoch)
             {
                 return;
@@ -536,10 +542,12 @@ public void EnsureMe()
             {
                 me = profile;
                 accessBlocked = false;
+                regionBlocked = false;
             }
             else if (status == 403)
             {
                 accessBlocked = true;
+                regionBlocked = refusal.Code == FailureCodes.VelvetRegionBlocked;
             }
         }, () => loadingMe = false);
     }

src/Aetherphone/Core/Aethernet/AppAvailability.cs

@@ -10,7 +10,7 @@ internal sealed class AppAvailability : IDisposable
 
     private static readonly string[] AlwaysAvailable = { "appstore", "settings", "announcements" };
     private static readonly string[] HiddenUntilLaunched = { "muster", "coin", "casino" };
-    private static readonly string[] UnavailableInChina = { "music", "aetherstream", "news" };
+    private static readonly string[] UnavailableInChina = { "music", "aetherstream", "news", "velvet" };
 
     private static AppAvailability? current;
 

src/Aetherphone/Core/Changelog/ChangelogData.cs

@@ -6,6 +6,7 @@ internal static class ChangelogData
 {
     public static readonly IReadOnlyList<ChangelogEntry> Entries = new[]
     {
+        new ChangelogEntry("1.0.0.2", "2026-08-17", L.Changelog.Release1002),
         new ChangelogEntry("1.0.0.1", "2026-08-17", L.Changelog.Release1001),
         new ChangelogEntry("1.0.0.0", "2026-08-16", L.Changelog.Release1000),
         new ChangelogEntry("0.9.9.9", "2026-08-07", L.Changelog.Release0999),

src/Aetherphone/Core/Localization/FailureText.cs

@@ -84,6 +84,7 @@ internal static class FailureCodes
     public const string PhotoTagRejected = "photo_tag_rejected";
     public const string VelvetRequestsClosed = "velvet_requests_closed";
     public const string VelvetRequestsMutualsOnly = "velvet_requests_mutuals_only";
+    public const string VelvetRegionBlocked = "velvet_region_blocked";
     public const string PatreonLinkExpired = "patreon_link_expired";
     public const string PatreonUnavailable = "patreon_unavailable";
     public const string PatreonAlreadyLinked = "patreon_already_linked";

src/Aetherphone/Core/Localization/L.cs

@@ -1338,6 +1338,11 @@ internal static class Settings
 
     internal static class Changelog
     {
+        public static readonly LocString[] Release1002 =
+        {
+            new("changelog.r1002.0", "A few changes specific to the Chinese game version"),
+        };
+
         public static readonly LocString[] Release1001 =
         {
             new("changelog.r1001.0",
@@ -3207,6 +3212,8 @@ internal static class Velvet
         public static readonly LocString UnavailableTitle = new("velvet.unavailableTitle", "Velvet is unavailable");
         public static readonly LocString UnavailableBody = new("velvet.unavailableBody",
             "Velvet is an adults only space and is not available on Lalafell characters. If you recently changed your race, this clears once the Lodestone reflects it.");
+        public static readonly LocString UnavailableRegionBody = new("velvet.unavailableRegionBody",
+            "Velvet is not available on the Chinese game version. Everything else on your phone works as normal.");
         public static readonly LocString DiscoveryHeader = new("velvet.discoveryHeader", "Discovery");
         public static readonly LocString DiscoverableHelp =
             new("velvet.discoverableHelp", "When on, your profile can be found by others in Discover.");

src/Aetherphone/Localization/de.json

@@ -2128,6 +2128,7 @@
   "velvet.discoverableHelp": "Wenn aktiv, können andere dein Profil in Entdecken finden.",
   "velvet.unavailableTitle": "Velvet ist nicht verfügbar",
   "velvet.unavailableBody": "Velvet ist ein Bereich nur für Erwachsene und auf Lalafell-Charakteren nicht verfügbar. Wenn du kürzlich dein Volk geändert hast, verschwindet dies, sobald der Lodestone es übernimmt.",
+  "velvet.unavailableRegionBody": "Velvet ist auf der chinesischen Spielversion nicht verfügbar. Alles andere auf deinem Telefon funktioniert wie gewohnt.",
   "velvet.whoCanMessage": "Wer dir schreiben darf",
   "velvet.whoEveryone": "Alle",
   "velvet.whoFriends": "Freunde",
@@ -4404,6 +4405,7 @@
   "coin.rollupMore": "und {0} weitere",
   "coin.settingsRow": "Aether Coin",
   "coin.aboutWhat": "Ein kleines Dankeschön fürs Benutzen des Handys: einchecken, spielen, reden und in Optik investieren.",
+  "changelog.r1002.0": "Einige Änderungen speziell für die chinesische Spielversion",
   "changelog.r1001.0": "Behoben, dass das Telefon nach einem Update bei manchen nicht mehr lud: Wenn AetherStream sich nicht an die Anzeige des Spiels hängen kann, startet das Telefon jetzt normal, statt alles mit sich zu reißen",
   "changelog.r1001.1": "Eine fehlende Schriftdatei lässt das Telefon nicht mehr ohne Text zurück: Bis die Datei wieder da ist, greift das Telefon auf die Schrift des Spiels zurück",
   "changelog.r1000.68": "Gamba hinzugefügt, eine neue Spielgeld-Casino-App: An der Kasse werden Coins zu Chips, und das ganze Haus spielt damit, von Blackjack an gemeinsamen Tischen über Live-Bingoräume, ein gemeinsames Rad, Spielautomaten, Rubbellose und eine Schicht hinter der Bar bis zum kostenlosen täglichen Dreh; jede Runde ist nachweisbar fair, der Verlauf hält jeden Einsatz und jede Auszahlung fest, Verlustlimits setzen das Haus wie du selbst, und echtes Geld ist nirgends im Spiel",