Commit Graph

12889 Commits

Author SHA1 Message Date
Nilesh 5ee505d42e Fix #1236 Increase max length of UserInviteRequest.text from 420 to 5000 2022-12-11 20:37:37 +00:00
Darius Kazemi 9a63ac6062
Merge pull request #1235, Mastodon 4.0.2 / Hometown 1.0.8 merge 2022-12-04 12:55:18 -08:00
Darius Kazemi 57cbfed37e Revert "Random WIP mostly for changing layout, should look and then discard"
This reverts commit 6ceb7f2783.
2022-12-04 12:38:29 -08:00
Darius Kazemi a98750aac0 Merge tag 'v3.5.5+hometown-1.0.8' into hometown-4.0-1.0.8-merge 2022-12-04 12:18:18 -08:00
Darius Kazemi 5732db7348 Merge tag 'v4.0.2' into hometown-4.0-merge 2022-12-04 12:01:49 -08:00
Darius Kazemi 29eb83d073
Merge pull request #1233 from hometown-fork/1232-rss-opt-out
Adding a `norss` user preference
2022-12-03 22:08:21 -08:00
Darius Kazemi 427596ab01 Adding a `norss` user preference
There is now a `norss` user preference for a user to opt out of having an RSS feed of their public posts. This operates on the exact same logic as the existing `noindex` for the search engine opt-out: the admin can check a box in Site Settings for a default setting for users. If a user has never touched their RSS opt-out setting then it is equal to whatever the default is. But individual users can override the default in their Preferences -> Other menu.

So a privacy-minded server admin could opt everyone out by default, but the overall default behavior is to have RSS feeds of public posts for everyone, which is the default Mastodon behavior anyway.

The `norss`, like `noindex`, is just a key on a pre-existing `settings` object that is a key-value store, so there doesn't even need to be a database migration for this!

Fixes #1232
2022-12-03 22:04:55 -08:00
Darius Kazemi 4360a50949 Fix sanitizer rule
We don't need to add a class to every span!
2022-12-02 17:38:01 -08:00
Darius Kazemi 9c4df21753 Fix ActivityPub Article rendering bugs
* re-add the `article-type` class to article content in feed
 * fix margin on `article-type`
 * handle images where `src` is formatted like `/foo/bar.png` by inferring the protocol and domain (and port and password if applicable) from `url` in the AP object received -- without this we can't make a reasonable inference of origin since the domain for the content might be different from the domain of the activitypub server itself
2022-12-02 17:13:06 -08:00
Darius Kazemi f6e4ef606a Fix positioning of version in link footer 2022-12-01 22:17:50 -08:00
Darius Kazemi ae7eee0098 Change to migration so it's not "strong" 2022-12-01 22:14:34 -08:00
Darius Kazemi f9c2070d2f
Merge pull request #1229 from hometown-fork/1219-expose-local-only-default-on-api
Expose the "default_federation" preference on the preferences API
2022-12-01 21:28:46 -08:00
Darius Kazemi 7964499716
Merge pull request #1228 from hometown-fork/1183-fetch-ap-articles
Make the "media gallery" not show up on Articles
2022-12-01 21:28:27 -08:00
Darius Kazemi 81dd6eec39
Merge pull request #1227 from hometown-fork/1187-keep-local-posts
Add option to keep local-only posts on auto-delete
2022-12-01 21:28:07 -08:00
Darius Kazemi d271c40341
Merge pull request #1226 from hometown-fork/1174-multiple-choice-poll-toggle
Add toggle for multiple choice polls
2022-12-01 21:27:52 -08:00
Darius Kazemi 38a6d091b6
Merge pull request #1225 from hometown-fork/1206-update-footer
Fix references to Mastodon in footer
2022-12-01 21:27:34 -08:00
Darius Kazemi 67db9ccdf3
Merge pull request #1224 from hometown-fork/1202-fix-i-dont-like-it
Make the "I don't like it" category let you report an account
2022-12-01 21:26:32 -08:00
Darius Kazemi 7c4b7c6cfe
Merge pull request #1223 from hometown-fork/1213-version-string
Swap version numbers and add identifier
2022-12-01 21:26:00 -08:00
Darius Kazemi a52bd88273 Expose the "default_federation" preference on the preferences API
Now when you make a call to `api/v1/preferences` you get a `posting:default:federation` response, which is `true` if the user's posts federate by default, and `false` if the user's posts are local-only by default.
2022-12-01 21:23:10 -08:00
Darius Kazemi 160c575c8b Making the "media gallery" not show up on Articles
When we fetch Articles, we render images inline as intended by the Article. There is no need for a Media Gallery item.
2022-12-01 21:07:04 -08:00
Darius Kazemi 503efed083 Add option to keep local-only posts on auto-delete
This adds a `keep_local` column to the `account_statuses_cleanup_policy` table in the database. There is a new checkbox in the preferences for automatic post deletion, and when calculating which statuses to delete there is now a filter for `without_local_scope`.
2022-12-01 20:28:45 -08:00
Darius Kazemi fb23e84d58 Add toggle for multiple choice polls
Adding an explicit toggle to the poll interface so the multiple choice polls are no longer a "hidden" feature.

Fixes #1174
2022-12-01 19:45:40 -08:00
Darius Kazemi b8c624b673 Fix references to Mastodon in footer
We now link the Hometown documentation, and list Hometown first as the place to report issues.

Fixes #1206
2022-12-01 19:36:42 -08:00
Darius Kazemi 6341c9419c Make the "I don't like it" category let you report an account
This makes it so that when a user reports an account and selects "I don't like it", instead of getting a message about how they should personally block that person, it sends them to the normal reporting interface and they can file their report.

Fixes #1202
2022-12-01 19:13:17 -08:00
Darius Kazemi ca5c920a37 Swap version numbers and add identifier
For better compatibility with third party apps and to be more in line with what other fediverse software does (including other Mastodon forks), I am changing the semver version to reflect the synchronized Mastodon version, and making the Hometown version part of the build metadata after the '+' sign. I am also adding a 'hometown' identifier to the build metadata.

Fixes #1213
2022-12-01 18:47:21 -08:00
Darius Kazemi 6ceb7f2783 Random WIP mostly for changing layout, should look and then discard 2022-12-01 18:26:28 -08:00
Darius Kazemi 9545af9026 Basic tweaks and fixes to the merge 2022-11-16 21:49:51 -08:00
Darius Kazemi 840688318f Merge tag 'v4.0.0' into hometown-4.0-merge 2022-11-16 20:54:49 -08:00
Eugen Rochko 03b0f3ac83
Bump version to 4.0.2 (#20725) 2022-11-15 03:57:18 +01:00
Eugen Rochko 43b0b2f3f4
Fix wrong directive `unsafe-wasm-eval` to `wasm-unsafe-eval` (#20729) 2022-11-15 03:39:06 +01:00
prplecake b46b7c3d5e
Use "unsafe-wasm-eval" instead of "unsafe-eval" in script-src CSP (#20606)
* Add "unsafe-eval" to script-src CSP

* Use 'unsafe-wasm-eval' instead of 'unsafe-eval'
2022-11-15 03:22:38 +01:00
dependabot[bot] b59683c156
Bump nokogiri from 1.13.8 to 1.13.9 (#20041)
Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.13.8 to 1.13.9.
- [Release notes](https://github.com/sparklemotion/nokogiri/releases)
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.13.8...v1.13.9)

---
updated-dependencies:
- dependency-name: nokogiri
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2022-11-15 03:19:56 +01:00
Eugen Rochko 17bd9a87b9
Fix wrong color on mentions hidden behind content warning in web UI (#20724) 2022-11-15 02:58:00 +01:00
Claire 8c3c6dcae9
Fix filters from other users being used in the streaming service (#20719) 2022-11-15 02:09:58 +01:00
Darius Kazemi 73bdd71e09 Merge tag 'v3.5.5' into hometown-dev 2022-11-14 13:44:19 -08:00
Claire 696f7b3608 Bump version to 3.5.5 2022-11-14 22:26:24 +01:00
Eugen Rochko 4415dd6036
Bump version to 4.0.1 (#20696) 2022-11-14 22:21:14 +01:00
Claire b22e1476ca Fix nodes order being sometimes mangled when rewriting emoji (#20677)
* Fix front-end emoji tests

* Fix nodes order being sometimes mangled when rewriting emoji
2022-11-14 22:20:29 +01:00
Claire ccbca50a25
Fix nodes order being sometimes mangled when rewriting emoji (#20677)
* Fix front-end emoji tests

* Fix nodes order being sometimes mangled when rewriting emoji
2022-11-14 22:14:55 +01:00
Darius Kazemi f5ffda7cf3 Merge tag 'v3.5.4' into hometown-dev 2022-11-14 11:47:27 -08:00
Eugen Rochko fb389bd73c
Bump version to 4.0.0 (#20636) 2022-11-14 20:27:12 +01:00
Eugen Rochko 21fd25a269
Fix rate limiting for paths with formats (#20675) 2022-11-14 20:26:31 +01:00
Claire 71c92d3f56
Fix emoji substitution not applying only to text nodes in backend code (#20641)
Signed-off-by: Claire <claire.github-309c@sitedethib.com>

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-11-14 20:26:21 +01:00
Claire 625e086996
Fix emoji substitution not applying only to text nodes in Web UI (#20640)
Signed-off-by: Claire <claire.github-309c@sitedethib.com>

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-11-14 20:26:03 +01:00
Claire 105ab82425 Bump version to 3.5.4 2022-11-14 20:09:16 +01:00
Claire 2d54986a03
Fix media metadata being only editable once (#20665) 2022-11-14 17:52:31 +01:00
Claire 2dd8f977e8 Fix emoji substitution not applying only to text nodes in backend code
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-11-14 11:20:41 +01:00
Claire 2db06e1d08 Fix emoji substitution not applying only to text nodes in Web UI
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2022-11-14 11:20:41 +01:00
Eugen Rochko 063579373e Fix rate limiting for paths with formats 2022-11-14 11:20:41 +01:00
Pierre Bourdon 1659788de4 blurhash_transcoder: prevent out-of-bound reads with <8bpp images (#20388)
The Blurhash library used by Mastodon requires an input encoded as 24
bits raw RGB data. The conversion to raw RGB using Imagemagick did not
previously specify the desired bit depth. In some situations, this leads
Imagemagick to output in a pixel format using less bpp than expected.
This then manifested as segfaults of the Sidekiq process due to
out-of-bounds read, or potentially a (highly noisy) memory infoleak.

Fixes #19235.
2022-11-14 11:20:41 +01:00