CloudToys/puyopuyotetr.is
1
0
Fork 0
Code
23,951 Commits 1 Branch 1 Tag 336 MiB
main
Commit Graph

1567 Commits

Author SHA1 Message Date
Noa Himesaka
d45671066c Merge branch 'main' of https://github.com/glitch-soc/mastodon 2024-10-17 00:30:51 +09:00
Claire
4d9b4ef72f Merge commit '7c10b0fb7a078661558fef86399d86831423260c' into glitch-soc/merge-upstream 2024-10-14 19:46:52 +02:00
Matt Jankowski
258dce1256
Add OpenSSL::SSL::SSLError to http connection errors wrapper (#32307) 2024-10-08 14:59:51 +00:00
Noa Himesaka
0e5dd35e84 Merge branch 'main' of https://github.com/glitch-soc/mastodon 2024-10-08 23:58:28 +09:00
Matt Jankowski
e8ec6667bd
Extract wrapper constant for HTTP::* error classes (#32285) 2024-10-08 13:53:35 +00: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
Matt Jankowski
1f65a95421
Remove unneeded reorder(nil) conditions (#32200) 2024-10-02 12:26:16 +00:00
Matt Jankowski
4aa26eba53
Extract WebPushRequest from push notification worker and subscription (#32208) 2024-10-02 11:11:52 +00:00
Jeong Arm
66b2bc1c84
Ignore error if mentioned account was not processable (#29215) 
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2024-10-02 08:08:02 +00:00
Noa Himesaka
67c1a405ad Merge branch 'pr2462' 2024-10-01 17:19:04 +09:00
Essem
f8a38731c3
Fix reblog reactions being hydrated improperly 2024-09-30 20:29:22 -05:00
Essem
d0307e6d52
Turn custom emoji regexps into class level constants 2024-09-30 20:28:42 -05:00
Essem
7cb1921ae7
Hydrate reactions on streaming API 2024-09-30 20:28:01 -05:00
Essem
73e334f611
Make name of like content parser function more general 2024-09-30 20:27:59 -05:00
Essem
cf8ec7193b
Check for content attribute in Misskey likes 2024-09-30 20:27:59 -05:00
Essem
0fe45d5fef
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-09-30 20:27:58 -05:00
Claire
7ef25ae53b Merge commit '9d664f87a04b6a5157ddbe60ee33b5b7a960198e' into glitch-soc/merge-upstream 2024-09-29 11:06:09 +02:00
Noa Himesaka
262ddc00f4 Merge branch 'main' of https://github.com/glitch-soc/mastodon 2024-09-28 23:23:16 +09:00
Claire
513f187daf
Add “A Mastodon update is available.” message on admin dashboard for non-bugfix updates (#32106) 2024-09-26 19:27:57 +00:00
Claire
633165ba9c Merge commit '28966fa0a6d7b98ee94696acdc79e45449ce8349' into glitch-soc/merge-upstream 2024-09-25 17:41:37 +02:00
Renaud Chaput
3dc4ddc663
Fix search params being dropped when redirected to non-deck path (#31984) 2024-09-25 13:35:37 +00:00
Claire
c6039f99ce Merge commit '70988519df66f0b8edeb6ca95140f1d3e436fea8' into glitch-soc/merge-upstream 2024-09-24 19:34:30 +02:00
André Menrath
556837f156
Fix the summary of converted object types to be treated as HTML (#28629) 2024-09-24 15:57:53 +00:00
Claire
c2c3a66478 Merge commit '5dfdec645313e556413147597138a8008bc35996' into glitch-soc/merge-upstream 2024-09-23 20:24:18 +02:00
Eugen Rochko
aaab6b7adc
Add reblogs and favourites counts to statuses in ActivityPub (#32007) 2024-09-23 13:14:15 +00:00
Claire
221bba1897 Merge commit '7ed9c590b98610f8d68deab9ef8df260eec6d8f0' into glitch-soc/merge-upstream 2024-09-21 15:06:06 +02:00
Claire
7ed9c590b9
Fix issue when encountering reblog of deleted post in feed rebuild (#32001) 2024-09-20 14:58:06 +00:00
Claire
8afa3bb2fa
Change Mastodon to issue correctly-signed queries by default (#31994) 2024-09-20 10:10:09 +00:00
Matt Jankowski
5405bdd344
Remove unused E2EE messaging code (#31193) 2024-09-18 09:27:43 +00:00
Claire
83b553c7d1 Merge commit '0226bbe5165a53658b29e46ddbef6a10507fdc8c' into glitch-soc/merge-upstream 2024-09-12 21:32:39 +02:00
Claire
3465d39494 Merge commit '24ef8255b3f9b44cb54f49bc78fe3382a7070b1a' into glitch-soc/merge-upstream 
Conflicts:
- `app/helpers/accounts_helper.rb`:
  Upstream removed a helper, textually adjacent to a glitch-soc-only one.
  Not really a conflict.
  Removed the helper as upstream did.
- `app/views/layouts/embedded.html.haml`:
  Conflicts due to theming system.
  Adapted upstream's change to our theming system.
- `app/views/statuses/_simple_status.html.haml`:
  Removed upstream, but we had local changes.
  Removed as upstream did.
 2024-09-12 20:05:08 +02:00
Taylor Chaparro
1b6a82b799
Fix invalid date searches returning 503 (#31526) 2024-09-12 13:40:20 +00:00
Claire
a496aeabcb
Change form-action Content-Security-Policy directive to be more restrictive (#26897) 2024-09-12 13:24:19 +00:00
Claire
c35ea59ee6
Fix security context sometimes not being added in LD-Signed activities (#31871) 2024-09-12 12:58:12 +00:00
David Roetzel
ab763c493f
Ignore undefined as canonical url (#31882) 2024-09-12 11:14:42 +00:00
Claire
10e2b87774 Merge commit '0c3c06f7cc50c9207a44f56e184ce6a41f953171' into glitch-soc/merge-upstream 2024-09-12 12:09:21 +02:00
Matt Jankowski
da07adfe6c
Add CustomEmoji.enabled scope (#31830) 2024-09-10 13:21:40 +00:00
Claire
441af2632d Merge commit '2caa3f365ded73be17b623177967110e66f14061' into glitch-soc/merge-upstream 2024-09-09 18:22:41 +02:00
Mike Dalessio
a0ea2fa3b0
Change fetch link card service to parse as HTML5 (#31814) 2024-09-09 10:59:42 +00:00
Mike Dalessio
10143d053a
Change some instances of Nokogiri HTML4 parsing to HTML5 (#31812) 2024-09-08 18:41:37 +00:00
Claire
1a0ef0c526 Merge commit '5acec087caed4a2fdf0fd8ed11f891222496f321' into glitch-soc/merge-upstream 2024-09-05 20:36:25 +02:00
Matt Jankowski
4678473e54
Add AnnualReport::Source#report_statuses method for subclasses to use (#31753) 2024-09-04 19:50:33 +00:00
Claire
5a55180b95 Merge commit 'fe04291af46d7cb9d3439fa73739b2ffb2b53d72' into glitch-soc/merge-upstream 
Conflicts:
- `spec/lib/sanitize/config_spec.rb`:
  Upstream rewrote top-level `describe` calls to `RSpec.describe`, and
  glitch-soc had differences in the first few tests because of the wider
  subset of HTML it accepts.
  Changed `describe` to `RSpec.describe` as upstream did, keeping
  glitch-soc's tests.
 2024-09-04 19:38:52 +02:00
Matt Jankowski
fe04291af4
Use more accurate beginning/ending times in annual report source (#31751) 2024-09-04 17:19:53 +00:00
Claire
402c1e116d Merge commit '491033c86cc9c29302bfe68cc94dabad82ded4cc' into glitch-soc/merge-upstream 2024-09-02 17:43:10 +02:00
David Roetzel
388d5473e1
Refactor (ruby) redis configuration (#31694) 2024-09-02 14:19:55 +00:00
Noa Himesaka
3cd560117e fix: error running #1 2024-08-24 23:12:32 +09:00
Noa Himesaka
bd3ef05053 Merge commit 'refs/pull/2462/head' of https://github.com/glitch-soc/mastodon 2024-08-24 22:54:36 +09:00
Noa Himesaka
acf40f349d Merge branch 'main' of https://github.com/glitch-soc/mastodon 2024-08-24 22:53:34 +09:00
Essem
4399c948fb
Fix reblog reactions being hydrated improperly 2024-08-22 12:24:00 -05:00