Kieran
/
snort
5
14
Fork 14
Code Issues 53 Pull Requests 1 Packages Projects Releases 24 Wiki Activity

chore: select any relay for global

This commit is contained in:
Kieran 2023-02-20 17:54:07 +00:00
parent b23b1764e5
commit 5293991072
Signed by: Kieran
GPG Key ID: DE71CEB3925BE941
1 changed files with 33 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
packages/app/src/Pages/Root.tsx
View File

@ -13,6 +13,11 @@ import { TimelineSubject } from "Feed/TimelineFeed";
import messages from "./messages"; import messages from "./messages";
import { debounce } from "Util"; import { debounce } from "Util";
interface RelayOption {
url: string;
paid: boolean;
}
export default function RootPage() { export default function RootPage() {
const { formatMessage } = useIntl(); const { formatMessage } = useIntl();
const { loggedOut, publicKey: pubKey, follows, tags, relays, preferences } = useSelector((s: RootState) => s.login); const { loggedOut, publicKey: pubKey, follows, tags, relays, preferences } = useSelector((s: RootState) => s.login);
@ -40,8 +45,8 @@ export default function RootPage() {
return RootTab.Posts; return RootTab.Posts;
} }
}); });
const [relay, setRelay] = useState<string>(); const [relay, setRelay] = useState<RelayOption>();
const [globalRelays, setGlobalRelays] = useState<string[]>([]); const [globalRelays, setGlobalRelays] = useState<RelayOption[]>([]);
const tagTabs = tags.map((t, idx) => { const tagTabs = tags.map((t, idx) => {
return { text: `#${t}`, value: idx + 3 }; return { text: `#${t}`, value: idx + 3 };
}); });
@ -66,12 +71,14 @@ export default function RootPage() {
useEffect(() => { useEffect(() => {
return debounce(1_000, () => { return debounce(1_000, () => {
const ret: string[] = []; const ret: RelayOption[] = [];
System.Sockets.forEach((v, k) => { System.Sockets.forEach((v, k) => {
if (v.Info?.limitation?.payment_required === true) { ret.push({
ret.push(k); url: k,
} paid: v.Info?.limitation?.payment_required ?? false,
});
}); });
ret.sort(a => (a.paid ? 1 : -1));
if (ret.length > 0 && !relay) { if (ret.length > 0 && !relay) {
setRelay(ret[0]); setRelay(ret[0]);
@ -93,6 +100,8 @@ export default function RootPage() {
return { type: "pubkey", items: follows, discriminator: "follows" }; return { type: "pubkey", items: follows, discriminator: "follows" };
})(); })();
const paidRelays = globalRelays.filter(a => a.paid);
const publicRelays = globalRelays.filter(a => !a.paid);
return ( return (
<> <>
<div className="main-content"> <div className="main-content">
@ -104,12 +113,23 @@ export default function RootPage() {
description="Label for reading global feed from specific relays" description="Label for reading global feed from specific relays"
/> />
&nbsp; &nbsp;
<select onChange={e => setRelay(e.target.value)}> <select onChange={e => setRelay(globalRelays.find(a => a.url === e.target.value))}>
{globalRelays.map(a => ( {paidRelays.length > 0 && (
<option key={a} value={a}> <optgroup label="Paid Relays">
{new URL(a).host} {paidRelays.map(a => (
</option> <option key={a.url} value={a.url}>
))} {new URL(a.url).host}
</option>
))}
</optgroup>
)}
<optgroup label="Public Relays">
{publicRelays.map(a => (
<option key={a.url} value={a.url}>
{new URL(a.url).host}
</option>
))}
</optgroup>
</select> </select>
</div> </div>
)} )}
@ -121,7 +141,7 @@ export default function RootPage() {
postsOnly={tab.value === RootTab.Posts.value} postsOnly={tab.value === RootTab.Posts.value}
method={"TIME_RANGE"} method={"TIME_RANGE"}
window={undefined} window={undefined}
relay={isGlobal ? relay : undefined} relay={isGlobal ? relay?.url : undefined}
/> />
</> </>
); );