Support for Bubble timeline on Akkoma and Chuckya#858
Support for Bubble timeline on Akkoma and Chuckya#858Steffo99 wants to merge 12 commits intocheeaun:mainfrom
Conversation
Steffo99
changed the title
Steffo99
changed the title
|
Figured out how to add it to the shortcut menu, but I'm struggling to understand how to add a new input type to the shortcut settings (the For now I've set its type to More screenshots!
|
Steffo99
force-pushed
the
feature/akkoma-bubble
branch
from
3727666 to
ae9330a
Compare
Steffo99
changed the title
|
This works everywhere now, and even has a proper dropdown:
I think I also stumbled upon a bug in the import of shortcuts, which I think I fixed in 369935f. |
|
CCing @TheEssem, who might (or might not) be interested in this implementation, as author of TheEssem/mastodon@07ff6d0 |
|
I think I managed to fix the merge conflicts on my fork without botching anything, so I have this running on my instance. If there's anything in particular you want another pair of eyes on, let me know. |
|
This is perhaps a dumb question, and I swear I've searched, but what's the best way to deal with merge conflicts on the default PO file at src/locals/en.po? When I first merged this branch I just manually looked for the strings in question as a way to learn how the code worked, but that's impractical. When watching the build output after merging with the current release, I saw messages from lingui extract. Should I be running |
I think just running a build should be enough for the relevant files to be replaced, although I never really explored how the localization system works, so perhaps @cheeaun might be able to provide a better answer :) |
|
Thank you so much! Is it implemented? |
Steffo99
force-pushed
the
feature/akkoma-bubble
branch
2 times, most recently
from
382d200 to
7c81ba1
Compare
|
@Steffo99 this has been a while 😮💨. Would be useful to see some screenshots of this working 😁 |
I'm not sure why I did that back then.
Steffo99
force-pushed
the
feature/akkoma-bubble
branch
from
af86bb9 to
7d9c1e8
Compare
|
A few more screenshots! 
|
| // TODO: this switches depending on our current instance, and not the instance we're viewing | ||
| let endpoint; | ||
| if(supports('@akkoma/bubble-timeline')) { | ||
| endpoint = masto.v1.timelines.bubble | ||
| } | ||
| else { | ||
| endpoint = masto.v1.timelines.public | ||
| } | ||
|
|
||
| const publicIterator = useRef(); | ||
| async function fetchPublic(firstLoad) { | ||
| if (firstLoad || !publicIterator.current) { | ||
|
|
||
| // TODO: same as above for Pixelfed here | ||
| const opts = { | ||
| limit: LIMIT, | ||
| local: isLocal || undefined, | ||
| local: variant === 'local' || undefined, | ||
| bubble: variant === 'bubble' || undefined, | ||
| remote: variant === 'federated' && supports('@pixelfed/global-feed') || undefined, | ||
| }; | ||
| if (!isLocal && supports('@pixelfed/global-feed')) { | ||
| opts.remote = true; | ||
| } |
There was a problem hiding this comment.
Do we have a way to check supports for the instance we're viewing, instead of the one we're logged in to?
This breaks from Mastodon to Pixelfed or between Akkoma and anything else...
4 participants
Closes #601.
Still very work in progress, but wanted to share it in the meantime!
Screenshot
Not really necessary, but all pull requests look nicer with images!