Commit graph

16930 commits

Author SHA1 Message Date
fef
5b024455a7
fix up merge errors
See 57b7968504
2022-12-01 23:35:49 +00:00
fef
57b7968504
merge nyastodon-specific changes back in
This was caused by an accidental rebase that i
"fixed" by force-pushing, which caused nyastodon
to be even with glitch-soc/main.  oops.
2022-12-01 23:23:12 +00:00
fef
e27a610ada
cleanup JS imports and other minor stuff 2022-12-01 23:34:42 +01:00
fef
8ca3b6525d
cleanup JS imports and other minor stuff 2022-12-01 22:30:39 +00:00
fef
49b0f93cf6
remove unnecessary parameter 2022-12-01 22:37:30 +01:00
fef
059cc99934
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-01 22:37:30 +01:00
fef
30362cb520
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-01 22:37:29 +01:00
fef
a1dc767f8c
remove outdated comments 2022-12-01 22:37:29 +01:00
fef
09a85f2504
clean up new imports in vanilla flavour 2022-12-01 22:37:29 +01:00
fef
1922a5d92d
backport emoji reactions to vanilla flavour 2022-12-01 22:37:29 +01:00
fef
3f0eca5f4b
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-01 22:37:29 +01:00
fef
b0ae82beb2
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-01 22:37:28 +01:00
fef
7c11bd1df2
change default reaction limit to 1 2022-12-01 22:37:28 +01:00
fef
53c79b8e3a
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-01 22:37:28 +01:00
fef
91ca188f51
fix reaction margins and paddings 2022-12-01 22:37:28 +01:00
fef
eb1ecbd7e8
cleanup frontend emoji reaction code 2022-12-01 22:37:28 +01:00
fef
8503bdf46d
cleanup backend emoji reaction code 2022-12-01 22:37:28 +01:00
fef
58869dee10
fix padding for reaction button 2022-12-01 22:37:28 +01:00
fef
02b61f0080
handle misskey reactions properly
misskey federates emoji reactions as likes.
2022-12-01 22:37:27 +01:00
fef
5fe08b76dd
move react button to action bar 2022-12-01 22:37:27 +01:00
fef
d3ff2b670e
cherry-pick emoji reaction changes 2022-12-01 22:37:27 +01:00
fef
c45431a1b8
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-01 22:37:27 +01:00
fef
ab346f4ba0
make status reaction count limit configurable 2022-12-01 22:37:27 +01:00
fef
d43a993f36
remove accidentally created file 2022-12-01 22:37:27 +01:00
fef
9cc751f5f1
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-01 22:37:27 +01:00
fef
852c57c308
show reactions in detailed status view 2022-12-01 22:37:26 +01:00
fef
fbf8e3d869
add frontend for emoji reactions
this is still pretty bare bones but hey, it works.
2022-12-01 22:37:26 +01:00
fef
493f746150
add backend support for status emoji reactions
turns out we can just reuse the code for
announcement reactions.
2022-12-01 22:37:26 +01:00
Jeremy Kescher
32600375b3
Merge remote-tracking branch 'upstream/main' into develop 2022-12-01 20:57:06 +01:00
Claire
4ac6601476
Port navigation bar from upstream (#1986)
Fixes #1977
2022-12-01 20:06:08 +01:00
Claire
105d9743ae
Merge pull request #1984 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
2022-12-01 11:35:13 +01:00
Claire
fd6f9bf7a7 Merge branch 'main' into glitch-soc/merge-upstream 2022-12-01 11:08:52 +01:00
Nick Schonning
491ab8de89
Fix GitHub form label type (#21833) 2022-12-01 10:49:25 +01:00
Claire
68d1df8bc3
Fix some performance issues with /admin/instances (#21907)
/admin/instances?availability=failing remains wholly unefficient
2022-12-01 10:32:10 +01:00
fef
7a96ae759b
remove unnecessary parameter 2022-12-01 05:26:58 +01:00
fef
58145e775f
bump to nyastodon 1.1.5 2022-12-01 02:58:57 +00:00
fef
ca4df02956
merge catcatnya/main into main 2022-12-01 02:53:26 +00:00
fef
c8ab12a14a
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-01 03:33:21 +01:00
fef
6bc368c6ed
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-01 03:33:21 +01:00
fef
87850197b6
remove outdated comments 2022-12-01 03:33:16 +01:00
fef
1953917c19
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-01 02:24:08 +00:00
fef
d99758ba9a
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-01 01:41:47 +00:00
fef
537bd898a0
remove outdated comments 2022-11-30 19:29:56 +00:00
Jeremy Kescher
495da7d1a8
Merge remote-tracking branch 'upstream/main' into develop 2022-11-30 18:24:52 +01:00
Claire
fc0e11abdb
Merge pull request #1983 from ClearlyClaire/glitch-soc/features/translation
Port “Translate” feature from upstream
2022-11-30 18:12:53 +01:00
fef
8861470b95
clean up new imports in vanilla flavour 2022-11-30 18:11:19 +01:00
fef
46eaff7d62
clean up new imports in vanilla flavour 2022-11-30 17:09:16 +00:00
Jeremy Kescher
bbbf5f1746
Upgrade ruby dependencies 2022-11-30 18:06:14 +01:00
Jeremy Kescher
d23e167d0d
Merge remote-tracking branch 'upstream/main' into develop 2022-11-30 17:56:57 +01:00
fef
57e46f4aaf
merge catstodon/main into main 2022-11-30 16:35:05 +00:00