Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feature/archive account #4350

Merged
merged 8 commits into from
Aug 30, 2024
Merged

feature/archive account #4350

merged 8 commits into from
Aug 30, 2024

Conversation

sywhb
Copy link
Contributor

@sywhb sywhb commented Aug 29, 2024

  • allow omnivore_admin to delete filters
  • add archived status to user account
  • redirect archived user to /export page when login

Copy link

vercel bot commented Aug 29, 2024

The latest updates on your projects. Learn more about Vercel for Git ↗︎

Name Status Preview Comments Updated (UTC)
omnivore-demo ✅ Ready (Inspect) Visit Preview 💬 Add feedback Aug 30, 2024 7:01am
omnivore-prod ✅ Ready (Inspect) Visit Preview 💬 Add feedback Aug 30, 2024 7:01am

@@ -40,12 +40,11 @@ export const refreshAllFeeds = async (db: DataSource): Promise<boolean> => {
FROM
omnivore.subscriptions s
INNER JOIN
omnivore.user u ON u.id = s.user_id
omnivore.user u ON u.id = s.user_id AND u.status = $4
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Optimized the query a little bit here

@@ -1039,7 +1039,10 @@ export const updateLibraryItemReadingProgress = async (
}

const updatedItem = result[0][0]
await pubsub.entityUpdated<ItemEvent>(EntityType.ITEM, updatedItem, userId)
if (updatedItem.readingProgressBottomPercent === 100) {
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Here I try to reduce the number of PAGE_UPDATE event being sent so we only send the event when the item is fully read or reset to unread

@@ -158,15 +157,16 @@ export async function handleGoogleWebAuth(
}
}

let redirectURL = `${baseURL()}${
user.status === StatusType.Archived ? '/export' : DEFAULT_HOME_PATH
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we change this to /account-archived.

@jacksonh
Copy link
Contributor

Just one small change on the path

@sywhb sywhb merged commit f3e3d57 into main Aug 30, 2024
5 of 7 checks passed
@sywhb sywhb deleted the feature/archive-account branch August 30, 2024 06:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants