namekuji/chuckya
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
18681 commits 8 branches 15 tags 274 MiB
Commit graph

1956 commits

Author SHA1 Message Date
Essem
bda3bbf777
Merge remote-tracking branch 'upstream/main' 2023-06-14 19:34:26 -05:00
Essem
c140e9acb6
Revert to using mp3 for audio (god dammit apple) 2023-06-14 19:19:29 -05:00
Claire
42a0898f16 Merge commit '3a2a15c6ea4d4603469861ed9be09da12a122e45' into glitch-soc/merge-upstream 
Conflicts:
- `app/views/settings/preferences/appearance/show.html.haml`:
  Conflict because glitch-soc does not have a theme selector here.
 2023-06-10 18:42:29 +02:00
Claire
c48ec9cb8c Merge commit 'b85c387c5c0527b0ad31c27031a09d361826c5fc' into glitch-soc/merge-upstream 
Conflicts:
- `config/initializers/content_security_policy.rb`:
  Kept our version, it was not affected by upstream's bug.
 2023-06-10 16:48:01 +02:00
Claire
d8b0a732aa Merge commit '1483a3ddfe74e4fb81d87447a1781943eab86c60' into glitch-soc/merge-upstream 
Conflicts:
- `config/initializers/simple_form.rb`:
  Upstream added a new simple_form component, where we had an extra one.
  Kept both components.
 2023-06-10 16:22:14 +02:00
Claire
aa57f7e3e2 Merge commit '5fae2de454806730742b7be7435ae1c4fb97cf3c' into glitch-soc/merge-upstream 2023-06-10 15:17:08 +02:00
Claire
93c714417f Merge commit 'b922ad7a1b4bc8d968d0df2c7f307d4fec53435d' into glitch-soc/merge-upstream 
Conflicts:
- `package.json`:
  Upstream changed various script definitions in lines surrounding the one for
  `i18n:extract`, which had glitch-soc-specific changes.
  Updated the scripts as upstream did, while keeping our changes to
  `i18n:extract`.
 2023-06-10 14:38:04 +02:00
Eugen Rochko
4c9406bdb0
Add time zone preference (#25342) 2023-06-10 03:29:37 +02:00
Eugen Rochko
67d17ce194
Add legal as report category (#23941) 2023-06-06 23:41:59 +02:00
Nick Schonning
c66250abf1
Autofix Rubocop Regex Style rules (#23690) 
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2023-06-06 14:50:51 +02:00
Eugen Rochko
4eda233e09
Add webhook templating (#23289) 
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2023-06-06 10:42:47 +02:00
Essem
c6f492b4cd
Merge remote-tracking branch 'upstream/main' 2023-06-05 23:44:57 -05:00
Claire
c22fc2fa80 Merge commit '00c222377db0e305ac3f4a15bf1c18eb89c1f45f' into glitch-soc/merge-upstream 
Conflicts:
- `.rubocop_todo.yml`:
  Took upstream's changes.
 2023-06-05 13:25:22 +02:00
Darius Kazemi
bacb674921
Add exclusive lists (#22048) 
Co-authored-by: Liam Cooke <liam@liamcooke.com>
Co-authored-by: John Holdun <john@johnholdun.com>
Co-authored-by: Effy Elden <effy@effy.space>
Co-authored-by: Lina Reyne <git@lina.pizza>
Co-authored-by: Lina <20880695+necropolina@users.noreply.github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2023-06-05 09:37:02 +02:00
Essem
f0e15bdb85
Merge remote-tracking branch 'upstream/main' 2023-06-03 12:15:36 -05:00
Claire
8884d1ece0
Add support for importing lists (#25203) 2023-06-01 14:47:31 +02:00
Claire
2b45fecde1
Fix multiple N+1s in ConversationsController (#25134) 2023-06-01 02:41:51 +02:00
Christian Schmidt
69057467cb
Translate CW, poll options and media descriptions (#24175) 
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2023-06-01 00:10:21 +02:00
Claire
b6519ab3f5
Fix inconsistent naming of Instance.by_domain_and_subdomain (#25159) 2023-05-31 09:57:24 +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
Claire
0669783da8 Merge branch 'main' into glitch-soc/merge-upstream 2023-05-28 17:01:25 +02:00
Claire
6dbd44faea Merge commit 'b896b16cb3c8626fbee12a7eda7f882114b1a040' into glitch-soc/merge-upstream 2023-05-28 15:01:53 +02:00
Plastikmensch
ea10f2e1e0
Don't set me to true for remote reactions 
When an account and a remote account reacted with a custom emoji with the same shortcode, the `me` attribute was also true for the remote reaction, despite being a different emoji.

This query should probably be optimised, but it works.

Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
 2023-05-27 12:01:13 +02:00
Plastikmensch
b326dcab78
Don't allow reactions with disabled custom emojis 
Also doesn't set custom_emoji to a local variant of name when not given.

Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
 2023-05-27 12:01:13 +02:00
Plastikmensch
051bb17de8
Add custom_emoji to reacted? 
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
 2023-05-27 12:01:13 +02:00
Jeremy Kescher
bf7945f15b
Run rubocop -a 2023-05-27 12:01:13 +02:00
Jeremy Kescher
92fea0e028
Reactions: Return 404 when status should not be visible, asynchronous unreact 2023-05-27 12:01:13 +02:00
Jeremy Kescher
83e1c8e742
Migrate emoji reactions 2023-05-27 12:01:13 +02:00
fef
6fa408f1a0
delete reaction notifications when deleting status 2023-05-27 12:01:13 +02:00
fef
f87de8770b
support reacting with foreign custom emojis 2023-05-27 12:01:13 +02:00
fef
3df2d0b1f1
handle incoming custom emoji reactions properly 2023-05-27 12:01:12 +02:00
fef
f9b72463b4
cherry-pick emoji reaction changes 2023-05-27 11:58:20 +02:00
fef
7f0e61fb8d
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-27 11:58:20 +02:00
fef
871d6c594e
add backend support for status emoji reactions 
turns out we can just reuse the code for
announcement reactions.
 2023-05-27 11:58:20 +02:00
Claire
e2ab9d4dad Merge commit 'e387175fc9a3ebfd72ab45ebfe43ecfabef7b0c3' into glitch-soc/merge-upstream 2023-05-25 23:47:28 +02:00
Claire
2e02d03524 Merge commit '4a22e72b9b1b8f14792efcc649b0db8bc27f0df2' into glitch-soc/merge-upstream 2023-05-25 22:59:30 +02:00
Claire
ad1098970b Merge commit 'bec6a1cad4c509c53deb378c7ba984ba7e2de5a9' into glitch-soc/merge-upstream 
Conflicts:
- `app/controllers/auth/confirmations_controller.rb`:
  Upstream merged our captcha code, but there are some
  conflicts due to glitch-soc's theming system.
- `app/views/admin/settings/registrations/show.html.haml`:
  Upstream merged our captcha code, but there are some
  conflicts due to glitch-soc's theming system.

Additional changes:
- `Gemfile`:
  Upstream added hcaptcha dependency in another place in the file.
- `config/settings.yml`:
  Upstream added the `captcha_enabled` setting in another place in the file.
 2023-05-25 22:49:18 +02:00
Claire
b735954971 Merge commit '2ce0b666a139726dc406e6c1887728553b947e59' into glitch-soc/merge-upstream 
Conflicts:
- `config/webpack/generateLocalePacks.js`:
  A dependency update changed how functions are imported.
  Also, some linting fixes not applicable to glitch-soc.
 2023-05-25 20:43:25 +02:00
Claire
1d588d58f1
Improve various queries against account domains (#25126) 2023-05-25 09:27:16 +02:00
Claire
dfa5889fc0
Change Identity to not destroy associated User on destroy (#25098) 2023-05-23 15:00:36 +02:00
Matt Jankowski
9f5deb310b
Fix Performance/MapCompact cop (#24797) 
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2023-05-23 10:49:12 +02:00
Emelia Smith
19f9098551
Allow reports with long comments from remote instances, but truncate (#25028) 2023-05-22 13:15:21 +02:00
Claire
bec6a1cad4
Add hCaptcha support (#25019) 2023-05-16 23:27:35 +02:00
Claire
3ed3d54bf3
Fix reports not being closed when performing batch suspensions (#24988) 2023-05-16 14:56:49 +02:00
Essem
2cf4b3a95b
Merge remote-tracking branch 'catstodon/feature/emoji_reactions' 2023-05-09 22:37:07 -05:00
Jeremy Kescher
845d1be5ca
Run rubocop -a 2023-05-09 23:41:48 +02:00
Jeremy Kescher
530167dff5
Reactions: Return 404 when status should not be visible, asynchronous unreact 2023-05-09 22:58:58 +02:00
Jeremy Kescher
5b7d1d5281
Migrate emoji reactions 2023-05-09 22:58:56 +02:00
fef
c05db8c765
delete reaction notifications when deleting status 2023-05-09 22:56:46 +02:00