6,321 commits

Author	SHA1	Message	Date
Essem	1b3c8e3f05	Merge remote-tracking branch 'upstream/main'	2023-05-18 13:24:54 -05:00
Claire	058898802a	Fix AvatarComposite and DisplayName referencing undefined props (#2222)	2023-05-17 23:24:27 +02:00
Essem	2cf4b3a95b	Merge remote-tracking branch 'catstodon/feature/emoji_reactions'	2023-05-09 22:37:07 -05:00
Jeremy Kescher	c50ccdf69d	eslint fix	2023-05-10 00:11:26 +02:00
Jeremy Kescher	63e9572b94	Remove further leftover makeCustomEmojiMap references	2023-05-10 00:05:39 +02:00
Claire	f371464639	Remove our copy of image.d.ts as tsconfig already uses upstream's	2023-05-10 00:00:28 +02:00
Claire	96e99e2170	Run prettier on Typescript files ... Port 51b83ed195 to glitch-soc	2023-05-09 23:41:18 +02:00
Jeremy Kescher	f3c8de9379	Removed unused imports in status_container.js	2023-05-09 23:37:40 +02:00
Claire	facc7ab03c	Merge commit '51b83ed195' into glitch-soc/merge-upstream	2023-05-09 23:37:38 +02:00
Jeremy Kescher	3ecb6ce63e	Add back missing visibleReactions variable to both initial_state.js files	2023-05-09 23:37:34 +02:00
Renaud Chaput	5aa08826cf	[Glitch] Type Redux store and middleware ... Port 6aeb162927 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>	2023-05-09 23:28:40 +02:00
Renaud Chaput	a56c71faba	[Glitch] Remove unused iOS agent sniffing function ... Port 224d458f7e to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>	2023-05-09 23:20:57 +02:00
Jeremy Kescher	711fee1508	Add missing visible_reactions to vanilla initial_state typedef	2023-05-09 23:20:44 +02:00
Renaud Chaput	526fe33e2f	[Glitch] Rework polyfills loading ... Port a3a2414f0e to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>	2023-05-09 23:20:24 +02:00
Jeremy Kescher	010569da7b	Fix max_reactions typedef	2023-05-09 23:18:20 +02:00
fusagiko / takayamaki	e22a88b512	[Glitch] Add more detailed type annotation for Account ... Port 6579e3af7d to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>	2023-05-09 23:16:23 +02:00
Claire	1a664560cc	Merge commit '6aeb162927' into glitch-soc/merge-upstream ... Conflicts: - `.github/dependabot.yml`: We deleted it. Kept it removed. - `app/javascript/packs/public.jsx`: Upstream changed an import, we have slightly different ones. Ported upstream changes.	2023-05-09 23:12:48 +02:00
Claire	0fff2b67de	Disable broken onboarding code	2023-05-09 23:03:23 +02:00
neatchee	81c3d63f01	Remove stale/missed references to makeCustomEmojiMap / EmojiMap	2023-05-09 22:58:59 +02:00
neatchee	6af0296abc	Restore loc files for non-English languages; CrowdIn should handle this	2023-05-09 22:58:58 +02:00
Jeremy Kescher	92d6dc61eb	Update emoji reaction patches	2023-05-09 22:58:58 +02:00
neatchee	214eee241b	Fix placement of reactions bar for new threading UI	2023-05-09 22:58:58 +02:00
neatchee	1b76bb6bcc	Remove old .js locale files accidentally restored during rebase	2023-05-09 22:58:42 +02:00
Ivan Rodriguez	55303adfef	Keep emoji picker within screen bounds ... Adds the `flip` prop to `<Overlay>`. Fixes #40	2023-05-09 22:58:42 +02:00
neatchee	f577764472	Fix rebase issues	2023-05-09 22:58:42 +02:00
fef	9b2cfc3191	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-09 22:56:46 +02:00
fef	b7d563611f	fix status action bar after upstream changes	2023-05-09 22:56:46 +02:00
Renaud Chaput	5f2071d055	[Glitch] Enforce stricter rules for Typescript files ... Port c8181eb0a4 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>	2023-05-09 22:56:26 +02:00
fef	b46adb9a1d	properly disable reactions when not logged in	2023-05-09 22:56:07 +02:00
fef	f0d129fabe	also disable reaction buttons in vanilla flavour	2023-05-09 22:56:07 +02:00
fef	245f5b3f2f	disable reaction button when not signed in	2023-05-09 22:56:07 +02:00
fef	01723aef2b	fix image for new custom emoji reactions	2023-05-09 22:56:07 +02:00
fef	83bffa8b3c	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-09 22:55:28 +02:00
fef	a97b0fd62b	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-05-09 22:55:28 +02:00
fef	9ac20598db	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-05-09 22:55:28 +02:00
fef	c53ff0fecc	cleanup JS imports and other minor stuff	2023-05-09 22:55:26 +02:00
fef	c898de9aba	remove unnecessary parameter	2023-05-09 22:55:14 +02:00
fef	ef5396ce65	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-05-09 22:55:12 +02:00
fef	9702fa0a99	remove outdated comments	2023-05-09 22:54:35 +02:00
fef	c32386f15a	clean up new imports in vanilla flavour	2023-05-09 22:54:35 +02:00
fef	5aa74e9aae	rebase with upstream	2023-05-09 22:54:35 +02:00
fef	5d5fd9457d	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-09 22:54:33 +02:00
fef	4d7340472b	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-09 22:53:50 +02:00
fef	fbace10f99	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-09 22:53:23 +02:00
fef	2e312d28e8	fix reaction margins and paddings	2023-05-09 22:53:23 +02:00
fef	46179ed6be	cleanup frontend emoji reaction code	2023-05-09 22:53:23 +02:00
fef	4653f9830d	fix padding for reaction button	2023-05-09 22:53:23 +02:00
fef	2ec91c6d0f	move react button to action bar	2023-05-09 22:53:23 +02:00
fef	c5befd7c1a	cherry-pick emoji reaction changes	2023-05-09 22:53:21 +02:00
fef	dd4762f3ca	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-09 22:51:38 +02:00