Commit graph

714 commits

Author SHA1 Message Date
Claire
b73e4b59fc [Glitch] Fix history handling not properly handling states after update to react-router v5
Port 15182d1e5e to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-10-24 20:34:30 +02:00
たいち ひ
c6f990997d [Glitch] Rewrite emoji_unicode_mapping_light to TS
Port 9482810703 to glitch-soc

Co-authored-by: taichi.fukuda ひ <taichi.fukuda@systemi.co.jp>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-10-24 20:33:55 +02:00
Claire
5323f0eeca [Glitch] Fix incorrect proptypes from react-router-v5 update
Port 0ad66175bf to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-10-24 19:03:16 +02:00
Renaud Chaput
9325cb5759 [Glitch] Convert <Button> to Typescript
Port 9d45a444f9 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-10-24 19:03:16 +02:00
Essem
a2e88f3544
[Glitch] Fix some remote posts getting truncated
Port 4d59dfb to glitch-soc
2023-10-24 10:19:12 -05:00
Renaud Chaput
d6eacb79c6 [Glitch] Upgrade to react-router v5
Port 1b70d7ed7c to glitch-soc

Co-authored-by: Claire <claire.github-309c@sitedethib.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-10-21 22:14:24 +02:00
Essem
84ea1a19fa
Merge branch 'main' of https://github.com/glitch-soc/mastodon 2023-10-11 11:07:33 -05:00
Essem
29f2a7d9f4
Merge branch 'main' of https://github.com/glitch-soc/mastodon 2023-10-10 12:24:32 -05:00
Renaud Chaput
7b325aa81b [Glitch] Autofix missing comma and indentation in JS files
Port 774e1189d2 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-10-09 21:14:25 +02:00
Claire
967bd543bb [Glitch] Fix auto-loading-more when not scrolled
Port 2b98e2ecd6 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-10-08 17:34:10 +02:00
Michael Stanclift
cfc0da77ac [Glitch] Fix retention dashboard not displaying correct month
Port 7fddeca190 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-10-08 16:33:37 +02:00
Essem
8d776b9aa5
Merge remote-tracking branch 'upstream/main' 2023-09-26 20:03:35 -05:00
Renaud Chaput
919ed0e469 [Glitch] Convert dropdown_menu state to Typescript
Port 4b7bc1f07c to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-09-26 13:19:27 +02:00
Essem
81c06b286f
Merge branch 'main' of https://github.com/glitch-soc/mastodon 2023-09-16 11:27:11 -05:00
Claire
d3f14dd7d4 [Glitch] Fix dismiss button overlapping with text in dismissable banners
Port 2a4fcc51fd to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-09-15 21:48:36 +02:00
Essem
c57f803db7
Merge remote-tracking branch 'claire/glitch-soc/port-upstream-hashtags' 2023-09-04 19:10:42 -05:00
Essem
b871816f0e
Merge remote-tracking branch 'upstream/main' 2023-09-04 19:00:18 -05:00
Eugen Rochko
04220ff7e8 [Glitch] Fix colors and typography on hashtag bar in web UI
Port 10b06436d1 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-09-02 15:34:20 +02:00
Claire
023673c0d9 [Glitch] Add data-nosnippet attribute to remote posts and local posts with noindex
Port c3a42e1280 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-09-02 11:49:35 +02:00
Claire
670f55e83c Fix interaction between CWs and hashtag bars 2023-09-02 11:44:58 +02:00
Claire
cbf9b0d8b1 [Glitch] Change hashtag bar tags to be de-emphasized
Port 613cfd625c to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-09-02 11:44:58 +02:00
Renaud Chaput
5153b5e862 [Glitch] Better hashtag normalization when processing a post
Port 58acaa9ae6 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-09-02 11:44:58 +02:00
Renaud Chaput
0412a9d775 [Glitch] Remove hashtags from the last line of a status if it only contains hashtags
Port 061fd66ee6 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-09-02 11:44:58 +02:00
Claire
a547453059 [Glitch] Fix case-insensitive comparison of hashtags to do case-folding
Port 3ed2bf92d0 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-09-02 11:44:58 +02:00
Claire
03580d3443 [Glitch] Fix hashtag bar sometimes including tags that appear in the post's body
Port f0862bcf98

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-09-02 11:44:58 +02:00
Claire
58cfd200a5 [Glitch] Add display of out-of-band hashtags in the web interface
Port df6e719898 to glitch-soc

Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-09-02 11:44:58 +02:00
Essem
1fe16ad546
Merge remote-tracking branch 'claire/glitch-soc/merge-upstream' 2023-08-27 00:24:46 -05:00
Essem
7f94e0a8a7
Merge remote-tracking branch 'upstream/main' 2023-08-27 00:23:51 -05:00
Claire
9b958a707f Fix interaction between CWs and hashtag bars 2023-08-25 21:54:15 +02:00
Claire
f5b0cca7d0 [Glitch] Change hashtag bar tags to be de-emphasized
Port 613cfd625c to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-08-25 21:42:04 +02:00
Renaud Chaput
5485c87def [Glitch] Better hashtag normalization when processing a post
Port 58acaa9ae6 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-08-25 21:40:52 +02:00
Renaud Chaput
7402adf6e2 [Glitch] Remove hashtags from the last line of a status if it only contains hashtags
Port 061fd66ee6 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-08-25 21:38:24 +02:00
Claire
bd02fbcbcc [Glitch] Fix case-insensitive comparison of hashtags to do case-folding
Port 3ed2bf92d0 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-08-25 21:25:04 +02:00
Claire
d11b6dcbfc [Glitch] Fix hashtag bar sometimes including tags that appear in the post's body
Port f0862bcf98

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-08-25 21:24:37 +02:00
Claire
f5a557a4b9 [Glitch] Add display of out-of-band hashtags in the web interface
Port df6e719898 to glitch-soc

Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-08-25 21:18:48 +02:00
Claire
685270f3f7 [Glitch] Fix clicking “Explore” or “Live feeds” column headers to scroll in advanced mode
Port e90649b064 to glitch-soc

Co-authored-by: Plastikmensch <Plastikmensch@users.noreply.github.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-08-24 22:00:27 +02:00
Essem
0451c28535
Merge remote-tracking branch 'upstream/main' 2023-08-24 13:51:53 -05:00
Claire
c053bfc45a [Glitch] Fix “legal” report category not showing up in moderation interface
Port 0446394465 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-08-22 18:54:22 +02:00
Essem
d9ea6abec0
Merge remote-tracking branch 'upstream/main' 2023-07-31 12:24:48 -05:00
gunchleoc
09ebf7e37c [Glitch] Replace 'favourite' by 'favorite' for American English
Port 217ef7f2af to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-07-30 14:44:36 +02:00
Claire
6256cee034
Change error boundary to upstream's (#2323) 2023-07-27 19:25:07 +02:00
Claire
0c45bed333 [Glitch] Fix “Back” button sometimes redirecting out of Mastodon
Port a442a1d1c6 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-07-17 19:12:09 +02:00
Essem
e64c00ec84
Merge remote-tracking branch 'upstream/main' 2023-07-17 10:24:20 -05:00
Stanislas Signoud
9bd012b7cb [Glitch] Change links in multi-column mode so tabs are open in single-column mode
Port 5fad7bd58a to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-07-14 13:01:31 +02:00
Eugen Rochko
f0d3267fbf [Glitch] Fix dropdowns being disabled for logged out users in web UI
Port a8edbcf963 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-07-14 13:01:31 +02:00
Renaud Chaput
18f55567b0 [Glitch] Upgrade to typescript-eslint v6
Port a7253075d1 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-07-13 14:51:24 +02:00
Claire
3be4f4266d Fix incorrect types in DisplayName 2023-07-13 14:51:24 +02:00
Claire
0870c7c95e [Glitch] Upgrade to Prettier 3
Port 73b64b8917 to glitch-soc
2023-07-13 14:01:40 +02:00
Eugen Rochko
71f8c45c18 [Glitch] Change label and design of sensitive and unavailable media in web UI
Port 338a0e70cc to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-07-12 15:43:10 +02:00
fusagiko / takayamaki
9e311f95aa [Glitch] simplify counters
Port e0d230fb37 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-07-12 15:18:41 +02:00
alfe
5b9e43187c [Glitch] Rewrite <ShortNumber /> as FC and TS
Port 20e85c0e83 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-07-12 15:17:18 +02:00
Renaud Chaput
55ea79165a [Glitch] Convert <DismissableBanner> to Typescript
Port 4534498a8e to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-07-12 15:09:14 +02:00
Renaud Chaput
0bfa4a990f [Glitch] Fix translate button position
Port 9f078e238d to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-07-12 15:05:24 +02:00
Essem
9a33572bef
Merge remote-tracking branch 'upstream/main' 2023-07-05 12:48:40 -05:00
Eugen Rochko
a117c953d0 [Glitch] Add button to see results for polls in web UI
Port b7910bc751 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-07-05 12:42:24 +02:00
forsamori
ac74374311 [Glitch] Add at-symbol prepended to mention span title
Port d9a5c1acfa to glitch-soc

Co-authored-by: Sam BC <samuel.balbirnie-cumming@xdesign.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-07-05 12:38:54 +02:00
Essem
f426885fa2
Merge remote-tracking branch 'upstream/main' 2023-07-01 19:45:24 -05:00
たいち ひ
c71fc42f4e [Glitch] Rewrite <AutosuggestHashtag /> as FC and TS
Port 804488d38e to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-06-25 14:27:46 +02:00
alfe
9bf63257fb [Glitch] Rewrite <LoadingIndicator/> as FC and TS (#25364)
Port a86886b1fd to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-06-18 12:10:37 +02:00
alfe
cdec45eca9 [Glitch] Rewrite <LoadPending /> as FC and TS
Port dfaf59d99a to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-06-18 10:42:04 +02:00
Essem
bda3bbf777
Merge remote-tracking branch 'upstream/main' 2023-06-14 19:34:26 -05:00
Plastikmensch
fefdc3244c
[Glitch] Change "direct message" nomenclature to "private mention" in web UI (#2158)
Port 68a192e718 to glitch-soc

Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
2023-06-11 13:33:45 +02:00
Eugen Rochko
fb0d2de8fe [Glitch] Change design of dropdowns in web UI
Port e4fd9503ec to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-06-10 17:10:06 +02:00
alfe
83ae40e192 [Glitch] Rewrite <LoadMore /> as FC and TS
Port fb5bf5cbf8 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-06-10 16:59:25 +02:00
S.H
a4d7a17089 [Glitch] Fix using Date.now() instead of intl.now()
Port b3f9a0da52 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-06-10 15:21:04 +02:00
Claire
9af04d5a46 [Glitch] Add a confirmation screen when suspending a domain
Port e9385e93e9 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-06-10 15:10:24 +02:00
Christian Schmidt
7e25fd9b0c [Glitch] Translate CW, poll options and media descriptions
Port 69057467cb to glitch-soc

Co-authored-by: Claire <claire.github-309c@sitedethib.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-06-10 14:48:41 +02:00
Renaud Chaput
9e133e2527 [Glitch] Upgrade react-intl
Port 44cd88adc4 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-06-10 14:37:08 +02:00
Essem
f0e15bdb85
Merge remote-tracking branch 'upstream/main' 2023-06-03 12:15:36 -05:00
Claire
5ed48e6878 Fix extraneous newlines 2023-05-28 18:06:09 +02:00
fusagiko / takayamaki
382b2a506a [Glitch] Rewrite actions/modal and reducers/modal with typescript
Port 38c6216082 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-05-28 17:49:55 +02:00
Essem
b763a47623
Merge remote-tracking branch 'catstodon/feature/emoji_reactions' 2023-05-28 10:45:57 -05:00
Essem
7cbfc6b4ac
Merge remote-tracking branch 'upstream/main' 2023-05-28 10:40:04 -05:00
たいち ひ
6a592083f1 [Glitch] Fix export style of <LoadGap /> based on <Domain />
Port 4197b5e4c8 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-05-28 17:15:21 +02:00
Renaud Chaput
0009b4b574 [Glitch] Update inconsistent defaultMessage
Port e58c36d308 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-05-28 17:14:31 +02:00
Eugen Rochko
e7dc375aab [Glitch] Change share action from being in action bar to being in dropdown in web UI
Port 1caa5ff39e to glitch-soc

Co-authored-by: Claire <claire.github-309c@sitedethib.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-05-28 16:59:12 +02:00
たいち ひ
017fbc7a74 [Glitch] Rewrite <LoadGap /> as FC and TS
Port 7336f3648b to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2023-05-28 16:48:17 +02:00
Claire
7d7db8977b Fix import order with ESLint
Port d27216dc46 to glitch-soc
2023-05-28 16:38:10 +02:00
Claire
a0bc0619ca [Glitch] Use JSX syntax for Fragments
Port 5a16bd7bf4 to glitch-soc
2023-05-28 14:56:24 +02:00
Claire
6001f5ff36 [Glitch] Use the new JSX transform everywhere
Port 8f66126b10 to glitch-soc
2023-05-28 14:18:43 +02:00
Jeremy Kescher
fd5e5a759e
Move status_reactions.js to status_reactions.jsx 2023-05-27 13:55:17 +02:00
Jeremy Kescher
55199ec150
Use named import for AnimatedNumber 2023-05-27 13:32:45 +02:00
Jeremy Kescher
7f1b0f43e9
Update emoji reaction patches 2023-05-27 12:01:13 +02:00
neatchee
bbce42a7cb
Fix rebase issues 2023-05-27 12:01:13 +02:00
fef
e688fac3ec
properly disable reactions when not logged in 2023-05-27 12:01:13 +02:00
fef
4454aa7e99
fix image for new custom emoji reactions 2023-05-27 12:01:12 +02:00
fef
1ca69c2513
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-27 12:01:12 +02:00
fef
adc1cd4823
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-27 12:01:12 +02:00
fef
6ea8080771
cleanup JS imports and other minor stuff 2023-05-27 12:01:10 +02:00
fef
c80a2f0df0
remove outdated comments 2023-05-27 11:59:32 +02:00
fef
a0c91c47c6
rebase with upstream 2023-05-27 11:59:32 +02:00
fef
b796afc818
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-27 11:59:32 +02:00
fef
f1421b6d7d
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-27 11:59:32 +02:00
fef
0bb2d62c96
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-27 11:59:32 +02:00
fef
50f91f5510
cleanup frontend emoji reaction code 2023-05-27 11:59:32 +02:00
fef
1791024b73
fix padding for reaction button 2023-05-27 11:59:32 +02:00
fef
ed636f695f
move react button to action bar 2023-05-27 11:59:30 +02:00
fef
f9b72463b4
cherry-pick emoji reaction changes 2023-05-27 11:58:20 +02:00
fef
f1952244d1
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-27 11:58:20 +02:00
fef
44154d2c07
add frontend for emoji reactions
this is still pretty bare bones but hey, it works.
2023-05-27 11:58:20 +02:00