diff --git a/lib/shared/thread-utils.js b/lib/shared/thread-utils.js
--- a/lib/shared/thread-utils.js
+++ b/lib/shared/thread-utils.js
@@ -946,6 +946,26 @@
   rawThreadInfo: RawThreadInfo,
   viewerID: ?string,
   userInfos: UserInfos,
+): ThreadInfo {
+  const currentUser = getMinimallyEncodedCurrentUser(
+    rawThreadInfo,
+    null,
+    viewerID,
+    userInfos,
+  );
+  return baseThreadInfoFromRawThreadInfo(
+    rawThreadInfo,
+    viewerID,
+    userInfos,
+    currentUser,
+  );
+}
+
+function baseThreadInfoFromRawThreadInfo(
+  rawThreadInfo: RawThreadInfo,
+  viewerID: ?string,
+  userInfos: UserInfos,
+  currentUser: ThreadCurrentUserInfo,
 ): ThreadInfo {
   let threadInfo: ThreadInfo = {
     minimallyEncoded: true,
@@ -961,12 +981,7 @@
     community: rawThreadInfo.community,
     members: getRelativeMemberInfos(rawThreadInfo, viewerID, userInfos),
     roles: rawThreadInfo.roles,
-    currentUser: getMinimallyEncodedCurrentUser(
-      rawThreadInfo,
-      null,
-      viewerID,
-      userInfos,
-    ),
+    currentUser,
     repliesCount: rawThreadInfo.repliesCount,
   };