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.

Sign up for GitHub

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

Jump to bottom

added Nostr feed support #471

Merged
merged 53 commits into from
Jan 4, 2025
Merged

added Nostr feed support #471

merged 53 commits into from
Jan 4, 2025

Conversation

KotlinGeekDev
Copy link
Contributor

@KotlinGeekDev KotlinGeekDev commented Dec 26, 2024 •
edited
Loading

This PR adds support for using the Nostr protocol, specifically the long form content part of the specifications, and to support using Nostr URIs as a way to fetch the feed of a particular author.
The PR also adds support for identifying Nostr URIs in OPML files when importing them.
A demo of how this integration works is shown below:

feeder-demo-pr.mp4

Thank you for your work.

KotlinGeekDev and others added 30 commits December 3, 2024 12:55
@KotlinGeekDev
Add nostr library dependency.
6c44025
@KotlinGeekDev
Add a Nostr URI parsing function.
de76140
@KotlinGeekDev
Add a function for getting author profile information. Rename nreq() …
baf21bc 
…to nreqProfile() to match function's use. Add default relays, and Nostr Client.
@KotlinGeekDev
Use a hack for being able to use Nostr URIs while keeping the URL dep…
573dfd4 
…endency intact.
@KotlinGeekDev
Merge branch 'spacecowboy:master' into nostr-feeds
0c9bd44
@KotlinGeekDev
Merge nreqProfile into getProfileMetadata. Use default relays if user…
c043feb 
… does not have one.
@KotlinGeekDev
Complete the compatibility 'hack' for Nostr URIs, by stripping the bo…
3c7187c 
…lted-on URL.
@KotlinGeekDev
Add function for finding where the author publishes to(the Nostr publ…
215732d 
…ish relays).
@KotlinGeekDev
Introduce fetchArticlesForAuthor(). Only use getUserPublishRelays() i…
913b038 
…f relays are not found from parsing the Nostr URI.
@KotlinGeekDev
Introduce fetchArticlesForAuthor() and AuthorNostrData. Only use getU…
349c976 
…serPublishRelays() if relays are not found from parsing the Nostr URI.
@KotlinGeekDev
Merge remote-tracking branch 'origin/nostr-feeds' into nostr-feeds
ea5906b
@KotlinGeekDev
Add function to fetch Nostr feed and convert it to Feeder internal mo…
ee91977 
…dels. Actually use AuthorNostrData.
@KotlinGeekDev
Wire up everything in the SearchFeedViewModel. Adapt it to take into …
3019dbd 
…account the input being handled.
@KotlinGeekDev
Merge branch 'spacecowboy:master' into nostr-feeds
5aba78f
@KotlinGeekDev
Check for a Nostr URI first(so as to make the integration work correc…
b5a9ea4 
…tly). Fix the if-else in searchForFeeds().
@KotlinGeekDev
Add Nostr URI checks when creating/editing the feed, to make sure a N…
8053a9d 
…ostr feed can be saved.
@KotlinGeekDev
Add Nostr URI checks when creating/editing the feed, to make sure a N…
68c11b2 
…ostr feed can be saved, pt. 2.
@KotlinGeekDev
Re-use code for checking adapted Nostr URIs.
6ef7560
@KotlinGeekDev
Make sure RssLocalSync looks for Nostr feeds when using Nostr-based i…
0e38a5c 
…nput.
@KotlinGeekDev
Reduce timeouts for fetching from relays.
2a3705c
@KotlinGeekDev
Fix incorrect article timestamp issue.
3bf7412
@KotlinGeekDev
Retry with default relays if the ones found don't work. Save only the…
fb03159 
… working relays as well.
@KotlinGeekDev
Add guardrails so as not to use too many relays when fetching for art…
4f04ddb 
…icles. Add a default set of relays for articles.
@KotlinGeekDev
Improve search times by just using the Nostr profile found(may be cha…
554f67e 
…nged).
@KotlinGeekDev
OPML support for Nostr(file imports).
8fcfe33
@KotlinGeekDev
Update Nostr feed URL by default if it conflicts with one already pre…
abeaa80 
…sent in the app.
@KotlinGeekDev
Use default relays when guardrails fail, or when user doesn't have th…
0fa5d89 
…em. Clear all relays for user after fetch.
@KotlinGeekDev
Adjust Nostr URI validity checks, and improve Nostr support for singu…
bf099a6 
…lar links.
@KotlinGeekDev
Add support for parsing and displaying Markdown content.
89d4333
@KotlinGeekDev
Make linter happy.
02557a9
@KotlinGeekDev
Copy link
Contributor Author

Looks very interesting. Thanks for contributing!

I'll take a closer look as soon as I'm back at a proper screen.

Thank you for looking into this. I hope the code will not have many issues for you.

spacecowboy
spacecowboy requested changes Jan 1, 2025
View reviewed changes
Copy link
Owner

@spacecowboy spacecowboy left a comment

Choose a reason for hiding this comment

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

Sorry for the delay. I've added some comments. Gonna build it and try it also

app/build.gradle.kts Outdated Show resolved Hide resolved
app/build.gradle.kts Show resolved Hide resolved
app/src/main/java/com/nononsenseapps/feeder/model/FeedParser.kt Outdated Show resolved Hide resolved
app/src/main/java/com/nononsenseapps/feeder/model/FeedParser.kt Outdated Show resolved Hide resolved
app/src/main/java/com/nononsenseapps/feeder/model/FeedParser.kt Outdated Show resolved Hide resolved
app/src/main/java/com/nononsenseapps/feeder/ui/compose/searchfeed/SearchFeedScreen.kt Outdated Show resolved Hide resolved
app/src/main/java/com/nononsenseapps/feeder/ui/compose/searchfeed/SearchFeedScreen.kt Show resolved Hide resolved
app/src/main/java/com/nononsenseapps/feeder/ui/compose/searchfeed/SearchFeedViewModel.kt Outdated Show resolved Hide resolved
app/src/main/java/com/nononsenseapps/feeder/ui/compose/searchfeed/SearchFeedViewModel.kt Outdated Show resolved Hide resolved
app/src/main/java/com/nononsenseapps/feeder/util/LinkUtils.kt Outdated Show resolved Hide resolved
@KotlinGeekDev
Copy link
Contributor Author

Thanks for the review! Please, I left some comments above about the rationale for some choices in the code.
Perhaps we can find another way to fix them.
Thank you.

@KotlinGeekDev
Copy link
Contributor Author

KotlinGeekDev commented Jan 2, 2025 •
edited
Loading

Also, please @spacecowboy you can try out this OPML file , and this Nostr author's profile as well - nostr:npub1jlrs53pkdfjnts29kveljul2sm0actt6n8dxrrzqcersttvcuv3qdjynqn .

@spacecowboy
Copy link
Owner

I suggest that you do not rename string resources. You'll get constant conflicts with translations

@spacecowboy
Copy link
Owner

and on that theme, don't change the string to url/uri. Regular users have no idea what the difference is

@KotlinGeekDev
Copy link
Contributor Author

and on that theme, don't change the string to url/uri. Regular users have no idea what the difference is

Got it. Let me fix that.

@KotlinGeekDev
Copy link
Contributor Author

Everything is fixed now.

spacecowboy
spacecowboy requested changes Jan 2, 2025
View reviewed changes
Copy link
Owner

@spacecowboy spacecowboy left a comment

Choose a reason for hiding this comment

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

Nice work.

Found some issues in my tests, I've added suggested changes above.

Also two general questions about number of relays used.

app/src/main/java/com/nononsenseapps/feeder/model/FeedParser.kt Show resolved Hide resolved
app/src/main/java/com/nononsenseapps/feeder/model/FeedParser.kt Outdated Show resolved Hide resolved
app/src/main/java/com/nononsenseapps/feeder/model/RssLocalSync.kt Outdated Show resolved Hide resolved
app/src/main/java/com/nononsenseapps/feeder/ui/compose/searchfeed/SearchFeedViewModel.kt Outdated Show resolved Hide resolved
@KotlinGeekDev
Copy link
Contributor Author

Thanks for the review. I answered the questions and made the necessary fixes.

@KotlinGeekDev
Copy link
Contributor Author

Everything is now alright, @spacecowboy .

@spacecowboy
Copy link
Owner

Thank you @KotlinGeekDev . I think it's allright to merge now

@spacecowboy spacecowboy changed the title Nostr feeds support added Nostr feed support Jan 4, 2025
@spacecowboy spacecowboy merged commit 7fae5a3 into spacecowboy:master Jan 4, 2025
2 checks passed
@KotlinGeekDev
Copy link
Contributor Author

Thank you @KotlinGeekDev . I think it's allright to merge now

Thank you @spacecowboy for taking the time to review the PR and merge it,
and thanks for your work on Feeder! 🙏

@KotlinGeekDev KotlinGeekDev deleted the nostr-feeds branch January 4, 2025 13:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@spacecowboy spacecowboy spacecowboy approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@KotlinGeekDev @spacecowboy