treehouse
/
mastodon
22
8
Fork 5
Code Issues 32 Pull Requests Projects 1 Releases Wiki Activity
14,709 Commits
12 Branches
15 Tags
760 MiB
Commit Graph

9158 Commits (b7882a75d21132a35e9ee4d204b0dc08fc5ecb73)

Author SHA1 Message Date
Claire b7882a75d2 Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `app/controllers/api/v1/statuses_controller.rb`:
  Upstream moved things around in a place where glitch-soc had support for
  an extra parameter (`content_type`).
  Follow upstream but reintroduce `content_type`.
 2022-02-10 19:09:27 +01:00
Eugen Rochko 64a94a889b Chore: Disable menu items for editing statuses in web UI (#17497) 
Feature must be unlocked in a separate release for max. compatibility
 2022-02-10 15:28:53 +01:00
Claire c6de53c1a9 Fix NoMethodError in StatusUpdateDistributionWorker (#17499) 
* Add tests

* Fix NoMethodError in StatusUpdateDistributionWorker

* Fix tests
 2022-02-10 14:57:10 +01:00
Claire 2e7bc0fbf5 Fix poll votes not being properly reset on poll change (#17498) 
* Fix poll votes not being properly reset on poll change

* Fix and add tests

* Fix poll update handling when the number of options changes
 2022-02-10 14:26:54 +01:00
Eugen Rochko 6dfda3670f Fix outdated iso-639 reference in update status service (#17496) 2022-02-10 03:09:44 +01:00
Eugen Rochko cb76142d9e Add editing for published statuses (#17320) 
* Add editing for published statuses

* Fix change of multiple-choice boolean in poll not resetting votes

* Remove the ability to update existing media attachments for now
 2022-02-10 00:15:30 +01:00
Eugen Rochko 2c9def57b3 Add `category` and `rule_ids` params to `POST /api/v1/reports` (#17492) 2022-02-10 00:10:16 +01:00
Claire c3725e1e19 Add content_type to status_edits 2022-02-09 18:02:31 +01:00
Eugen Rochko 4ffee8156d [Glitch] Add edit history to web UI 
Port 948da1a958 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2022-02-09 17:51:35 +01:00
Claire 0845bee8d6 Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `app/views/settings/preferences/appearance/show.html.haml`:
  Upstream renamed some helper functions that were used in a part of the
  settings page which glitch-soc slightly changed the layout of.
  Ported the change.
 2022-02-09 17:28:33 +01:00
Claire e689495a81 Please Codeclimate 2022-02-09 17:15:36 +01:00
Claire 1af75ba990 Rework actions modal to bring it closer to upstream and fix modal stacking issue 2022-02-09 16:40:23 +01:00
Claire d92bd7c906 Remove unused noModal prop 2022-02-09 16:40:23 +01:00
Claire 952342d251 Some more refactoring 2022-02-09 16:40:23 +01:00
Claire f14193d3f4 Refactor dropdown and action modal code slightly 
Simplify it a bit and make it closer to upstream
 2022-02-09 13:23:12 +01:00
Eugen Rochko 6732217dd0 Change languages to be listed under standard instead of native name in admin UI (#17485) 2022-02-09 04:15:38 +01:00
Eugen Rochko 948da1a958 Add edit history to web UI (#17390) 
* Add edit history to web UI

* Change history reducer to store items per status

* Fix missing loading prop
 2022-02-09 01:17:07 +01:00
Eugen Rochko b0021ca3d5 Fix error in suggestions API due to typo (#17486) 
Regression from #17479
 2022-02-08 22:23:04 +01:00
Claire bab90c9e1b Merge branch 'main' into glitch-soc/merge-upstream 2022-02-08 18:23:53 +01:00
Eugen Rochko a44cc7931a Remove language detection through cld3 (#17478) 
* Remove language detection through cld3

* Update app/helpers/languages_helper.rb

Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>

Co-authored-by: Yamagishi Kazutoshi <ykzts@desire.sh>
 2022-02-08 02:41:17 +01:00
Eugen Rochko 1e5989c612 Add global `locale` param (#17464) 
- Remove the session-based locale stickyness
 2022-02-08 02:34:56 +01:00
Eugen Rochko d979087a98 Fix localization of cold-start follow recommendations (#17479) 2022-02-08 01:53:49 +01:00
Claire edd7dad3e2 Fix Ruby 2.5 incompatibility (#17465) 2022-02-07 19:57:06 +01:00
Eugen Rochko 73a585dd64 Fix structured data parsing from links choking on bad data (#17403) 
* Fix structured data parsing from links choking on bad data

- Fix og:url meta tag being prioritized over canonical link tag
- Fix structured data parsing choking on commented-out CDATA declarations
- Fix HTML entities in title, description, provider_name, author_name
- Change structured data parsing to attempt every JSON-LD script tag

* Remove unnecessary slash escapes from CDATA regex pattern
 2022-02-07 18:16:31 +01:00
Claire 42fdf52f0c Fix replies collection incorrectly looping (#17462) 
* Refactor tests

* Add tests

* Fix replies collection incorrectly looping
 2022-02-07 17:06:43 +01:00
Claire 621d92114d Fix errors when multiple Delete are received for a given actor (#17460) 2022-02-07 13:14:48 +01:00
Claire aaace9f1db Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `CHANGELOG.md`:
  Upstream added newlines.
  Conflicts are because the CHANGELOG was independently merged from 3.4.6 on
  last security update.
  Took upstream's version.
- `app/helpers/context_helper.rb`:
  Conflicts because of extra vocabulary in glitch-soc. The conflicts were
  actually handled in last security merge.
  Kept our version.
 2022-02-06 15:34:42 +01:00
Claire 5d53b3c8a7 Fix instance actor not being dereferenceable (#17457) 
* Add tests

* Fix instance actor not being dereferenceable

* Fix tests

* Fix tests for real
 2022-02-06 15:31:03 +01:00
Claire c94ff7c869 Move glitch-soc-specific theming methods to ThemingConcern 2022-02-05 10:58:51 +01:00
Claire 4944068bd0 Make theme-selection fall back to default ones if configured is not found 2022-02-05 10:29:27 +01:00
Eugen Rochko 25d1195a04 Fix error on account relationships page in admin UI (#17444) 2022-02-05 05:06:34 +01:00
Claire b3190c2cd6 Fix compacted JSON-LD possibly causing compatibility issues on forwarding (#17428) 2022-02-03 14:09:04 +01:00
Claire ec8cf0e39b Fix response_to_recipient? CTE (#17427) 2022-02-03 14:07:43 +01:00
Claire b891d09d2f Compact JSON-LD signed incoming activities (#17426) 
Co-authored-by: Puck Meerburg <puck@puck.moe>
 2022-02-03 14:07:29 +01:00
Claire eee2c187ee Fix response_to_recipient? CTE 2022-02-02 19:55:57 +01:00
Claire 77cc434f2b Fix compacted JSON-LD possibly causing compatibility issues on forwarding 2022-02-02 19:55:57 +01:00
Puck Meerburg 9d92e9204f Compact JSON-LD signed incoming activities 2022-02-02 16:13:11 +01:00
Claire 2341754c70 Merge branch 'main' into glitch-soc/merge-upstream 2022-02-01 20:59:28 +01:00
Claire 2657ca3b5e Fix requiring an extra restart after recent post-deployment migrations (#17422) 
Follow-up to #16409
 2022-02-01 20:57:39 +01:00
Claire a2bc2e14c6 Merge branch 'main' into glitch-soc/merge-upstream 2022-01-30 22:33:30 +01:00
Claire 8919f6cf63 Change public profile pages to be disabled for unconfirmed users (#17385) 
Fixes #17382

Note that unconfirmed and unapproved accounts can still be searched for
and their (empty) account retrieved using the REST API.
 2022-01-28 14:24:37 +01:00
Claire de596a03c0 Fix Sidekiq warning when pushing DMs to direct timeline 2022-01-28 09:07:56 +01:00
Claire daab277c0e Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `Gemfile.lock`:
  Upstream-updated lib textually too close to glitch-soc-only dep.
  Updated like upstream.
 2022-01-28 08:58:32 +01:00
Claire 33ea1c9008 Fix Sidekiq warnings about JSON serialization (#17381) 
* Fix Sidekiq warnings about JSON serialization

This occurs on every symbol argument we pass, and every symbol key in hashes,
because Sidekiq expects strings instead.

See https://github.com/mperham/sidekiq/pull/5071

We do not need to change how workers parse their arguments because this has
not changed and we were already converting to symbols adequately or using
`with_indifferent_access`.

* Set Sidekiq to raise on unsafe arguments in test mode

In order to more easily catch issues that would produce warnings in production
code.
 2022-01-28 00:43:56 +01:00
Claire 56a49e9334 Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `config/environments/production.rb`:
  Upstream changed a header but we had different default headers.
  Applied the same change, and also dropped HSTS headers redundant with
  Rails'.
 2022-01-26 22:32:21 +01:00
Claire 6e8d231e27 Fix local distribution of edited statuses (#17380) 
Because `FanOutOnWriteService#update?` was broken, edits were considered as new
toots and a regular `update` payload was sent.
 2022-01-26 20:53:50 +01:00
Eugen Rochko b6364cf1ad Fix poll updates being saved as status edits (#17373) 
Fix #17344
 2022-01-26 18:05:39 +01:00
Claire 599b27788a Add some explanation text on the CAPTCHA confirmation page 2022-01-26 13:24:51 +01:00
Claire ea32eb89e1 Change CAPTCHA handling to be only on email verification 
This simplifies the implementation considerably, and while not providing
ideal UX, it's the most flexible approach.
 2022-01-25 23:56:57 +01:00
Claire 6988e6ecc3 Add ability to set hCaptcha either on registration form or on e-mail validation 
Upshot of CAPTCHA on e-mail validation is it does not need to break the in-band
registration API.
 2022-01-25 23:09:48 +01:00