Commit graph

16734 commits

Author SHA1 Message Date
fef
a9bb743db7
cleanup JS imports and other minor stuff 2022-12-20 18:27:53 +01:00
fef
04467e8f6d
remove unnecessary parameter 2022-12-20 18:27:53 +01:00
fef
a0d7cadcfd
change reaction api to match other interactions
Status reactions had an API similar to that of
announcement reactions, using PUT and DELETE at a
single endpoint.  I believe that for statuses, it
makes more sense to follow the convention of the
other interactions and use separate POST endpoints
for create and destroy respectively.
2022-12-20 18:27:52 +01:00
fef
f4faa1b511
fix reaction deletion bug and clean up controller
Turns out the strange error where it would delete
the wrong reaction occurred because I forgot to
pass the emoji name to the query, which resulted
in the database deleting the first reaction it
found.  Also, this removes the unused set_reaction
callback and includes the Authorization module for
the status reactions controller.
2022-12-20 18:27:52 +01:00
fef
f580ffb127
remove outdated comments 2022-12-20 18:27:52 +01:00
fef
e405eb76f4
clean up new imports in vanilla flavour 2022-12-20 18:27:52 +01:00
fef
7cbe6dc3e8
rebase with upstream 2022-12-20 18:27:51 +01:00
fef
7250a4f6c2
make number of visible reactions a vanilla setting
Reactions will be backported to the vanilla
flavour, which requires all related settings to
be accessible from the vanilla settings page
rather than the glitch specific settings modal.
2022-12-20 18:27:46 +01:00
fef
47d0271957
make number of displayed reactions a setting
This adds an extra item to the local settings for
specifying the number of reactions shown in toots.
The detailed status view always shows all
reactions.
2022-12-20 18:25:43 +01:00
fef
c19e74051c
change default reaction limit to 1 2022-12-20 18:24:21 +01:00
fef
38b8c494b8
limit number of reactions displayed
Too many reactions on a single post quickly get
spammy, so they are now sorted by count and only
the first MAX_REACTIONS number of different
emojis are actually displayed.
2022-12-20 18:24:21 +01:00
fef
21b5bb587d
fix reaction margins and paddings 2022-12-20 18:24:20 +01:00
fef
f129b47f13
cleanup frontend emoji reaction code 2022-12-20 18:24:20 +01:00
fef
89a8c21f80
cleanup backend emoji reaction code 2022-12-20 18:24:20 +01:00
fef
d862d9e06e
fix padding for reaction button 2022-12-20 18:24:20 +01:00
fef
1b3df9b5e8
handle misskey reactions properly
misskey federates emoji reactions as likes.
2022-12-20 18:24:19 +01:00
fef
da78479b93
move react button to action bar 2022-12-20 18:24:19 +01:00
fef
19491d2032
cherry-pick emoji reaction changes 2022-12-20 18:23:55 +01:00
fef
738433e46a
make frontend fetch reaction limit
the maximum number of reactions was previously
hardcoded to 8.  this commit also fixes an
incorrect query in StatusReactionValidator where
it didn't count per-user reactions but the total
amount of different ones.
2022-12-20 18:22:05 +01:00
fef
200dd90a9f
make status reaction count limit configurable 2022-12-20 18:22:05 +01:00
fef
83f0b5f288
remove accidentally created file 2022-12-20 18:22:05 +01:00
fef
cc71e734c4
federate emoji reactions
this is kind of experimental, but it should work
in theory.  at least i tested it with a remove
akkoma instance and it didn't crash.
2022-12-20 18:22:05 +01:00
fef
ff379c7fd0
show reactions in detailed status view 2022-12-20 18:22:04 +01:00
fef
dcea57a808
add frontend for emoji reactions
this is still pretty bare bones but hey, it works.
2022-12-20 18:22:04 +01:00
fef
7facf831e1
add backend support for status emoji reactions
turns out we can just reuse the code for
announcement reactions.
2022-12-20 18:22:04 +01:00
www-cat
ba15694003
Add ukrainian translations (#1959) 2022-12-20 12:47:03 +01:00
Plastikmensch
ee71d42c29
Add missing translation keys (#2010)
* Add missing locale keys

Added missing translation keys to en.js to make translation easier and more complete.

Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>

* Remove translation keys for explore

Have been added to vanilla in #2014

Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>

* Remove unused key

Sorry, originally worked on this on my custom fork, which has this key, before I decided to work on glitch.

Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>

Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
2022-12-20 12:45:53 +01:00
Claire
749c360ba0
Reuse upstream's “Posts and replies” as column heading (#2023)
Upstream does not have a column heading for “Posts and replies”, but the
text itself exists in a similar context, so re-use that translatable
string so that we can use upstream's translations.
2022-12-20 12:37:14 +01:00
Jeremy Kescher
719a0951af
[Glitch] Fix being unable to react with the keycap number sign emoji (#2004)
Port of https://github.com/mastodon/mastodon/pull/22231
2022-12-17 11:34:39 +01:00
Claire
7ca0a71601
Merge pull request #2014 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
2022-12-16 11:50:35 +01:00
Claire
0912fb736d [Glitch] Add follow request banner on account header
Port 70415714f1 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-12-15 21:11:32 +01:00
Holden Foreman
c459625119 [Glitch] Fix language surrounding disability in prompts for alt text and other media descriptions
Port c761e7a5ef to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-12-15 21:07:10 +01:00
Bramus!
1ced365371 [Glitch] Fix media markup
Port 7fbc17afa2 to glitch-soc

Co-authored-by: Effy Elden <effy@effy.space>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-12-15 21:06:29 +01:00
Claire
cdba1ec5f4 [Glitch] Fix being stuck in edit mode when deleting the edited status
Port ebf1d74e40 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-12-15 21:06:00 +01:00
Rens Groothuijsen
d7a6a9393a [Glitch] Display search popout at fixed screen position
Port 726c7dea31 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-12-15 21:05:28 +01:00
Terence Eden
89d3d85cf2 [Glitch] Add transparancy to modal background for accessibility
Port ff414a5489 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-12-15 21:04:20 +01:00
Mina Her
0f5ecb3860 [Glitch] Fix margin for search field on medium window size
Port cedf138313 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-12-15 21:03:14 +01:00
Meisam
7883ba34bb [Glitch] set activation for tag follow button
Port 059d64a59e to glitch-soc

Co-authored-by: meisam <meisam@noreply.codeberg.org>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-12-15 21:00:35 +01:00
Claire
602f18103c [Glitch] Fix the top action bar appearing in multi-column layout
Port 38596e49d4 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-12-15 20:59:59 +01:00
Nick Schonning
57eab6dbee [Glitch] Fix typo in handler function call name
Port 72a8af8088 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-12-15 20:58:48 +01:00
Connor Shea
e76fb9b2c4 [Glitch] Increase the width of the unread notification border.
Port 08c0e43b6f to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-12-15 20:58:22 +01:00
Francis Murillo
b22da94a65 [Glitch] Render current day formats in the client timezone
Port c50e9d078a to glitch-soc

Co-authored-by: Effy Elden <effy@effy.space>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-12-15 20:57:17 +01:00
Yamagishi Kazutoshi
9f3cc9e555 [Glitch] FormattedMessage must be used directly
Port 58200132d0 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-12-15 20:55:42 +01:00
Pleclown
98f7b3657a [Glitch] Adding 12 hours option for polls
Port 3a59ffde8d to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-12-15 20:54:53 +01:00
Alex Stine
aad42cfc35 [Glitch] Fix hidden label causing accessibility issue for search inputs
Port 903e5a3f45 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-12-15 20:54:11 +01:00
Riedler
8cd7b95559 [Glitch] Fix profile avatar being slightly offset into left border
Port c3388f4ab1 to glitch-soc

Co-authored-by: Riedler <riedler@gelse.eu>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-12-15 20:49:15 +01:00
Claire
65cc5cb891 [Glitch] Change dropdown menu to contain “Copy link to post” even for non-public posts
Port fe9eab51d1 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-12-15 20:47:58 +01:00
Claire
1e8aff072a [Glitch] Fix wasteful request to /api/v1/custom_emojis when not logged in
Port 1f762f4271 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-12-15 20:46:21 +01:00
Claire
b70c2e2167 Fix issue with glitch-soc theming 2022-12-15 20:30:46 +01:00
Claire
f3a4d57be1 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `README.md`:
  Discarded upstream changes: we have our own README
- `app/controllers/follower_accounts_controller.rb`:
  Port upstream's minor refactoring
2022-12-15 20:25:25 +01:00