From 367133127f517768d1464f6cf351ff1a504afdf9 Mon Sep 17 00:00:00 2001
From: Kimura Youichi <kim.upsilon@bucyou.net>
Date: Thu, 6 Jun 2024 00:08:48 +0900
Subject: [PATCH] =?utf8?q?TwitterUser.Id=E3=83=97=E3=83=AD=E3=83=91?=
 =?utf8?q?=E3=83=86=E3=82=A3=E3=82=92=E5=89=8A=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 OpenTween.Tests/Api/TwitterApiTest.cs                             | 2 +-
 OpenTween.Tests/Models/TwitterPostFactoryTest.cs                  | 5 +----
 OpenTween.Tests/SocialProtocol/Twitter/TwitterAccountStateTest.cs | 1 -
 OpenTween/Api/DataModel/TwitterUser.cs                            | 4 ----
 OpenTween/Api/GraphQL/TwitterGraphqlUser.cs                       | 1 -
 OpenTween/ListManage.cs                                           | 2 +-
 OpenTween/UserInfo.cs                                             | 5 +++--
 7 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/OpenTween.Tests/Api/TwitterApiTest.cs b/OpenTween.Tests/Api/TwitterApiTest.cs
index c1ac6d7f..2177a36d 100644
--- a/OpenTween.Tests/Api/TwitterApiTest.cs
+++ b/OpenTween.Tests/Api/TwitterApiTest.cs
@@ -1182,7 +1182,7 @@ namespace OpenTween.Api
                 },
                 JsonUtils.SerializeJsonByDataContract(new TwitterUser
                 {
-                    Id = 100L,
+                    IdStr = "100",
                     ScreenName = "opentween",
                 })
             );
diff --git a/OpenTween.Tests/Models/TwitterPostFactoryTest.cs b/OpenTween.Tests/Models/TwitterPostFactoryTest.cs
index 1f2e2e0c..1917033a 100644
--- a/OpenTween.Tests/Models/TwitterPostFactoryTest.cs
+++ b/OpenTween.Tests/Models/TwitterPostFactoryTest.cs
@@ -60,7 +60,6 @@ namespace OpenTween.Models
 
             return new()
             {
-                Id = userId,
                 IdStr = userId.ToString(),
                 ScreenName = "tetete",
                 Name = "ててて",
@@ -211,7 +210,7 @@ namespace OpenTween.Models
 
             var factory = new TwitterPostFactory(this.CreateTabinfo(), settingCommon);
             var status = this.CreateStatus();
-            status.User.Id = 20000L;
+            status.User.IdStr = "20000";
             var post = factory.CreateFromStatus(status, selfUserId: new("20000"), followerIds: EmptyIdSet, firstLoad: false);
 
             Assert.False(post.IsRead); // 未読
@@ -458,7 +457,6 @@ namespace OpenTween.Models
                 IdStr = "1234567890",
                 User = new()
                 {
-                    Id = 1111,
                     IdStr = "1111",
                     ScreenName = "foo",
                 },
@@ -486,7 +484,6 @@ namespace OpenTween.Models
                 IdStr = "1234567890",
                 User = new TwitterUser
                 {
-                    Id = 1111,
                     IdStr = "1111",
                     ScreenName = "foo",
                 },
diff --git a/OpenTween.Tests/SocialProtocol/Twitter/TwitterAccountStateTest.cs b/OpenTween.Tests/SocialProtocol/Twitter/TwitterAccountStateTest.cs
index 3ab0d6d0..f1515067 100644
--- a/OpenTween.Tests/SocialProtocol/Twitter/TwitterAccountStateTest.cs
+++ b/OpenTween.Tests/SocialProtocol/Twitter/TwitterAccountStateTest.cs
@@ -34,7 +34,6 @@ namespace OpenTween.SocialProtocol.Twitter
 
             var twitterUser = new TwitterUser
             {
-                Id = 514241801L,
                 IdStr = "514241801",
                 ScreenName = "OpenTween",
                 StatusesCount = 31,
diff --git a/OpenTween/Api/DataModel/TwitterUser.cs b/OpenTween/Api/DataModel/TwitterUser.cs
index a1597d05..f5dfc1e0 100644
--- a/OpenTween/Api/DataModel/TwitterUser.cs
+++ b/OpenTween/Api/DataModel/TwitterUser.cs
@@ -70,9 +70,6 @@ namespace OpenTween.Api.DataModel
         [DataMember(Name = "friends_count")]
         public int FriendsCount { get; set; }
 
-        [DataMember(Name = "id")]
-        public long Id { get; set; }
-
         [DataMember(Name = "id_str")]
         public string IdStr { get; set; }
 
@@ -120,7 +117,6 @@ namespace OpenTween.Api.DataModel
         {
             return new()
             {
-                Id = 0L,
                 IdStr = "0",
                 ScreenName = "?????",
                 Name = "Unknown User",
diff --git a/OpenTween/Api/GraphQL/TwitterGraphqlUser.cs b/OpenTween/Api/GraphQL/TwitterGraphqlUser.cs
index 22221b64..cc6a506a 100644
--- a/OpenTween/Api/GraphQL/TwitterGraphqlUser.cs
+++ b/OpenTween/Api/GraphQL/TwitterGraphqlUser.cs
@@ -73,7 +73,6 @@ namespace OpenTween.Api.GraphQL
 
             return new()
             {
-                Id = long.Parse(GetText(userElm, "rest_id")),
                 IdStr = GetText(userElm, "rest_id"),
                 Name = GetText(userLegacyElm, "name"),
                 ProfileImageUrlHttps = GetText(userLegacyElm, "profile_image_url_https"),
diff --git a/OpenTween/ListManage.cs b/OpenTween/ListManage.cs
index f3723e6b..7281e5ba 100644
--- a/OpenTween/ListManage.cs
+++ b/OpenTween/ListManage.cs
@@ -341,7 +341,7 @@ namespace OpenTween
             }
         }
 
-        private async Task LoadUserIconAsync(Uri imageUri, long userId)
+        private async Task LoadUserIconAsync(Uri imageUri, PersonId userId)
         {
             var oldImage = this.UserIcon.Image;
             this.UserIcon.Image = null;
diff --git a/OpenTween/UserInfo.cs b/OpenTween/UserInfo.cs
index 69f57d19..4369c4b6 100644
--- a/OpenTween/UserInfo.cs
+++ b/OpenTween/UserInfo.cs
@@ -29,6 +29,7 @@
 using System;
 using System.Net;
 using OpenTween.Api.DataModel;
+using OpenTween.Models;
 
 namespace OpenTween
 {
@@ -40,7 +41,7 @@ namespace OpenTween
 
         public UserInfo(TwitterUser user)
         {
-            this.Id = user.Id;
+            this.Id = new TwitterUserId(user.IdStr);
             this.Name = WebUtility.HtmlDecode(user.Name).Trim();
             this.ScreenName = user.ScreenName;
             this.Location = WebUtility.HtmlDecode(user.Location);
@@ -68,7 +69,7 @@ namespace OpenTween
             }
         }
 
-        public long Id = 0;
+        public PersonId Id = null!;
         public string Name = "";
         public string ScreenName = "";
         public string Location = "";
-- 
2.11.0