Commit graph

17547 commits

Author SHA1 Message Date
fef
81a12e2c18 delete reaction notifications when deleting status 2023-04-04 15:22:12 -07:00
fef
c31b59012e support reacting with foreign custom emojis 2023-04-04 15:22:12 -07:00
fef
54b6ae4f8a properly disable reactions when not logged in 2023-04-04 15:22:12 -07:00
fef
5c1f1d60c3 serialize custom emoji reactions properly for AP
Akkoma and possibly others expect the `tag` field
in an EmojiReact activity to be an array, not just
a single object, so it's being wrapped into one
now.  I'm not entirely sure whether this is the
idiomatic way of doing it tbh, but it works fine.
2023-04-04 15:22:12 -07:00
fef
0468afdba4 also disable reaction buttons in vanilla flavour 2023-04-04 15:22:12 -07:00
fef
b01c1f4822 disable reaction button when not signed in 2023-04-04 15:22:12 -07:00
fef
6ca3f312b7 fix image for new custom emoji reactions 2023-04-04 15:22:12 -07:00
fef
6a2f9d9597 run i18n-tasks normalize 2023-04-04 15:22:12 -07:00
fef
49324217c3 display external custom emoji reactions properly
Using an emoji map was completely unnecessary in
the first place, because the reaction list from
the API response includes URLs for every custom
emoji anyway.  The reaction list now also contains
a boolean field indicating whether it is an
external custom emoji, which is required because
people should only be able to react with Unicode
emojis and local custom ones, not with custom
emojis from other servers.
2023-04-04 15:22:12 -07:00
fef
728083ab53 handle incoming custom emoji reactions properly 2023-04-04 15:22:12 -07:00
fef
57d9f63bc0 support Undo action for EmojiReaction 2023-04-04 15:22:12 -07:00
fef
751909d348 download remote custom emojis from reactions
Emoji reactions containing custom emojis from
remote instances were assumed to already have
been downloaded and stored in the database.
This might obviously not be the case.
2023-04-04 15:22:12 -07:00
fef
613d247a0a sanitize setting for number of visible reactions
This is kind of a hack, but the lack of
validation for settings unfortunately makes it
necessary.
2023-04-04 15:22:00 -07:00
Jeremy Kescher
d645eb2654 Add reaction limit to instance serializer 2023-04-04 15:21:12 -07:00
fef
77e2cc11ff fix padding on posts without reactions
The margins of the elements above and below the
main reaction list element overlapped before
reactions were added.  Adding display: none to
empty reaction bars restores this exact look.
2023-04-04 15:21:12 -07:00
fef
3a5c456aa8 rename nop handler to handleNoOp
This also adds the comment in action_bar.js to
status_action_bar.js, clarifying that a future
version could improve this code by modifying
EmojiPickerDropdown.
2023-04-04 15:21:12 -07:00
fef
eab49f22c0 cleanup JS imports and other minor stuff 2023-04-04 15:21:11 -07:00
fef
2b43aba58c remove unnecessary parameter 2023-04-04 15:20:34 -07:00
fef
d38c56ab16 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.
2023-04-04 15:20:34 -07:00
fef
df673abeea 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.
2023-04-04 15:20:34 -07:00
fef
3588c37413 remove outdated comments 2023-04-04 15:20:34 -07:00
fef
de4967add7 clean up new imports in vanilla flavour 2023-04-04 15:20:34 -07:00
fef
465404b4b1 rebase with upstream 2023-04-04 15:20:34 -07:00
fef
869bc2f469 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.
2023-04-04 15:20:34 -07:00
fef
92aebbb7f3 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.
2023-04-04 15:18:14 -07:00
fef
dd0b09273a change default reaction limit to 1 2023-04-04 15:18:14 -07:00
fef
5b7514a17f 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.
2023-04-04 15:18:14 -07:00
fef
5ada827029 fix reaction margins and paddings 2023-04-04 15:18:14 -07:00
fef
d249994de8 cleanup frontend emoji reaction code 2023-04-04 15:18:14 -07:00
fef
1b3305c3db cleanup backend emoji reaction code 2023-04-04 15:18:14 -07:00
fef
2d8e3e9b9b fix padding for reaction button 2023-04-04 15:18:14 -07:00
fef
f9b15866af handle misskey reactions properly
misskey federates emoji reactions as likes.
2023-04-04 15:18:14 -07:00
fef
b37da9e59f move react button to action bar 2023-04-04 15:18:14 -07:00
fef
6f49b19f16 cherry-pick emoji reaction changes 2023-04-04 15:18:14 -07:00
fef
f4be9f729a 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.
2023-04-04 15:18:14 -07:00
fef
69662f53be make status reaction count limit configurable 2023-04-04 15:18:13 -07:00
fef
a5784922b5 remove accidentally created file 2023-04-04 15:18:13 -07:00
fef
7f7c635f62 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.
2023-04-04 15:18:13 -07:00
fef
f152cb0e58 show reactions in detailed status view 2023-04-04 15:18:13 -07:00
fef
73c6e0a443 add frontend for emoji reactions
this is still pretty bare bones but hey, it works.
2023-04-04 15:18:13 -07:00
fef
ce8b8d9b78 add backend support for status emoji reactions
turns out we can just reuse the code for
announcement reactions.
2023-04-04 15:18:13 -07:00
Claire
aa08a72654
Merge pull request #2161 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
2023-04-04 13:17:45 +02:00
Rubicon Rowe
69ca6316ec [Glitch] Fix inconsistent radius in drawer
Port fa98363a27 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-04-04 12:51:24 +02:00
Claire
d13ef49b15 Merge branch 'main' into glitch-soc/merge-upstream 2023-04-04 12:45:12 +02:00
Claire
0e919397db
Fix unescaped user input in LDAP query (#24379) 2023-04-04 12:42:38 +02:00
Claire
af01ab7efe
Merge pull request #2159 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
2023-04-04 12:01:52 +02:00
Rubicon Rowe
fa98363a27
Fix inconsistent radius in drawer (#24407) 2023-04-04 11:41:05 +02:00
dependabot[bot]
a8cd1b1238
Bump glob from 9.3.2 to 9.3.4 (#24383)
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-04-04 11:25:25 +02:00
dependabot[bot]
d909aa3c3b
Bump devise from 4.9.0 to 4.9.2 (#24393)
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-04-04 11:09:34 +02:00
dependabot[bot]
dd3e232126
Bump doorkeeper from 5.6.5 to 5.6.6 (#24399)
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-04-04 11:04:56 +02:00