Commit graph

20369 commits

Author SHA1 Message Date
fef
7403e91a6e rebase with upstream 2023-05-07 15:05:56 -07:00
fef
573f12ef46 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-05-07 15:05:56 -07:00
fef
c3a18c6fff 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-05-07 15:05:56 -07:00
fef
b6f8093a9d change default reaction limit to 1 2023-05-07 15:05:56 -07:00
fef
78e0e74fa7 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-05-07 15:05:56 -07:00
fef
4951abefb3 fix reaction margins and paddings 2023-05-07 15:05:56 -07:00
fef
299b501db4 cleanup frontend emoji reaction code 2023-05-07 15:05:56 -07:00
fef
98682312e1 cleanup backend emoji reaction code 2023-05-07 15:05:56 -07:00
fef
0ae702a331 fix padding for reaction button 2023-05-07 15:05:56 -07:00
fef
256a07ef40 handle misskey reactions properly
misskey federates emoji reactions as likes.
2023-05-07 15:05:56 -07:00
fef
c96110a037 move react button to action bar 2023-05-07 15:05:56 -07:00
fef
f61c649318 cherry-pick emoji reaction changes 2023-05-07 15:05:56 -07:00
fef
6bd06460f4 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-05-07 15:05:56 -07:00
fef
4f4237c58e make status reaction count limit configurable 2023-05-07 15:05:56 -07:00
fef
6646d36d1b remove accidentally created file 2023-05-07 15:05:56 -07:00
fef
a1685c4a83 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-05-07 15:05:56 -07:00
fef
56cb7ff931 show reactions in detailed status view 2023-05-07 15:05:56 -07:00
fef
671fb4c3ed add frontend for emoji reactions
this is still pretty bare bones but hey, it works.
2023-05-07 15:05:55 -07:00
fef
9fccc8ca76 add backend support for status emoji reactions
turns out we can just reuse the code for
announcement reactions.
2023-05-07 15:05:29 -07:00
Essem
cd71462f92
Merge remote-tracking branch 'neatchee/feat/emoji_reactions' 2023-05-07 15:08:48 -05:00
Essem
708df4cc2a
Merge remote-tracking branch 'upstream/main' 2023-05-07 15:05:29 -05:00
Claire
de74acbe0c
Fix some more Javascript linting issues and discrepancies with upstream (#2209)
* Fix typo in flavours/glitch/features/video/index.js

* Fix various linting issues and discrepancies with upstream
2023-05-07 21:43:25 +02:00
Claire
ed0a407888
Fix thread lines not being properly updated when new posts are received (#2210) 2023-05-07 20:06:10 +02:00
Plastikmensch
179e38cf15
Reset language to default when cancelling a reply (#2114)
When cancelling a reply, the language was still set to the language of the replied to toot.

Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
2023-05-07 18:45:10 +02:00
Claire
3fb7fe14c6
Fix some of the Javascript linting issues, as well as bugs and unneeded divergences with upstream (#2208)
* Run eslint --fix

* Fix linting issues in video player and reduce divergences with upstream

This includes a behavior change of not auto-looping videos anymore. I don't
remember loops being ever intended, and they have been removed from upstream
a while ago, but we somehow missed the change.

* Fix lint issues in `app/javascript/flavours/glitch/selectors/index.js`

Those were basically caused by dead code that isn't present upstream, so
that brings us closer to upstream as well.

* Fix linting issue and bug in streaming/index.js

* Fix linting issues in config/webpack/shared.js

* Fix unused import in flavours/glitch/features/ui/index.js

* Fix linting issues and reduce divergences from upstream in flavours/glitch/features/ui/components/video_modal.jsx

* Fix linting issues in flavours/glitch/reducers

* Fix linting issues in glitch-soc onboarding modal

* Fix linting issues in flavours/glitch/features/ui/components/navigation_panel.jsx

* Remove dead code for unused local setting navbar_under

* Fix various linting issues

* Fix linting issues in flavours/glitch/components/scrollable_list.jsx and reduce divergences with upstream
2023-05-07 18:22:25 +02:00
Claire
9b59748679
Fix rubocop warnings (#2206) 2023-05-07 15:06:15 +02:00
Claire
6f64c79ca4
Fix SCSS linting issues (#2207)
* Disable font-family-no-missing-generic-family-keyword for font-awesome accessibility icons

* Run stylelint --fix

* Avoid `@extend` directives with doodle modal CSS

* Drop use of `@extend` for notification cleanup buttons SCSS

* Run prettier on SCSS
2023-05-07 15:04:59 +02:00
Claire
a6207d243b
New Crowdin updates (#2202)
* New translations en.json (Russian)
[ci skip]

* New translations en.json (Russian)
[ci skip]
2023-05-07 13:37:47 +02:00
neatchee
3fffa8a04b Fix placement of reactions bar for new threading UI 2023-05-07 01:10:49 -07:00
Jeremy Kescher
74184e0359 Fix appearance/show.html.haml 2023-05-07 01:01:49 -07:00
Jeremy Kescher
b06a233ee8 Migrate emoji reactions 2023-05-07 01:01:49 -07:00
neatchee
5ccfbf6ee3 Remove old .js locale files accidentally restored during rebase 2023-05-07 01:01:49 -07:00
Ivan Rodriguez
09c808ae99 Keep emoji picker within screen bounds
Adds the `flip` prop to `<Overlay>`. Fixes #40
2023-05-07 01:01:49 -07:00
neatchee
54a2372897 Fix rebase issues 2023-05-07 01:01:49 -07:00
neatchee
12d95fcebe Per PR suggestion, split name and domain, and look for emoji ID, for unreact, so remote emoji's can be unreacted 2023-05-07 01:01:49 -07:00
fef
4559e8aa33 move emoji reaction strings to locales-glitch 2023-05-07 01:01:49 -07:00
Jeremy Kescher
5328d58a7c Fix status reactions preventing an on_cascade delete 2023-05-07 01:01:49 -07:00
fef
8744bb10a3 bypass reaction limit for foreign accounts 2023-05-07 01:01:49 -07:00
fef
cf7850f0d2 fix 404 when reacting with Keycap Number Sign
The Unicode sequence for this emoji starts with an
ASCII # character, which the browser's URI parser
truncates before sending the request to the
backend.
2023-05-07 01:01:49 -07:00
fef
f55666786b fix status action bar after upstream changes 2023-05-07 01:01:49 -07:00
fef
3fb33bdc7d fix schema after rebase 2023-05-07 01:01:49 -07:00
fef
17c8841513 delete reaction notifications when deleting status 2023-05-07 01:01:49 -07:00
fef
2e2430ad49 support reacting with foreign custom emojis 2023-05-07 01:01:49 -07:00
fef
fffe4af3b7 properly disable reactions when not logged in 2023-05-07 01:01:49 -07:00
fef
f33147e152 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-05-07 01:01:49 -07:00
fef
7ce619b13c also disable reaction buttons in vanilla flavour 2023-05-07 01:01:49 -07:00
fef
8f64167661 disable reaction button when not signed in 2023-05-07 01:01:49 -07:00
fef
ba4984e15d fix image for new custom emoji reactions 2023-05-07 01:01:49 -07:00
fef
705598c780 run i18n-tasks normalize 2023-05-07 01:01:49 -07:00
fef
2568ea1fe1 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-05-07 01:01:49 -07:00