1
0
mirror of https://github.com/funamitech/mastodon synced 2024-11-30 15:58:28 +09:00
Commit Graph

14026 Commits

Author SHA1 Message Date
Essem
8afbeda3d4
Make addReaction and removeReaction optional props
This prevents things from breaking with embeds.
2024-10-06 23:40:04 -05:00
Essem
e5b5f5c018
Fix grouped reaction notification text 2024-10-06 23:40:04 -05:00
Essem
15e1541115
Fix reblog reactions being hydrated improperly 2024-10-06 23:40:03 -05:00
Essem
579a88d5ee
Fix reactions bar alignment in grouped notifications 2024-10-06 23:40:03 -05:00
Essem
729587128a
Add notification grouping for reactions 2024-10-06 23:40:03 -05:00
Essem
75d16a4814
Turn custom emoji regexps into class level constants 2024-10-06 23:40:03 -05:00
Essem
0fb3dcf085
Disable reactions in detailed status view when visibleReactions is 0 2024-10-06 23:40:03 -05:00
Jeremy Kescher
ed68485e5c
[Glitch+Emoji reactions] Use modern React context for for identity for emoji reaction code 2024-10-06 23:40:02 -05:00
Essem
613d811b93
Fix reaction picker dropdown appearance 2024-10-06 23:40:02 -05:00
Essem
56e536496d
Merge fixes 2024-10-06 23:38:19 -05:00
Essem
10faca4790
Hydrate reactions on streaming API 2024-10-06 23:38:19 -05:00
Essem
bcf114e37e
Purge status reactions on account delete 2024-10-06 23:38:18 -05:00
Essem
0b611e965e
Fix rubocop lint issue 2024-10-06 23:38:18 -05:00
Essem
921467043d
Refactor status reactions query
This was done to announcement reactions in 1b0cb3b54d. Might as well do it here too.
2024-10-06 23:38:18 -05:00
Essem
a630abf5c3
Simplify reactions API controller 2024-10-06 23:38:18 -05:00
Essem
624ce0c8fb
Update reaction emails
Reaction icon made by t3rminus@calamity.world
2024-10-06 23:38:18 -05:00
Essem
fb97f7692a
Revert variant selector normalization
Probably worth tackling later, but for now it's not worth worrying about; some other implementations (e.g. Misskey's) look to have the same behavior anyways.
2024-10-06 23:38:18 -05:00
Essem
e899b8f64d
Move reaction normalization to API controller 2024-10-06 23:38:17 -05:00
Essem
fd1e54634f
Quick fixes 2024-10-06 23:38:17 -05:00
Essem
a567db4099
Make name of like content parser function more general 2024-10-06 23:38:17 -05:00
Essem
02b602a4e4
Normalize emojis with variant selectors 2024-10-06 23:38:17 -05:00
Essem
3226459053
Check for content attribute in Misskey likes 2024-10-06 23:38:17 -05:00
Essem
aee9faa347
Add reaction notification column settings
This was in a previous PR. Not quite sure how it didn't carry over.
2024-10-06 23:38:16 -05:00
Essem
561b023001
Linting fixes 2024-10-06 23:38:16 -05:00
Essem
8b0694e0ed
Refactor react services 2024-10-06 23:38:16 -05:00
Essem
63eaca7e8c
Fix reblog reactions 2024-10-06 23:38:16 -05:00
Essem
87faa54726
Add notification emails for reactions 2024-10-06 23:38:15 -05:00
Essem
b275f1aa77
Add support for emoji reactions
Squashed, modified, and rebased from glitch-soc/mastodon#2221.

Co-authored-by: fef <owo@fef.moe>
Co-authored-by: Jeremy Kescher <jeremy@kescher.at>
Co-authored-by: neatchee <neatchee@gmail.com>
Co-authored-by: Ivan Rodriguez <104603218+IRod22@users.noreply.github.com>
Co-authored-by: Plastikmensch <plastikmensch@users.noreply.github.com>
2024-10-06 23:38:15 -05:00
Claire
6967031144 Fix video player's height in detailed status view 2024-10-06 19:19:28 +02:00
Christian Schmidt
c37daa11f2 [Glitch] Remove redundant title attribute
Port c40ab43dc7 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-10-06 17:04:53 +02:00
Claire
7b40f14452 [Glitch] Fix media gallery items having incorrect borders when hidden
Port 51769e0670 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-10-06 17:04:53 +02:00
Claire
c720623dc7 [Glitch] Fix unsupported grouped notifications from streaming causing duplicate IDs
Port 77f5b127fa to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-10-06 17:04:53 +02:00
forsamori
819abbdb2f [Glitch] Add margin-bottom to error.dialog to reduce whitespace
Port 63a959099b to glitch-soc

Co-authored-by: Claire <claire.github-309c@sitedethib.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-10-06 17:04:53 +02:00
Claire
b22272fcdc [Glitch] Hide badges in media gallery when media are hidden
Port f768a6eb16 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-10-06 17:04:53 +02:00
Claire
299372babe [Glitch] Fix editing description of media uploads with custom thumbnails
Port f760899b04 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-10-06 17:04:53 +02:00
Claire
54b209243b [Glitch] Fix media uploads in composer appearing over search results in advanced interface
Port b5006539c9 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-10-06 17:04:53 +02:00
Claire
ce3bedade3 [Glitch] Fix incorrect 'navigator' check
Port 4a737a948a to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-10-06 17:04:53 +02:00
Nick Schonning
61a0c58dee [Glitch] Enable ESLlint no-case-declarations
Port f91f077985 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-10-06 17:04:53 +02:00
Matt Jankowski
af39ac6edc [Glitch] Adjust spacing on setting sub-nav items when below mobile size
Port f10d61bf86

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-10-06 16:44:22 +02:00
Matt Jankowski
edfa716a18 [Glitch] Improve alignment of icons on admin roles list
Port f811fcb2b2 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-10-06 16:43:50 +02:00
Renaud Chaput
8572fa1452 [Glitch] Fix follow notifications from streaming being grouped
Port 1be55ce244 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-10-06 16:43:17 +02:00
Claire
b28ce2424c Merge commit 'c40ab43dc703be988c277d4ba6b7987a3a80e16c' into glitch-soc/merge-upstream
Conflicts:
- `app/helpers/application_helper.rb`:
  Upstream added a helper where glitch-soc had its own, not really
  a conflict.
  Added upstream's helper.
- `lib/sanitize_ext/sanitize_config.rb`:
  Upstream renamed a constant that was used slightly differently in glitch-soc.
  Renamed it as upstream did.
2024-10-06 16:07:58 +02:00
Christian Schmidt
c40ab43dc7
Remove redundant title attribute (#32258) 2024-10-04 16:23:05 +00:00
Claire
51769e0670
Fix media gallery items having incorrect borders when hidden (#32257) 2024-10-04 14:55:44 +00:00
Claire
1f720366e9
Fix notification push notifications not including the author's username (#32254) 2024-10-04 14:29:23 +00:00
Matt Jankowski
ebdeac0731
Add coverage for missing status scenario in NotificationMailer (#32256) 2024-10-04 14:15:14 +00:00
Matt Jankowski
4fe7f213a6
Use async_count in more view locations (#32086) 2024-10-04 12:29:43 +00:00
Claire
77f5b127fa
Fix unsupported grouped notifications from streaming causing duplicate IDs (#32243) 2024-10-04 12:23:30 +00:00
Claire
49407e7623
Fix Content-Security-Policy when using sso-redirect (#32241) 2024-10-04 08:50:36 +00:00
gunchleoc
160917e718
Pluralize csv imports (#27094)
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-10-04 08:19:01 +00:00