From f3bc187e1c365cd8921b49fde3e943100a1f9b98 Mon Sep 17 00:00:00 2001
From: Kimura Youichi <kim.upsilon@bucyou.net>
Date: Sun, 19 Aug 2018 01:57:07 +0900
Subject: [PATCH] =?utf8?q?userId,=20appId=20=E3=81=AB=E5=AF=BE=E5=BF=9C?=
 =?utf8?q?=E3=81=99=E3=82=8B=E3=82=AA=E3=83=96=E3=82=B8=E3=82=A7=E3=82=AF?=
 =?utf8?q?=E3=83=88=E3=81=8C=E5=AD=98=E5=9C=A8=E3=81=99=E3=82=8B=E3=81=8B?=
 =?utf8?q?=E3=83=81=E3=82=A7=E3=83=83=E3=82=AF=E3=81=99=E3=82=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Fixes: 2c8e0d8f ("/direct_messages/events/list.json によるDMの取得に対応")
---
 OpenTween/Twitter.cs | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/OpenTween/Twitter.cs b/OpenTween/Twitter.cs
index 58c1c8f5..e86b2b55 100644
--- a/OpenTween/Twitter.cs
+++ b/OpenTween/Twitter.cs
@@ -1346,20 +1346,23 @@ namespace OpenTween
                         .ToArray();
 
                     //以下、ユーザー情報
-                    TwitterUser user;
+                    string userId;
                     if (eventItem.MessageCreate.SenderId != this.Api.CurrentUserId.ToString(CultureInfo.InvariantCulture))
                     {
-                        user = users[eventItem.MessageCreate.SenderId];
+                        userId = eventItem.MessageCreate.SenderId;
                         post.IsMe = false;
                         post.IsOwl = true;
                     }
                     else
                     {
-                        user = users[eventItem.MessageCreate.Target.RecipientId];
+                        userId = eventItem.MessageCreate.Target.RecipientId;
                         post.IsMe = true;
                         post.IsOwl = false;
                     }
 
+                    if (!users.TryGetValue(userId, out var user))
+                        continue;
+
                     post.UserId = user.Id;
                     post.ScreenName = user.ScreenName;
                     post.Nickname = user.Name.Trim();
@@ -1378,9 +1381,8 @@ namespace OpenTween
                     post.ImageUrl = string.Intern(post.ImageUrl);
 
                     var appId = eventItem.MessageCreate.SourceAppId;
-                    if (appId != null)
+                    if (appId != null && apps.TryGetValue(appId, out var app))
                     {
-                        var app = apps[appId];
                         post.Source = string.Intern(app.Name);
 
                         try
-- 
2.11.0