nostr/primal-web-app
1
0
Fork 0
mirror of https://github.com/PrimalHQ/primal-web-app.git synced 2024-10-01 17:31:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Check if contact list event actually arrived before continuing with the (un)follow action

Browse Source
This commit is contained in:
Bojan Mojsilovic 2024-03-07 17:54:30 +01:00
parent 5b2db7e85f
commit 59a2d5d166
2 changed files with 51 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
src/contexts/AccountContext.tsx
View File

@ -35,6 +35,9 @@ import EnterPinModal from "../components/EnterPinModal/EnterPinModal";
import CreateAccountModal from "../components/CreateAccountModal/CreateAccountModal";
import LoginModal from "../components/LoginModal/LoginModal";
import { logError, logInfo, logWarning } from "../lib/logger";
import { useToastContext } from "../components/Toaster/Toaster";
import { useIntl } from "@cookbook/solid-intl";
import { account as tAccount } from "../translations";
export type AccountContextStore = {
likes: string[],
@ -129,6 +132,9 @@ export const AccountContext = createContext<AccountContextStore>();
export function AccountProvider(props: { children: JSXElement }) {
const toast = useToastContext();
const intl = useIntl();
let relayAtempts: Record<string, number> = {};
const relayAtemptLimit = 10;
let relaysExplicitlyClosed: string[] = [];
@ -582,6 +588,8 @@ export function AccountProvider(props: { children: JSXElement }) {
updateStore('followInProgress', () => pubkey);
let contactsReceived = false;
let contactData: ContactsData = {
content: '',
created_at: 0,
@ -591,8 +599,14 @@ export function AccountProvider(props: { children: JSXElement }) {
const unsub = subscribeTo(`before_follow_${APP_ID}`, async (type, subId, content) => {
if (type === 'EOSE') {
if (!contactsReceived) {
toast?.sendWarning(intl.formatMessage(tAccount.followFailed))
updateStore('followInProgress', () => '');
unsub();
return;
}
if (!store.following.includes(pubkey)) {
if (!contactData.following.includes(pubkey)) {
const relayInfo = contactData.content;
const date = Math.floor((new Date()).getTime() / 1000);
@ -621,13 +635,14 @@ export function AccountProvider(props: { children: JSXElement }) {
return;
}
if (content &&
content.kind === Kind.Contacts &&
content.created_at &&
content.created_at >= store.followingSince
) {
contactData = extractContacts(content);
// updateContacts(content);
if (type === 'EVENT') {
if (!content || content.kind !== Kind.Contacts) return;
contactsReceived = true;
if (content.created_at && content.created_at >= store.followingSince) {
contactData = extractContacts(content);
}
}
});
@ -642,6 +657,8 @@ export function AccountProvider(props: { children: JSXElement }) {
updateStore('followInProgress', () => pubkey);
let contactsReceived = false;
let contactData: ContactsData = {
content: '',
created_at: 0,
@ -651,7 +668,14 @@ export function AccountProvider(props: { children: JSXElement }) {
const unsub = subscribeTo(`before_unfollow_${APP_ID}`, async (type, subId, content) => {
if (type === 'EOSE') {
if (store.following.includes(pubkey)) {
if (!contactsReceived) {
toast?.sendWarning(intl.formatMessage(tAccount.unfollowFailed))
updateStore('followInProgress', () => '');
unsub();
return;
}
if (contactData.following.includes(pubkey)) {
const relayInfo = contactData.content;
const date = Math.floor((new Date()).getTime() / 1000);
@ -680,13 +704,14 @@ export function AccountProvider(props: { children: JSXElement }) {
return;
}
if (content &&
content.kind === Kind.Contacts &&
content.created_at &&
content.created_at >= store.followingSince
) {
contactData = extractContacts(content);
// updateContacts(content);
if (type === 'EVENT') {
if (!content || content.kind !== Kind.Contacts) return;
contactsReceived = true;
if (content.created_at && content.created_at >= store.followingSince) {
contactData = extractContacts(content);
}
}
});

10
src/translations.ts
View File

@ -34,6 +34,16 @@ export const account = {
defaultMessage: 'unfollow all',
description: 'Unfollow all button label',
},
followFailed: {
id: 'account.followFailed',
defaultMessage: 'Failed to complete the follow possibly due to a network error. Please try again.',
description: 'Feedback to user that the follow action has failed',
},
unfollowFailed: {
id: 'account.unfollowFailed',
defaultMessage: 'Failed to complete the unfollow possibly due to a network error. Please try again.',
description: 'Feedback to user that the unfollow action has failed',
},
needToLogin: {
id: 'account.needToLogin',
defaultMessage: 'You need to be signed in to perform this action',