Display public favorites #390

Open
lamp wants to merge 38 commits from lamp/akkoma-fe:public-favorites into develop
First-time contributor

closes #389

closes #389
Owner

Thanks for porting this! I haven’t looked closely at this yet, but i think the attribution needs to be clearer. Both because attibuting original authors is the nice thing to do and because not doing so can become legally problematic.

iiuc the first commit ports over the two Pleroma PRs linked in the issue and those original commit hashes are mentioned in the commit messages. However, (a) there’s no information about the original author, (b) those commits don’t exists in akkoma-fe and thus can’t be easily looked up and (c) afaiu you’re not the original author of those patches.

If the original commits applied cleanly or only with minor changes. ideally they’d ideally retain the original primary author, possibly with an added Cherry-picked-from: line. (e.g. by exporting from pleroma-fe with git format-patch and then applying to akkoma-fe with git am, or just using git commit --amend --author="...")
If significant changes were needed, it’s probably fine to keep yourself as the primary author, but you should at least add something like this to the commit message:

Based on the below but with many adjustments
necessary to adapt it to akkoma-fe:

Cherry-picked-from: https://git.pleroma.social/pleroma/pleroma-fe/-/commit/6f452d672fe740035cf1d29d03bcda0d39438753
Cherry-picked-from: https://git.pleroma.social/pleroma/pleroma-fe/-/commit/1ceffb4e713b4b20d70121fba92d2b50f2d3cadf

Co-authored-by: marcin mikołajczak <git@mkljczk.pl>
Thanks for porting this! I haven’t looked closely at this yet, but i think the attribution needs to be clearer. Both because attibuting original authors is the nice thing to do and because not doing so can become legally problematic. iiuc the first commit ports over the two Pleroma PRs linked in the issue and those original commit hashes are mentioned in the commit messages. However, (a) there’s no information about the original author, (b) those commits don’t exists in akkoma-fe and thus can’t be easily looked up and (c) afaiu you’re not the original author of those patches. If the original commits applied cleanly or only with minor changes. ideally they’d ideally retain the original primary author, possibly with an added `Cherry-picked-from:` line. *(e.g. by exporting from pleroma-fe with `git format-patch` and then applying to akkoma-fe with `git am`, or just using `git commit --amend --author="..."`)* If significant changes were needed, it’s probably fine to keep yourself as the primary author, but you should at least add something like this to the commit message: ``` Based on the below but with many adjustments necessary to adapt it to akkoma-fe: Cherry-picked-from: https://git.pleroma.social/pleroma/pleroma-fe/-/commit/6f452d672fe740035cf1d29d03bcda0d39438753 Cherry-picked-from: https://git.pleroma.social/pleroma/pleroma-fe/-/commit/1ceffb4e713b4b20d70121fba92d2b50f2d3cadf Co-authored-by: marcin mikołajczak <git@mkljczk.pl> ```
lamp force-pushed public-favorites from 893ce69a1b
All checks were successful
ci/woodpecker/pr/woodpecker Pipeline was successful
to 4d91a7b2c3
All checks were successful
ci/woodpecker/pr/woodpecker Pipeline was successful
2024-05-07 00:55:46 +00:00
Compare
Author
First-time contributor

ok i

ok i
Oneric left a comment
Owner

The basics seem good to me except for one change to potentially clean things up a bit

The basics seem good to me except for one change to potentially clean things up a bit
@ -117,2 +120,2 @@
// only we can see our own favourites
if (this.isUs) timelineTabMap['favorites'] = 'favorites'
if (this.favoritesTabVisible) timelineTabMap['favorites'] = 'favorites'
Owner

provided it works well with user_profile.vue (not sure tbh; frontend stuff isn’t my strong suit), it would imho be cleaner to properly distinguish one’s own favourites from publicly accessible favourites here and get rid off the userId checks and mangling in the other parts, i.e.:

-      // only we can see our own favourites
       if (this.isUs) timelineTabMap['favorites'] = 'favorites'
+      else if(this.favoritesTabVisible) timelineTabMap['favorites'] = 'publicFavorites'
provided it works well with `user_profile.vue` *(not sure tbh; frontend stuff isn’t my strong suit)*, it would imho be cleaner to properly distinguish one’s own favourites from publicly accessible favourites here and get rid off the `userId` checks and mangling in the other parts, i.e.: ```diff - // only we can see our own favourites if (this.isUs) timelineTabMap['favorites'] = 'favorites' + else if(this.favoritesTabVisible) timelineTabMap['favorites'] = 'publicFavorites' ```
Author
First-time contributor

i tried this but weird stuff happened

i tried this but weird stuff happened
Owner

oh also, can you add: Fixes: https://akkoma.dev/AkkomaGang/akkoma-fe/issues/389 as the last line of the commit message? This way the issue will be closed automatically (just mentioning it in the PR comment doesn't actually to work ime)

oh also, can you add: `Fixes: https://akkoma.dev/AkkomaGang/akkoma-fe/issues/389` as the last line of the commit message? This way the issue will be closed automatically (just mentioning it in the PR comment doesn't actually to work ime)
lamp added 37 commits 2025-10-14 21:46:21 +00:00
Merge pull request 'port MFM link into stable docs' (#38) from develop into stable
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
d03872d598
Reviewed-on: AkkomaGang/pleroma-fe#38
Merge pull request 'stable release' (#130) from develop into stable
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
5972d89117
Reviewed-on: AkkomaGang/pleroma-fe#130
Merge pull request '2022.09 stable' (#160) from develop into stable
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
d7499a1f91
Reviewed-on: AkkomaGang/pleroma-fe#160
Merge pull request '2022.10 stable' (#177) from develop into stable
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
c8c8d40827
Reviewed-on: AkkomaGang/pleroma-fe#177
Merge pull request '2022.11 stable release' (#202) from develop into stable
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
975f04bf5a
Reviewed-on: AkkomaGang/pleroma-fe#202
Merge pull request 'hotfix: translation' (#207) from develop into stable
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
80a519d7e4
Reviewed-on: AkkomaGang/pleroma-fe#207
Merge pull request 'hotfix: mfm mysteries' (#215) from develop into stable
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
2c9b73646c
Reviewed-on: AkkomaGang/pleroma-fe#215
Merge branch 'develop' into stable
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
9c9b4cc07c
Merge branch 'develop' into stable
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
8569b5946e
Merge branch 'develop' into stable
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
ci/woodpecker/tag/woodpecker Pipeline was successful
85abc62213
Merge branch 'develop' into stable
All checks were successful
ci/woodpecker/tag/woodpecker Pipeline was successful
ci/woodpecker/push/woodpecker Pipeline was successful
9aa64d82c9
Merge branch 'develop' into stable
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
e530c2b462
Merge branch 'develop' into stable
Some checks failed
ci/woodpecker/tag/woodpecker Pipeline was successful
ci/woodpecker/push/woodpecker Pipeline failed
5106fcedd6
Merge branch 'develop' into stable
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
e7a558a533
Currently translated at 71.9% (753 of 1046 strings)

Co-authored-by: Aldiantoro Nugroho <kriwil@gmail.com>
Co-authored-by: Weblate <noreply@weblate.org>
Translate-URL: http://translate.akkoma.dev/projects/akkoma/pleroma-fe/id/
Translation: Pleroma fe/pleroma-fe
Currently translated at 93.9% (983 of 1046 strings)

Translated using Weblate (Spanish)

Currently translated at 92.5% (967 of 1045 strings)

Co-authored-by: Weblate <noreply@weblate.org>
Co-authored-by: taretka <info@tarteka.net>
Translate-URL: http://translate.akkoma.dev/projects/akkoma/pleroma-fe/es/
Translation: Pleroma fe/pleroma-fe
Currently translated at 80.4% (841 of 1045 strings)

Translated using Weblate (Italian)

Currently translated at 65.3% (683 of 1045 strings)

Co-authored-by: Cuche <cuche@mailbox.org>
Co-authored-by: Weblate <noreply@weblate.org>
Translate-URL: http://translate.akkoma.dev/projects/akkoma/pleroma-fe/it/
Translation: Pleroma fe/pleroma-fe
Currently translated at 72.3% (757 of 1046 strings)

Co-authored-by: Weblate <noreply@weblate.org>
Co-authored-by: kazari <6c577a54-aac9-482a-955e-745c858445e3@simplelogin.com>
Translate-URL: http://translate.akkoma.dev/projects/akkoma/pleroma-fe/ja_EASY/
Translation: Pleroma fe/pleroma-fe
Currently translated at 100.0% (1046 of 1046 strings)

Translated using Weblate (Polish)

Currently translated at 100.0% (1046 of 1046 strings)

Co-authored-by: Weblate <noreply@weblate.org>
Co-authored-by: subtype <subtype@hollow.capital>
Translate-URL: http://translate.akkoma.dev/projects/akkoma/pleroma-fe/pl/
Translation: Pleroma fe/pleroma-fe
Currently translated at 68.7% (719 of 1046 strings)

Co-authored-by: Mel <hi@mel.gg>
Co-authored-by: Weblate <noreply@weblate.org>
Translate-URL: http://translate.akkoma.dev/projects/akkoma/pleroma-fe/ru/
Translation: Pleroma fe/pleroma-fe
Translated using Weblate (Chinese (Simplified))

Currently translated at 100.0% (1046 of 1046 strings)

Co-authored-by: Poesty Li <poesty7450@gmail.com>
Co-authored-by: Weblate <noreply@weblate.org>
Translate-URL: http://translate.akkoma.dev/projects/akkoma/pleroma-fe/zh_Hans/
Translation: Pleroma fe/pleroma-fe
Currently translated at 15.9% (167 of 1046 strings)

Co-authored-by: Weblate <noreply@weblate.org>
Co-authored-by: getimiskon <getimiskon@disroot.org>
Translate-URL: http://translate.akkoma.dev/projects/akkoma/pleroma-fe/el/
Translation: Pleroma fe/pleroma-fe
Currently translated at 0.2% (3 of 1046 strings)

Added translation using Weblate (Japanese)

Co-authored-by: Nakaya <s_fpfb_sub-second@yahoo.co.jp>
Co-authored-by: Weblate <noreply@weblate.org>
Translate-URL: http://translate.akkoma.dev/projects/akkoma/pleroma-fe/ja/
Translation: Pleroma fe/pleroma-fe
Translated using Weblate (Vietnamese)
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
4e7d5d3a08
Currently translated at 92.2% (965 of 1046 strings)

Translated using Weblate (Vietnamese)

Currently translated at 92.2% (965 of 1046 strings)

Translated using Weblate (Vietnamese)

Currently translated at 84.3% (882 of 1046 strings)

Translated using Weblate (Vietnamese)

Currently translated at 84.3% (882 of 1046 strings)

Translated using Weblate (Vietnamese)

Currently translated at 79.8% (835 of 1046 strings)

Translated using Weblate (Vietnamese)

Currently translated at 79.8% (835 of 1046 strings)

Co-authored-by: Nguyễn Gia Phong <cnx@loang.net>
Co-authored-by: Weblate <noreply@weblate.org>
Co-authored-by: xarvos <huyngo@disroot.org>
Translate-URL: http://translate.akkoma.dev/projects/akkoma/pleroma-fe/vi/
Translation: Pleroma fe/pleroma-fe
Merge branch 'origin/develop' into Weblate.
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
e292af4211
Merge branch 'origin/develop' into Weblate.
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
0925763267
Merge branch 'origin/develop' into Weblate.
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
d610a46c32
Merge branch 'develop' into stable
All checks were successful
ci/woodpecker/tag/woodpecker Pipeline was successful
ci/woodpecker/push/woodpecker Pipeline was successful
7cc6c35654
Merge branch 'develop' into stable
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
ci/woodpecker/tag/woodpecker Pipeline was successful
cb63cc38c1
Merge branch 'develop' into stable
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
ci/woodpecker/tag/woodpecker Pipeline was successful
578ef52df6
Merge branch 'develop' into stable
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
cfbf3ecb6d
Merge branch 'develop' into stable
Some checks failed
ci/woodpecker/push/woodpecker Pipeline failed
d6e8d785c8
Merge branch 'develop' into stable
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
9f8eba3464
Merge branch 'develop' into stable
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
52b27396b9
Merge remote-tracking branch 'upstream/stable' into public-favorites
Some checks are pending
ci/woodpecker/pr/woodpecker Pipeline is pending approval
589d8ea29f
Author
First-time contributor

I merged the update. Now I can't figure out why are the public favorites being sorted?

// Keep the visible statuses sorted
if (timeline && !(['bookmarks', 'favorites'].includes(timeline))) {
sortTimeline(timelineObject)
}

timeline should be 'favorites' regardless. but it is only not sorting when I'm logged in.

I merged the update. Now I can't figure out why are the public favorites being sorted? https://akkoma.dev/lamp/akkoma-fe/src/commit/589d8ea29fa86c875a1550244dc8a347c28abde7/src/modules/statuses.js#L316-L319 timeline should be 'favorites' regardless. but it is only not sorting when I'm logged in.
Owner

Your own favs are paginated by like ids (≈date of liking the post); most other timelines are sorted by post id (≈date of post (or when it was fetched for remote posts)). Resorting own favs by id of the posts destroys the intended order and causes judder as new entries are added at various different places

Your own favs are paginated by like ids (≈date of liking the post); most other timelines are sorted by post id (≈date of post (or when it was fetched for remote posts)). Resorting own favs by id of the posts destroys the intended order and causes judder as new entries are added at various different places
Author
First-time contributor

ohh it's the backend serving them like this. frontend is not sorting them like it's supposed not to.

So the favorites from /api/v1/pleroma/accounts/:id/favourites are ordered by post date while from /api/v1/favourites are ordered by favourite date. ugh. so this is pleroma issue..

ohh it's the backend serving them like this. frontend is not sorting them like it's supposed not to. So the favorites from /api/v1/pleroma/accounts/:id/favourites are ordered by post date while from /api/v1/favourites are ordered by favourite date. ugh. so this is pleroma issue..
Oneric changed title from Fix public favorites to Display public favorites 2025-10-26 13:02:30 +00:00
Some checks are pending
ci/woodpecker/pr/woodpecker Pipeline is pending approval
This pull request can be merged automatically.
This branch is out-of-date with the base branch
You are not authorized to merge this pull request.
View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u public-favorites:lamp-public-favorites
git switch lamp-public-favorites
Sign in to join this conversation.
No description provided.