Merge pull request #127 from arrow2nd/fix-user-page

fix user page
arrow2nd · Jan 23, 2023 · 696f13f · 696f13f
2 parents 6a12bdc + 6266d60
commit 696f13f
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 ## [Unreleased]
 
+## [v2.2.1] - 2023-01-23
+
+### Fixed
+
+- 存在しないユーザのページを開くと落ちる
+
 ## [v2.2.0] - 2023-01-16
 
 ### Added
@@ -196,7 +202,8 @@
 
 - リリースしました！ 😸
 
-[unreleased]: https://github.com/arrow2nd/nekome/compare/v2.2.0...HEAD
+[unreleased]: https://github.com/arrow2nd/nekome/compare/v2.2.1...HEAD
+[v2.2.1]: https://github.com/arrow2nd/nekome/compare/v2.2.0...v2.2.1
 [v2.2.0]: https://github.com/arrow2nd/nekome/compare/v2.1.0...v2.2.0
 [v2.1.0]: https://github.com/arrow2nd/nekome/compare/v2.0.10...v2.1.0
 [v2.0.10]: https://github.com/arrow2nd/nekome/compare/v2.0.9...v2.0.10

diff --git a/api/user.go b/api/user.go
@@ -40,7 +40,7 @@ func (a *API) FetchUser(userNames []string) ([]*UserDictionary, error) {
 func (a *API) fetchPinnedTweets(raw *twitter.UserRaw) (*twitter.TweetRaw, error) {
 	tweetIDs := []string{}
 	for _, user := range raw.Users {
-		if user.PinnedTweetID != "" {
+		if user != nil && user.PinnedTweetID != "" {
 			tweetIDs = append(tweetIDs, user.PinnedTweetID)
 		}
 	}

diff --git a/app/page_user.go b/app/page_user.go
@@ -141,7 +141,7 @@ func (u *userPage) fetchProfile() error {
 		return err
 	}
 
-	if len(users) == 0 || users[0] == nil {
+	if len(users) == 0 || users[0] == nil || users[0].User == nil {
 		return fmt.Errorf("failed to get user profile: %w", err)
 	}