From 9a31b823e82fb3f558dbbae366b2b99255a00d9e Mon Sep 17 00:00:00 2001
From: vivganes <vivek@vivekganesan.com>
Date: Thu, 6 Apr 2023 08:01:40 +0530
Subject: [PATCH 1/2] fix #477

---
 packages/app/src/Element/NoteTime.tsx |  5 +++--
 packages/app/src/Element/Timeline.tsx | 12 ++++++++++++
 packages/app/src/Feed/TimelineFeed.ts |  2 ++
 3 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/packages/app/src/Element/NoteTime.tsx b/packages/app/src/Element/NoteTime.tsx
index 26d1bcba..ff5fa3b3 100644
--- a/packages/app/src/Element/NoteTime.tsx
+++ b/packages/app/src/Element/NoteTime.tsx
@@ -7,11 +7,12 @@ const DayInMs = HourInMs * 24;
 export interface NoteTimeProps {
   from: number;
   fallback?: string;
+  displayAbsoluteTime?: boolean;
 }
 
 export default function NoteTime(props: NoteTimeProps) {
   const [time, setTime] = useState<string>();
-  const { from, fallback } = props;
+  const { from, fallback, displayAbsoluteTime } = props;
   const absoluteTime = new Intl.DateTimeFormat(undefined, {
     dateStyle: "medium",
     timeStyle: "long",
@@ -59,7 +60,7 @@ export default function NoteTime(props: NoteTimeProps) {
 
   return (
     <time dateTime={isoDate} title={absoluteTime}>
-      {time}
+      {displayAbsoluteTime ? absoluteTime : time}
     </time>
   );
 }
diff --git a/packages/app/src/Element/Timeline.tsx b/packages/app/src/Element/Timeline.tsx
index a74c0c5d..402f5175 100644
--- a/packages/app/src/Element/Timeline.tsx
+++ b/packages/app/src/Element/Timeline.tsx
@@ -15,6 +15,8 @@ import NoteReaction from "Element/NoteReaction";
 import useModeration from "Hooks/useModeration";
 import ProfilePreview from "Element/ProfilePreview";
 import Skeleton from "Element/Skeleton";
+import NoteTime from "./NoteTime";
+import Spinner from "Icons/Spinner";
 
 export interface TimelineProps {
   postsOnly: boolean;
@@ -137,6 +139,16 @@ const Timeline = (props: TimelineProps) => {
       )}
       {mainFeed.map(eventElement)}
       <LoadMore onLoadMore={feed.loadMore} shouldLoadMore={!feed.loading}>
+        <div>
+          <Spinner /> Searching for stuff from{" "}
+          <b>
+            <NoteTime from={feed.since * 1000} displayAbsoluteTime />
+          </b>{" "}
+          upto{" "}
+          <b>
+            <NoteTime from={feed.until * 1000} displayAbsoluteTime />
+          </b>
+        </div>
         <Skeleton width="100%" height="120px" margin="0 0 16px 0" />
         <Skeleton width="100%" height="120px" margin="0 0 16px 0" />
         <Skeleton width="100%" height="120px" margin="0 0 16px 0" />
diff --git a/packages/app/src/Feed/TimelineFeed.ts b/packages/app/src/Feed/TimelineFeed.ts
index a8b198f2..b788ec2d 100644
--- a/packages/app/src/Feed/TimelineFeed.ts
+++ b/packages/app/src/Feed/TimelineFeed.ts
@@ -180,6 +180,8 @@ export default function useTimelineFeed(subject: TimelineSubject, options: Timel
     main: main.data,
     related: related.data,
     latest: latest.data,
+    since: since,
+    until: until,
     loading: main.loading(),
     loadMore: () => {
       if (main.data) {
-- 
2.45.2


From 858988b90a10bd8685a0855fba1ee0022f8a6451 Mon Sep 17 00:00:00 2001
From: vivganes <vivek@vivekganesan.com>
Date: Sat, 8 Apr 2023 19:31:17 +0530
Subject: [PATCH 2/2] show searching message only in search/profile page

---
 packages/app/src/Element/Timeline.tsx | 33 +++++++++++++++++++--------
 1 file changed, 23 insertions(+), 10 deletions(-)

diff --git a/packages/app/src/Element/Timeline.tsx b/packages/app/src/Element/Timeline.tsx
index 402f5175..7f61039a 100644
--- a/packages/app/src/Element/Timeline.tsx
+++ b/packages/app/src/Element/Timeline.tsx
@@ -109,6 +109,17 @@ const Timeline = (props: TimelineProps) => {
     }
   }
 
+  function isSearchingMessageShown() {
+    //show in ProfilePage
+    if (props.subject.type === "pubkey" && props.subject.discriminator !== "follows") {
+      return true;
+    }
+    if (props.subject.type === "keyword") {
+      return true;
+    }
+    return false;
+  }
+
   return (
     <div className="main-content">
       {latestFeed.length > 0 && (
@@ -139,16 +150,18 @@ const Timeline = (props: TimelineProps) => {
       )}
       {mainFeed.map(eventElement)}
       <LoadMore onLoadMore={feed.loadMore} shouldLoadMore={!feed.loading}>
-        <div>
-          <Spinner /> Searching for stuff from{" "}
-          <b>
-            <NoteTime from={feed.since * 1000} displayAbsoluteTime />
-          </b>{" "}
-          upto{" "}
-          <b>
-            <NoteTime from={feed.until * 1000} displayAbsoluteTime />
-          </b>
-        </div>
+        {isSearchingMessageShown() && (
+          <div>
+            <Spinner /> <FormattedMessage defaultMessage="Searching for stuff from" />{" "}
+            <b>
+              <NoteTime from={feed.since * 1000} displayAbsoluteTime />
+            </b>{" "}
+            <FormattedMessage defaultMessage="upto" />{" "}
+            <b>
+              <NoteTime from={feed.until * 1000} displayAbsoluteTime />
+            </b>
+          </div>
+        )}
         <Skeleton width="100%" height="120px" margin="0 0 16px 0" />
         <Skeleton width="100%" height="120px" margin="0 0 16px 0" />
         <Skeleton width="100%" height="120px" margin="0 0 16px 0" />
-- 
2.45.2